瀏覽代碼

Merge remote-tracking branch 'origin/dev/20200716_1.3.9' into dev/20200716_1.3.9

zhoutg 4 年之前
父節點
當前提交
cb790f5588

+ 4 - 0
src/main/java/com/diagbot/vo/EntryStatisticsVO.java

@@ -48,4 +48,8 @@ public class EntryStatisticsVO {
      * 科室名称
      * 科室名称
      */
      */
     private String deptName;
     private String deptName;
+    /**
+     * 是否归档(0:未归档,1:已归档)
+     */
+    private String isPlacefile = "1";
 }
 }

+ 5 - 0
src/main/java/com/diagbot/vo/FilterPageVO.java

@@ -66,4 +66,9 @@ public class FilterPageVO extends Page {
      * 规则类型(0:无,1:空项,2:错误)
      * 规则类型(0:无,1:空项,2:错误)
      */
      */
     private Integer ruleType;
     private Integer ruleType;
+
+    /**
+     * 是否归档(0:未归档,1:已归档)
+     */
+    private String isPlacefile = "1";
 }
 }

+ 5 - 0
src/main/java/com/diagbot/vo/FilterUnModifyMRVO.java

@@ -57,4 +57,9 @@ public class FilterUnModifyMRVO {
      * 排序(降序)
      * 排序(降序)
      */
      */
     private String desc;
     private String desc;
+
+    /**
+     * 是否归档(0:未归档,1:已归档)
+     */
+    private String isPlacefile = "1";
 }
 }

+ 5 - 0
src/main/java/com/diagbot/vo/FilterVO.java

@@ -49,4 +49,9 @@ public class FilterVO {
     private String deptClass;
     private String deptClass;
 
 
     private String level;
     private String level;
+
+    /**
+     * 是否归档(0:未归档,1:已归档)
+     */
+    private String isPlacefile = "1";
 }
 }

+ 5 - 0
src/main/java/com/diagbot/vo/QcResultShortPageVO.java

@@ -76,4 +76,9 @@ public class QcResultShortPageVO extends Page {
      * 核查状态(1:已核查,0:未核查)
      * 核查状态(1:已核查,0:未核查)
      */
      */
     private Integer checkStatus;
     private Integer checkStatus;
+
+    /**
+     * 是否归档(0:未归档,1:已归档)
+     */
+    private String isPlacefile = "1";
 }
 }

+ 4 - 0
src/main/java/com/diagbot/vo/TaskVO.java

@@ -32,4 +32,8 @@ public class TaskVO {
     private Date endLeaveDate;
     private Date endLeaveDate;
     // 是否使用CRF缓存
     // 是否使用CRF缓存
     private boolean useCrfCache;
     private boolean useCrfCache;
+    /**
+     * 是否归档(0:未归档,1:已归档)
+     */
+    private String isPlacefile = "1";
 }
 }

+ 174 - 60
src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -160,7 +160,9 @@
         AND a.is_deleted = 'N'
         AND a.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND d.is_deleted = 'N'
         AND d.is_deleted = 'N'
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -194,7 +196,9 @@
         AND a.is_deleted = 'N'
         AND a.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND d.is_deleted = 'N'
         AND d.is_deleted = 'N'
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -212,7 +216,9 @@
         select * from med_behospital_info a
         select * from med_behospital_info a
         where a.is_deleted = 'N'
         where a.is_deleted = 'N'
         and a.qc_type_id != 0
         and a.qc_type_id != 0
