Merge branch 'develop' into dev/diagnose20210315

cdssman-service/src/main/java/com/diagbot/facade/KlConceptCommonFacade.java

@@ -49,6 +49,7 @@ public class KlConceptCommonFacade extends KlConceptCommonServiceImpl {
                 klConceptCommonSub.setMaxAge(klConceptSaveVO.getMaxAge());
                 klConceptCommonSub.setMinAge(klConceptSaveVO.getMinAge());
                 klConceptCommonSub.setGmtModified(now);
+                klConceptCommonSub.setSexType(klConceptSaveVO.getSexType());
                 klConceptCommonSub.setModifier(UserUtils.getCurrentPrincipleID());
                 res = this.save(klConceptCommonSub);
             }
@@ -58,6 +59,7 @@ public class KlConceptCommonFacade extends KlConceptCommonServiceImpl {
             klConceptCommonSub.setMaxAge(klConceptSaveVO.getMaxAge());
             klConceptCommonSub.setMinAge(klConceptSaveVO.getMinAge());
             klConceptCommonSub.setGmtModified(now);
+            klConceptCommonSub.setSexType(klConceptSaveVO.getSexType());
             klConceptCommonSub.setModifier(UserUtils.getCurrentPrincipleID());
             res = this.save(klConceptCommonSub);
         }

cdssman-service/src/main/java/com/diagbot/facade/KlDiseaseFacade.java

@@ -177,13 +177,27 @@ public class KlDiseaseFacade extends KlDiseaseServiceImpl {
         Date now = DateUtil.now();
         boolean res = false;
         if (null != klConceptSaveVO.getConceptId()) {
-            UpdateWrapper<KlDisease> klDiseaseQuerySub = new UpdateWrapper<>();
-            klDiseaseQuerySub.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("concept_id", klConceptSaveVO.getConceptId())
-                    .set("gmt_modified", now)
-                    .set("modifier", UserUtils.getCurrentPrincipleID())
-                    .set(StringUtil.isNotBlank(klConceptSaveVO.getIcdCode()),"icd10_code", klConceptSaveVO.getIcdCode());
-            res = this.update(new KlDisease(),klDiseaseQuerySub);
+            //校验
+            int countLis = this.count(new QueryWrapper<KlDisease>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("concept_id", klConceptSaveVO.getConceptId()));
+            if (countLis > 0) {
+                UpdateWrapper<KlDisease> klDiseaseQuerySub = new UpdateWrapper<>();
+                klDiseaseQuerySub.eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq("concept_id", klConceptSaveVO.getConceptId())
+                        .set("gmt_modified", now)
+                        .set("modifier", UserUtils.getCurrentPrincipleID())
+                        .set(StringUtil.isNotBlank(klConceptSaveVO.getIcdCode()), "icd10_code", klConceptSaveVO.getIcdCode());
+                res = this.update(new KlDisease(), klDiseaseQuerySub);
+            } else {
+                KlDisease kllDiseaseSub = new KlDisease();
+                kllDiseaseSub.setConceptId(klConceptSaveVO.getConceptId());
+                kllDiseaseSub.setGmtModified(now);
+                kllDiseaseSub.setModifier(UserUtils.getCurrentPrincipleID());
+                kllDiseaseSub.setIcd10Code(klConceptSaveVO.getIcdCode());
+                res = this.save(kllDiseaseSub);
+            }
+
         } else {
             KlDisease kllDiseaseSub = new KlDisease();
             kllDiseaseSub.setConceptId(klConceptSaveVO.getConceptId());
@@ -195,7 +209,7 @@ public class KlDiseaseFacade extends KlDiseaseServiceImpl {
         return res;
     }
 
-    public boolean saveAll(KlConcept klConceptPare,KlConceptSaveVO klConceptSaveVO) {
+    public boolean saveAll(KlConcept klConceptPare, KlConceptSaveVO klConceptSaveVO) {
         Date now = DateUtil.now();
         KlDisease kllDiseaseSub = new KlDisease();
         kllDiseaseSub.setConceptId(klConceptPare.getId());

config-server/src/main/resources/shared/cdssman-service-dev.yml

@@ -23,11 +23,11 @@ spring:
         testOnBorrow: false
         testOnReturn: false
         # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
+        poolPreparedStatements: false
         maxPoolPreparedStatementPerConnectionSize: 20
         # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
         filters.commons-log.connection-logger-name: wall,log4j
-        share-prepared-statements: true
+        share-prepared-statements: false
         filter:
           stat:
             enabled: true

config-server/src/main/resources/shared/cdssman-service-local.yml

@@ -23,11 +23,11 @@ spring:
         testOnBorrow: false
         testOnReturn: false
         # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
+        poolPreparedStatements: false
         maxPoolPreparedStatementPerConnectionSize: 20
         # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
         filters.commons-log.connection-logger-name: wall,log4j
-        share-prepared-statements: true
+        share-prepared-statements: false
         filter:
           stat:
             enabled: true

config-server/src/main/resources/shared/cdssman-service-pre.yml

@@ -23,11 +23,11 @@ spring:
         testOnBorrow: false
         testOnReturn: false
         # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
+        poolPreparedStatements: false
         maxPoolPreparedStatementPerConnectionSize: 20
         # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
         filters.commons-log.connection-logger-name: wall,log4j
-        share-prepared-statements: true
+        share-prepared-statements: false
         filter:
           stat:
             enabled: true

config-server/src/main/resources/shared/cdssman-service-pro.yml

@@ -25,11 +25,11 @@ spring:
           testOnBorrow: false
           testOnReturn: false
           # 打开PSCache，并且指定每个连接上PSCache的大小
-          poolPreparedStatements: true
+          poolPreparedStatements: false
           maxPoolPreparedStatementPerConnectionSize: 20
           # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
           filters.commons-log.connection-logger-name: wall,log4j
-          share-prepared-statements: true
+          share-prepared-statements: false
           filter:
             stat:
               enabled: true

config-server/src/main/resources/shared/cdssman-service-test.yml

@@ -23,11 +23,11 @@ spring:
         testOnBorrow: false
         testOnReturn: false
         # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
+        poolPreparedStatements: false
         maxPoolPreparedStatementPerConnectionSize: 20
         # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
         filters.commons-log.connection-logger-name: wall,log4j
-        share-prepared-statements: true
+        share-prepared-statements: false
         filter:
           stat:
             enabled: true