化验结果用公表项，返回结果用套餐项

aipt-service/src/main/java/com/diagbot/dto/ConceptPushDTO.java

@@ -3,6 +3,8 @@ package com.diagbot.dto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -13,6 +15,6 @@ import lombok.Setter;
 public class ConceptPushDTO extends ConceptBaseDTO {
     private Integer libType;
     //数据服务模式调用方名称
-    private String clientName;
+    private List<String> clientNames;
     private Integer type;
 }

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

@@ -73,12 +73,12 @@ public class ClinicalFacade {
      */
     public ResponseData processClinicalData(@RequestBody SearchVo searchVo) {
         SearchVo sData = searchVo;
-//        Map<String, List<Map<String, String>>> standWord = getStandWord();
-//        //        standWordObj = getStandWord();
-//        Response<List<Lexeme>> resp = nlpServiceClient.split(sData.getSymptom());
-//        if (null != resp && null != resp.getData()) {
-//            addStandWord(resp.getData(), standWord, sData);
-//        }
+        //        Map<String, List<Map<String, String>>> standWord = getStandWord();
+        //        //        standWordObj = getStandWord();
+        //        Response<List<Lexeme>> resp = nlpServiceClient.split(sData.getSymptom());
+        //        if (null != resp && null != resp.getData()) {
+        //            addStandWord(resp.getData(), standWord, sData);
+        //        }
 
         sData.setLisArr(processLis(sData.getLisArr()));
 
@@ -109,17 +109,17 @@ public class ClinicalFacade {
             Otherval = lisres.getOtherValue();
 
             if (Otherval.indexOf(pos) >= 0 || Otherval.indexOf(neg) >= 0) {
-                lisres.setOtherValue(lisres.getDetailName() + Otherval);
+                lisres.setOtherValue(lisres.getUniqueName() + Otherval);
             } else {
                 Otherval = (Otherval.trim().length() > 0) ? Otherval.trim() + "\n" : "";
                 if (lisres.getValue() == null) {
                     continue;
                 } else if (lisres.getMaxValue() != null && lisres.getValue() > lisres.getMaxValue()) {
-                    lisres.setOtherValue(Otherval + lisres.getDetailName() + up);
+                    lisres.setOtherValue(Otherval + lisres.getUniqueName() + up);
                 } else if (lisres.getMinValue() != null && lisres.getValue() < lisres.getMinValue()) {
-                    lisres.setOtherValue(Otherval + lisres.getDetailName() + down);
+                    lisres.setOtherValue(Otherval + lisres.getUniqueName() + down);
                 } else {
-                    lisres.setOtherValue(Otherval + lisres.getDetailName() + normal);
+                    lisres.setOtherValue(Otherval + lisres.getUniqueName() + normal);
                 }
             }
         }
@@ -188,7 +188,7 @@ public class ClinicalFacade {
         for (int i = 0; i < lexemes.size(); i++) {
             if (lexemes.get(i).getProperty().contains("33") || lexemes.get(i).getProperty().contains("28")
                     || lexemes.get(i).getProperty().contains("2") || lexemes.get(i).getProperty().contains("9")
-                    ) {
+            ) {
                 feature.add(lexemes.get(i));
             }
         }
@@ -401,5 +401,4 @@ public class ClinicalFacade {
         }
         return standWordObj;
     }
-
 }

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

@@ -148,10 +148,10 @@ public class PushFacade {
             if (ListUtil.isNotEmpty(lis)) {
                 List<String> nameList = lis.stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
                 if (ListUtil.isNotEmpty(nameList)) {
-                    List<ConceptPushDTO> lisDTO = getConceptDTOList(nameList, LexiconTypeEnum.LIS_TABLES.getKey());
+                    List<ConceptPushDTO> lisDTO = getConceptDTOList(nameList, LexiconTypeEnum.LIS_PACKAGE.getKey());
                     if (isConnect) {
                         lisDTO = addClientName(lisDTO, searchVo.getHosCode(), ConceptTypeEnum.Lis.getKey());
-                        lisDTO = removeLisDetail(lisDTO);
+                        //lisDTO = removeLisDetail(lisDTO);
                     }
                     pushDTO.setLab(lisDTO);
                 }
@@ -413,7 +413,7 @@ public class PushFacade {
                 for (ConceptPushDTO concept : concepts) {
                     List<String> clientNames = lisMappingByUniqueName.get(concept.getName());
                     if (ListUtil.isNotEmpty(clientNames)) {
-                        concept.setClientName(clientNames.get(0));
+                        concept.setClientNames(clientNames);
                     }
                 }
             }
@@ -424,7 +424,7 @@ public class PushFacade {
                 for (ConceptPushDTO concept : concepts) {
                     List<String> clientNames = pacsConfigMapByUniqueName.get(concept.getName());
                     if (ListUtil.isNotEmpty(clientNames)) {
-                        concept.setClientName(clientNames.get(0));
+                        concept.setClientNames(clientNames);
                     }
                 }
             }
@@ -435,7 +435,9 @@ public class PushFacade {
                 for (ConceptPushDTO concept : concepts) {
                     String clientName = disMap.get(concept.getName());
                     if (StringUtil.isNotBlank(clientName)) {
-                        concept.setClientName(disMap.get(concept.getName()));
+                        List<String> clientNames = Lists.newLinkedList();
+                        clientNames.add(clientName);
+                        concept.setClientNames(clientNames);
                     }
                 }
             }
@@ -449,7 +451,7 @@ public class PushFacade {
      * @param lisDTO
      * @return
      */
-    public List<ConceptPushDTO> removeLisDetail(List<ConceptPushDTO> lisDTO) {
+    /*public List<ConceptPushDTO> removeLisDetail(List<ConceptPushDTO> lisDTO) {
         List<ConceptPushDTO> retLisDTO = Lists.newLinkedList();
         if (ListUtil.isEmpty(lisDTO)) {
             return retLisDTO;
@@ -473,5 +475,5 @@ public class PushFacade {
             }
         }
         return retLisDTO;
-    }
+    }*/
 }

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

@@ -3,6 +3,8 @@ package com.diagbot.dto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @Description:推理返回标签（概念）
  * @Author:zhaops
@@ -12,6 +14,6 @@ import lombok.Setter;
 @Setter
 public class ConceptPushDTO extends ConceptBaseDTO {
     private Integer libType;  //词性
-    private String clientName;//数据服务模式调用方名称
+    private List<String> clientNames;//数据服务模式调用方名称
     private Integer type;
 }

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

@@ -150,7 +150,27 @@ public class PushFacade {
         if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Lis.getKey()))) {
             List<QuestionPushDTO> labs = data.getLab();
             if (ListUtil.isNotEmpty(labs)) {
-                List<String> uniqueNameList = labs.stream().map(lab -> lab.getName()).collect(Collectors.toList());
+                List<QuestionPushDTO> lisDTO = Lists.newLinkedList();
+                Map<String, Long> lisMap = new LinkedHashMap<>();
+                List<String> mealNameList = labs.stream().map(lab -> lab.getName()).collect(Collectors.toList());
+                Map<String, QuestionDTO> questionDTOMap = addLisQuestion(mealNameList, pushVO.getAge(), pushVO.getSex());
+                for (String name : mealNameList) {
+                    QuestionPushDTO questionPushDTO = new QuestionPushDTO();
+                    QuestionDTO questionDTO = questionDTOMap.get(name);
+                    if (questionDTO != null) {
+                        BeanUtil.copyProperties(questionDTO, questionPushDTO);
+                    } else {
+                        questionPushDTO.setName(name);
+                        questionPushDTO.setType(ConceptTypeEnum.Lis.getKey());
+                    }
+                    questionPushDTO.setLibType(12);
+                    if (lisMap.containsKey(name) && lisMap.get(name) != null) {
+                        questionPushDTO.setConceptId(lisMap.get(name));
+                    }
+                    lisDTO.add(questionPushDTO);
+                }
+
+               /* List<String> uniqueNameList = labs.stream().map(lab -> lab.getName()).collect(Collectors.toList());
                 //公表项转套餐项
                 Map<String, List<String>> lisMapping = lisMappingFacade.getLisMappingByUniqueName(uniqueNameList);
                 List<String> nameList = Lists.newLinkedList();
@@ -190,7 +210,7 @@ public class PushFacade {
                         questionPushDTO.setConceptId(lisMap.get(name));
                     }
                     lisDTO.add(questionPushDTO);
-                }
+                }*/
                 pushDTO.setLab(lisDTO);
             }
         }

ltapi-service/src/main/java/com/diagbot/dto/ConceptPushDTO.java

@@ -3,6 +3,8 @@ package com.diagbot.dto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @Description:推理返回标签（概念）
  * @Author:zhaops
@@ -12,6 +14,6 @@ import lombok.Setter;
 @Setter
 public class ConceptPushDTO extends ConceptBaseDTO {
     private Integer libType;  //词性
-    private String clientName;//数据服务模式调用方名称
+    private List<String> clientNames;//数据服务模式调用方名称
     private Integer type;
 }