-        and a.is_placefile = 1
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <if test="filterFlag != null and filterFlag == 0">
         <if test="filterFlag != null and filterFlag == 0">
             and
             and
             not EXISTS (
             not EXISTS (
@@ -240,7 +246,9 @@
             select * from med_behospital_info b
             select * from med_behospital_info b
             where b.is_deleted = 'N'
             where b.is_deleted = 'N'
             and b.qc_type_id != 0
             and b.qc_type_id != 0
-            and b.is_placefile = 1
+            <if test="isPlacefile != null and isPlacefile != ''">
+                and b.is_placefile = #{isPlacefile}
+            </if>
             <if test="startLeaveDate != null">
             <if test="startLeaveDate != null">
                 <![CDATA[ and b.leave_hospital_date >= #{startLeaveDate}]]>
                 <![CDATA[ and b.leave_hospital_date >= #{startLeaveDate}]]>
             </if>
             </if>
@@ -505,7 +513,9 @@
         med_behospital_info a
         med_behospital_info a
         WHERE
         WHERE
         a.is_deleted = 'N'
         a.is_deleted = 'N'
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
         </if>
         </if>
@@ -529,7 +539,9 @@
         AND b.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND a.hospital_id = b.hospital_id
         AND a.hospital_id = b.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND (
         AND (
         ( IFNULL( b.newborn_day, '' ) != '' AND b.newborn_day != '0' AND b.newborn_day != '-' )
         ( IFNULL( b.newborn_day, '' ) != '' AND b.newborn_day != '0' AND b.newborn_day != '-' )
         OR ( IFNULL( b.newborn_month, '' )!= '' AND b.newborn_month != '0' AND b.newborn_month != '-' )
         OR ( IFNULL( b.newborn_month, '' )!= '' AND b.newborn_month != '0' AND b.newborn_month != '-' )
@@ -559,7 +571,9 @@
         AND a.hospital_id = b.hospital_id
         AND a.hospital_id = b.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND b.return_to_type = '死亡'
         AND b.return_to_type = '死亡'
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -587,7 +601,9 @@
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND c.mode_id = d.id
         AND c.mode_id = d.id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND d.`name` = '手术记录'
         AND d.`name` = '手术记录'
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
@@ -616,7 +632,9 @@
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.beh_dept_id = c.dept_id
         AND a.beh_dept_id = c.dept_id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <if test="userId!=null">
         <if test="userId!=null">
             AND c.user_id = #{userId}
             AND c.user_id = #{userId}
         </if>
         </if>
@@ -657,7 +675,9 @@
         ( IFNULL( b.newborn_day, '' ) != '' AND b.newborn_day != '0' AND b.newborn_day != '-' )
         ( IFNULL( b.newborn_day, '' ) != '' AND b.newborn_day != '0' AND b.newborn_day != '-' )
         OR ( IFNULL( b.newborn_month, '' )!= '' AND b.newborn_month != '0' AND b.newborn_month != '-' )
         OR ( IFNULL( b.newborn_month, '' )!= '' AND b.newborn_month != '0' AND b.newborn_month != '-' )
         )
         )
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="userId!=null">
         <if test="userId!=null">
             AND c.user_id = #{userId}
             AND c.user_id = #{userId}
@@ -696,7 +716,9 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND a.beh_dept_id = c.dept_id
         AND a.beh_dept_id = c.dept_id
         AND b.return_to_type = '死亡'
         AND b.return_to_type = '死亡'
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="userId!=null">
         <if test="userId!=null">
             AND c.user_id = #{userId}
             AND c.user_id = #{userId}
@@ -738,7 +760,9 @@
         AND a.beh_dept_id = c.dept_id
         AND a.beh_dept_id = c.dept_id
         AND d.mode_id = e.id
         AND d.mode_id = e.id
         AND e.`name` = '手术记录'
         AND e.`name` = '手术记录'
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="userId!=null">
         <if test="userId!=null">
             AND c.user_id = #{userId}
             AND c.user_id = #{userId}
@@ -785,7 +809,9 @@
         AND a.is_deleted = 'N'
         AND a.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND d.is_deleted = 'N'
         AND d.is_deleted = 'N'
-        AND a.is_placefile = '1'
+        <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageVO.isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageVO.hospitalId}
             AND a.hospital_id = #{filterPageVO.hospitalId}
@@ -820,7 +846,9 @@
         AND a.is_deleted = 'N'
         AND a.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND d.is_deleted = 'N'
         AND d.is_deleted = 'N'
-        AND a.is_placefile = '1'
+        <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageVO.isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageVO.hospitalId}
             AND a.hospital_id = #{filterPageVO.hospitalId}
@@ -870,7 +898,9 @@
         AND d.is_deleted = 'N'
         AND d.is_deleted = 'N'
         AND e.is_deleted = 'N'
         AND e.is_deleted = 'N'
         AND a.beh_dept_id = e.dept_id
         AND a.beh_dept_id = e.dept_id
-        AND a.is_placefile = '1'
+        <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageByDeptVO.isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageByDeptVO.userId!=null">
         <if test="filterPageByDeptVO.userId!=null">
             AND e.user_id = #{filterPageByDeptVO.userId}
             AND e.user_id = #{filterPageByDeptVO.userId}
@@ -916,7 +946,9 @@
         AND d.is_deleted = 'N'
         AND d.is_deleted = 'N'
         AND e.is_deleted = 'N'
         AND e.is_deleted = 'N'
         AND a.beh_dept_id = e.dept_id
         AND a.beh_dept_id = e.dept_id
-        AND a.is_placefile = '1'
+        <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageByDeptVO.isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageByDeptVO.userId!=null">
         <if test="filterPageByDeptVO.userId!=null">
             AND e.user_id = #{filterPageByDeptVO.userId}
             AND e.user_id = #{filterPageByDeptVO.userId}
@@ -987,7 +1019,9 @@
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -1029,7 +1063,9 @@
         AND a.behospital_code = d.behospital_code
         AND a.behospital_code = d.behospital_code
         AND d.cases_id = e.cases_id
         AND d.cases_id = e.cases_id
         AND d.cases_entry_id = e.id
         AND d.cases_entry_id = e.id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -1168,7 +1204,9 @@
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.beh_dept_id = d.dept_id
         AND a.beh_dept_id = d.dept_id
         AND d.parent_dept_id = e.dept_id
         AND d.parent_dept_id = e.dept_id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -1225,7 +1263,9 @@
         AND d.cases_entry_id = e.id
         AND d.cases_entry_id = e.id
         AND a.beh_dept_id = f.dept_id
         AND a.beh_dept_id = f.dept_id
         AND f.parent_dept_id = g.dept_id
         AND f.parent_dept_id = g.dept_id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -1365,8 +1405,9 @@
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = d.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.beh_dept_id = d.dept_id
         AND a.beh_dept_id = d.dept_id
-        AND a.is_placefile = '1'
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -1431,8 +1472,9 @@
         AND d.cases_id = e.cases_id
         AND d.cases_id = e.cases_id
         AND d.cases_entry_id = e.id
         AND d.cases_entry_id = e.id
         AND a.beh_dept_id = f.dept_id
         AND a.beh_dept_id = f.dept_id
-        AND a.is_placefile = '1'
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -1559,7 +1601,9 @@
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND c.cases_id = 243
         AND c.cases_id = 243
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -1603,7 +1647,9 @@
         AND d.cases_id = e.cases_id
         AND d.cases_id = e.cases_id
         AND d.cases_entry_id = e.id
         AND d.cases_entry_id = e.id
         AND d.cases_id = 243
         AND d.cases_id = 243
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -1661,7 +1707,9 @@
         AND b.cases_id = c.cases_id
         AND b.cases_id = c.cases_id
         AND c.cases_id = d.cases_id
         AND c.cases_id = d.cases_id
         AND c.cases_entry_id = d.id
         AND c.cases_entry_id = d.id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND d.cases_id = 243
         AND d.cases_id = 243
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
@@ -1796,7 +1844,9 @@
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.beh_dept_id = e.dept_id
         AND a.beh_dept_id = e.dept_id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -1847,7 +1897,9 @@
         AND d.cases_id = e.cases_id
         AND d.cases_id = e.cases_id
         AND d.cases_entry_id = e.id
         AND d.cases_entry_id = e.id
         AND a.beh_dept_id = f.dept_id
         AND a.beh_dept_id = f.dept_id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -1970,7 +2022,9 @@
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.beh_dept_id = f.dept_id
         AND a.beh_dept_id = f.dept_id
         AND c.cases_id = 243
         AND c.cases_id = 243
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -2028,7 +2082,9 @@
         AND d.cases_id = e.cases_id
         AND d.cases_id = e.cases_id
         AND d.cases_entry_id = e.id
         AND d.cases_entry_id = e.id
         AND c.cases_id = 243
         AND c.cases_id = 243
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -2101,7 +2157,9 @@
         AND c.cases_id = d.cases_id
         AND c.cases_id = d.cases_id
         AND c.cases_entry_id = d.id
         AND c.cases_entry_id = d.id
         AND a.beh_dept_id = e.dept_id
         AND a.beh_dept_id = e.dept_id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND d.cases_id = 243
         AND d.cases_id = 243
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
@@ -2849,7 +2907,9 @@
         AND c.cases_id = d.cases_id
         AND c.cases_id = d.cases_id
         AND c.cases_entry_id = d.id
         AND c.cases_entry_id = d.id
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
-        AND a.is_placefile = 1
+        <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
+            and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
+        </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         </if>
@@ -3018,7 +3078,9 @@
         AND c.cases_id = d.cases_id
         AND c.cases_id = d.cases_id
         AND c.cases_entry_id = d.id
         AND c.cases_entry_id = d.id
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
-        AND a.is_placefile = 1
+        <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
+            and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
+        </if>
         <if test="qcResultShortPageVO.userId != null and qcResultShortPageVO.userId != ''">
         <if test="qcResultShortPageVO.userId != null and qcResultShortPageVO.userId != ''">
             AND e.user_id = #{qcResultShortPageVO.userId}
             AND e.user_id = #{qcResultShortPageVO.userId}
         </if>
         </if>
@@ -3250,7 +3312,9 @@
         AND a.hospital_id = b.hospital_id
         AND a.hospital_id = b.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND b.mode_id = 30
         AND b.mode_id = 30
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -3305,7 +3369,9 @@
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND b.home_page_id = c.home_page_id
         AND b.home_page_id = c.home_page_id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -3356,7 +3422,9 @@
         AND b.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND a.hospital_id = b.hospital_id
         AND a.hospital_id = b.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -3407,7 +3475,9 @@
         DAY,
         DAY,
         DATE( behospital_date ),
         DATE( behospital_date ),
         DATE( leave_hospital_date ))> 30
         DATE( leave_hospital_date ))> 30
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -3509,7 +3579,9 @@
         AND a.hospital_id = b.hospital_id
         AND a.hospital_id = b.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND b.leave_hospital_type = '非医嘱离院'
         AND b.leave_hospital_type = '非医嘱离院'
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -3564,7 +3636,9 @@
         med_behospital_info a
         med_behospital_info a
         WHERE
         WHERE
         a.is_deleted = 'N'
         a.is_deleted = 'N'
-        AND a.is_placefile = 1
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         AND IFNULL( a.diagnose, '' )!= ''
         AND IFNULL( a.diagnose, '' )!= ''
         AND IFNULL( a.file_code, '' )!= ''
         AND IFNULL( a.file_code, '' )!= ''
@@ -3586,7 +3660,9 @@
         med_behospital_info tt2
         med_behospital_info tt2
         WHERE
         WHERE
         tt2.is_deleted = 'N'
         tt2.is_deleted = 'N'
-        AND tt2.is_placefile = 1
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and tt2.is_placefile = #{isPlacefile}
+        </if>
         AND tt2.qc_type_id != 0
         AND tt2.qc_type_id != 0
         AND tt1.file_code = tt2.file_code
         AND tt1.file_code = tt2.file_code
         AND tt1.diagnose = tt2.diagnose
         AND tt1.diagnose = tt2.diagnose
@@ -3631,7 +3707,9 @@
         med_behospital_info a
         med_behospital_info a
         WHERE
         WHERE
         a.is_deleted = 'N'
         a.is_deleted = 'N'
-        AND a.is_placefile = 1
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         AND IFNULL( a.diagnose, '' )!= ''
         AND IFNULL( a.diagnose, '' )!= ''
         AND IFNULL( a.file_code, '' )!= ''
         AND IFNULL( a.file_code, '' )!= ''
@@ -3704,7 +3782,9 @@
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND c.cases_id = 243
         AND c.cases_id = 243
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -3751,7 +3831,9 @@
         AND b.cases_id = c.cases_id
         AND b.cases_id = c.cases_id
         AND c.cases_id = d.cases_id
         AND c.cases_id = d.cases_id
         AND c.cases_entry_id = d.id
         AND c.cases_entry_id = d.id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND d.cases_id = 243
         AND d.cases_id = 243
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
@@ -3849,7 +3931,9 @@
         WHERE
         WHERE
         a.is_deleted = 'N'
         a.is_deleted = 'N'
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
-        AND a.is_placefile = 1
+        <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
+            and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
+        </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         </if>
@@ -3988,7 +4072,9 @@
         AND m3.gmt_create = m4.gmt_create
         AND m3.gmt_create = m4.gmt_create
         AND m3.have_home_page = 1
         AND m3.have_home_page = 1
         AND m4.cases_id = 243
         AND m4.cases_id = 243
-        AND m1.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and m1.is_placefile = #{isPlacefile}
+        </if>
         AND m1.qc_type_id != 0
         AND m1.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND m1.hospital_id = #{hospitalId}
             AND m1.hospital_id = #{hospitalId}
@@ -4020,7 +4106,9 @@
         AND a.behospital_code = e.behospital_code
         AND a.behospital_code = e.behospital_code
         AND d.cases_id = 243
         AND d.cases_id = 243
         AND d.score_res > e.score_res
         AND d.score_res > e.score_res
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -4047,7 +4135,9 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
         </if>
         </if>
@@ -4097,7 +4187,9 @@
         AND a.hospital_id = b.hospital_id
         AND a.hospital_id = b.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
         </if>
         </if>
@@ -4132,7 +4224,9 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND ifnull(c.`status`,0) = 1
         AND ifnull(c.`status`,0) = 1
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -4168,7 +4262,9 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
         </if>
         </if>
@@ -4220,7 +4316,9 @@
         AND m3.gmt_create = m4.gmt_create
         AND m3.gmt_create = m4.gmt_create
         AND m3.have_home_page = 1
         AND m3.have_home_page = 1
         AND m4.cases_id = 243
         AND m4.cases_id = 243
-        AND m1.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and m1.is_placefile = #{isPlacefile}
+        </if>
         AND m1.qc_type_id != 0
         AND m1.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND m1.hospital_id = #{hospitalId}
             AND m1.hospital_id = #{hospitalId}
@@ -4424,7 +4522,9 @@
         WHERE
         WHERE
         a.is_deleted = 'N'
         a.is_deleted = 'N'
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
-        AND a.is_placefile = 1
+        <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
+            and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
+        </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         </if>
@@ -4597,7 +4697,9 @@
         WHERE
         WHERE
         a.is_deleted = 'N'
         a.is_deleted = 'N'
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
-        AND a.is_placefile = 1
+        <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
+            and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
+        </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         </if>
@@ -4810,7 +4912,9 @@
         AND c.cases_id = d.cases_id
         AND c.cases_id = d.cases_id
         AND c.cases_entry_id = d.id
         AND c.cases_entry_id = d.id
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
-        AND a.is_placefile = 1
+        <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
+            and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
+        </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         </if>
@@ -4994,7 +5098,9 @@
         AND c.cases_id = d.cases_id
         AND c.cases_id = d.cases_id
         AND c.cases_entry_id = d.id
         AND c.cases_entry_id = d.id
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
-        AND a.is_placefile = 1
+        <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
+            and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
+        </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         </if>
@@ -5121,7 +5227,9 @@
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND c.cases_entry_id = d.id
         AND c.cases_entry_id = d.id
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
         </if>
         </if>
@@ -5226,7 +5334,9 @@
         AND c.cases_id = d.cases_id
         AND c.cases_id = d.cases_id
         AND c.cases_entry_id = d.id
         AND c.cases_entry_id = d.id
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
-        AND a.is_placefile = 1
+        <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
+            and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
+        </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         </if>
@@ -5392,7 +5502,9 @@
         AND c.cases_id = d.cases_id
         AND c.cases_id = d.cases_id
         AND c.cases_entry_id = d.id
         AND c.cases_entry_id = d.id
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
-        AND a.is_placefile = 1
+        <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
+            and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
+        </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         </if>
@@ -5539,7 +5651,9 @@
         AND c.cases_id = d.cases_id
         AND c.cases_id = d.cases_id
         AND c.cases_entry_id = d.id
         AND c.cases_entry_id = d.id
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
-        AND a.is_placefile = 1
+        <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
+            and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
+        </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         </if>

+ 24 - 8
src/main/resources/mapper/HomePageMapper.xml

@@ -168,7 +168,9 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND a.is_deleted = 'N'
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.is_deleted = 'N'
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -200,7 +202,9 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND a.is_deleted = 'N'
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.is_deleted = 'N'
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -244,7 +248,9 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND a.is_deleted = 'N'
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.is_deleted = 'N'
-        AND a.is_placefile = '1'
+        <if test="filterPageByAverageVO.isPlacefile != null and filterPageByAverageVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageByAverageVO.isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageByAverageVO.hospitalId != null and filterPageByAverageVO.hospitalId != ''">
         <if test="filterPageByAverageVO.hospitalId != null and filterPageByAverageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageByAverageVO.hospitalId}
             AND a.hospital_id = #{filterPageByAverageVO.hospitalId}
@@ -278,7 +284,9 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND a.is_deleted = 'N'
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.is_deleted = 'N'
-        AND a.is_placefile = '1'
+        <if test="filterPageByAverageVO.isPlacefile != null and filterPageByAverageVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageByAverageVO.isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageByAverageVO.hospitalId != null and filterPageByAverageVO.hospitalId != ''">
         <if test="filterPageByAverageVO.hospitalId != null and filterPageByAverageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageByAverageVO.hospitalId}
             AND a.hospital_id = #{filterPageByAverageVO.hospitalId}
@@ -312,7 +320,9 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND a.is_deleted = 'N'
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.is_deleted = 'N'
-        AND a.is_placefile = '1'
+        <if test="filterPageByAverageVO.isPlacefile != null and filterPageByAverageVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageByAverageVO.isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageByAverageVO.hospitalId != null and filterPageByAverageVO.hospitalId != ''">
         <if test="filterPageByAverageVO.hospitalId != null and filterPageByAverageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageByAverageVO.hospitalId}
             AND a.hospital_id = #{filterPageByAverageVO.hospitalId}
@@ -369,7 +379,9 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND a.is_deleted = 'N'
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.is_deleted = 'N'
-        AND a.is_placefile = '1'
+        <if test="filterPageByAverageVO.isPlacefile != null and filterPageByAverageVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageByAverageVO.isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageByAverageVO.hospitalId != null and filterPageByAverageVO.hospitalId != ''">
         <if test="filterPageByAverageVO.hospitalId != null and filterPageByAverageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageByAverageVO.hospitalId}
             AND a.hospital_id = #{filterPageByAverageVO.hospitalId}
@@ -403,7 +415,9 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND a.is_deleted = 'N'
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.is_deleted = 'N'
-        AND a.is_placefile = '1'
+        <if test="filterPageByAverageVO.isPlacefile != null and filterPageByAverageVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageByAverageVO.isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageByAverageVO.hospitalId != null and filterPageByAverageVO.hospitalId != ''">
         <if test="filterPageByAverageVO.hospitalId != null and filterPageByAverageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageByAverageVO.hospitalId}
             AND a.hospital_id = #{filterPageByAverageVO.hospitalId}
@@ -437,7 +451,9 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND a.is_deleted = 'N'
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.is_deleted = 'N'
-        AND a.is_placefile = '1'
+        <if test="filterPageByAverageVO.isPlacefile != null and filterPageByAverageVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageByAverageVO.isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageByAverageVO.hospitalId != null and filterPageByAverageVO.hospitalId != ''">
         <if test="filterPageByAverageVO.hospitalId != null and filterPageByAverageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageByAverageVO.hospitalId}
             AND a.hospital_id = #{filterPageByAverageVO.hospitalId}

+ 87 - 29
src/main/resources/mapper/QcresultInfoMapper.xml

@@ -61,7 +61,9 @@
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -100,7 +102,9 @@
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -135,7 +139,9 @@
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -188,7 +194,9 @@
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = d.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.behospital_code = d.behospital_code
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -218,7 +226,9 @@
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -288,7 +298,9 @@
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = d.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.behospital_code = d.behospital_code
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -318,7 +330,9 @@
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -381,7 +395,9 @@
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = d.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.behospital_code = d.behospital_code
-        AND a.is_placefile = '1'
+        <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageVO.isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageVO.hospitalId}
             AND a.hospital_id = #{filterPageVO.hospitalId}
@@ -427,7 +443,9 @@
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND a.is_placefile = '1'
+        <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageVO.isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageVO.hospitalId}
             AND a.hospital_id = #{filterPageVO.hospitalId}
