Merge remote-tracking branch 'origin/dev/20200426_2nd' into test

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -83,7 +83,7 @@
         <if test="level != null and level != ''">
             and t.level = #{level}
         </if>
-
+        and t.qc_type_id != 0
     </select>
 
     <select id="getMsg" resultType="com.diagbot.dto.MsgDTO">
@@ -125,7 +125,7 @@
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND c.is_deleted = 'N'
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -155,7 +155,7 @@
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND c.is_deleted = 'N'
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -197,7 +197,7 @@
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND c.is_deleted = 'N'
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -228,7 +228,7 @@
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND c.is_deleted = 'N'
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -259,7 +259,7 @@
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND c.is_deleted = 'N'
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -296,7 +296,7 @@
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND c.is_deleted = 'N'
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -329,7 +329,7 @@
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND c.is_deleted = 'N'
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -356,6 +356,7 @@
             AND a.hospital_id = b.hospital_id
             AND a.behospital_code = b.behospital_code
             )
+         and a.qc_type_id != 0
     </select>
 
     <!--质控评分(科室)分页-->
@@ -423,6 +424,7 @@
         <if test="level != null and level != ''">
             and t.level = #{level}
         </if>
+        and t.qc_type_id != 0
     </select>
 
     <!--质控评分(个人)分页-->
@@ -489,6 +491,7 @@
         <if test="level != null and level != ''">
             and t.level = #{level}
         </if>
+        and t.qc_type_id != 0
     </select>
 
     <!-- 病案首页病历数统计 -->
@@ -503,7 +506,7 @@
         AND b.is_deleted = 'N'
         AND a.hospital_id = b.hospital_id
         AND a.behospital_code = b.behospital_code
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -538,7 +541,7 @@
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = b.behospital_code
         AND b.home_page_id = c.home_page_id
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -568,7 +571,7 @@
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.beh_dept_id = c.dept_id
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="death!=null and death==1">
             AND b.leave_hospital_type = '死亡'
         </if>
@@ -611,7 +614,7 @@
         AND a.behospital_code = b.behospital_code
         AND b.home_page_id = d.home_page_id
         AND a.beh_dept_id = c.dept_id
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="userId!=null">
             AND c.user_id = #{userId}
         </if>

src/main/resources/mapper/HomePageMapper.xml

@@ -154,7 +154,7 @@
         AND a.behospital_code = b.behospital_code
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -185,7 +185,7 @@
         AND a.behospital_code = b.behospital_code
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -30,7 +30,7 @@
         AND a.behospital_code = b.behospital_code
         AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -64,7 +64,7 @@
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -106,7 +106,7 @@
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -150,7 +150,7 @@
         AND d.cases_id = e.id
         AND d.cases_entry_id = f.id
         AND e.id = f.cases_id
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -187,7 +187,7 @@
         AND a.behospital_code = c.behospital_code
         AND c.cases_id = d.cases_id
         AND c.cases_entry_id = d.id
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -222,7 +222,7 @@
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -259,7 +259,7 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.beh_dept_id = d.dept_id
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="userId!=null">
             AND d.user_id = #{userId}
         </if>
@@ -318,7 +318,7 @@
         AND d.cases_entry_id = f.id
         AND e.id = f.cases_id
         AND a.beh_dept_id = g.dept_id
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="userId!=null">
             AND g.user_id = #{userId}
         </if>
@@ -366,7 +366,7 @@
         AND c.cases_id = d.cases_id
         AND c.cases_entry_id = d.id
         AND a.beh_dept_id = e.dept_id
-        AND a.qc_type_id IS NOT NULL
+        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="userId!=null">
             AND e.user_id = #{userId}
         </if>