|
@@ -2725,6 +2725,7 @@
|
|
|
<result column="behospitalDate" property="behospitalDate"/>
|
|
|
<result column="leaveHospitalDate" property="leaveHospitalDate"/>
|
|
|
<result column="score" property="score"/>
|
|
|
+ <result column="scoreBn" property="scoreBn"/>
|
|
|
<collection property="exportExcelCaseDTOS" ofType="com.diagbot.dto.ExportExcelCaseDTO">
|
|
|
<result column="caseName" property="caseName"/>
|
|
|
<collection property="exportExcelMsgDTOS"
|
|
@@ -2795,6 +2796,7 @@
|
|
|
t1.behospitalDate,
|
|
|
t1.leaveHospitalDate,
|
|
|
t1.score,
|
|
|
+ t1.scoreBn as scoreBn,
|
|
|
t2.avgScore,
|
|
|
t1.msg,
|
|
|
t1.caseName
|
|
@@ -2807,6 +2809,7 @@
|
|
|
a.behospital_date AS behospitalDate,
|
|
|
a.leave_hospital_date AS leaveHospitalDate,
|
|
|
b.score_res AS score,
|
|
|
+ f.score_res as scoreBn,
|
|
|
c.msg AS msg,
|
|
|
d.NAME AS caseName,
|
|
|
a.beh_dept_id AS behDeptId,
|
|
@@ -2816,17 +2819,22 @@
|
|
|
med_behospital_info a,
|
|
|
med_qcresult_info b,
|
|
|
med_qcresult_detail c,
|
|
|
- qc_cases d
|
|
|
+ qc_cases d,
|
|
|
+ med_qcresult_cases f
|
|
|
WHERE
|
|
|
a.is_deleted = 'N'
|
|
|
AND b.is_deleted = 'N'
|
|
|
AND c.is_deleted = 'N'
|
|
|
AND d.is_deleted = 'N'
|
|
|
+ AND f.is_deleted = 'N'
|
|
|
AND a.hospital_id = b.hospital_id
|
|
|
AND a.hospital_id = c.hospital_id
|
|
|
+ AND a.hospital_id = f.hospital_id
|
|
|
AND a.behospital_code = b.behospital_code
|
|
|
AND a.behospital_code = c.behospital_code
|
|
|
+ AND a.behospital_code = f.behospital_code
|
|
|
AND c.cases_id = d.id
|
|
|
+ AND f.cases_id = 243
|
|
|
<if test="isPlacefile != null and isPlacefile != ''">
|
|
|
and a.is_placefile = #{isPlacefile}
|
|
|
</if>
|
|
@@ -6835,9 +6843,6 @@
|
|
|
<if test="qcResultPageVO.patName != null and qcResultPageVO.patName != ''">
|
|
|
AND a.NAME LIKE CONCAT( '%', #{qcResultPageVO.patName}, '%' )
|
|
|
</if>
|
|
|
- <if test="qcResultPageVO.casesEntryName != null and qcResultPageVO.casesEntryName != ''">
|
|
|
- AND d.NAME = #{qcResultPageVO.casesEntryName}
|
|
|
- </if>
|
|
|
<if test="qcResultPageVO.doctorId != null and qcResultPageVO.doctorId != ''">
|
|
|
AND (a.doctor_id LIKE CONCAT( '%', #{qcResultPageVO.doctorId}, '%' )
|
|
|
OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultPageVO.doctorId}, '%' )
|
|
@@ -6848,15 +6853,6 @@
|
|
|
OR a.beh_doctor_name LIKE CONCAT( '%', #{qcResultPageVO.doctorName}, '%' )
|
|
|
OR a.director_doctor_name LIKE CONCAT( '%', #{qcResultPageVO.doctorName}, '%' ))
|
|
|
</if>
|
|
|
- <if test="qcResultPageVO.casesEntryId != null ">
|
|
|
- AND d.id = #{qcResultPageVO.casesEntryId}
|
|
|
- </if>
|
|
|
- <if test="qcResultPageVO.isReject != null">
|
|
|
- AND c.is_reject = #{qcResultPageVO.isReject}
|
|
|
- </if>
|
|
|
- <if test="qcResultPageVO.ruleType != null">
|
|
|
- AND d.rule_type = #{qcResultPageVO.ruleType}
|
|
|
- </if>
|
|
|
)be
|
|
|
left join med_check_info mci
|
|
|
on mci.is_deleted = 'N'
|