@@ -485,7 +503,9 @@
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = d.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.behospital_code = d.behospital_code
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND d.is_reject = 1
         AND d.is_reject = 1
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
@@ -522,7 +542,9 @@
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -554,7 +576,9 @@
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -595,7 +619,9 @@
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.beh_dept_id = d.dept_id
         AND a.beh_dept_id = d.dept_id
         AND d.parent_dept_id = e.dept_id
         AND d.parent_dept_id = e.dept_id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
             AND a.hospital_id = #{hospitalId}
@@ -632,7 +658,9 @@
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = d.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.beh_dept_id = d.dept_id
         AND a.beh_dept_id = d.dept_id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="userId!=null">
         <if test="userId!=null">
             AND d.user_id = #{userId}
             AND d.user_id = #{userId}
@@ -691,7 +719,9 @@
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND c.cases_entry_id = d.id
         AND c.cases_entry_id = d.id
         AND a.beh_dept_id = e.dept_id
         AND a.beh_dept_id = e.dept_id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="userId!=null">
         <if test="userId!=null">
             AND e.user_id = #{userId}
             AND e.user_id = #{userId}
@@ -757,7 +787,9 @@
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.beh_dept_id = f.dept_id
         AND a.beh_dept_id = f.dept_id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="userId!=null">
         <if test="userId!=null">
             AND f.user_id = #{userId}
             AND f.user_id = #{userId}
