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

aipt-service/src/main/java/com/diagbot/facade/ConceptDetailFacade.java

@@ -25,7 +25,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * @Description:
+ * @Description:提示信息
  * @Author:zhaops
  * @time: 2019/5/6 15:03
  */
@@ -52,8 +52,13 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
         QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
         conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("concept_id", concept.getId())
-                .apply("find_in_set({0},position)", conceptIntroduceVO.getPosition())
                 .orderByAsc("order_no");
+        if (conceptIntroduceVO.getPosition() != null) {
+            conceptDetailQueryWrapper.apply("find_in_set({0},position)", conceptIntroduceVO.getPosition());
+        }
+        if (ListUtil.isNotEmpty(conceptIntroduceVO.getTitles())) {
+            conceptDetailQueryWrapper.in("title", conceptIntroduceVO.getTitles());
+        }
         List<ConceptDetail> conceptDetailList = this.list(conceptDetailQueryWrapper);
         List<ConceptDetailDTO> conceptDetailDTOList = ListUtil.newArrayList();
         if (ListUtil.isNotEmpty(conceptDetailList)) {
@@ -80,8 +85,13 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
         QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
         conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("concept_id", concept.getId())
-                .apply("find_in_set({0},position)", conceptIntroduceVO.getPosition())
                 .orderByAsc("order_no");
+        if (conceptIntroduceVO.getPosition() != null) {
+            conceptDetailQueryWrapper.apply("find_in_set({0},position)", conceptIntroduceVO.getPosition());
+        }
+        if (ListUtil.isNotEmpty(conceptIntroduceVO.getTitles())) {
+            conceptDetailQueryWrapper.in("title", conceptIntroduceVO.getTitles());
+        }
         List<ConceptDetail> conceptDetailList = this.list(conceptDetailQueryWrapper);
         return conceptDetailList;
     }

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

