智能预问诊常用和标签检索添加医生端名称

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

@@ -10,7 +10,12 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class QuestionUsualDTO extends ConceptBaseDTO{
+public class QuestionUsualDTO {
+    // 概念id
+    private Long conceptId;
+    //医生端名称
+    private String name;
+    //标签id
     private Long questionId;
     //客户端界面描述
     private String description;
@@ -18,4 +23,6 @@ public class QuestionUsualDTO extends ConceptBaseDTO{
     private Integer hasExplain = 0;
     //详细阐述
     private String explains;
+    //系统名称
+    private String tagName;
 }

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

@@ -33,4 +33,8 @@ public class RetrievalDTO {
     private Integer hasExplain = 0;
     //详细阐述
     private String explains;
+    //系统名称
+    private String tagName;
+    //医生端名称
+    private String doctorName;
 }

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

@@ -73,14 +73,21 @@ public class QuestionUsualFacade {
             Map<String, QuestionInfo> questionInfoMap
                     = questionInfoList.stream()
                     .collect(Collectors.toMap(QuestionInfo::getTagName, questionInfo -> questionInfo));
-            questionUsualDTOList = BeanUtil.listCopyTo(conceptBaseDTORespDTO.data, QuestionUsualDTO.class);
+            for (ConceptBaseDTO conceptBaseDTO : conceptBaseDTORespDTO.data) {//将概念id和概念名称放入出参
+                QuestionUsualDTO questionUsualDTO = new QuestionUsualDTO();
+                questionUsualDTO.setTagName(conceptBaseDTO.getName());
+                questionUsualDTO.setConceptId(conceptBaseDTO.getConceptId());
+                questionUsualDTOList.add(questionUsualDTO);
+            }
             for (QuestionUsualDTO questionUsualDTO : questionUsualDTOList) {
-                if (null != questionInfoMap.get(questionUsualDTO.getName())) {
-                    questionUsualDTO.setQuestionId(questionInfoMap.get(questionUsualDTO.getName()).getId());
-                    questionUsualDTO.setDescription(questionInfoMap.get(questionUsualDTO.getName()).getDescription());
-                    if (StringUtil.isNotBlank(questionInfoMap.get(questionUsualDTO.getName()).getExplains())){
+                if (null != questionInfoMap.get(questionUsualDTO.getTagName())) {
+                    questionUsualDTO.setTagName(questionInfoMap.get(questionUsualDTO.getTagName()).getTagName());
+                    questionUsualDTO.setName(questionInfoMap.get(questionUsualDTO.getTagName()).getName());
+                    questionUsualDTO.setQuestionId(questionInfoMap.get(questionUsualDTO.getTagName()).getId());
+                    questionUsualDTO.setDescription(questionInfoMap.get(questionUsualDTO.getTagName()).getDescription());
+                    if (StringUtil.isNotBlank(questionInfoMap.get(questionUsualDTO.getTagName()).getExplains())){
                         questionUsualDTO.setHasExplain(1);
-                        questionUsualDTO.setExplains(questionInfoMap.get(questionUsualDTO.getName()).getExplains());
+                        questionUsualDTO.setExplains(questionInfoMap.get(questionUsualDTO.getTagName()).getExplains());
                     }
                 }
             }

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

@@ -68,8 +68,9 @@ public class RetrievalFacade {
             for (ConceptRetrievalDTO conceptRetrievalDTO : conceptInfos.data) {
                 retrievalDTO = new RetrievalDTO();
                 retrievalDTO.setConceptId(conceptRetrievalDTO.getSelfId());
-                retrievalDTO.setName(conceptRetrievalDTO.getSelfName());
+                retrievalDTO.setTagName(conceptRetrievalDTO.getSelfName());
                 if (null != questionInfoMap.get(conceptRetrievalDTO.getSelfName())) {//如果匹配到就添加questionId
+                    retrievalDTO.setName(questionInfoMap.get(conceptRetrievalDTO.getSelfName()).getName());
                     retrievalDTO.setQuestionId(questionInfoMap.get(conceptRetrievalDTO.getSelfName()).getId());
                     retrievalDTO.setDescription(questionInfoMap.get(conceptRetrievalDTO.getSelfName()).getDescription());
                     if (StringUtil.isNotBlank(questionInfoMap.get(conceptRetrievalDTO.getSelfName()).getExplains())){