Merge branch 'dev/20200702_1.3.7' into debug

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -2273,6 +2273,7 @@
         t1.behDoctorName,
         t1.patName,
         t1.behospitalCode,
+        t1.hospitalId,
         t1.behospitalDate,
         t1.leaveHospitalDate,
         t1.score,
@@ -2294,7 +2295,8 @@
         c.msg AS msg,
         d.NAME AS caseName,
         a.beh_dept_id AS behDeptId,
-        a.beh_dept_name AS behDeptName
+        a.beh_dept_name AS behDeptName,
+        a.hospital_id AS hospitalId
         FROM
         med_behospital_info a,
         med_qcresult_info b,
@@ -2410,9 +2412,8 @@
         WHERE is_deleted = 'N') g
         ON tp.behospitalCode = g.behospital_code
         AND tp.hospitalId = g.hospital_id ) tu
-        where tu.checkStatus is not null
         <if test="checkStatus != null ">
-            and tu.checkStatus = #{checkStatus}
+            where tu.checkStatus = #{checkStatus}
         </if>
     </select>
 
@@ -2426,6 +2427,7 @@
         t1.behDoctorName,
         t1.patName,
         t1.behospitalCode,
+        t1.hospitalId,
         t1.behospitalDate,
         t1.leaveHospitalDate,
         t1.score,
@@ -2447,7 +2449,8 @@
         c.msg AS msg,
         d.NAME AS caseName,
         a.beh_dept_id AS behDeptId,
-        a.beh_dept_name AS behDeptName
+        a.beh_dept_name AS behDeptName,
+        a.hospital_id AS hospitalId
         FROM
         med_behospital_info a,
         med_qcresult_info b,
@@ -2577,9 +2580,8 @@
         WHERE is_deleted = 'N') g
         ON tp.behospitalCode = g.behospital_code
         AND tp.hospitalId = g.hospital_id ) tu
-        where tu.checkStatus is not null
         <if test="checkStatus != null ">
-            and tu.checkStatus = #{checkStatus}
+            where tu.checkStatus = #{checkStatus}
         </if>
     </select>
 
@@ -2593,6 +2595,7 @@
         t1.behDoctorName,
         t1.patName,
         t1.behospitalCode,
+        t1.hospitalId,
         t1.behospitalDate,
         t1.leaveHospitalDate,
         t1.score,
@@ -2614,7 +2617,8 @@
         c.msg AS msg,
         d.NAME AS caseName,
         a.beh_dept_id AS behDeptId,
-        a.beh_dept_name AS behDeptName
+        a.beh_dept_name AS behDeptName,
+        a.hospital_id AS hospitalId
         FROM
         med_behospital_info a,
         med_qcresult_info b,
@@ -2750,9 +2754,8 @@
         WHERE is_deleted = 'N') g
         ON tp.behospitalCode = g.behospital_code
         AND tp.hospitalId = g.hospital_id ) tu
-        WHERE tu.checkStatus IS NOT NULL
         <if test="checkStatus != null ">
-            and tu.checkStatus = #{checkStatus}
+            where tu.checkStatus = #{checkStatus}
         </if>
     </select>