未整改病历统计

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

@@ -317,9 +317,6 @@ public class ConsoleExportFacade {
     public void unModifyMRStatisticsExport(HttpServletResponse response, FilterUnModifyMRVO filterUnModifyMRVO) {
         filterFacade.filterUnModifyMRVOSet(filterUnModifyMRVO);
         List<ExcelExportEntity> colList = Lists.newLinkedList();
-           /* ExcelExportEntity deptIdCol = new ExcelExportEntity("科室编码", "deptId");
-            deptIdCol.setWidth(20);
-            colList.add(deptIdCol);*/
         ExcelExportEntity deptNameCol = new ExcelExportEntity("科室名称", "deptName");
         deptNameCol.setWidth(50);
         colList.add(deptNameCol);
@@ -336,6 +333,9 @@ public class ConsoleExportFacade {
 
         List<String> columnSet = Arrays.asList(hospitalSet.getValue().split(","));
         for (String valueStr : columnSet) {
+            if(StringUtil.isBlank(valueStr)){
+                continue;
+            }
             String[] keyValue = valueStr.split("--");
             if (keyValue != null || keyValue.length > 1) {
                 ExcelExportEntity entryCol = new ExcelExportEntity(keyValue[1], "entry_" + keyValue[0] + "_num");

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

@@ -997,7 +997,7 @@ public class ConsoleFacade {
                 .eq("code", "unmodify_mr_entry");
         SysHospitalSet hospitalSet = sysHospitalSetFacade.getOne(hospitalSetQueryWrapper);
         if (hospitalSet == null || StringUtil.isBlank(hospitalSet.getValue())) {
-            return null;
+            return unModifyMRDTO;
         }
 
         //表头生成
@@ -1020,6 +1020,9 @@ public class ConsoleFacade {
         orderNo++;
         List<Long> casesEntryIds = Lists.newArrayList();
         for (String valueStr : columnSet) {
+            if(StringUtil.isBlank(valueStr)){
+                continue;
+            }
             String[] keyValue = valueStr.split("--");
             if (keyValue != null || keyValue.length > 1) {
                 casesEntryIds.add(Long.valueOf(keyValue[0]));
@@ -1062,7 +1065,6 @@ public class ConsoleFacade {
         List<QcCasesEntry> casesEntryList = qcCasesEntryFacade.list(qcCasesEntryQueryWrapper);
         Map<Long, String> basCasesEntryMap = EntityUtil.makeMapWithKeyValue(casesEntryList, "id", "name");
 
-
         List<UnModifyMRDetailDTO> records = behospitalInfoFacade.unModifyMRStatistics(filterUnModifyMRVO);
         Map<String, List<UnModifyMRDetailDTO>> deptMap = EntityUtil.makeEntityListMap(records, "deptName");
         Map<String, String> deptInfoMap = EntityUtil.makeMapWithKeyValue(records, "deptName", "deptId");