获取常用标签添加类型

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

@@ -20,4 +20,6 @@ public class QuestionUsualVO {
     private Integer age;
     @NotNull(message = "请输入病人性别")
     private Integer sexType;
+    @NotNull(message = "请输入标签类型")
+    private Integer type;
 }

icss-service/src/main/java/com/diagbot/web/QuestionUsualController.java

@@ -35,9 +35,10 @@ public class QuestionUsualController {
     private QuestionUsualFacade questionUsualFacade;
 
     @ApiOperation(value = "常用标签——根据科室获取常用标签[by:wangyu]",
-            notes = "deptCode：医院编码<br>" +
+            notes = "deptCode：科室id<br>" +
                     "age：年龄<br>" +
-                    "sexType: 性别<br>")
+                    "sexType: 性别<br>" +
+                    "type：类型(1：症状 3：其他史 4：查体，5：化验 6：辅检 7：诊断)，必填<br>")
     @PostMapping("/getQuestionUsual")
     @SysLogger("getQuestionUsual")
     public RespDTO<List<QuestionUsualDTO>> getQuestionUsual(@RequestBody @Valid QuestionUsualVO questionUsualVO) {

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

@@ -20,7 +20,7 @@
         SELECT b.id as question_id, b.`name` FROM `icss_dept_info` a
         LEFT JOIN `icss_question_usual` c ON a.id = c.dept_id
         LEFT JOIN `icss_question_info` b ON b.id = c.question_id
-        WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N' AND a.id = #{deptId}
+        WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N' AND a.id = #{deptId} AND b.type = #{type}
         <if test="age != null and age != ''">
             <![CDATA[ and b.age_begin <= #{age} ]]>
             <![CDATA[ and b.age_end >= #{age} ]]>