Merge branch 'dev/20210808_核查bug修复' into innerDevelop

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -15669,24 +15669,21 @@
         SELECT
         f1.behDeptId,
         f1.behDeptName,
-        f1.doctorName,
         f1.patName,
         f1.behospitalCode,
         f1.hospitalId,
         f1.behospitalDate,
         f1.leaveHospitalDate,
         f1.score,
+        f1.scoreBn,
         f2.avgScore,
         <if test="qcResultShortPageVO.radioCheck !=null and qcResultShortPageVO.radioCheck == 1">
         f1.msg,
         f1.caseName,
         </if>
         f1.checkStatus,
-        f1.mrStatus,
         f1.chName,
-        f1.mrName,
-        f1.chTime,
-        f1.mrTime
+        f1.chTime
         FROM
         (SELECT
         t.doctorName AS behDoctorName,
@@ -15695,6 +15692,7 @@
         t.behospitalDate AS behospitalDate,
         t.leaveHospitalDate AS leaveHospitalDate,
         qi.score_res AS score,
+        t.scoreBn,
         <if test="qcResultShortPageVO.radioCheck !=null and qcResultShortPageVO.radioCheck == 1">
         qd.msg AS msg,
         qc.NAME AS caseName,
@@ -15703,11 +15701,8 @@
         t.behDeptName,
         t.hospitalId,
         t.checkStatus,
-        t.mrStatus,
         t.chName,
-        t.mrName,
-        t.chTime,
-        t.mrTime
+        t.chTime
         FROM
         (
         SELECT DISTINCT
@@ -15717,6 +15712,7 @@
         t1.LEVEL AS LEVEL,
         t1.grade_type AS gradeType,
         t1.score_res AS scoreRes,
+        t1.scoreBn,
         t1.NAME AS NAME,
         t1.sex AS sex,
         t1.beh_dept_id AS behDeptId,
@@ -15737,21 +15733,15 @@
         t2.age,
         t1.file_code AS fileCode,
         t1.checkStatus,
-        t1.mrStatus,
         t1.chName,
-        t1.mrName,
-        t1.chTime,
-        t1.mrTime
+        t1.chTime
         FROM
         (
         SELECT
         be.*,
         ifnull( mci.STATUS, 0 ) AS checkStatus,
-        ifnull( hm_mci.STATUS, 0 ) AS mrStatus,
         mci.check_name AS chName,
-        hm_mci.check_name AS mrName,
-        mci.gmt_create AS chTime,
-        hm_mci.gmt_create AS mrTime
+        mci.gmt_create AS chTime
         FROM
         (
         SELECT DISTINCT
@@ -15778,7 +15768,8 @@
         a.diagnose,
         a.placefile_date,
         a.ward_name,
-        c.gmt_create
+        c.gmt_create,
+        d.score_res as scoreBn
         FROM
         med_behospital_info a,
         med_home_page b,
@@ -15906,13 +15897,9 @@
         </if>
         ) be
         LEFT JOIN med_check_info mci ON mci.is_deleted = 'N'
-        AND mci.check_type = 0
+        AND mci.check_type in(0,2)
         AND be.hospital_id = mci.hospital_id
         AND be.behospital_code = mci.behospital_code
-        LEFT JOIN med_check_info hm_mci ON hm_mci.is_deleted = 'N'
-        AND hm_mci.check_type = 1
-        AND be.hospital_id = hm_mci.hospital_id
-        AND be.behospital_code = hm_mci.behospital_code
         ) t1
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
         AND t1.behospital_code = t2.behospital_code
@@ -15987,21 +15974,15 @@
         t2.age,
         t1.file_code AS fileCode,
         t1.checkStatus,
-        t1.mrStatus,
         t1.chName,
-        t1.mrName,
-        t1.chTime,
-        t1.mrTime
+        t1.chTime
         FROM
         (
         SELECT
         be.*,
         ifnull( mci.STATUS, 0 ) AS checkStatus,
-        ifnull( hm_mci.STATUS, 0 ) AS mrStatus,
         mci.check_name AS chName,
-        hm_mci.check_name AS mrName,
-        mci.gmt_create AS chTime,
-        hm_mci.gmt_create AS mrTime
+        mci.gmt_create AS chTime
         FROM
         (
         SELECT DISTINCT
@@ -16156,13 +16137,9 @@
         </if>
         ) be
         LEFT JOIN med_check_info mci ON mci.is_deleted = 'N'
-        AND mci.check_type = 0
+        AND mci.check_type in(0,2)
         AND be.hospital_id = mci.hospital_id
         AND be.behospital_code = mci.behospital_code
-        LEFT JOIN med_check_info hm_mci ON hm_mci.is_deleted = 'N'
-        AND hm_mci.check_type = 1
-        AND be.hospital_id = hm_mci.hospital_id
-        AND be.behospital_code = hm_mci.behospital_code
         ) t1
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
         AND t1.behospital_code = t2.behospital_code
@@ -16790,11 +16767,8 @@
         f1.caseName,
         </if>
         f1.checkStatus,
-        f1.mrStatus,
         f1.chName,
-        f1.mrName,
-        f1.chTime,
-        f1.mrTime
+        f1.chTime
         FROM
         (SELECT
         t.doctorName,
@@ -16812,11 +16786,8 @@
         t.behDeptName,
         t.hospitalId,
         t.checkStatus,
-        t.mrStatus,
         t.chName,
-        t.mrName,
-        t.chTime,
-        t.mrTime
+        t.chTime
         FROM
         (
         SELECT DISTINCT
@@ -16847,22 +16818,16 @@
         t2.age,
         t1.file_code AS fileCode,
         t1.checkStatus,
-        t1.mrStatus,
         t1.chName,
-        t1.mrName,
-        t1.chTime,
-        t1.mrTime
+        t1.chTime
         FROM
         (
         SELECT
         be.*,
         ifnull( mci.STATUS, 0 ) AS checkStatus,
-        ifnull( hm_mci.STATUS, 0 ) AS mrStatus,
         mci.check_name AS chName,
         e.score_res as scoreBn,
-        hm_mci.check_name AS mrName,
-        mci.gmt_create AS chTime,
-        hm_mci.gmt_create AS mrTime
+        mci.gmt_create AS chTime
         FROM
         (
         SELECT DISTINCT
@@ -16949,13 +16914,9 @@
         </if>
         ) be
         LEFT JOIN med_check_info mci ON mci.is_deleted = 'N'
-        AND mci.check_type = 0
+        AND mci.check_type in(0,2)
         AND be.hospital_id = mci.hospital_id
         AND be.behospital_code = mci.behospital_code
-        LEFT JOIN med_check_info hm_mci ON hm_mci.is_deleted = 'N'
-        AND hm_mci.check_type = 1
-        AND be.hospital_id = hm_mci.hospital_id
-        AND be.behospital_code = hm_mci.behospital_code
         LEFT JOIN med_qcresult_cases e
         on  be.behospital_code = e.behospital_code
         and be.hospital_id = e.hospital_id
@@ -17035,21 +16996,15 @@
         t2.age,
         t1.file_code AS fileCode,
         t1.checkStatus,
-        t1.mrStatus,
         t1.chName,
-        t1.mrName,
-        t1.chTime,
-        t1.mrTime
+        t1.chTime
         FROM
         (
         SELECT
         be.*,
         ifnull( mci.STATUS, 0 ) AS checkStatus,
-        ifnull( hm_mci.STATUS, 0 ) AS mrStatus,
         mci.check_name AS chName,
-        hm_mci.check_name AS mrName,
-        mci.gmt_create AS chTime,
-        hm_mci.gmt_create AS mrTime
+        mci.gmt_create AS chTime
         FROM
         (
         SELECT DISTINCT
@@ -17136,13 +17091,9 @@
         </if>
         ) be
         LEFT JOIN med_check_info mci ON mci.is_deleted = 'N'
-        AND mci.check_type = 0
+        AND mci.check_type in(0,2)
         AND be.hospital_id = mci.hospital_id
         AND be.behospital_code = mci.behospital_code
-        LEFT JOIN med_check_info hm_mci ON hm_mci.is_deleted = 'N'
-        AND hm_mci.check_type = 1
-        AND be.hospital_id = hm_mci.hospital_id
-        AND be.behospital_code = hm_mci.behospital_code
         ) t1
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
         AND t1.behospital_code = t2.behospital_code