Merge remote-tracking branch 'origin/dev/icss' into debug

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

@@ -69,7 +69,7 @@ public class PatientInfoFacade {
 
         QueryWrapper<DeptInfo> deptInfoQ = new QueryWrapper<>();
         deptInfoQ.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("id", getTopPatientInfoDTO.getSelfDeptName());
+                .eq("name", getTopPatientInfoDTO.getSelfDeptName());
         DeptInfo deptInfo = deptInfoFacade.getOne(deptInfoQ);
         if (null != deptInfo) {
             getTopPatientInfoDTO.setSelfDeptName(deptInfo.getName());

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

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

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} AND b.type = #{type}
+        WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N' AND a.id = #{deptId}
         <if test="age != null and age != ''">
             <![CDATA[ and b.age_begin <= #{age} ]]>
             <![CDATA[ and b.age_end >= #{age} ]]>