Merge branch 'dev/20220228_v3.0.1通用版_渠道管理第一期' into debug

daqe-center/src/main/java/com/lantone/daqe/facade/ColumnResultManagementFacade.java

@@ -155,7 +155,7 @@ public class ColumnResultManagementFacade {
                     .eq("id", resultId)
                     .set("description", updateColumnResultVO.getDescription())
                     .set("gmt_modified", new Date())
-                    .set("modifier", principleId)
+                    .set("modifier", principleId == null ? "0" : principleId)
             );
         }
         //正则校验结果表
@@ -165,7 +165,7 @@ public class ColumnResultManagementFacade {
                     .eq("id", resultId)
                     .set("description", updateColumnResultVO.getDescription())
                     .set("gmt_modified", new Date())
-                    .set("modifier", principleId)
+                    .set("modifier", principleId == null ? "0" : principleId)
             );
         }
         //关键字校验结果表
@@ -175,7 +175,7 @@ public class ColumnResultManagementFacade {
                     .eq("id", resultId)
                     .set("description", updateColumnResultVO.getDescription())
                     .set("gmt_modified", new Date())
-                    .set("modifier", principleId)
+                    .set("modifier", principleId == null ? "0" : principleId)
             );
         }
 
@@ -184,7 +184,7 @@ public class ColumnResultManagementFacade {
                 .eq("id", updateColumnResultVO.getId())
                 .set("description", updateColumnResultVO.getDescription())
                 .set("gmt_modified", new Date())
-                .set("modifier", principleId)
+                .set("modifier", principleId == null ? "0" : principleId)
         );
     }
 

daqe-center/src/main/java/com/lantone/daqe/facade/ColumnVerifyManagementFacade.java

@@ -475,7 +475,7 @@ public class ColumnVerifyManagementFacade {
                                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                                 .set("regular_id", updateColumnVerifyVO.getRegularId())
                                 .set("gmt_modified", new Date())
-                                .set("modifier",principleId)
+                                .set("modifier", principleId == null ? "0" : principleId)
                         );
                         Long mappingId = selectOneMapping.getId();
                         //修改总表
@@ -486,7 +486,7 @@ public class ColumnVerifyManagementFacade {
                                 .set("verify_val", updateColumnVerifyVO.getRegularName())
                                 .set("description", updateColumnVerifyVO.getDescription())
                                 .set("gmt_modified", new Date())
-                                .set("modifier",principleId)
+                                .set("modifier", principleId == null ? "0" : principleId)
                         );
                     } else {
                         //未关联正则走新增
@@ -533,7 +533,7 @@ public class ColumnVerifyManagementFacade {
                                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                                 .set("is_required", updateColumnVerifyVO.getIsRequired())
                                 .set("gmt_modified", new Date())
-                                .set("modifier",principleId)
+                                .set("modifier", principleId == null ? "0" : principleId)
                         );
                         Long mappingId = selectOneInfo.getId();
                         //修改总表
@@ -544,7 +544,7 @@ public class ColumnVerifyManagementFacade {
                                 .set("verify_val", updateColumnVerifyVO.getIsRequired())
                                 .set("description", updateColumnVerifyVO.getDescription())
                                 .set("gmt_modified", new Date())
-                                .set("modifier",principleId)
+                                .set("modifier", principleId == null ? "0" : principleId)
                         );
                     } else {
                         NonnullInfo nonnullInfo = new NonnullInfo();

daqe-center/src/main/resources/upgrade/V2__daqe_init_uptable.sql

@@ -26,3 +26,23 @@ ADD COLUMN `behospital_date`  datetime NULL DEFAULT NULL COMMENT '入院日期'
 -- ----------------------------
 ALTER TABLE `dc_regular_result`
 ADD COLUMN `behospital_date`  datetime NULL DEFAULT NULL COMMENT '入院日期' AFTER `description`;
+-- ----------------------------
+-- 7.新增`str_admission_note`表-新增主键
+-- ----------------------------
+ALTER TABLE `str_admission_note`
+ADD COLUMN `id`  bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键id' FIRST ,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (`id`, `rec_id`, `hospital_id`, `behospital_code`);
+-- ----------------------------
+-- 8.新增`str_leave_hospital`表-新增主键
+-- ----------------------------
+ALTER TABLE `str_leave_hospital`
+ADD COLUMN `id`  bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键id' FIRST ,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (`id`, `rec_id`, `hospital_id`);
+-- ----------------------------
+-- 9.修改`dc_regular_result`表-regular_des字段默认为空
+-- ----------------------------
+ALTER TABLE `dc_regular_result`
+MODIFY COLUMN `regular_des`  varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '正则式描述' AFTER `regular_val`;
+