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

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

@@ -243,7 +243,10 @@ public class ClinicalFacade {
                     Integer standWordSBP = Integer.valueOf(values[0]); //标准词收缩压
                     Integer standWordDBP = Integer.valueOf(values[1]); //标准词舒张压
                     if (featuresSBP > standWordSBP && featuresDBP > standWordDBP) {
-                        String standWord = standWordKey + standWordMap.get("op") + standWordMap.get("value") + standWordMap.get("unit") + "。";
+                        String standWord = standWordKey
+                                + standWordMap.get("op")
+                                + standWordMap.get("value")
+                                + standWordMap.get("unit") + "。";
                         sData.setSymptom(sData.getSymptom() + standWord);
                         System.out.println(sData.getSymptom());
                     }
@@ -251,7 +254,10 @@ public class ClinicalFacade {
             } else {
                 String num = getNum(standWordMap.get("value"));
                 if (Double.valueOf(getNum(features[1])) > Double.valueOf(num)) {
-                    String standWord = standWordKey + standWordMap.get("op") + standWordMap.get("value") + standWordMap.get("unit") + "。";
+                    String standWord = standWordKey
+                            + standWordMap.get("op")
+                            + standWordMap.get("value")
+                            + standWordMap.get("unit") + "。";
                     sData.setSymptom(sData.getSymptom() + standWord);
                     System.out.println(sData.getSymptom());
 
@@ -272,7 +278,10 @@ public class ClinicalFacade {
                     Integer standWordSBP = Integer.valueOf(values[0]); //收缩压
                     Integer standWordDBP = Integer.valueOf(values[1]); //舒张压
                     if (featuresSBP < standWordSBP && featuresDBP < standWordDBP) {
-                        String standWord = standWordKey + standWordMap.get("op") + standWordMap.get("value") + standWordMap.get("unit") + "。";
+                        String standWord = standWordKey
+                                + standWordMap.get("op")
+                                + standWordMap.get("value")
+                                + standWordMap.get("unit") + "。";
                         sData.setSymptom(sData.getSymptom() + standWord);
                         System.out.println(sData.getSymptom());
                     }
@@ -280,7 +289,11 @@ public class ClinicalFacade {
             } else {
                 String num = getNum(standWordMap.get("value"));
                 if (Double.valueOf(getNum(features[1])) < Double.valueOf(num)) {
-                    String standWord = standWordKey + standWordMap.get("op") + standWordMap.get("value") + standWordMap.get("unit") + "。";
+                    String standWord = standWordKey
+                            + standWordMap.get("op")
+                            + standWordMap.get("value")
+                            + standWordMap.get("unit")
+                            + "。";
                     sData.setSymptom(sData.getSymptom() + standWord);
                     System.out.println(sData.getSymptom());
                 }

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

@@ -54,7 +54,8 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
         Concept concept = conceptFacade.exist(conceptBaseVO);
         //提示信息明细
         QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
-        conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+        conceptDetailQueryWrapper
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("concept_id", concept.getId())
                 .orderByAsc("order_no");
         if (conceptIntroduceVO.getPosition() == null) {
@@ -120,10 +121,15 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
         if (ListUtil.isNotEmpty(conceptList)) {
             List<Long> conceptIds = conceptList
                     .stream()
-                    .map(concept -> concept.getId()).collect(Collectors.toList());
+                    .map(concept -> concept.getId())
+                    .collect(Collectors.toList());
             QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
-            conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+            conceptDetailQueryWrapper
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .in("concept_id", conceptIds);
+            if (ListUtil.isEmpty(conceptIds)) {
+                return retMap;
+            }
             List<ConceptDetail> conceptDetailList = this.list(conceptDetailQueryWrapper);
             if (ListUtil.isNotEmpty(conceptDetailList)) {
                 Map<Long, List<ConceptDetail>> conceptDetailMap
@@ -154,19 +160,19 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
      */
     public List<Long> existListByConceptIds(ExistListByConceptIdsVO existListByConceptIdsVO) {
         QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
-        conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+        conceptDetailQueryWrapper
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("concept_id", existListByConceptIdsVO.getConceptIds());
         List<ConceptDetail> conceptDetailList = this.list(conceptDetailQueryWrapper);
         if (ListUtil.isNotEmpty(conceptDetailList)) {
             List<Long> retConceptIds = conceptDetailList
                     .stream()
-                    .map(conceptDetail -> conceptDetail.getConceptId()).distinct().collect(Collectors.toList());
+                    .map(conceptDetail -> conceptDetail.getConceptId())
+                    .distinct()
+                    .collect(Collectors.toList());
             return retConceptIds;
         } else {
             return null;
-
-
-
         }
     }
 }

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

@@ -46,7 +46,8 @@ public class FeatureFacade {
             List<Concept> concepts
                     = conceptFacade.getListByNamesAndType(entry.getValue()
                     .stream()
-                    .map(i -> i.getName()).collect(Collectors.toList()), entry.getKey());
+                    .map(i -> i.getName())
+                    .collect(Collectors.toList()), entry.getKey());
             Map<String, Long> conceptMap
                     = EntityUtil.makeMapWithKeyValue(concepts, "libName", "id");
             map.put(entry.getKey(), conceptMap);
@@ -55,7 +56,9 @@ public class FeatureFacade {
         for (FeatureConceptDTO featureConceptDTO : symptomFeatureList) {
             if (null != featureConceptDTO.getLibType()) {
                 featureConceptDTO.setType(ParamConvertUtil.libConvert2Concept(featureConceptDTO.getLibType()));
-                featureConceptDTO.setConceptId(map.get(featureConceptDTO.getLibType()).get(featureConceptDTO.getName()));
+                featureConceptDTO.setConceptId(map
+                        .get(featureConceptDTO.getLibType())
+                        .get(featureConceptDTO.getName()));
             }
         }
         return symptomFeatureList;

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

@@ -117,7 +117,8 @@ public class PushFacade {
             if (ListUtil.isNotEmpty(symptom)) {
                 List<String> nameList = symptom
                         .stream()
-                        .map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
+                        .map(featureRate -> featureRate.getFeatureName())
+                        .collect(Collectors.toList());
                 if (ListUtil.isNotEmpty(nameList)) {
                     pushDTO.setSymptom(getConceptDTOList(nameList, LexiconTypeEnum.SYMPTOM.getKey()));
                 }
@@ -129,7 +130,8 @@ public class PushFacade {
             if (ListUtil.isNotEmpty(vital)) {
                 List<String> nameList = vital
                         .stream()
-                        .map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
+                        .map(featureRate -> featureRate.getFeatureName())
+                        .collect(Collectors.toList());
                 if (ListUtil.isNotEmpty(nameList)) {
                     pushDTO.setVital(getConceptDTOList(nameList, LexiconTypeEnum.VITAL_RESULT.getKey()));
                 }
@@ -141,7 +143,8 @@ public class PushFacade {
             if (ListUtil.isNotEmpty(vital)) {
                 List<String> nameList = vital
                         .stream()
-                        .map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
+                        .map(featureRate -> featureRate.getFeatureName())
+                        .collect(Collectors.toList());
                 if (ListUtil.isNotEmpty(nameList)) {
                     pushDTO.setVital(getConceptDTOList(nameList, LexiconTypeEnum.VITAL_INDEX.getKey()));
                 }
@@ -154,7 +157,8 @@ public class PushFacade {
             if (ListUtil.isNotEmpty(lis)) {
                 List<String> nameList = lis
                         .stream()
-                        .map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
+                        .map(featureRate -> featureRate.getFeatureName())
+                        .collect(Collectors.toList());
                 if (ListUtil.isNotEmpty(nameList)) {
                     List<ConceptPushDTO> lisDTO = getConceptDTOList(nameList, LexiconTypeEnum.LIS_PACKAGE.getKey());
                     if (isConnect) {
@@ -171,7 +175,8 @@ public class PushFacade {
             if (ListUtil.isNotEmpty(pacs)) {
                 List<String> nameList = pacs
                         .stream()
-                        .map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
+                        .map(featureRate -> featureRate.getFeatureName())
+                        .collect(Collectors.toList());
                 if (ListUtil.isNotEmpty(nameList)) {
                     List<ConceptPushDTO> pacsDTO = getConceptDTOList(nameList, LexiconTypeEnum.PACS_ITEMS.getKey());
                     if (isConnect) {
@@ -204,7 +209,8 @@ public class PushFacade {
                 for (Map.Entry<String, List<FeatureRate>> entry : disFeatureMap.entrySet()) {
                     List<String> nameListByDisClass = entry.getValue()
                             .stream()
-                            .map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
+                            .map(featureRate -> featureRate.getFeatureName())
+                            .collect(Collectors.toList());
                     if (ListUtil.isNotEmpty(nameListByDisClass)) {
                         List<ConceptPushDTO> disDTO
                                 = getConceptDTOList(nameListByDisClass, LexiconTypeEnum.DIAGNOSIS.getKey());
@@ -423,7 +429,8 @@ public class PushFacade {
         lisConfigVO.setHosCode(hosCode);
         List<String> uniqueNameList = concepts
                 .stream()
-                .map(concept -> concept.getName()).collect(Collectors.toList());
+                .map(concept -> concept.getName())
+                .collect(Collectors.toList());
         lisConfigVO.setUniqueNameList(uniqueNameList);
         if (type.equals(ConceptTypeEnum.Lis.getKey())) {
             RespDTO<Map<String, List<String>>> lisRes

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

@@ -82,12 +82,14 @@ public class TreatmentFacade {
             //药品大类
             List<String> cateBigNameList = drugsList
                     .stream()
-                    .map(drugs -> drugs.getBigdrugsName()).collect(Collectors.toList());
+                    .map(drugs -> drugs.getBigdrugsName())
+                    .collect(Collectors.toList());
             conceptNameList.addAll(cateBigNameList);
             //药品小类
             List<String> cateSmallNameList = drugsList
                     .stream()
-                    .map(drugs -> drugs.getSubdrugsName()).collect(Collectors.toList());
+                    .map(drugs -> drugs.getSubdrugsName())
+                    .collect(Collectors.toList());
             conceptNameList.addAll(cateSmallNameList);
             //药品
             List<Medicition> medicitionTotalList = Lists.newLinkedList();
@@ -98,13 +100,15 @@ public class TreatmentFacade {
             }
             List<String> drugNameList = medicitionTotalList
                     .stream()
-                    .map(m -> m.getMedicitionName()).collect(Collectors.toList());
+                    .map(m -> m.getMedicitionName())
+                    .collect(Collectors.toList());
             conceptNameList.addAll(drugNameList);
         }
         if (ListUtil.isNotEmpty(adverseReactionList)) {
             List<String> adNameList = adverseReactionList
                     .stream()
-                    .map(a -> a.getName()).collect(Collectors.toList());
+                    .map(a -> a.getName())
+                    .collect(Collectors.toList());
             conceptNameList.addAll(adNameList);
         }
         //概念

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

@@ -57,12 +57,14 @@ public class FeatureFacade {
     public List<FeatureConceptDTO> addQuestionId(List<FeatureConceptDTO> concepts, Integer type) {
         List<String> nameList = concepts
                 .stream()
-                .map(concept -> concept.getName()).collect(Collectors.toList());
+                .map(concept -> concept.getName())
+                .collect(Collectors.toList());
         if (ListUtil.isEmpty(nameList)) {
             return concepts;
         }
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+        questionInfoQueryWrapper
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("tag_name", nameList)
                 .eq("type", type);
         List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);

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

@@ -138,7 +138,9 @@ public class PushFacade {
                 if (ListUtil.isNotEmpty(vitalDTOList)) {
                     List<Long> vitalIds = vitalDTOList
                             .stream()
-                            .map(vital -> vital.getId()).filter(vitalId -> vitalId != null).collect(Collectors.toList());
+                            .map(vital -> vital.getId())
+                            .filter(vitalId -> vitalId != null)
+                            .collect(Collectors.toList());
                     pushDTO.setVitalIds(vitalIds);
                 }
             }
@@ -157,7 +159,8 @@ public class PushFacade {
                 Map<String, Long> lisMap = new LinkedHashMap<>();
                 List<String> mealNameList = labs
                         .stream()
-                        .map(lab -> lab.getName()).collect(Collectors.toList());
+                        .map(lab -> lab.getName())
+                        .collect(Collectors.toList());
                 Map<String, QuestionDTO> questionDTOMap
                         = addLisQuestion(mealNameList, pushVO.getAge(), pushVO.getSex());
                 for (String name : mealNameList) {
@@ -288,9 +291,10 @@ public class PushFacade {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "全科信息未维护");
         }
         QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<>();
-        deptVitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("dept_id", dept.getConceptId()).
-                orderByAsc("order_no");
+        deptVitalQueryWrapper
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("dept_id", dept.getConceptId())
+                .orderByAsc("order_no");
         List<DeptVital> deptVitalList = deptVitalFacade.list(deptVitalQueryWrapper);
         //科室模板为空时，取全科模板
         if (deptVitalList.size() == 0 && dept.getName().equals("全科") == false) {
@@ -301,9 +305,10 @@ public class PushFacade {
             RespDTOUtil.respNGDeal(res, "全科信息未维护");
             BeanUtil.copyProperties(res.data, dept);
             deptVitalQueryWrapper = new QueryWrapper<>();
-            deptVitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                    eq("dept_id", dept.getConceptId()).
-                    orderByAsc("order_no");
+            deptVitalQueryWrapper
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("dept_id", dept.getConceptId())
+                    .orderByAsc("order_no");
             deptVitalList = deptVitalFacade.list(deptVitalQueryWrapper);
         }
         //标签列表
@@ -324,7 +329,10 @@ public class PushFacade {
         if (ListUtil.isNotEmpty(vitalDTO)) {
             ConceptExistVO conceptExistVO = new ConceptExistVO();
             conceptExistVO.setType(ConceptTypeEnum.Vital.getKey());
-            List<String> vitalNames = vitalDTO.stream().map(vital -> vital.getTagName()).collect(Collectors.toList());
+            List<String> vitalNames = vitalDTO
+                    .stream()
+                    .map(vital -> vital.getTagName())
+                    .collect(Collectors.toList());
             conceptExistVO.setNameList(vitalNames);
             RespDTO<Map<String, Long>> respDTO = aiptServiceClient.getConceptMapByNameAndType(conceptExistVO);
             if (RespDTOUtil.respIsOK(respDTO)) {
@@ -390,12 +398,16 @@ public class PushFacade {
             return mapDTO;
         }
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                in("name", nameList).
-                eq("tag_type", TagTypeEnum.T7.getKey());
+        questionInfoQueryWrapper
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .in("name", nameList)
+                .eq("tag_type", TagTypeEnum.T7.getKey());
         List<QuestionInfo> lisList = questionFacade.list(questionInfoQueryWrapper);
         if (ListUtil.isNotEmpty(lisList)) {
-            List<Long> lisIds = lisList.stream().map(lis -> lis.getId()).collect(Collectors.toList());
+            List<Long> lisIds = lisList
+                    .stream()
+                    .map(lis -> lis.getId())
+                    .collect(Collectors.toList());
             QuestionIds2VO questionIds2VO = new QuestionIds2VO();
             questionIds2VO.setAge(age);
             questionIds2VO.setSexType(sex);

prec-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -191,6 +191,10 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
      * @return
      */
     public Map<Long, List<QuestionDetail>> getQuestionDetailWithMap(List<Long> questionIds) {
+        if (ListUtil.isEmpty(questionIds)) {
+            return new LinkedHashMap<>();
+        }
+
         List<QuestionDetail> detailList = questionDetailFacade.list(new QueryWrapper<QuestionDetail>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("question_id", questionIds)

tran-service/src/main/java/com/diagbot/facade/InquiryDetailFacade.java

@@ -1,15 +1,16 @@
 package com.diagbot.facade;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.InquiryDetailServiceImpl;
+import com.diagbot.util.ListUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author: rengb
@@ -17,7 +18,7 @@ import com.diagbot.service.impl.InquiryDetailServiceImpl;
  */
 @Component
 public class InquiryDetailFacade extends InquiryDetailServiceImpl {
-	
+
     /**
      * 根据病历id集合获取病历明细
      *
@@ -25,9 +26,12 @@ public class InquiryDetailFacade extends InquiryDetailServiceImpl {
      * @return
      */
     public Map<Long, List<InquiryDetail>> getDetailsByInquryIds(List<Long> inquiryIds) {
+        if (ListUtil.isEmpty(inquiryIds)) {
+            return new HashMap<>();
+        }
         QueryWrapper<InquiryDetail> queryWrapper = new QueryWrapper<InquiryDetail>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-        			.in("inquiry_id", inquiryIds);
+                .in("inquiry_id", inquiryIds);
         List<InquiryDetail> inquiryDetails = this.list(queryWrapper);
         return inquiryDetails.stream().collect(Collectors.groupingBy(InquiryDetail::getInquiryId));
     }