导出

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -5884,7 +5884,10 @@
         f1.mrTime
         FROM
         (SELECT
-        CONCAT( ifnull( t.directorDoctorName, '' ), '\n', t.doctorName ) AS behDoctorName,
+        CONCAT(
+        ( CASE WHEN t.directorDoctorName IS NOT NULL AND t.directorDoctorName != '' THEN concat( t.directorDoctorName, '\n' ) ELSE '' END ),
+        t.doctorName
+        ) AS behDoctorName,
         t.`name` AS patName,
         t.behospitalCode AS behospitalCode,
         t.behospitalDate AS behospitalDate,
@@ -6678,7 +6681,10 @@
         f1.mrTime
         FROM
         (SELECT
-        CONCAT( ifnull( t.directorDoctorName, '' ), '\n', t.doctorName ) AS behDoctorName,
+        CONCAT(
+        ( CASE WHEN t.directorDoctorName IS NOT NULL AND t.directorDoctorName != '' THEN concat( t.directorDoctorName, '\n' ) ELSE '' END ),
+        t.doctorName
+        ) AS behDoctorName,
         t.`name` AS patName,
         t.behospitalCode AS behospitalCode,
         t.behospitalDate AS behospitalDate,
@@ -7888,7 +7894,10 @@
         f1.mrTime
         FROM
         (SELECT
-        CONCAT( ifnull( t.directorDoctorName, '' ), '\n', t.doctorName ) AS behDoctorName,
+        CONCAT(
+        ( CASE WHEN t.directorDoctorName IS NOT NULL AND t.directorDoctorName != '' THEN concat( t.directorDoctorName, '\n' ) ELSE '' END ),
+        t.doctorName
+        ) AS behDoctorName,
         t.`name` AS patName,
         t.behospitalCode AS behospitalCode,
         t.behospitalDate AS behospitalDate,
@@ -8423,7 +8432,10 @@
         f1.mrTime
         FROM
         (SELECT
-        CONCAT( ifnull( t.directorDoctorName, '' ), '\n', t.doctorName ) AS behDoctorName,
+        CONCAT(
+        ( CASE WHEN t.directorDoctorName IS NOT NULL AND t.directorDoctorName != '' THEN concat( t.directorDoctorName, '\n' ) ELSE '' END ),
+        t.doctorName
+        ) AS behDoctorName,
         t.`name` AS patName,
         t.behospitalCode AS behospitalCode,
         t.behospitalDate AS behospitalDate,