diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 6c528ca1..4a9808c6 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -363,6 +363,11 @@ public class UdiRelevanceController extends BaseController { udiProductEntity.setBasicPrductRemak6(udiRelevanceSaveRequest.getBasicPrductRemak6()); udiProductEntity.setBasicPrductRemak7(udiRelevanceSaveRequest.getBasicPrductRemak7()); udiProductEntity.setBasicPrductRemak8(udiRelevanceSaveRequest.getBasicPrductRemak8()); + udiProductEntity.setBasicPrductRemak9(udiRelevanceSaveRequest.getBasicPrductRemak9()); + udiProductEntity.setBasicPrductRemak10(udiRelevanceSaveRequest.getBasicPrductRemak10()); + udiProductEntity.setBasicPrductRemak11(udiRelevanceSaveRequest.getBasicPrductRemak11()); + udiProductEntity.setBasicPrductRemak12(udiRelevanceSaveRequest.getBasicPrductRemak12()); + udiProductEntity.setBasicPrductRemak13(udiRelevanceSaveRequest.getBasicPrductRemak13()); udiProductEntity.setCatalogcode(udiRelevanceSaveRequest.getCatalogcode()); udiProductEntity.setCatalogname1(udiRelevanceSaveRequest.getCatalogname1()); diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java index 17694388..abbfde95 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -97,6 +97,11 @@ public class UdiRelevanceSaveRequest { private String basicPrductRemak6; private String basicPrductRemak7; private String basicPrductRemak8; + private String basicPrductRemak9; + private String basicPrductRemak10; + private String basicPrductRemak11; + private String basicPrductRemak12; + private String basicPrductRemak13; private String price; private Integer useExpireTime; diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 1a44a5c2..583cdaad 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -102,6 +102,11 @@ public class UdiRelevanceResponse { private String basicPrductRemak6; private String basicPrductRemak7; private String basicPrductRemak8; + private String basicPrductRemak9; + private String basicPrductRemak10; + private String basicPrductRemak11; + private String basicPrductRemak12; + private String basicPrductRemak13; private BigDecimal price; private Boolean isSelect; diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index bb8d151d..b60f831a 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -954,6 +954,21 @@ basicPrductRemak8=#{basicPrductRemak8}, + + basicPrductRemak9=#{basicPrductRemak9}, + + + basicPrductRemak10=#{basicPrductRemak10}, + + + basicPrductRemak11=#{basicPrductRemak11}, + + + basicPrductRemak12=#{basicPrductRemak12}, + + + basicPrductRemak13=#{basicPrductRemak13}, + updateTime=#{updateTime}, diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 7e4ed892..46d86c2e 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -456,6 +456,12 @@ basic_products.basicPrductRemak5, basic_products.basicPrductRemak6, basic_products.basicPrductRemak7, + basic_products.basicPrductRemak8, + basic_products.basicPrductRemak9, + basic_products.basicPrductRemak10, + basic_products.basicPrductRemak11, + basic_products.basicPrductRemak12, + basic_products.basicPrductRemak13, basic_products.sfwblztlcp, basic_products.cgzmraqxgxx, basic_products.sfbjwycxsy, @@ -659,6 +665,11 @@ basic_products.basicPrductRemak6, basic_products.basicPrductRemak7, basic_products.basicPrductRemak8, + basic_products.basicPrductRemak9, + basic_products.basicPrductRemak10, + basic_products.basicPrductRemak11, + basic_products.basicPrductRemak12, + basic_products.basicPrductRemak13, basic_products.sfwblztlcp, basic_products.cgzmraqxgxx, basic_products.sfbjwycxsy, diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 7ed520f1..085b8259 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -896,3 +896,10 @@ CALL Pro_Temp_ColumnWork('thr_products_add_di', 'basicPrductRemak12', CALL Pro_Temp_ColumnWork('thr_products_add_di', 'basicPrductRemak13', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''备注字段13''', 1); + + +INSERT ignore INTO `sys_param_config` (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (20101, 0, '耗材字典备用字段9', 'basicPrductRemak9', '供货单位', 1, 2, NULL, '2025-01-15 11:36:12'); +INSERT ignore INTO `sys_param_config` (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (20102, 0, '耗材字典备用字段10', 'basicPrductRemak10', '零售价', 1, 2, NULL, '2025-01-15 10:44:12'); +INSERT ignore INTO `sys_param_config` (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (20103, 0, '耗材字典备用字段11', 'basicPrductRemak11', '病案名称', 1, 2, NULL, '2025-01-15 10:44:22'); +INSERT ignore INTO `sys_param_config` (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (20104, 0, '耗材字典备用字段12', 'basicPrductRemak12', '医保结算', 1, 2, NULL, '2025-01-15 10:44:31'); +INSERT ignore INTO `sys_param_config` (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (20105, 0, '耗材字典备用字段13', 'basicPrductRemak13', '是否医保范围', 1, 2, NULL, '2025-01-15 10:44:40');