@@ -406,7 +406,7 @@ public class PushFacade {
                 }
             }
         } else if (type.equals(ConceptTypeEnum.Pacs.getKey())) {
-            RespDTO<Map<String, List<String>>> pacsRes = tranServiceClient.getLisConfigByUniqueNameAndHosCode(hosCodeVO);
+            RespDTO<Map<String, List<String>>> pacsRes = tranServiceClient.getPacsConfigByUniqueNameAndHosCode(hosCodeVO);
             if (RespDTOUtil.respIsOK(pacsRes)) {
                 Map<String, List<String>> pacsConfigMapByUniqueName = pacsRes.data;
                 for (ConceptPushDTO concept : concepts) {

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

@@ -150,7 +150,7 @@ public class TreatmentFacade {
         retMap.put("treatment", drugsList);
 
         //判断是否慢病，慢病增加回访时间，上次用药，不良反应
-        if (disType.equals(DisTypeEnum.CHRONIC.getKey())) {
+        if (disType != null && disType.equals(DisTypeEnum.CHRONIC.getKey())) {
             //验证是否慢病
             conceptBaseVO.setName("慢病");
             conceptBaseVO.setLibType(LexiconTypeEnum.TYPES_OF_DISEASE.getKey());

aipt-service/src/main/java/com/diagbot/vo/ConceptIntroduceVO.java

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:获取提示信息入参
@@ -13,6 +14,6 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 public class ConceptIntroduceVO extends ConceptBaseVO {
-    @NotNull(message = "请输入展示位置")
     private Integer position;
+    private List<String> titles;
 }

data-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -32,4 +32,5 @@ public class SearchData {
     private String adverseReactions; //不良反应
     private Integer disType;    //诊断类型
     private String adverseEvent;
+    private String hosCode;
 }

data-service/src/main/java/com/diagbot/dto/ConceptIntroduceDTO.java

@@ -1,5 +1,8 @@
 package com.diagbot.dto;
 
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.List;
 
 /**
@@ -7,6 +10,8 @@ import java.util.List;
  * @Author:zhaops
  * @time: 2019/5/13 20:24
  */
+@Getter
+@Setter
 public class ConceptIntroduceDTO extends ConceptBaseDTO {
     private List<ConceptDetailDTO> details;
 }

data-service/src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -35,6 +35,7 @@ public class AssembleFacade {
         searchData.setFeatureType(pushVO.getFeatureType());
         searchData.setSysCode("1");
         searchData.setLength(10);
+        searchData.setHosCode(pushVO.getHosCode());
 
         switch (pushVO.getSex()) {
             case 1:

data-service/src/main/java/com/diagbot/facade/ConceptDetailFacade.java

@@ -0,0 +1,26 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.AiptServiceClient;
+import com.diagbot.dto.ConceptIntroduceDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.ConceptIntroduceVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/14 9:49
+ */
+@Component
+public class ConceptDetailFacade {
+    @Autowired
+    private AiptServiceClient aiptServiceClient;
+
+    public ConceptIntroduceDTO getConceptDetail(ConceptIntroduceVO conceptIntroduceVO) {
+        RespDTO<ConceptIntroduceDTO> res = aiptServiceClient.getConceptDetail(conceptIntroduceVO);
+        RespDTOUtil.respNGDeal(res, "获取提示信息失败");
+        return res.data;
+    }
+}

data-service/src/main/java/com/diagbot/vo/ConceptIntroduceVO.java

@@ -1,9 +1,11 @@
 package com.diagbot.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:获取提示信息入参
@@ -13,6 +15,10 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 public class ConceptIntroduceVO extends ConceptBaseVO {
-    @NotNull(message = "请输入展示位置")
+    //此版本暂不提供该过滤条件
+    @ApiModelProperty(hidden = true)
     private Integer position;
+    //此版本暂不提供该过滤条件
+    @ApiModelProperty(hidden = true)
+    private List<String> titles;
 }

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

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -13,6 +14,7 @@ import lombok.Setter;
 public class PushVO  extends PushBaseVO {
     private String diseaseName;
     private String scaleName; //量表名称
+    @ApiModelProperty(hidden = true)
     private Integer disType;  //0-普通病（默认不填），1-慢病，2-急诊
     private String adverseReactions; //不良反应
     private String indications;   //推理指标

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

@@ -4,6 +4,7 @@ import com.diagbot.annotation.SysLogger;
 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;
@@ -21,6 +22,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/calc")
+@Api(value = "计算相关API", tags = { "数据服务模式-计算相关API" })
 public class CalculateController {
     @Autowired
     CalculateFacade calculateFacade;

data-service/src/main/java/com/diagbot/web/ConceptDetailController.java

@@ -0,0 +1,41 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.ConceptIntroduceDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.ConceptDetailFacade;
+import com.diagbot.vo.ConceptIntroduceVO;
+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/5/14 9:51
+ */
+@RestController
+@RequestMapping("/conceptDetail")
+@Api(value = "提示信息相关API", tags = { "数据服务模式-提示信息相关API" })
+public class ConceptDetailController {
+    @Autowired
+    private ConceptDetailFacade conceptDetailFacade;
+
+    @ApiOperation(value = "获取提示信息[by:zhaops]",
+            notes = "name: 标签名称，必填<br>" +
+                    "libType：标签类型，必填<br>" +
+                    "titles：提示信息标题列表<br>" +
+                    "position：展示位置（1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书，6-不良反应，7-描述信息(智能分诊症状提示信息)）")
+    @PostMapping("/getConceptDetail")
+    @SysLogger("getConceptDetail")
+    public RespDTO<ConceptIntroduceDTO> getConceptDetail(@Valid @RequestBody ConceptIntroduceVO conceptIntroduceVO) {
+        ConceptIntroduceDTO data = conceptDetailFacade.getConceptDetail(conceptIntroduceVO);
+        return RespDTO.onSuc(data);
+    }
+}

data-service/src/main/java/com/diagbot/web/PushController.java

@@ -5,6 +5,7 @@ import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PushFacade;
 import com.diagbot.vo.PushVO;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,11 +23,12 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/push")
+@Api(value = "推理相关API", tags = { "数据服务模式-推理相关API" })
 public class PushController {
     @Autowired
     PushFacade pushFacade;
 
-    @ApiOperation(value = "知识库标准化-推理接口(半结构化)[by:zhaops]",
+    @ApiOperation(value = "数据服务模式-推理[by:zhaops]",
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填) 1：男，2：女<br>" +
                     "symptom：症状,String<br>" +
@@ -56,7 +58,7 @@ public class PushController {
         return RespDTO.onSuc(pushFacade.push(pushVO));
     }
 
-    @ApiOperation(value = "知识库标准化-治疗方案[by:zhaops]",
+    @ApiOperation(value = "数据服务模式-治疗方案[by:zhaops]",
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填)，1：男，2：女<br>" +
                     "symptom：症状,String<br>" +
@@ -85,7 +87,7 @@ public class PushController {
         return RespDTO.onSuc(pushFacade.pushTreatment(pushVO));
     }
 
-    @ApiOperation(value = "知识库标准化-量表[by:zhaops]",
+    @ApiOperation(value = "数据服务模式-量表[by:zhaops]",
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填)，1：男，2：女<br>" +
                     "symptom：症状,String<br>" +
@@ -103,7 +105,7 @@ public class PushController {
                     "lis：source：数据来源（必填）,Integer<br>" +
                     "pacs：辅检,String<br>" +
                     "diag：诊断,String<br>" +
-                    "featureType：类型(必填)，8：治疗方案,String<br>" +
+                    "featureType：类型(必填)，21：量表,String<br>" +
                     "diseaeName：取治疗方案的诊断,String<br>" +
                     "scaleName：量表名称,String<br>" +
                     "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +

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

@@ -5,15 +5,11 @@ import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.client.bean.ConceptBaseVO;
 import com.diagbot.client.bean.ConceptExistVO;
-import com.diagbot.client.bean.FeatureRate;
-import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.ConceptPushDTO;
-import com.diagbot.dto.EMRQuestionDTO;
 import com.diagbot.dto.PushDTO;
-import com.diagbot.dto.PushEMRDTO;
 import com.diagbot.dto.PushKYJDTO;
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.dto.QuestionPushDTO;
@@ -29,12 +25,8 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EntityUtil;
-import com.diagbot.util.FastJsonUtils;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.vo.EMRPushVO;
-import com.diagbot.vo.HosCodeVO;
 import com.diagbot.vo.LisResult;
 import com.diagbot.vo.PushKYJVO;
 import com.diagbot.vo.PushVO;
@@ -162,7 +154,7 @@ public class PushFacade {
                 List<ConceptPushDTO> vitalDTOList = addQuestionId(vitals, QuestionTypeEnum.Vital.getKey());
                 pushDTO.setVital(vitalDTOList);
                 if (ListUtil.isNotEmpty(vitalDTOList)) {
-                    List<Long> vitalIds = vitalDTOList.stream().map(vital -> vital.getId()).collect(Collectors.toList());
+                    List<Long> vitalIds = vitalDTOList.stream().map(vital -> vital.getId()).filter(vitalId -> vitalId != null).collect(Collectors.toList());
                     pushDTO.setVitalIds(vitalIds);
                 }
             }
@@ -360,174 +352,6 @@ public class PushFacade {
         return vitalDTO;
     }
 
-    /**
-     * 电子病历评级-数据服务模式推理
-     *
-     * @param emrPushVO
-     * @return
-     */
-    public PushEMRDTO pushEMR(EMRPushVO emrPushVO) {
-        Boolean isDocking = tranServiceClient.isDocking().data;
-        PushEMRDTO pushEMRDTO = new PushEMRDTO();
-        HosCodeVO hosCodeVO = new HosCodeVO();
-        hosCodeVO.setHosCode(emrPushVO.getHosCode());
-        PushVO pushVO = new PushVO();
-        BeanUtil.copyProperties(emrPushVO, pushVO);
-        //化验项转公表内容,参数处理
-        if (ListUtil.isNotEmpty(pushVO.getLis())) {
-            Map<String, Map<String, String>> lisConfigMap = new LinkedHashMap<>();
-            Map<String, String> lisConfigMap_emptyItemName = new LinkedHashMap<>();
-            if (isDocking) {
-                lisConfigMap = tranServiceClient.getLisConfigByHosCode_NotEmptyItemName(hosCodeVO).data;
-                lisConfigMap_emptyItemName = tranServiceClient.getLisConfigByHosCode_EmptyItemName(hosCodeVO).data;
-            } else {
-                lisConfigMap = lisMappingFacade.getLisMapping_NotEmptyItemName();
-                lisConfigMap_emptyItemName = lisMappingFacade.getLisConfig_EmptyItemName();
-            }
-            List<LisResult> lisResultList = pushVO.getLis();
-            for (LisResult lisResult : lisResultList) {
-                if (StringUtil.isNotBlank(lisResult.getName())) {
-                    if (StringUtil.isNotBlank(lisResult.getDetailName())) {
-                        lisResult.setUniqueName(lisConfigMap.get(lisResult.getName()).get(lisResult.getDetailName()));
-                    } else {
-                        lisResult.setUniqueName(lisConfigMap_emptyItemName.get(lisResult.getName()));
-                    }
-                }
-            }
-            pushVO.setLis(lisResultList);
-        }
-
-        SearchData searchData = assembleFacade.assembleData(pushVO);
-        ResponseData data = pushAipt(searchData);
-        String featureType = pushVO.getFeatureType();
-        String[] featureTypes = featureType.split(",|，");
-        Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
-
-        if (featureTypeSet.contains(String.valueOf(QuestionTypeEnum.Symptom.getKey()))) {
-            List<FeatureRate> symptomFeature = data.getSymptom();
-            if (symptomFeature.size() > 0) {
-                List<EMRQuestionDTO> symptomList = Lists.newLinkedList();
-                for (FeatureRate featureRate : symptomFeature) {
-                    EMRQuestionDTO symptom = new EMRQuestionDTO();
-                    symptom.setName(featureRate.getFeatureName());
-                    symptom.setUniqueName(featureRate.getFeatureName());
-                    symptomList.add(symptom);
-                }
-                pushEMRDTO.setSymptomList(symptomList);
-            }
-        }
-        if (featureTypeSet.contains(String.valueOf(QuestionTypeEnum.Vital.getKey()))) {
-            List<FeatureRate> vitalFeature = data.getVitals();
-            if (vitalFeature.size() > 0) {
-                List<EMRQuestionDTO> vitalList = Lists.newLinkedList();
-                for (FeatureRate featureRate : vitalFeature) {
-                    EMRQuestionDTO vital = new EMRQuestionDTO();
-                    vital.setName(featureRate.getFeatureName());
-                    vital.setUniqueName(featureRate.getFeatureName());
-                    vitalList.add(vital);
-                }
-                pushEMRDTO.setVitalList(vitalList);
-            }
-        }
-        if (featureTypeSet.contains(String.valueOf(QuestionTypeEnum.Lis.getKey()))) {
-            List<FeatureRate> lisFeatures = data.getLabs();
-            if (lisFeatures.size() > 0) {
-                Map<String, List<String>> lisMappingByUniqueName = new LinkedHashMap<>();
-                if (isDocking) {
-                    lisMappingByUniqueName = tranServiceClient.getLisConfigByUniqueNameAndHosCode(hosCodeVO).data;
-                } else {
-                    lisMappingByUniqueName = lisMappingFacade.getLisMappingByUniqueName();
-                }
-                List<EMRQuestionDTO> lisList = Lists.newLinkedList();
-                for (FeatureRate featureRate : lisFeatures) {
-                    EMRQuestionDTO lis = new EMRQuestionDTO();
-                    lis.setUniqueName(featureRate.getFeatureName());
-                    if (ListUtil.isNotEmpty(lisMappingByUniqueName.get(featureRate.getFeatureName()))) {
-                        lis.setName(lisMappingByUniqueName.get(featureRate.getFeatureName()).get(0));
-                    }
-                    lisList.add(lis);
-                }
-                pushEMRDTO.setLisList(lisList);
-            }
-        }
-        if (featureTypeSet.contains(String.valueOf(QuestionTypeEnum.Pacs.getKey()))) {
-            List<FeatureRate> pacsFeatures = data.getPacs();
-            if (pacsFeatures.size() > 0) {
-                Map<String, List<String>> pacsConfigMapByUniqueName = new LinkedHashMap<>();
-                if (isDocking) {
-                    pacsConfigMapByUniqueName = tranServiceClient.getPacsConfigByUniqueNameAndHosCode(hosCodeVO).data;
-                }
-                List<EMRQuestionDTO> pacsList = Lists.newLinkedList();
-                for (FeatureRate featureRate : pacsFeatures) {
-                    EMRQuestionDTO pacs = new EMRQuestionDTO();
-                    pacs.setUniqueName(featureRate.getFeatureName());
-                    if (isDocking) {
-                        if (ListUtil.isNotEmpty(pacsConfigMapByUniqueName.get(featureRate.getFeatureName()))) {
-                            pacs.setName(pacsConfigMapByUniqueName.get(featureRate.getFeatureName()).get(0));
-                        }
-                    } else {
-                        pacs.setName(featureRate.getFeatureName());
-                    }
-                    pacsList.add(pacs);
-                }
-                pushEMRDTO.setPacsList(pacsList);
-            }
-        }
-        if (featureTypeSet.contains(String.valueOf(QuestionTypeEnum.Disease.getKey()))) {
-            List<FeatureRate> dis = data.getDis();
-            List<String> disNameList = dis.stream().map(disease -> disease.getFeatureName()).collect(Collectors.toList());
-            Map<String, List<EMRQuestionDTO>> retDisMap = new LinkedHashMap<>();
-            Map<String, String> disMap = tranServiceClient.getDiseaseIcdByHosCode(hosCodeVO).data;
-
-            //诊断分类
-            for (FeatureRate featureRate : dis) {
-                if (StringUtil.isBlank(featureRate.getDesc())) {
-                    featureRate.setDesc("{\"可能诊断\":\"\"}");
-                }
-                Map<String, Object> descMap = FastJsonUtils.getJsonToMap(featureRate.getDesc());
-                for (String disClass : descMap.keySet()) {
-                    List<EMRQuestionDTO> retDisList = Lists.newLinkedList();
-                    if (retDisMap.get(disClass) != null) {
-                        retDisList = retDisMap.get(disClass);
-                    }
-                    EMRQuestionDTO retDis = new EMRQuestionDTO();
-                    retDis.setUniqueName(featureRate.getFeatureName());
-                    if (isDocking) {
-                        //对接模式转icd10名称
-                        retDis.setName(disMap.get(featureRate.getFeatureName()));
-                    } else {
-                        retDis.setName(featureRate.getFeatureName());
-                    }
-                    retDisList.add(retDis);
-                    retDisMap.put(disClass, retDisList);
-                }
-            }
-            //警惕
-            searchData = new SearchData();
-            searchData.setDiag(String.join(",", disNameList));
-            RespDTO<GdbResponse> graphRes = aiptServiceClient.highRisk(searchData);
-            Map<String, String> graphResult = graphRes.data.getResult();
-            if (graphResult.size() > 0) {
-                List<EMRQuestionDTO> highRiskDisList = Lists.newLinkedList();
-                for (Map.Entry<String, String> entry : graphResult.entrySet()) {
-                    if (entry.getValue().equals("1")) {
-                        EMRQuestionDTO hrDis = new EMRQuestionDTO();
-                        hrDis.setUniqueName(entry.getKey());
-                        if (isDocking) {
-                            hrDis.setName(disMap.get(entry.getKey()));
-                        } else {
-                            hrDis.setName(entry.getValue());
-                        }
-                        highRiskDisList.add(hrDis);
-                    }
-                }
-                retDisMap.put("警惕", highRiskDisList);
-            }
-            pushEMRDTO.setDis(retDisMap);
-        }
-        return pushEMRDTO;
-    }
-
 
     /**
      * 概念关联标签，添加标签id ——症状，化验