Merge branch 'dev/20201009_1.4.6' into debug

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -2801,40 +2801,52 @@
         t1.behospitalDate,
         t1.leaveHospitalDate,
         t1.score,
-        e.score_res as scoreBn,
+        t1.scoreBn,
         t2.avgScore,
         t1.msg,
         t1.caseName
         FROM
         (
         SELECT
-        a.doctor_name AS behDoctorName,
+        CONCAT(
+        ( CASE WHEN a.director_doctor_name IS NOT NULL AND a.director_doctor_name != '' THEN concat( a.director_doctor_name, '\n' ) ELSE '' END ),
+        a.doctor_name
+        ) AS behDoctorName,
         a.`name` AS patName,
         a.behospital_code AS behospitalCode,
-        a.hospital_id,
         a.behospital_date AS behospitalDate,
         a.leave_hospital_date AS leaveHospitalDate,
         b.score_res AS score,
+        e.score_res as scoreBn,
         c.msg AS msg,
         d.NAME AS caseName,
         a.beh_dept_id AS behDeptId,
         a.beh_dept_name AS behDeptName,
         a.hospital_id AS hospitalId
         FROM
-        med_behospital_info a,
-        med_qcresult_info b,
-        med_qcresult_detail c,
-        qc_cases d
-        WHERE
-        a.is_deleted = 'N'
+        med_behospital_info a
+        RIGHT JOIN
+        med_qcresult_info b
+        ON a.hospital_id = b.hospital_id
+        AND a.is_deleted = 'N'
         AND b.is_deleted = 'N'
-        AND c.is_deleted = 'N'
-        AND d.is_deleted = 'N'
-        AND a.hospital_id = b.hospital_id
-        AND a.hospital_id = c.hospital_id
         AND a.behospital_code = b.behospital_code
-        AND a.behospital_code = c.behospital_code
+        LEFT JOIN
+        med_qcresult_detail c
+        ON c.is_deleted = 'N'
+        AND b.behospital_code = c.behospital_code
+        AND b.hospital_id = c.hospital_id
+        LEFT JOIN
+        qc_cases d
+        on d.is_deleted = 'N'
         AND c.cases_id = d.id
+        LEFT JOIN med_qcresult_cases e
+        on  b.behospital_code = e.behospital_code
+        and b.hospital_id = e.hospital_id
+        AND e.is_deleted = 'N'
+        and e.cases_id = 243
+        WHERE
+        1=1
         <if test="isPlacefile != null and isPlacefile != ''">
             and a.is_placefile = #{isPlacefile}
         </if>
@@ -2876,11 +2888,7 @@
         <if test="name != null and name != ''">
             AND a.name like CONCAT('%',#{name},'%')
         </if>
-        ) t1 LEFT JOIN med_qcresult_cases e
-        on  t1.behospitalCode = e.behospital_code
-        AND t1.hospital_id = e.hospital_id
-        AND e.is_deleted = 'N'
-        and e.cases_id = 243,
+        ) t1,
         (
         SELECT
         ROUND( AVG( b.score_res ), 2 ) AS avgScore,
@@ -3005,6 +3013,7 @@
         t1.leaveHospitalDate,
         t1.score,
         t2.avgScore,
+        t1.scoreBn,
         t1.msg,
         t1.caseName
         FROM
@@ -3013,9 +3022,11 @@
         a.doctor_name AS behDoctorName,
         a.`name` AS patName,
         a.behospital_code AS behospitalCode,
+        a.hospital_id AS hospital_id,
         a.behospital_date AS behospitalDate,
         a.leave_hospital_date AS leaveHospitalDate,
         b.score_res AS score,
+        e.score_res as scoreBn,
         c.msg AS msg,
         d.NAME AS caseName,
         a.beh_dept_id AS behDeptId,
@@ -3084,7 +3095,12 @@
         <if test="name != null and name != ''">
             AND a.name like CONCAT('%',#{name},'%')
         </if>
-        ) t1,
+        ) t1
+        LEFT JOIN med_qcresult_cases e
+        on  t1.behospitalCode = e.behospital_code
+        and t1.hospital_id = e.hospital_id
+        AND e.is_deleted = 'N'
+        and e.cases_id = 243,
         (
         SELECT
         ROUND( AVG( b.score_res ), 2 ) AS avgScore,