导出

src/main/java/com/diagbot/dto/ExportExcelDTO.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Getter
 @Setter
 public class ExportExcelDTO {
-    @Excel(name = "出院科室", needMerge = true)
+    @Excel(name = "科室", needMerge = true)
     private String behDeptName;
     @Excel(name = "平均分数", needMerge = true)
     private String avgScore;

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -2792,10 +2792,7 @@
         FROM
         (
         SELECT
-        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.doctor_name AS behDoctorName,
         a.`name` AS patName,
         a.behospital_code AS behospitalCode,
         a.behospital_date AS behospitalDate,
@@ -2992,10 +2989,7 @@
         FROM
         (
         SELECT
-        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.doctor_name AS behDoctorName,
         a.`name` AS patName,
         a.behospital_code AS behospitalCode,
         a.behospital_date AS behospitalDate,
@@ -3206,10 +3200,7 @@
         FROM
         (
         SELECT
-        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.doctor_name AS behDoctorName,
         a.`name` AS patName,
         a.behospital_code AS behospitalCode,
         a.behospital_date AS behospitalDate,
@@ -5393,11 +5384,7 @@
         f1.mrTime
         FROM
         (SELECT
-        CONCAT(
-        ( CASE WHEN t.directorDoctorName IS NOT NULL AND t.directorDoctorName != '' THEN concat( t.directorDoctorName,
-        '\n' ) ELSE '' END ),
-        t.doctorName
-        ) AS behDoctorName,
+        t.doctorName AS behDoctorName,
         t.`name` AS patName,
         t.behospitalCode AS behospitalCode,
         t.behospitalDate AS behospitalDate,
@@ -5884,10 +5871,7 @@
         f1.mrTime
         FROM
         (SELECT
-        CONCAT(
-        ( CASE WHEN t.directorDoctorName IS NOT NULL AND t.directorDoctorName != '' THEN concat( t.directorDoctorName, '\n' ) ELSE '' END ),
-        t.doctorName
-        ) AS behDoctorName,
+        t.doctorName AS behDoctorName,
         t.`name` AS patName,
         t.behospitalCode AS behospitalCode,
         t.behospitalDate AS behospitalDate,
@@ -6681,10 +6665,7 @@
         f1.mrTime
         FROM
         (SELECT
-        CONCAT(
-        ( CASE WHEN t.directorDoctorName IS NOT NULL AND t.directorDoctorName != '' THEN concat( t.directorDoctorName, '\n' ) ELSE '' END ),
-        t.doctorName
-        ) AS behDoctorName,
+        t.doctorName AS behDoctorName,
         t.`name` AS patName,
         t.behospitalCode AS behospitalCode,
         t.behospitalDate AS behospitalDate,
@@ -7895,9 +7876,7 @@
         FROM
         (SELECT
         CONCAT(
-        ( CASE WHEN t.directorDoctorName IS NOT NULL AND t.directorDoctorName != '' THEN concat( t.directorDoctorName, '\n' ) ELSE '' END ),
-        t.doctorName
-        ) AS behDoctorName,
+        t.doctorName AS behDoctorName,
         t.`name` AS patName,
         t.behospitalCode AS behospitalCode,
         t.behospitalDate AS behospitalDate,
@@ -8433,9 +8412,7 @@
         FROM
         (SELECT
         CONCAT(
-        ( CASE WHEN t.directorDoctorName IS NOT NULL AND t.directorDoctorName != '' THEN concat( t.directorDoctorName, '\n' ) ELSE '' END ),
-        t.doctorName
-        ) AS behDoctorName,
+        t.doctorName AS behDoctorName,
         t.`name` AS patName,
         t.behospitalCode AS behospitalCode,
         t.behospitalDate AS behospitalDate,