xiazai bug

eitc-patient-pc/src/main/java/com/eitc/patient/controller/DiagnosisManageController.java

@@ -35,6 +35,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -130,13 +131,18 @@ public class DiagnosisManageController extends BaseController {
         List<DiagnosisManageTemplateExcel> list = util.importExcel(file.getInputStream());
         // 2.如果解析数据为空则返回错误信息
         if (CollectionUtils.isEmpty(list)) {
-            throw new RuntimeException("上传数据为空，请填写");
-        }
-        // 解析模板
-        List<DiagnosisManageTemplateExcel> diagnosisManageTemplateExcels = diagnosisManageService.importTemplate(list);
-        // 导出错误模板
-        if (CollectionUtils.isNotEmpty(diagnosisManageTemplateExcels)) {
-            util.exportExcel(response, diagnosisManageTemplateExcels, "模板错误");
+            List<DiagnosisManageTemplateExcel> diagnosisTypeTemplateExcels = new ArrayList<>();
+            DiagnosisManageTemplateExcel d = new DiagnosisManageTemplateExcel();
+            d.setMsg("上传数据为空，请填写");
+            diagnosisTypeTemplateExcels.add(d);
+            util.exportExcel(response, diagnosisTypeTemplateExcels, "模板错误");
+        } else {
+            // 解析模板
+            List<DiagnosisManageTemplateExcel> diagnosisManageTemplateExcels = diagnosisManageService.importTemplate(list);
+            // 导出错误模板
+            if (CollectionUtils.isNotEmpty(diagnosisManageTemplateExcels)) {
+                util.exportExcel(response, diagnosisManageTemplateExcels, "模板错误");
+            }
         }
     }
 

eitc-patient-pc/src/main/java/com/eitc/patient/controller/DiagnosisTypeTemplateController.java

@@ -149,13 +149,18 @@ public class DiagnosisTypeTemplateController extends BaseController {
         List<DiagnosisTypeTemplateExcel> list = util.importExcel(file.getInputStream());
         // 2.如果解析数据为空则返回错误信息
         if (CollectionUtils.isEmpty(list)) {
-            throw new RuntimeException("上传数据为空，请填写");
-        }
-        // 解析模板
-        List<DiagnosisTypeTemplateExcel> diagnosisTypeTemplateExcels = diagnosisTypeTemplateService.importTemplate(list, diagnosisTypeId);
-        // 导出错误模板
-        if (CollectionUtils.isNotEmpty(diagnosisTypeTemplateExcels)) {
+            List<DiagnosisTypeTemplateExcel> diagnosisTypeTemplateExcels = new ArrayList<>();
+            DiagnosisTypeTemplateExcel d = new DiagnosisTypeTemplateExcel();
+            d.setMsg("上传数据为空，请填写");
+            diagnosisTypeTemplateExcels.add(d);
             util.exportExcel(response, diagnosisTypeTemplateExcels, "模板错误");
+        } else {
+            // 解析模板
+            List<DiagnosisTypeTemplateExcel> diagnosisTypeTemplateExcels = diagnosisTypeTemplateService.importTemplate(list, diagnosisTypeId);
+            // 导出错误模板
+            if (CollectionUtils.isNotEmpty(diagnosisTypeTemplateExcels)) {
+                util.exportExcel(response, diagnosisTypeTemplateExcels, "模板错误");
+            }
         }
     }