分诊病历测试

triage-service/src/main/java/com/diagbot/dto/MRTestDTO.java

@@ -1,12 +1,9 @@
 package com.diagbot.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author:zhaops
@@ -26,6 +23,15 @@ public class MRTestDTO {
     private String mknr;
     @Excel(name = "症状", width = 100, orderNum = "5", needMerge = true)
     private String symptomNames;
-    @ExcelCollection(name = "诊断-科室", orderNum = "6")
-    private List<MRTestDiseaseDTO> diseaseDetails;
+    //@ExcelCollection(name = "诊断-科室", orderNum = "6")
+    //private List<MRTestDiseaseDTO> diseaseDetails;
+
+    @Excel(name = "诊断名称", width = 50, orderNum = "7")
+    private String diseaseName;
+    @Excel(name = "内部科室名称", width = 30, orderNum = "8")
+    private String innerDeptName;
+    @Excel(name = "外部科室名称", width = 30, orderNum = "9")
+    private String outDeptName;
+    @Excel(name = "外部小科室名称", width = 30, orderNum = "10")
+    private String outSubDeptName;
 }

triage-service/src/main/java/com/diagbot/facade/MRTestFacade.java

@@ -77,7 +77,27 @@ public class MRTestFacade {
                 }
                 List<MRTestDiseaseDTO> diseaseDetails = pushDiseaseDept(aivo, "7", diseaseDeptMap);
                 if (ListUtil.isNotEmpty(diseaseDetails)) {
-                    mrTestDTO.setDiseaseDetails(diseaseDetails);
+                    mrTestDTO.setDiseaseName(diseaseDetails
+                            .stream()
+                            .filter(i -> StringUtil.isNotBlank(i.getDiseaseName()))
+                            .map(i -> i.getDiseaseName())
+                            .collect(Collectors.joining("、")));
+                    mrTestDTO.setInnerDeptName(diseaseDetails
+                            .stream()
+                            .filter(i -> StringUtil.isNotBlank(i.getInnerDeptName()))
+                            .map(i -> i.getInnerDeptName())
+                            .collect(Collectors.joining("、")));
+                    mrTestDTO.setOutDeptName(diseaseDetails
+                            .stream()
+                            .filter(i -> StringUtil.isNotBlank(i.getOutDeptName()))
+                            .map(i -> i.getOutDeptName())
+                            .collect(Collectors.joining("、")));
+                    mrTestDTO.setOutSubDeptName(diseaseDetails
+                            .stream()
+                            .filter(i -> StringUtil.isNotBlank(i.getOutSubDeptName()))
+                            .map(i -> i.getOutSubDeptName())
+                            .collect(Collectors.joining("、")));
+
                 }
                 records.add(mrTestDTO);
             }