Merge remote-tracking branch 'origin/dev/nurse20210421' into debug

cdssman-service/src/main/java/com/diagbot/dto/KlConceptAllDTO.java

@@ -30,6 +30,7 @@ public class KlConceptAllDTO {
     private Double maxAge;
     private Double minVal;
     private Double maxVal;
+    private String unit;
     private Integer scopeType;
     private String  icdCode;
     private String remark;

cdssman-service/src/main/java/com/diagbot/entity/KlLis.java

@@ -72,7 +72,8 @@ public class KlLis implements Serializable {
     /**
      * 单位概念id
      */
-    private Long unit;
+
+    private String unit;
 
     /**
      * 备注
@@ -149,11 +150,11 @@ public class KlLis implements Serializable {
     public void setType(Integer type) {
         this.type = type;
     }
-    public Long getUnit() {
+    public String getUnit() {
         return unit;
     }
 
-    public void setUnit(Long unit) {
+    public void setUnit(String unit) {
         this.unit = unit;
     }
     public String getRemark() {

cdssman-service/src/main/java/com/diagbot/enums/DiseaseRelationTypeEnum.java

@@ -19,7 +19,8 @@ public enum DiseaseRelationTypeEnum implements KeyedNamed {
     disMedicine(506, "100&506&101"),
     disOperator(507, "100&507&106"),
     disDifferentDis(508, "100&508&100"),
-    disLiangbiao(509, "100&509&124")
+    disLiangbiao(509, "100&509&124"),
+    disNurse(510, "100&510&123"),
     ;
 
 

cdssman-service/src/main/java/com/diagbot/enums/RelationLibTypeEnum.java

@@ -19,7 +19,8 @@ public enum RelationLibTypeEnum implements KeyedNamed {
     disMedicine(506, "101"),
     disOperator(507, "106"),
     disDifferentDis(508, "100"),
-    disLiangbiao(509,"124");
+    disLiangbiao(509,"124"),
+    disNurse(510,"123");
 
 
     @Setter

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

@@ -36,7 +36,7 @@ public class CacheFacade {
 
     public boolean clearStandRuleDrugAll() {
         RespDTO<Boolean> resData =  cdssCoreClient.clearStandRuleDrugAll();
-        RespDTOUtil.respNGDealCover(resData, resData.msg);
+        RespDTOUtil.respNGDeal(resData, "加载数据失败！");
         return  resData.data;
     }
 

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

@@ -103,7 +103,7 @@ public class KlDiseaseFacade extends KlDiseaseServiceImpl {
      * @return
      */
     public DiseaseTreeDetailDTO getDetail(GetDiseaseDetailVO getDiseaseDetailVO) {
-        List<Integer> relations = Arrays.asList(501, 502, 503, 504, 505, 506, 507, 508, 509);
+        List<Integer> relations = Arrays.asList(501, 502, 503, 504, 505, 506, 507, 508, 509,510);
         List<KlLexiconRelationship> klLexiconRelationships = klLexiconRelationshipFacade.list(new QueryWrapper<KlLexiconRelationship>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("code", relations)

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.entity.KlConcept;
 import com.diagbot.entity.KlDrug;
-import com.diagbot.entity.KlLis;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.KlDrugServiceImpl;
 import com.diagbot.util.DateUtil;

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

@@ -37,12 +37,14 @@ public class KlLisFacade extends KlLisServiceImpl {
                         .set("modifier", UserUtils.getCurrentPrincipleID())
                         .set("min_value", klConceptSaveVO.getMinVal())
                         .set("max_value", klConceptSaveVO.getMaxVal())
+                        .set("unit", klConceptSaveVO.getUnit())
                         .set("type", klConceptSaveVO.getScopeType());
                 res = this.update(new KlLis(), klDiseaseQuerySub);
             } else {
                 KlLis klLisSub = new KlLis();
                 klLisSub.setConceptId(klConceptSaveVO.getConceptId());
                 klLisSub.setGmtModified(now);
+                klLisSub.setUnit(klConceptSaveVO.getUnit());
                 klLisSub.setModifier(UserUtils.getCurrentPrincipleID());
                 klLisSub.setMinValue(klConceptSaveVO.getMinVal());
                 klLisSub.setMaxValue(klConceptSaveVO.getMaxVal());
@@ -54,6 +56,7 @@ public class KlLisFacade extends KlLisServiceImpl {
             KlLis klLisSub = new KlLis();
             klLisSub.setConceptId(klConceptSaveVO.getConceptId());
             klLisSub.setGmtModified(now);
+            klLisSub.setUnit(klConceptSaveVO.getUnit());
             klLisSub.setModifier(UserUtils.getCurrentPrincipleID());
             klLisSub.setMinValue(klConceptSaveVO.getMinVal());
             klLisSub.setMaxValue(klConceptSaveVO.getMaxVal());
@@ -69,6 +72,7 @@ public class KlLisFacade extends KlLisServiceImpl {
         klLisSub.setConceptId(klConceptPare.getId());
         klLisSub.setMinValue(klConceptSaveVO.getMinVal());
         klLisSub.setMaxValue(klConceptSaveVO.getMaxVal());
+        klLisSub.setUnit(klConceptSaveVO.getUnit());
         klLisSub.setType(klConceptSaveVO.getScopeType());
         klLisSub.setCreator(UserUtils.getCurrentPrincipleID());
         klLisSub.setModifier(UserUtils.getCurrentPrincipleID());

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

@@ -264,7 +264,7 @@ public class RelationContactFacade extends KlRelationServiceImpl {
                     .eq("lib_name", disName.trim())
                     .eq("lib_type", 100));
             List<Long> ids = klConcepts.stream().map(x -> x.getId()).collect(Collectors.toList());
-            List<Integer> relations = Lists.newArrayList(501, 502, 503, 504, 505, 506, 507, 508, 509);
+            List<Integer> relations = Lists.newArrayList(501, 502, 503, 504, 505, 506, 507, 508, 509,510);
             List<KlRelation> klRelations = this.list(new QueryWrapper<KlRelation>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .in(ListUtil.isNotEmpty(ids), "start_id", ids)

cdssman-service/src/main/java/com/diagbot/vo/KlConceptSaveVO.java

@@ -35,6 +35,7 @@ public class KlConceptSaveVO {
     private Double maxAge;
     private Double minVal;
     private Double maxVal;
+    private String unit;
     private Integer scopeType;
     private String icdCode;
     private String remark;

cdssman-service/src/main/resources/mapper/KlConceptMapper.xml

@@ -72,6 +72,7 @@
         f.max_age AS maxAge,
         g.min_value AS minVal,
         g.max_value AS maxVal,
+        g.unit AS unit,
         g.type AS scopeType,
         h.icd10_code AS icdCode,
         dr.drug ,

cdssman-service/src/main/resources/mapper/KlDiseaseMapper.xml

@@ -110,7 +110,7 @@
                 #{item}
             </foreach>
         </if>-->
-        AND kr.relation_id IN (501,502,503,504,505,506,507,508,509)
+        AND kr.relation_id IN (501,502,503,504,505,506,507,508,509,510)
         ORDER BY
         rid,kro.order_no
     </select>

cdssman-service/src/main/resources/mapper/KlRelationMapper.xml

@@ -181,7 +181,8 @@
         506,
         507,
         508,
-        509
+        509,
+        510
         )
         GROUP BY b.id
         ) re

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

@@ -119,6 +119,8 @@ mybatis-plus:
 
 #远程调用验证标准词接口时间加长
 hystrix.command.CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用更新数据接口时间加长
+hystrix.command.CdssCoreClient#clearStandRuleDrugAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
 
 io.github.lvyahui8.spring:
   base-packages: com.diagbot.aggregate

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

@@ -118,6 +118,8 @@ mybatis-plus:
 
 #远程调用验证标准词接口时间加长
 hystrix.command.CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用更新数据接口时间加长
+hystrix.command.CdssCoreClient#clearStandRuleDrugAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
 
 io.github.lvyahui8.spring:
   base-packages: com.diagbot.aggregate

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

@@ -119,6 +119,8 @@ mybatis-plus:
 
 #远程调用验证标准词接口时间加长
 hystrix.command.CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用更新数据接口时间加长
+hystrix.command.CdssCoreClient#clearStandRuleDrugAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
 
 io.github.lvyahui8.spring:
   base-packages: com.diagbot.aggregate

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

@@ -119,6 +119,8 @@ mybatis-plus:
 
 #远程调用验证标准词接口时间加长
 hystrix.command.CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用更新数据接口时间加长
+hystrix.command.CdssCoreClient#clearStandRuleDrugAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
 
 io.github.lvyahui8.spring:
   base-packages: com.diagbot.aggregate

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

@@ -119,6 +119,8 @@ mybatis-plus:
 
 #远程调用验证标准词接口时间加长
 hystrix.command.CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用更新数据接口时间加长
+hystrix.command.CdssCoreClient#clearStandRuleDrugAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
 
 io.github.lvyahui8.spring:
   base-packages: com.diagbot.aggregate

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

@@ -12,7 +12,7 @@ spring:
       datasource:
         neo4j:
           driver-class-name: org.neo4j.jdbc.Driver
-          url: jdbc:neo4j:http://192.168.2.123:7472
+          url: jdbc:neo4j:http://192.168.2.122:7472
           username: neo4j
           password: 12345678
           #定义初始连接数