Pārlūkot izejas kodu

诊断依据明细基础类

kongwz 4 gadi atpakaļ
vecāks
revīzija
4ce4733a9b

+ 1 - 1
src/main/java/com/diagbot/dto/ExportDiagnoseDTO.java

@@ -37,6 +37,6 @@ public class ExportDiagnoseDTO implements Serializable {
     @Excel(name="最小值符号")
     private String minSymbol;
     @Excel(name="关联词")
-    private String relatedWords;
+    private String relation;
 
 }

+ 15 - 2
src/main/java/com/diagbot/facade/KlDiagnoseDetailFacade.java

@@ -5,11 +5,13 @@ import com.diagbot.dto.ExportDiagnoseDTO;
 import com.diagbot.entity.KlDiagnoseDetail;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.KlDiagnoseDetailServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EntityUtil;
+import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -43,7 +45,18 @@ public class KlDiagnoseDetailFacade extends KlDiagnoseDetailServiceImpl {
 
 
     public Map<String, List<ExportDiagnoseDTO>> processDiagnoseDetail(Map<String, List<KlDiagnoseDetail>> diagnoseDetailMap){
-        Map<String, List<ExportDiagnoseDTO>> data = new HashMap<>();
+        Map<String, List<ExportDiagnoseDTO>> data = new LinkedHashMap<>();
+        for(Map.Entry<String, List<KlDiagnoseDetail>> kd : diagnoseDetailMap.entrySet()){
+            String sheetName = kd.getKey();
+            List<KlDiagnoseDetail> datats = kd.getValue();
+            List<ExportDiagnoseDTO> eds = Lists.newArrayList();
+            for (KlDiagnoseDetail kdl:datats) {
+                ExportDiagnoseDTO exportDiagnoseDTO = new ExportDiagnoseDTO();
+                BeanUtil.copyProperties(kdl, exportDiagnoseDTO);
+                eds.add(exportDiagnoseDTO);
+            }
+            data.put(sheetName,eds);
+        }
         return data;
     }