合并后端

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/AmsReportServiceImpl.java

@@ -1327,7 +1327,7 @@ public class AmsReportServiceImpl implements AmsReportService {
             params.put("yjzb", exportInfos.get(i).getComboParentName());
             params.put("ejzb", exportInfos.get(i).getComboName());
             if (exportInfos.get(i).getNeedPlan() != null && exportInfos.get(i).getNeedPlan() == 1) {
-                TextRenderData textStr = Texts.of(exportInfos.get(i).getComboParentName() + "/" + exportInfos.get(i).getComboName()).bold().color("FF0000").create();
+                TextRenderData textStr = Texts.of(StrUtil.isEmpty(exportInfos.get(i).getComboParentName()) ? "" : exportInfos.get(i).getComboParentName() + "/" + exportInfos.get(i).getComboName()).bold().color("FF0000").create();
                 TextRenderData textName = Texts.of(scores.get(i).getName()).bold().color("FF0000").create();
                 TextRenderData textScore = Texts.of(scores.get(i).getScore() == null ? "" : scores.get(i).getScore() + "").bold().color("FF0000").create();
                 TextRenderData textImpression = Texts.of(StrUtil.isEmpty(exportInfos.get(i).getImpression()) ? exportInfos.get(i).getResult() : exportInfos.get(i).getImpression()).bold().color("FF0000").create();
@@ -1360,7 +1360,7 @@ public class AmsReportServiceImpl implements AmsReportService {
                     ).create();
                     of.addRow(row1);
                 } else {
-                    TextRenderData textStr = Texts.of(exportInfos.get(i).getImpression().contains("\n") ? "量表结论" + "\n" + "肌少总结论": "肌少总结论").bold().create();
+                    TextRenderData textStr = Texts.of(exportInfos.get(i).getImpression().contains("\n") ? "量表结论" + "\n" + "肌少总结论" : "肌少总结论").bold().create();
                     TextRenderData textName = Texts.of("").bold().create();
                     TextRenderData textScore = Texts.of(exportInfos.get(i).getScore() == null ? "" : exportInfos.get(i).getScore() + "").bold().create();
                     //中医体质辨识添加结论  结论为初步印象
@@ -1435,7 +1435,7 @@ public class AmsReportServiceImpl implements AmsReportService {
         if (ObjectUtil.isNotNull(report) && StrUtil.isNotBlank(report.getPositiveUrl())) {
             AmsReportVo.Result result = new AmsReportVo.Result();
             result.setPath(report.getPositiveUrl());
-            return result;
+//            return result;
         }
 
         RmsDto.QueryDetail queryDetail = new RmsDto.QueryDetail();

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,