病历详情列表/导出主诊断搜索条件添加

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -6369,46 +6369,16 @@
 
     <!-- 条目缺陷评分详情页导出-->
     <select id="qcResultShortPageExport" resultMap="ExportExcelMap">
+        SELECT * from(
         SELECT
-        f1.behDeptId,
-        f1.behDeptName,
-        f1.behDoctorName,
-        f1.patName,
-        f1.behospitalCode,
-        f1.hospitalId,
-        f1.behospitalDate,
-        f1.leaveHospitalDate,
-        f1.score,
-        f1.scoreBn,
-        f2.avgScore,
-        f1.msg,
-        f1.caseName,
-        f1.checkStatus,
-        f1.mrStatus,
-        f1.chName,
-        f1.mrName,
-        f1.chTime,
-        f1.mrTime
+        f1.*,
+        f2.avgScore
         FROM
         (SELECT
-        t.doctorName AS behDoctorName,
-        t.`name` AS patName,
-        t.behospitalCode AS behospitalCode,
-        t.behospitalDate AS behospitalDate,
-        t.leaveHospitalDate AS leaveHospitalDate,
+        t.*,
         qi.score_res AS score,
-        t.scoreBn,
         qd.msg AS msg,
-        qc.NAME AS caseName,
-        t.behDeptId,
-        t.behDeptName,
-        t.hospitalId,
-        t.checkStatus,
-        t.mrStatus,
-        t.chName,
-        t.mrName,
-        t.chTime,
-        t.mrTime
+        qc.NAME AS caseName
         FROM
         (SELECT DISTINCT
         t1.hospital_id AS hospitalId,
@@ -6417,8 +6387,8 @@
         t1.LEVEL AS LEVEL,
         t1.grade_type AS gradeType,
         t1.score_res AS scoreRes,
-        t1.scoreBn,
-        t1.NAME AS NAME,
+        t1.scoreBn AS scoreBn,
+        t1.NAME AS patName,
         t1.sex AS sex,
         t1.beh_dept_id AS behDeptId,
         t1.beh_dept_name AS behDeptName,
@@ -6433,16 +6403,16 @@
         t1.leave_hospital_date AS leaveHospitalDate,
         t1.placefile_date AS placefileDate,
         t1.gmt_create AS gradeTime,
-        t1.diagnose,
+        t1.diagnose AS diagnose,
         t1.ward_name AS wardName,
-        t2.age,
+        t2.age AS age,
         t1.file_code AS fileCode,
-        t1.checkStatus,
-        t1.mrStatus,
-        t1.chName,
-        t1.mrName,
-        t1.chTime,
-        t1.mrTime
+        t1.checkStatus AS checkStatus,
+        t1.mrStatus AS mrStatus,
+        t1.chName AS chName,
+        t1.mrName AS mrName,
+        t1.chTime AS chTime,
+        t1.mrTime AS mrTime
         FROM
         (
         SELECT DISTINCT
@@ -6918,6 +6888,7 @@
         WHERE
         f1.behDeptId = f2.behDeptId
         AND f1.behDeptName = f2.behDeptName
+        )m
     </select>
 
     <resultMap id="MedicalCheckMap" type="com.diagbot.dto.MedicalCheckDTO">