科室病历列表导出字段处理

src/main/java/com/diagbot/dto/ExportExcelByDeptDTO.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Getter
 @Setter
 public class ExportExcelByDeptDTO {
-    @Excel(name = "病区", needMerge = true)
+   // @Excel(name = "病区", needMerge = true)
     private String wardName;
 //    @Excel(name = "科室", needMerge = true)
     private String behDeptName;

src/main/java/com/diagbot/dto/ExportNinetyByDeptDTO.java

@@ -15,6 +15,8 @@ import java.util.List;
 @Getter
 @Setter
 public class ExportNinetyByDeptDTO {
+    @Excel(name = "病区", needMerge = true)
+    private String wardName;
     @Excel(name = "科室", needMerge = true)
     private String behDeptName;
     @ExcelCollection(name = "")

src/main/java/com/diagbot/dto/ExportSevenByDeptDTO.java

@@ -15,6 +15,8 @@ import java.util.List;
 @Getter
 @Setter
 public class ExportSevenByDeptDTO {
+    @Excel(name = "病区", needMerge = true)
+    private String wardName;
     @Excel(name = "科室", needMerge = true)
     private String behDeptName;
     @ExcelCollection(name = "")

src/main/java/com/diagbot/dto/ExportWideExcelByDeptDTO.java

@@ -15,9 +15,9 @@ import java.util.List;
 @Getter
 @Setter
 public class ExportWideExcelByDeptDTO {
-//    @Excel(name = "科室", needMerge = true)
+    // @Excel(name = "科室", needMerge = true)
     private String behDeptName;
-    @Excel(name = "病区", needMerge = true)
+    // @Excel(name = "病区", needMerge = true)
     private String wardName;
     @Excel(name = "医疗组", needMerge = true)
     private String medoupName;

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -2118,6 +2118,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         if(ListUtil.isNotEmpty(records)){
             ExportSevenByDeptDTO exportByDeptDTO = new ExportSevenByDeptDTO();
             exportByDeptDTO.setBehDeptName(records.get(0).getBehDeptName());
+            exportByDeptDTO.setWardName(records.get(0).getWardName());
             exportByDeptDTO.setExportExcelByDeptDTOS(records);
             resDTO.add(exportByDeptDTO);
         }

src/main/java/com/diagbot/facade/ConsoleByDeptExportFacade.java

@@ -69,6 +69,7 @@ public class ConsoleByDeptExportFacade {
         List<ExportSevenByDeptDTO> resDTO = new ArrayList<ExportSevenByDeptDTO>();
         if(ListUtil.isNotEmpty(records)){
             ExportSevenByDeptDTO exportByDeptDTO = new ExportSevenByDeptDTO();
+            exportByDeptDTO.setWardName(records.get(0).getWardName());
             exportByDeptDTO.setBehDeptName(records.get(0).getBehDeptName());
             exportByDeptDTO.setExportExcelByDeptDTOS(records);
             resDTO.add(exportByDeptDTO);
@@ -102,6 +103,7 @@ public class ConsoleByDeptExportFacade {
         List<ExportSevenByDeptDTO> resDTO = new ArrayList<ExportSevenByDeptDTO>();
         if(ListUtil.isNotEmpty(records)){
                 ExportSevenByDeptDTO exportByDeptDTO = new ExportSevenByDeptDTO();
+                exportByDeptDTO.setWardName(records.get(0).getWardName());
                 exportByDeptDTO.setBehDeptName(records.get(0).getBehDeptName());
                 exportByDeptDTO.setExportExcelByDeptDTOS(records);
             resDTO.add(exportByDeptDTO);
@@ -191,6 +193,7 @@ public class ConsoleByDeptExportFacade {
         List<ExportSevenByDeptDTO> resDTO = new ArrayList<ExportSevenByDeptDTO>();
         if(ListUtil.isNotEmpty(records)){
             ExportSevenByDeptDTO exportByDeptDTO = new ExportSevenByDeptDTO();
+            exportByDeptDTO.setWardName(records.get(0).getWardName());
             exportByDeptDTO.setBehDeptName(records.get(0).getBehDeptName());
             exportByDeptDTO.setExportExcelByDeptDTOS(records);
             resDTO.add(exportByDeptDTO);
@@ -256,6 +259,7 @@ public class ConsoleByDeptExportFacade {
         List<ExportSevenByDeptDTO> resDTO = new ArrayList<ExportSevenByDeptDTO>();
         if(ListUtil.isNotEmpty(records)){
             ExportSevenByDeptDTO exportByDeptDTO = new ExportSevenByDeptDTO();
+            exportByDeptDTO.setWardName(records.get(0).getWardName());
             exportByDeptDTO.setBehDeptName(records.get(0).getBehDeptName());
             exportByDeptDTO.setExportExcelByDeptDTOS(records);
             resDTO.add(exportByDeptDTO);
@@ -308,6 +312,7 @@ public class ConsoleByDeptExportFacade {
         List<ExportSevenByDeptDTO> resDTO = new ArrayList<ExportSevenByDeptDTO>();
         if(ListUtil.isNotEmpty(records)){
             ExportSevenByDeptDTO exportByDeptDTO = new ExportSevenByDeptDTO();
+            exportByDeptDTO.setWardName(records.get(0).getWardName());
             exportByDeptDTO.setBehDeptName(records.get(0).getBehDeptName());
             exportByDeptDTO.setExportExcelByDeptDTOS(records);
             resDTO.add(exportByDeptDTO);
@@ -343,6 +348,7 @@ public class ConsoleByDeptExportFacade {
         if(ListUtil.isNotEmpty(records)){
             ExportSevenByDeptDTO exportByDeptDTO = new ExportSevenByDeptDTO();
             exportByDeptDTO.setBehDeptName(records.get(0).getBehDeptName());
+            exportByDeptDTO.setWardName(records.get(0).getWardName());
             exportByDeptDTO.setExportExcelByDeptDTOS(records);
             resDTO.add(exportByDeptDTO);
         }
@@ -381,13 +387,24 @@ public class ConsoleByDeptExportFacade {
      * @return
      */
     public void unModifyExportByDept(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
-        solveParam(qcResultShortPageVO);
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        qcResultShortPageVO.setHospitalId(hospitalId);
+        qcResultShortPageVO.setUserId(Long.valueOf(userId));
         qcResultShortPageVO.setCurrent(1L);
         qcResultShortPageVO.setSize(Long.MAX_VALUE);
         qcResultShortPageVO.setSearchCount(false);
         List<ExportExcelByDeptDTO> records = behospitalInfoFacade.unModifyExportByDept(qcResultShortPageVO);
+        List<ExportSevenByDeptDTO> resDTO = new ArrayList<ExportSevenByDeptDTO>();
+        if(ListUtil.isNotEmpty(records)){
+            ExportSevenByDeptDTO exportByDeptDTO = new ExportSevenByDeptDTO();
+            exportByDeptDTO.setBehDeptName(records.get(0).getBehDeptName());
+            exportByDeptDTO.setWardName(records.get(0).getWardName());
+            exportByDeptDTO.setExportExcelByDeptDTOS(records);
+            resDTO.add(exportByDeptDTO);
+        }
         String fileName = "未整改病历详情页.xls";
-        ExcelUtils.exportExcelUser(records, null, "sheet1", ExportExcelByDeptDTO.class, fileName, response);
+        ExcelUtils.exportExcelUser(resDTO, null, "sheet1", ExportSevenByDeptDTO.class, fileName, response);
     }
 
     /**
@@ -553,8 +570,8 @@ public class ConsoleByDeptExportFacade {
                 ExportWideExcelByDeptDTO exportWideExcelByDeptDTO = new ExportWideExcelByDeptDTO();
                 exportWideExcelByDeptDTO.setAvgScore(exportExcelByDeptDTO.getAvgScore());
                 exportNinetyByDeptDTO.setBehDeptName( exportExcelByDeptDTO.getBehDeptName());
+                exportNinetyByDeptDTO.setWardName( exportExcelByDeptDTO.getWardName());
                 exportWideExcelByDeptDTO.setDoctorName(exportExcelByDeptDTO.getDoctorName());
-                exportWideExcelByDeptDTO.setWardName(exportExcelByDeptDTO.getWardName());
                 exportWideExcelByDeptDTO.setMedoupName(exportExcelByDeptDTO.getMedoupName());
                 List<ExportExcelBehByDeptDTO> exportExcelBehByDeptDTOS = exportExcelByDeptDTO.getExcelBehospitalDTOS();
                 List<ExportExcelWideBehByDeptDTO> exportExcelWideBehByDepDTOs = new ArrayList<>();