Merge remote-tracking branch 'origin/dev/icssNCD' into dev/icssNCD

config-server/src/main/resources/application.yml

@@ -57,8 +57,8 @@ management:
   endpoint:
     health:
       show-details: ALWAYS
-  security:
-    enabled: false
+#  security:
+#    enabled: false
 
 myuri: localhost
 

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

@@ -1,6 +1,6 @@
 server:
   port: 8766
-security.basic.enabled: false
+#security.basic.enabled: false
 turbine:
   aggregator:
     clusterConfig: default
@@ -20,6 +20,6 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
-management:
-  security:
-    enabled: false
+#management:
+#  security:
+#    enabled: false

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

@@ -1,6 +1,6 @@
 server:
   port: 8766
-security.basic.enabled: false
+#security.basic.enabled: false
 turbine:
   aggregator:
     clusterConfig: default
@@ -20,6 +20,6 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
-management:
-  security:
-    enabled: false
+#management:
+#  security:
+#    enabled: false

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

@@ -1,6 +1,6 @@
 server:
   port: 8766
-security.basic.enabled: false
+#security.basic.enabled: false
 turbine:
   aggregator:
     clusterConfig: default
@@ -20,6 +20,6 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
-management:
-  security:
-    enabled: false
+#management:
+#  security:
+#    enabled: false

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

@@ -1,6 +1,6 @@
 server:
   port: 8766
-security.basic.enabled: false
+#security.basic.enabled: false
 turbine:
   aggregator:
     clusterConfig: default
@@ -20,6 +20,6 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
-management:
-  security:
-    enabled: false
+#management:
+#  security:
+#    enabled: false

docs/006.20190304慢病基于icss增量脚本/init_icss_NCD.sql

@@ -263,3 +263,10 @@ INSERT INTO `icss_index_config` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-0
 alter table icss_module_info change  column disease module_type bigint(20) COMMENT '(0.通用 1.根据科室划分 2.慢病)';
 alter table icss_module_info add  column relation_id bigint(20) NOT NULL DEFAULT '0' COMMENT '关联id';
 ALTER TABLE `icss_module_info` MODIFY COLUMN `type`  varchar(20) NOT NULL DEFAULT 0 COMMENT '类型(1.主诉 2.现病史 3.其他史 4.查体 5.化验 6.辅检 7.诊断 8.医嘱 22.现病史空模板 31.主诉子模板 32.现病史子模板 322.现病史空模板子模板)' AFTER `name`;
+--修改普通模板的值
+UPDATE `icss_module_info` SET `module_type`='0',`relation_id`='0' WHERE (`id`='1');
+UPDATE `icss_module_info` SET `module_type`='0',`relation_id`='0' WHERE (`id`='2');
+UPDATE `icss_module_info` SET `type` = '32',`module_type`='0',`relation_id`='0' WHERE (`id`='3');
+UPDATE `icss_module_info` SET `module_type`='0',`relation_id`='0' WHERE (`id`='4');
+UPDATE `icss_module_info` SET `module_type`='0',`relation_id`='0' WHERE (`id`='5');
+UPDATE `icss_module_info` SET `type` = '31',`module_type`='0',`relation_id`='0' WHERE (`id`='6');

icss-service/src/main/java/com/diagbot/client/bean/AdverseReaction.java

@@ -13,7 +13,10 @@ import java.util.List;
 @Getter
 @Setter
 public class AdverseReaction {
+    private Long id;
     private String name;  //名称
+    private String tagName; //标签名称
+    private String showInfo = "0";//是否显示提示信息
     private Integer controlType; //控件类型
     private List<AdverseReactionDetail> details;
 }

icss-service/src/main/java/com/diagbot/client/bean/CalcResult.java

@@ -13,4 +13,5 @@ import lombok.Setter;
 public class CalcResult {
     private Double value;
     private String text;
+    private String unit;
 }

icss-service/src/main/java/com/diagbot/dto/CalculateDTO.java

@@ -0,0 +1,15 @@
+package com.diagbot.dto;
+
+import com.diagbot.client.bean.CalcResult;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:计算结果返回
+ * @Author:zhaops
+ * @time: 2019/4/15 14:52
+ */
+@Getter
+@Setter
+public class CalculateDTO extends CalcResult {
+}

