|
@@ -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;
|
|
|
}
|
|
|
|