常用标签接口加入性别年龄判断

icss-service/src/main/java/com/diagbot/vo/QuestionUsualVO.java

@@ -16,4 +16,8 @@ public class QuestionUsualVO {
 
     @NotNull(message = "请输入科室编码")
     private String deptCode;
+    @NotNull(message = "请输入病人年龄")
+    private Integer age;
+    @NotNull(message = "请输入病人性别")
+    private Integer sexType;
 }

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

@@ -23,5 +23,15 @@
         LEFT JOIN `icss_question_info` b ON b.id = c.question_id
         LEFT JOIN `tran_hospital_dept` d ON d.dept_id = a.id
         WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N' AND d.is_deleted = 'N' AND d.`code` = #{deptCode}
+        <if test="age != null and age != ''">
+            <![CDATA[ and b.age_begin <= #{age} ]]>
+            <![CDATA[ and b.age_end >= #{age} ]]>
+        </if>
+        <if test="sexType == 3">
+            and b.sex_type in ('1','2','3')
+        </if>
+        <if test="sexType != 3">
+            and b.sex_type in ('3',#{sexType})
+        </if>
     </select>
 </mapper>

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

@@ -16,7 +16,7 @@
     </resultMap>
 
     <select id="getSymptopInfo" resultType="com.diagbot.dto.RetrievalDTO">
-        SELECT c.`name`,c.id as questionId FROM icss_retrieval a
+        SELECT c.`name`,c.id as question_id 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 c.`name`,c.id as questionId FROM icss_retrieval a
+        SELECT c.`name`,c.id as question_id 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 c.`name`,c.id as questionId FROM icss_retrieval a
+        SELECT c.`name`,c.id as question_id 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'