@@ -798,7 +830,9 @@
         AND a.hospital_id = f.hospital_id
         AND a.hospital_id = f.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.beh_dept_id = f.dept_id
         AND a.beh_dept_id = f.dept_id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="userId!=null">
         <if test="userId!=null">
             AND f.user_id = #{userId}
             AND f.user_id = #{userId}
@@ -881,7 +915,9 @@
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.beh_dept_id = f.dept_id
         AND a.beh_dept_id = f.dept_id
-        AND a.is_placefile = '1'
+        <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageByDeptVO.isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="filterPageByDeptVO.userId!=null">
         <if test="filterPageByDeptVO.userId!=null">
             AND f.user_id = #{filterPageByDeptVO.userId}
             AND f.user_id = #{filterPageByDeptVO.userId}
@@ -941,7 +977,9 @@
         AND a.hospital_id = f.hospital_id
         AND a.hospital_id = f.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.beh_dept_id = f.dept_id
         AND a.beh_dept_id = f.dept_id
-        AND a.is_placefile = '1'
+        <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageByDeptVO.isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="filterPageByDeptVO.userId!=null">
         <if test="filterPageByDeptVO.userId!=null">
             AND f.user_id = #{filterPageByDeptVO.userId}
             AND f.user_id = #{filterPageByDeptVO.userId}
