按照机构查询代码回滚

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -2268,10 +2268,10 @@
             and a.is_placefile = #{isPlacefile}
         </if>
         AND a.qc_type_id != 0
-<!--        <if test="hospitalId != null and hospitalId != ''">-->
-<!--            AND a.hospital_id = #{hospitalId}-->
-<!--        </if>-->
-        <include refid="hospitalIdChoose"/>
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
+<!--        <include refid="hospitalIdChoose"/>-->
         <if test="isPlacefile != null and isPlacefile == 0">
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
@@ -2323,10 +2323,10 @@
             and a.is_placefile = #{isPlacefile}
         </if>
         AND a.qc_type_id != 0
-        <!--<if test="hospitalId != null and hospitalId != ''">
+        <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
-        </if>-->
-        <include refid="hospitalIdChoose"/>
+        </if>
+<!--        <include refid="hospitalIdChoose"/>-->
         <if test="isPlacefile != null and isPlacefile == 0">
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
@@ -2401,10 +2401,10 @@
             and a.is_placefile = #{isPlacefile}
         </if>
         AND a.qc_type_id != 0
-       <!-- <if test="hospitalId != null and hospitalId != ''">
+        <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
-        </if>-->
-        <include refid="hospitalIdChoose"/>
+        </if>
+<!--        <include refid="hospitalIdChoose"/>-->
         <if test="isPlacefile != null and isPlacefile == 0">
             <if test="lastStartDate != null and lastStartDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{lastStartDate}]]>
@@ -2456,10 +2456,10 @@
             and a.is_placefile = #{isPlacefile}
         </if>
         AND a.qc_type_id != 0
-        <!--<if test="hospitalId != null and hospitalId != ''">
+        <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
-        </if>-->
-        <include refid="hospitalIdChoose"/>
+        </if>
+<!--        <include refid="hospitalIdChoose"/>-->
         <if test="isPlacefile != null and isPlacefile == 0">
             <if test="lastStartDate != null and lastStartDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{lastStartDate}]]>
@@ -3312,10 +3312,10 @@
             and a.is_placefile = #{isPlacefile}
         </if>
         AND a.qc_type_id != 0
-<!--        <if test="hospitalId != null and hospitalId != ''">-->
-<!--            AND a.hospital_id = #{hospitalId}-->
-<!--        </if>-->
-        <include refid="hospitalIdChoose"/>
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
+<!--        <include refid="hospitalIdChoose"/>-->
 
 
         <if test="isPlacefile != null and isPlacefile == 0">
@@ -3371,10 +3371,10 @@
             and a.is_placefile = #{isPlacefile}
         </if>
         AND a.qc_type_id != 0
-<!--        <if test="hospitalId != null and hospitalId != ''">-->
-<!--            AND a.hospital_id = #{hospitalId}-->
-<!--        </if>-->
-        <include refid="hospitalIdChoose"/>
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
+<!--        <include refid="hospitalIdChoose"/>-->
         <if test="isPlacefile != null and isPlacefile == 0">
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
@@ -3443,10 +3443,10 @@
         </if>
         AND d.cases_id = 243
         AND a.qc_type_id != 0
-        <!--<if test="hospitalId != null and hospitalId != ''">
+        <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
-        </if>-->
-        <include refid="hospitalIdChoose"/>
+        </if>
+<!--        <include refid="hospitalIdChoose"/>-->
         <if test="isPlacefile != null and isPlacefile == 0">
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
@@ -3543,13 +3543,13 @@
         <choose>
             <when test="organizationName != null and organizationName != ''">
                 <choose>
-                    <when test="organizationName == '邵逸夫'">
+                    <when test="organizationName == '邵逸夫医院'">
                         AND a.hospital_id = 2
                     </when>
-                    <when test="organizationName == '浙江大学附属第一医院'">
+                    <when test="organizationName == '浙江大学医学院附属第一医院'">
                         AND a.hospital_id = 3
                     </when>
-                    <when test="organizationName == '七院'">
+                    <when test="organizationName == '杭州第七人民医院'">
                         AND a.hospital_id = 14
                     </when>
                 </choose>

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -1595,10 +1595,10 @@
             and a.is_placefile = #{filterPageVO.isPlacefile}
         </if>
         AND a.qc_type_id != 0
-<!--        <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">-->
-<!--            AND a.hospital_id = #{filterPageVO.hospitalId}-->
-<!--        </if>-->
-        <include refid="hospitalIdChoose"/>
+        <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
+            AND a.hospital_id = #{filterPageVO.hospitalId}
+        </if>
+<!--        <include refid="hospitalIdChoose"/>-->
         <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
             <if test="filterPageVO.startDate != null and filterPageVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageVO.startDate}]]>
@@ -1644,10 +1644,10 @@
             and a.is_placefile = #{filterPageVO.isPlacefile}
         </if>
         AND a.qc_type_id != 0
-<!--        <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">-->
-<!--            AND a.hospital_id = #{filterPageVO.hospitalId}-->
-<!--        </if>-->
-        <include refid="hospitalIdChoose"/>
+        <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
+            AND a.hospital_id = #{filterPageVO.hospitalId}
+        </if>
+<!--        <include refid="hospitalIdChoose"/>-->
         <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
             <if test="filterPageVO.startDate != null and filterPageVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageVO.startDate}]]>
@@ -1697,13 +1697,13 @@
         <choose>
             <when test="filterPageVO.organizationName != null and filterPageVO.organizationName != ''">
                 <choose>
-                    <when test="filterPageVO.organizationName == '邵逸夫'">
+                    <when test="filterPageVO.organizationName == '邵逸夫医院'">
                         AND a.hospital_id = 2
                     </when>
-                    <when test="filterPageVO.organizationName == '浙江大学附属第一医院'">
+                    <when test="filterPageVO.organizationName == '浙江大学医学院附属第一医院'">
                         AND a.hospital_id = 3
                     </when>
-                    <when test="filterPageVO.organizationName == '七院'">
+                    <when test="filterPageVO.organizationName == '杭州第七人民医院'">
                         AND a.hospital_id = 14
                     </when>
                 </choose>
@@ -1770,10 +1770,10 @@
             and a.is_placefile = #{filterPageVO.isPlacefile}
         </if>
         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}
-        </if>-->
-        <include refid="hospitalIdChoose"/>
+        </if>
+<!--        <include refid="hospitalIdChoose"/>-->
         <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
             <if test="filterPageVO.startDate != null and filterPageVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageVO.startDate}]]>
@@ -1845,10 +1845,10 @@
         AND e.cases_id = d.cases_id
         AND e.id = d.cases_entry_id
         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}
-        </if>-->
-        <include refid="hospitalIdChoose"/>
+        </if>
+<!--        <include refid="hospitalIdChoose"/>-->
         <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
             <if test="filterPageVO.startDate != null and filterPageVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageVO.startDate}]]>