修改测评完成报告单详情修改报告单无效bug

ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/RmsDao.xml

@@ -24,10 +24,10 @@
             rr.remark,
             rr.working_score as workingScore,
             rr.initial_impression as initialImpression,
-            b.diagnosis_name as clinicalDiagnosis,
+            IFNULL(rr.clinical_diagnosis, b.diagnosis_name) as clinicalDiagnosis,
             rr.pasi,
 --             rr.department,
-            b.bed_number as bedNumber,
+            ifnull(rr.bed_number, b.bed_number) as bedNumber,
             pp.`name` as patientName,
             pp.patient_number as patientNumber,
             b.outpatient_no as hospitalNumber,
@@ -40,7 +40,7 @@
             ee.hospital,
             d.dept_name as hospitalName,
             b.outpatient_no as outpatientNo,
-            b.department,
+            IFNULL(rr.department, b.department) as department,
             b.doctor,
             ee.version,
             h.version AS versionName,