@@ -1011,7 +1049,9 @@
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND a.is_placefile = '1'
+        <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageVO.isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageVO.hospitalId}
             AND a.hospital_id = #{filterPageVO.hospitalId}
@@ -1047,7 +1087,9 @@
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND a.is_placefile = '1'
+        <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageVO.isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageVO.hospitalId}
             AND a.hospital_id = #{filterPageVO.hospitalId}
@@ -1129,7 +1171,9 @@
         AND d.is_deleted = 'N'
         AND d.is_deleted = 'N'
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = d.hospital_id
         AND a.behospital_code = d.behospital_code
         AND a.behospital_code = d.behospital_code
-        AND a.is_placefile = '1'
+        <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageVO.isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageVO.hospitalId}
             AND a.hospital_id = #{filterPageVO.hospitalId}
@@ -1180,7 +1224,9 @@
         AND e.is_deleted = 'N'
         AND e.is_deleted = 'N'
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = d.hospital_id
         AND a.behospital_code = d.behospital_code
         AND a.behospital_code = d.behospital_code
-        AND a.is_placefile = '1'
+        <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageVO.isPlacefile}
+        </if>
         AND e.cases_id = d.cases_id
         AND e.cases_id = d.cases_id
         AND e.id = d.cases_entry_id
         AND e.id = d.cases_entry_id
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
@@ -1230,7 +1276,9 @@
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND a.is_placefile = '1'
+        <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageVO.isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageVO.hospitalId}
             AND a.hospital_id = #{filterPageVO.hospitalId}
