代码优化

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

@@ -18,5 +18,5 @@ public class RetrievalDTO {
     //显示类型
     private Integer showType;
     //Tag名称
-    private String tagName;
+    private String retrievalName;
 }

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

@@ -37,7 +37,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
         //将标签名放入实体
         Map<Long, QuestionInfo> map = questionFacade.getQuestionInfos();
         for (RetrievalDTO retrievalDTO:data) {
-            retrievalDTO.setTagName(map.get(retrievalDTO.getQuestionId()).getTagName());
+            retrievalDTO.setName(map.get(retrievalDTO.getQuestionId()).getTagName());
         }
         return data;
     }

icss-service/src/main/resources/mapper/RetrievalMapper.xml

@@ -16,7 +16,7 @@
     </resultMap>
 
     <select id="getSymptopInfo" resultType="com.diagbot.dto.RetrievalDTO">
-        SELECT a.`name`,c.id as question_id,b.show_type FROM icss_retrieval a
+        SELECT a.`name` as retrieval_Name,c.id as question_id,b.show_type FROM icss_retrieval a
         LEFT JOIN icss_retrieval_mapping b ON a.id = b.retrieval_id
         LEFT JOIN icss_question_info c ON b.question_id = c.id
         WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N'
@@ -33,7 +33,7 @@
             and c.sex_type in ('3',#{sexType})
         </if>
         UNION
-        SELECT a.`name`,c.id as question_id,b.show_type FROM icss_retrieval a
+        SELECT a.`name` as retrieval_Name,c.id as question_id,b.show_type FROM icss_retrieval a
         LEFT JOIN icss_retrieval_mapping b ON a.id = b.retrieval_id
         LEFT JOIN icss_question_info c ON b.question_id = c.id
         WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N'
@@ -50,7 +50,7 @@
             and c.sex_type in ('3',#{sexType})
         </if>
         UNION
-        SELECT a.`name`,c.id as question_id,b.show_type FROM icss_retrieval a
+        SELECT a.`name` as retrieval_Name,c.id as question_id,b.show_type FROM icss_retrieval a
         LEFT JOIN icss_retrieval_mapping b ON a.id = b.retrieval_id
         LEFT JOIN icss_question_info c ON b.question_id = c.id
         WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N'