区分医生端名称和系统名称

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

@@ -10,7 +10,10 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class ConceptPushDTO extends ConceptBaseDTO {
+public class ConceptPushDTO {
+    private Long conceptId; // 概念id
+    private String name;    //界面名称（医生端名称）
+    private String tagName; //系统名称（术语名称）
     private Integer libType;  //词性
     private Long id;
     private Integer type;

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

@@ -59,6 +59,10 @@ public class PushFacade {
         if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Symptom.getKey()))) {
             List<ConceptPushDTO> symptom = data.getSymptom();
             if (ListUtil.isNotEmpty(symptom)) {
+                //推理名称=系统名称=术语名称
+                for (ConceptPushDTO symp : symptom) {
+                    symp.setTagName(symp.getName());
+                }
                 List<ConceptPushDTO> symptomDTO = addQuestionId(symptom, 1);
                 pushDTO.setSymptom(symptomDTO);
             }
@@ -75,7 +79,7 @@ public class PushFacade {
      */
     public List<ConceptPushDTO> addQuestionId(List<ConceptPushDTO> concepts, Integer type) {
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        List<String> nameList = concepts.stream().map(concept -> concept.getName()).collect(Collectors.toList());
+        List<String> nameList = concepts.stream().map(concept -> concept.getTagName()).collect(Collectors.toList());
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).in("tag_name", nameList).eq("type", type);
         List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
         if (ListUtil.isNotEmpty(questionInfoList)) {
@@ -83,11 +87,13 @@ public class PushFacade {
             for (ConceptPushDTO concept : concepts) {
                 concept.setType(1);
                 if (questionInfoMap.containsKey(concept.getName())) {
-                    concept.setId(questionInfoMap.get(concept.getName()).getId());
-                    concept.setDescription(questionInfoMap.get(concept.getName()).getDescription());
-                    if (StringUtil.isNotBlank(questionInfoMap.get(concept.getName()).getExplains())){
+                    QuestionInfo questionInfo = questionInfoMap.get(concept.getTagName());
+                    concept.setId(questionInfo.getId());
+                    concept.setName(questionInfo.getName());
+                    concept.setDescription(questionInfo.getDescription());
+                    if (StringUtil.isNotBlank(questionInfo.getExplains())) {
                         concept.setHasExplain(1);
-                        concept.setExplains(questionInfoMap.get(concept.getName()).getExplains());
+                        concept.setExplains(questionInfo.getExplains());
                     }
                 }
             }