缺陷反馈记录列表入参加入是否归档

src/main/java/com/diagbot/dto/GetMedDefectFeedbackPageDTO.java

@@ -74,4 +74,7 @@ public class GetMedDefectFeedbackPageDTO  implements Serializable {
 
     @ApiModelProperty(value = "状态 0:待确认|1:已确认")
     private String status;
+
+    @ApiModelProperty(value = "是否归档 0: 未归档|1:已归档")
+    private String isPlacefile ;
 }

src/main/java/com/diagbot/vo/GetMedDefectFeedbackPageVO.java

@@ -63,4 +63,7 @@ public class GetMedDefectFeedbackPageVO extends Page {
 
     @ApiModelProperty(value = "状态 0:待确认|1:已确认")
     private String status;
+
+    @ApiModelProperty(value = "是否归档 0: 未归档|1:已归档")
+    private String isPlacefile ;
 }

src/main/resources/mapper/MedDefectFeedbackMapper.xml

@@ -32,6 +32,9 @@
     </resultMap>
 
     <select id="getMedDefectFeedbackPage" resultType="com.diagbot.dto.GetMedDefectFeedbackPageDTO">
+        SELECT
+        a.* ,b.is_placefile as isPlacefile FROM
+        (
         SELECT
         id,
         dept_name as deptName,
@@ -95,6 +98,14 @@
         <if test="getMedDefectFeedbackPageVO.name != null and getMedDefectFeedbackPageVO.name != ''">
             and name LIKE CONCAT( '%', #{getMedDefectFeedbackPageVO.name}, '%' )
         </if>
+        ) a ,
+        med_behospital_info b
+        where
+        a.behospitalCode=b.behospital_code
+        and b.is_deleted='N'
+        <if test="getMedDefectFeedbackPageVO.isPlacefile != null and getMedDefectFeedbackPageVO.isPlacefile != ''">
+            and b.is_placefile =#{getMedDefectFeedbackPageVO.isPlacefile}
+        </if>
 
     </select>
 
@@ -107,6 +118,7 @@
         WHERE
             is_deleted = 'N'
         AND hospital_id = #{hospitalID}
+        AND dept_id is not null
         GROUP BY dept_id
     </select>
 
@@ -119,6 +131,7 @@
         WHERE
             is_deleted = 'N'
         AND hospital_id = #{hospitalID}
+        AND mode_id is not null
         GROUP BY mode_id
     </select>