icss-service/src/main/java/com/diagbot/dto/PushDTO.java

@@ -27,5 +27,4 @@ public class PushDTO {
     private List<MedicalIndicationDTO> medicalIndications;
     private List<ScaleContent> scale;
     private List<EvaluationModuleMappingDTO> evaluationModule;
-    private CalcResult calcResult;
 }

icss-service/src/main/java/com/diagbot/enums/CalculateTypeEnum.java

@@ -0,0 +1,49 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 计算类型
+ * @Author:zhaops
+ * @time: 2019/4/15 13:57
+ */
+public enum CalculateTypeEnum implements KeyedNamed {
+    Scale(1, "量表计算"),
+    Formula(11, "公式计算");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    CalculateTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static CalculateTypeEnum getEnum(Integer key) {
+        for (CalculateTypeEnum item : CalculateTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        CalculateTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

icss-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java

@@ -18,8 +18,7 @@ public enum FeatureTypeEnum implements KeyedNamed {
     Treat(8, "治疗"),
     Scale(21, "量表内容"),
     MedicalIndication(22, "指标"),
-    ManagementEvaluation(11, "管理评估"),
-    Calculate(31,"计算");
+    ManagementEvaluation(11, "管理评估");
 
     @Setter
     private Integer key;

icss-service/src/main/java/com/diagbot/enums/ARControlTypeEnum.java

@@ -8,9 +8,11 @@ import lombok.Setter;
  * @Author:zhaops
  * @time: 2019/3/14 11:16
  */
-public enum  ARControlTypeEnum implements KeyedNamed {
-    Radio(1, "单选"),
-    CheckBox(0, "多选");
+public enum GBControlTypeEnum implements KeyedNamed {
+    Radio(0, "单选"),
+    CheckBox(1, "多选"),
+    Text(2,"文本"),
+    Dropdownlist(3,"下拉列表");
 
     @Setter
     private Integer key;
@@ -18,13 +20,13 @@ public enum  ARControlTypeEnum implements KeyedNamed {
     @Setter
     private String name;
 
-    ARControlTypeEnum(Integer key, String name) {
+    GBControlTypeEnum(Integer key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ARControlTypeEnum getEnum(Integer key) {
-        for (ARControlTypeEnum item : ARControlTypeEnum.values()) {
+    public static GBControlTypeEnum getEnum(Integer key) {
+        for (GBControlTypeEnum item : GBControlTypeEnum.values()) {
             if (item.key == key) {
                 return item;
             }
@@ -33,7 +35,7 @@ public enum  ARControlTypeEnum implements KeyedNamed {
     }
 
     public static String getName(Integer key) {
-        ARControlTypeEnum item = getEnum(key);
+        GBControlTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }
 

icss-service/src/main/java/com/diagbot/enums/QuestionTypeEnum.java

@@ -17,6 +17,7 @@ public enum QuestionTypeEnum implements KeyedNamed {
     Disease(7, "诊断"),
     Drug(8, "药品"),
     DrugClass(9, "药品分类"),
+    AdverseReaction(10,"不良反应"),
     Scale(21, "量表"),
     MedicalIndication(22, "推送指标");
 

icss-service/src/main/java/com/diagbot/facade/CalculateFacade.java

@@ -0,0 +1,26 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.AiptServiceClient;
+import com.diagbot.dto.CalculateDTO;
+import com.diagbot.vo.CalculateVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/4/15 13:45
+ */
+@Component
+public class CalculateFacade {
+    @Autowired
+    AiptServiceClient aiptServiceClient;
+
+    public CalculateDTO calculate(CalculateVO calculateVO) {
+        CalculateDTO calculateDTO = new CalculateDTO();
+        calculateDTO.setValue(10D);
+        calculateDTO.setUnit("ml/min•1.73m2");
+        calculateDTO.setText("肾功能衰竭");
+        return calculateDTO;
+    }
+}

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -417,14 +417,6 @@ public class PushFacade {
                 pushDTO.setMedicalIndications(medicalIndicationDTOList);
             }
         }
-
-        //公式计算 featuretype=31
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Calculate.getKey()))) {
-            CalcResult result = new CalcResult();
-            result.setValue(10D);
-            result.setText("肾功能衰竭");
-            pushDTO.setCalcResult(result);
-        }
         return pushDTO;
     }
 

icss-service/src/main/java/com/diagbot/facade/TreatmentFacade.java

@@ -146,12 +146,30 @@ public class TreatmentFacade {
 
             //不良反应
             List<AdverseReaction> adverseReactionList = FastJsonUtils.getJsonToListByKey(treatmentJson.toString(), "adverseEvent", AdverseReaction.class);
+            List<String> adNameList = adverseReactionList.stream().map(adverseReaction -> adverseReaction.getName()).collect(Collectors.toList());
+            List<QuestionInfo> adList = getTopQuestionList(adNameList, QuestionTypeEnum.AdverseReaction.getKey());
+            Map<String, QuestionInfo> adMap = EntityUtil.makeEntityMap(adList, "tagName");
+            List<Long> adIds = adList.stream().map(ad -> ad.getId()).collect(Collectors.toList());
+            List<IntroduceMap> adIntroduceMapList = getIntroduceMapList(adIds, QuestionTypeEnum.AdverseReaction.getKey());
+            Map<Long, IntroduceMap> adIntroduceMapMap = EntityUtil.makeEntityMap(adIntroduceMapList, "questionId");
+            for (AdverseReaction adverseReaction : adverseReactionList) {
+                adverseReaction.setTagName(adverseReaction.getName());
+                if (null != adMap && adMap.size() > 0) {
+                    QuestionInfo adInfo = adMap.get(adverseReaction.getName());
+                    if (adInfo != null) {
+                        adverseReaction.setId(adInfo.getId());
+                    }
+                    IntroduceMap adIntorduceMap = adIntroduceMapMap.get(adInfo.getId());
+                    if (adIntorduceMap != null) {
+                        adverseReaction.setShowInfo("1");
+                    }
+                }
+            }
             retMap.put("adverseReactions", adverseReactionList);
         }
         return retMap;
     }
 
-
     /**
      * 根据展示位置获取提示信息明细列表
      *
@@ -181,7 +199,7 @@ public class TreatmentFacade {
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("tag_name", tagNameList)
-                .eq("sub_type", 0)
+                //.eq("sub_type", 0)
                 .eq("type", type);
         List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
         return questionInfoList;

icss-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -34,7 +34,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
         versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("STATUS", StatusEnum.Enable.getKey())
-                .orderByDesc("refresh_time");
+                .orderByDesc("gmt_modified");
 
         VersionInfo versionInfo = getOne(versionInfoQuery);
         VersionWrapperDTO versionList = new VersionWrapperDTO();

icss-service/src/main/java/com/diagbot/vo/CalculateVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:计算参数
+ * @Author:zhaops
+ * @time: 2019/4/15 13:53
+ */
+@Getter
+@Setter
+public class CalculateVO {
+    private Integer type;
+    private String scale;
+    private String formula;
+}

icss-service/src/main/java/com/diagbot/vo/PushVO.java

@@ -38,5 +38,4 @@ public class PushVO {
     private Integer disType;  //0-普通病（默认不填），1-慢病，2-急诊
     private List<AdverseReaction> adverseReactions; //不良反应
     private List<IndicationResult> medicalIndications;   //推理指标
-    private JSONObject formula;//计算公式
 }

icss-service/src/main/java/com/diagbot/web/CalculateController.java

@@ -0,0 +1,39 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.CalculateDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.CalculateFacade;
+import com.diagbot.vo.CalculateVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * @Description:计算相关
+ * @Author:zhaops
+ * @time: 2019/4/15 13:40
+ */
+@RestController
+@RequestMapping("/push")
+@Api(value = "计算相关API", tags = { "2期-计算相关API" })
+public class CalculateController {
+    @Autowired
+    CalculateFacade calculateFacade;
+
+    @ApiOperation(value = "推理结果计算接口[by:zhaops]",
+            notes = "type： 1-量表，11-计算公式(必填)，Integer<br>" +
+                    "scale：量表填写内容，String<br>" +
+                    "formula：计算公式填写内容，String<br>")
+    @PostMapping("/calculate")
+    @SysLogger("calculate")
+    public RespDTO<CalculateDTO> calculate(@RequestBody @Valid CalculateVO calculateVO) {
+        return RespDTO.onSuc(calculateFacade.calculate(calculateVO));
+    }
+}

icssman-service/src/main/java/com/diagbot/facade/DisScaleFacade.java

@@ -132,6 +132,11 @@ public class DisScaleFacade extends DisScaleServiceImpl {
         disScaleQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("dis_id", getDisScaleByDisIdVO.getDisId());
         List<DisScale> disScales = this.list(disScaleQueryWrapper);
+        //如果查不到则关联信息已被删除
+        if(ListUtil.isEmpty(disScales)){
+            throw new CommonException(CommonErrorCode.NOT_EXISTS,
+                    "关联信息系不存在，请添加关联");
+        }
         List<Long> questionIds = new ArrayList<>();
         List<GetDisScaleAllInfoDTO> getDisScaleAllInfoDTOS = BeanUtil.listCopyTo(disScales, GetDisScaleAllInfoDTO.class);
         for (DisScale disScale : disScales) {
@@ -160,6 +165,7 @@ public class DisScaleFacade extends DisScaleServiceImpl {
      * @return
      */
     public Boolean delDisScaleInfo(DelDisScaleInfoVO delDisScaleInfoVO){
+        //判断关联信息是否已经被删除
         QueryWrapper<DisScale> disScaleQueryWrapper = new QueryWrapper<>();
         disScaleQueryWrapper.eq("id",delDisScaleInfoVO.getId())
                 .eq("is_deleted",IsDeleteEnum.Y.getKey());
@@ -167,6 +173,7 @@ public class DisScaleFacade extends DisScaleServiceImpl {
             throw new CommonException(CommonErrorCode.IS_EXISTS,
                     "此条关联已删除");
         }
+        //如果没有则执行删除
         UpdateWrapper<DisScale> disScaleUpdateWrapper = new UpdateWrapper<>();
         disScaleUpdateWrapper.eq("id",delDisScaleInfoVO.getId())
                 .set("is_deleted",IsDeleteEnum.Y.getKey())

icssman-service/src/main/java/com/diagbot/facade/EvaluationModuleMappingFacade.java

@@ -113,15 +113,12 @@ public class EvaluationModuleMappingFacade extends EvaluationModuleMappingServic
 		List<EvaluationModuleVO> data = evaluationModuleListVO.getEvaluationModuleData();
 		for (EvaluationModuleVO dataNew : data) {
 			EvaluationModuleMapping evaMou = new EvaluationModuleMapping();
-			evaMou.setDiseaseId(dataNew.getDiseaseId());
-			evaMou.setCreator(UserUtils.getCurrentPrincipleID());
+			BeanUtil.copyProperties(dataNew,evaMou);
 			evaMou.setGmtCreate(DateUtil.now());
 			evaMou.setGmtModified(DateUtil.now());
-			evaMou.setRegionName(dataNew.getRegionName());
-			evaMou.setRegionType(dataNew.getRegionType());
+			evaMou.setCreator(UserUtils.getCurrentPrincipleID());
 			evaMou.setModifier(UserUtils.getCurrentPrincipleID());
 			evaMou.setOrderNo(dataNew.getOrderNo());
-			evaMou.setRemark(dataNew.getRemark());
 			evaluationModuleLsit.add(evaMou);
 		}
 
@@ -156,15 +153,11 @@ public class EvaluationModuleMappingFacade extends EvaluationModuleMappingServic
 			List<EvaluationModuleVO> data = evaluationModuleListVO.getEvaluationModuleData();
 			for (EvaluationModuleVO dataNew : data) {
 				EvaluationModuleMapping evaMou = new EvaluationModuleMapping();
-				evaMou.setDiseaseId(dataNew.getDiseaseId());
-				evaMou.setCreator(UserUtils.getCurrentPrincipleID());
+				BeanUtil.copyProperties(dataNew,evaMou);
 				evaMou.setGmtCreate(DateUtil.now());
 				evaMou.setGmtModified(DateUtil.now());
-				evaMou.setRegionName(dataNew.getRegionName());
-				evaMou.setRegionType(dataNew.getRegionType());
+				evaMou.setCreator(UserUtils.getCurrentPrincipleID());
 				evaMou.setModifier(UserUtils.getCurrentPrincipleID());
-				evaMou.setOrderNo(dataNew.getOrderNo());
-				evaMou.setRemark(dataNew.getRemark());
 				evaluationModuleLsit.add(evaMou);
 			}
 			res = evaluationModuleMappingService.saveBatch(evaluationModuleLsit);
@@ -185,8 +178,13 @@ public class EvaluationModuleMappingFacade extends EvaluationModuleMappingServic
 		return update(new EvaluationModuleMapping(), evaluaNew);
 	}
 
+	/**
+	 * 
+	 * @param diseaseNameVO
+	 * @return
+	 */
 	public List<DiseaseInfoDTO> queryEvaluationDiseaseName(DiseaseNameVO diseaseNameVO) {
-		// TODO Auto-generated method stub
+
 		return evaluationModuleMappingService.queryEvaluationDiseaseName(diseaseNameVO);
 	}
 

icssman-service/src/main/java/com/diagbot/facade/IndexConfigFacade.java

@@ -99,15 +99,11 @@ public class IndexConfigFacade extends IndexConfigServiceImpl {
 			List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
 			for (IndexConfigVO dataNew : data) {
 				IndexConfig IndexConfig = new IndexConfig();
-				IndexConfig.setDiseaseId(dataNew.getDiseaseId());
-				IndexConfig.setCreator(UserUtils.getCurrentPrincipleID());
+				BeanUtil.copyProperties(dataNew,IndexConfig);
 				IndexConfig.setGmtCreate(DateUtil.now());
 				IndexConfig.setGmtModified(DateUtil.now());
-				IndexConfig.setIndexDesc(dataNew.getIndexDesc());
-				IndexConfig.setIndexUnique(dataNew.getIndexUnique());
+				IndexConfig.setCreator(UserUtils.getCurrentPrincipleID());
 				IndexConfig.setModifier(UserUtils.getCurrentPrincipleID());
-				IndexConfig.setOrderNo(dataNew.getOrderNo());
-				IndexConfig.setRemark(dataNew.getRemark());
 				IndexConfigLsit.add(IndexConfig);
 			}
 
@@ -148,15 +144,11 @@ public class IndexConfigFacade extends IndexConfigServiceImpl {
 			List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
 			for (IndexConfigVO dataNew : data) {
 				IndexConfig IndexConfig = new IndexConfig();
-				IndexConfig.setDiseaseId(dataNew.getDiseaseId());
-				IndexConfig.setCreator(UserUtils.getCurrentPrincipleID());
+				BeanUtil.copyProperties(dataNew,IndexConfig);
 				IndexConfig.setGmtCreate(DateUtil.now());
 				IndexConfig.setGmtModified(DateUtil.now());
-				IndexConfig.setIndexDesc(dataNew.getIndexDesc());
-				IndexConfig.setIndexUnique(dataNew.getIndexUnique());
+				IndexConfig.setCreator(UserUtils.getCurrentPrincipleID());
 				IndexConfig.setModifier(UserUtils.getCurrentPrincipleID());
-				IndexConfig.setOrderNo(dataNew.getOrderNo());
-				IndexConfig.setRemark(dataNew.getRemark());
 				IndexConfigLsit.add(IndexConfig);
 			}
 			res = indexConfigService.saveBatch(IndexConfigLsit);
@@ -184,7 +176,6 @@ public class IndexConfigFacade extends IndexConfigServiceImpl {
 	 * @return
 	 */
 	public List<DiseaseInfoDTO> queryIndexConfigDiseaseName(DiseaseNameVO diseaseNameVO) {
-		// TODO Auto-generated method stub
 		return indexConfigService.queryIndexConfigDiseaseName(diseaseNameVO);
 	}
 }

pom.xml

@@ -65,6 +65,12 @@
             <groupId>org.jolokia</groupId>
             <artifactId>jolokia-core</artifactId>
         </dependency>
+        <!-- 自动提示配置问题 -->
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.boot</groupId>-->
+            <!--<artifactId>spring-boot-properties-migrator</artifactId>-->
+            <!--<scope>runtime</scope>-->
+        <!--</dependency>-->
     </dependencies>
 
     <dependencyManagement>

uaa-service/src/main/resources/bootstrap.yml

@@ -20,6 +20,6 @@ eureka:
 
 myuri: localhost
 
-management:
-  security:
-    enabled: false
+#management:
+#  security:
+#    enabled: false