@@ -1272,7 +1320,9 @@
         AND c.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND a.is_placefile = '1'
+        <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageVO.isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageVO.hospitalId}
             AND a.hospital_id = #{filterPageVO.hospitalId}
@@ -1349,7 +1399,9 @@
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.beh_dept_id = g.dept_id
         AND a.beh_dept_id = g.dept_id
-        AND a.is_placefile = '1'
+        <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageByDeptVO.isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="filterPageByDeptVO.userId!=null">
         <if test="filterPageByDeptVO.userId!=null">
             AND g.user_id = #{filterPageByDeptVO.userId}
             AND g.user_id = #{filterPageByDeptVO.userId}
@@ -1396,7 +1448,9 @@
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = d.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.beh_dept_id = d.dept_id
         AND a.beh_dept_id = d.dept_id
-        AND a.is_placefile = '1'
+        <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageByDeptVO.isPlacefile}
+        </if>
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="filterPageByDeptVO.userId!=null">
         <if test="filterPageByDeptVO.userId!=null">
             AND d.user_id = #{filterPageByDeptVO.userId}
             AND d.user_id = #{filterPageByDeptVO.userId}
@@ -1492,7 +1546,9 @@
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = f.hospital_id
         AND a.hospital_id = f.hospital_id
         AND a.behospital_code = d.behospital_code
         AND a.behospital_code = d.behospital_code
-        AND a.is_placefile = '1'
+        <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageByDeptVO.isPlacefile}
+        </if>
         AND a.beh_dept_id = f.dept_id
         AND a.beh_dept_id = f.dept_id
         AND a.qc_type_id != 0
         AND a.qc_type_id != 0
         <if test="filterPageByDeptVO.userId!=null">
         <if test="filterPageByDeptVO.userId!=null">
@@ -1560,7 +1616,9 @@
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = f.hospital_id
         AND a.hospital_id = f.hospital_id
         AND a.behospital_code = d.behospital_code
         AND a.behospital_code = d.behospital_code
-        AND a.is_placefile = '1'
+        <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile != ''">
+            and a.is_placefile = #{filterPageByDeptVO.isPlacefile}
+        </if>
         AND d.cases_id = e.cases_id
         AND d.cases_id = e.cases_id
         AND d.cases_entry_id = e.id
         AND d.cases_entry_id = e.id
         AND a.beh_dept_id = f.dept_id
         AND a.beh_dept_id = f.dept_id