Merge branch 'dev/20211015_2.1.1' into test

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -12662,14 +12662,14 @@
         AND d.cases_entry_id = e.id
         AND d.cases_id = 243
         AND a.qc_type_id != 0
-<!--        <if test="qcResultPageVO.titleName != null ">-->
-<!--            <if test="qcResultPageVO.titleName == '不合格数'">-->
-<!--                AND c.`level`='不合格'-->
-<!--            </if>-->
-<!--            <if test="qcResultPageVO.titleName == '合格数'">-->
-<!--                AND c.`level`='合格'-->
-<!--            </if>-->
-<!--        </if>-->
+        <if test="qcResultPageVO.titleName != null ">
+            <if test="qcResultPageVO.titleName == '不合格数'">
+                AND c.`level`='不合格'
+            </if>
+            <if test="qcResultPageVO.titleName == '合格数'">
+                AND c.`level`='合格'
+            </if>
+        </if>
         <if test="qcResultPageVO.isPlacefile != null and qcResultPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultPageVO.isPlacefile}
         </if>
@@ -12958,14 +12958,14 @@
         AND d.cases_entry_id = e.id
         AND d.cases_id = 243
         AND a.qc_type_id != 0
-        <!--        <if test="qcResultPageVO.titleName != null ">-->
-        <!--            <if test="qcResultPageVO.titleName == '不合格数'">-->
-        <!--                AND c.`level`='不合格'-->
-        <!--            </if>-->
-        <!--            <if test="qcResultPageVO.titleName == '合格数'">-->
-        <!--                AND c.`level`='合格'-->
-        <!--            </if>-->
-        <!--        </if>-->
+                <if test="qcResultPageVO.titleName != null ">
+                    <if test="qcResultPageVO.titleName == '不合格数'">
+                        AND c.`level`='不合格'
+                    </if>
+                    <if test="qcResultPageVO.titleName == '合格数'">
+                        AND c.`level`='合格'
+                    </if>
+                </if>
         <if test="qcResultPageVO.isPlacefile != null and qcResultPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultPageVO.isPlacefile}
         </if>
@@ -13662,7 +13662,7 @@
         AND be.hospital_id = b.hospital_id
         AND be.behospital_code = b.behospital_code
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
-            AND b.`level` = #{qcResultPageVO.level}
+            AND b.`level` = #{qcResultShortPageVO.level}
         </if>
         left join qc_cases_entry d
         on  d.is_deleted = 'N'
@@ -13816,14 +13816,14 @@
         AND c.cases_id = k.cases_id
         AND k.cases_id = d.cases_id
         AND k.cases_entry_id = d.id
-<!--        <if test="qcResultShortPageVO.titleName != null ">-->
-<!--            <if test="qcResultShortPageVO.titleName == '不合格数'">-->
-<!--                AND c.`level`='不合格'-->
-<!--            </if>-->
-<!--            <if test="qcResultShortPageVO.titleName == '合格数'">-->
-<!--                AND c.`level`='合格'-->
-<!--            </if>-->
-<!--        </if>-->
+        <if test="qcResultShortPageVO.titleName != null ">
+            <if test="qcResultShortPageVO.titleName == '不合格数'">
+                AND c.`level`='不合格'
+            </if>
+            <if test="qcResultShortPageVO.titleName == '合格数'">
+                AND c.`level`='合格'
+            </if>
+        </if>
         AND a.qc_type_id != 0
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
@@ -13894,7 +13894,7 @@
         AND be.hospital_id = b.hospital_id
         AND be.behospital_code = b.behospital_code
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
-            AND b.`level` = #{qcResultPageVO.level}
+            AND b.`level` = #{qcResultShortPageVO.level}
         </if>
         ) t1
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
@@ -14154,7 +14154,7 @@
         AND be.hospital_id = b.hospital_id
         AND be.behospital_code = b.behospital_code
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
-            AND b.`level` = #{qcResultPageVO.level}
+            AND b.`level` = #{qcResultShortPageVO.level}
         </if>
         left join qc_cases_entry d
         on  d.is_deleted = 'N'
@@ -14227,7 +14227,13 @@
         t1.beh_dept_id AS behDeptId,
         t1.beh_dept_name AS behDeptName,
         t1.hospital_id as hospitalId,
-        t1.behospital_code as behospitalCode
+        t1.behospital_code as behospitalCode,
+        t1.checkStatus,
+        t1.mrStatus,
+        t1.chName,
+        t1.mrName,
+        t1.chTime,
+        t1.mrTime
         FROM
         (SELECT
         be.*,
@@ -14269,14 +14275,14 @@
         AND c.cases_id = k.cases_id
         AND k.cases_id = d.cases_id
         AND k.cases_entry_id = d.id
-        <!--        <if test="qcResultShortPageVO.titleName != null ">-->
-        <!--            <if test="qcResultShortPageVO.titleName == '不合格数'">-->
-        <!--                AND c.`level`='不合格'-->
-        <!--            </if>-->
-        <!--            <if test="qcResultShortPageVO.titleName == '合格数'">-->
-        <!--                AND c.`level`='合格'-->
-        <!--            </if>-->
-        <!--        </if>-->
+                <if test="qcResultShortPageVO.titleName != null ">
+                    <if test="qcResultShortPageVO.titleName == '不合格数'">
+                        AND c.`level`='不合格'
+                    </if>
+                    <if test="qcResultShortPageVO.titleName == '合格数'">
+                        AND c.`level`='合格'
+                    </if>
+                </if>
         AND a.qc_type_id != 0
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
@@ -14365,7 +14371,7 @@
         AND be.hospital_id = b.hospital_id
         AND be.behospital_code = b.behospital_code
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
-            AND b.`level` = #{qcResultPageVO.level}
+            AND b.`level` = #{qcResultShortPageVO.level}
         </if>
         ) t1
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
@@ -14615,7 +14621,7 @@
         AND be.hospital_id = b.hospital_id
         AND be.behospital_code = b.behospital_code
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
-            AND b.`level` = #{qcResultPageVO.level}
+            AND b.`level` = #{qcResultShortPageVO.level}
         </if>
         left join qc_cases_entry d
         on  d.is_deleted = 'N'
@@ -14847,7 +14853,7 @@
         AND be.hospital_id = b.hospital_id
         AND be.behospital_code = b.behospital_code
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
-            AND b.`level` = #{qcResultPageVO.level}
+            AND b.`level` = #{qcResultShortPageVO.level}
         </if>
         ) t1
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id