导入数据预匹配增加数据校验

cdssman-service/src/main/java/com/diagbot/facade/DeptConfigFacade.java

@@ -446,8 +446,32 @@ public class DeptConfigFacade {
      * @param response
      */
     public void precDataMatch(MultipartFile file, HttpServletResponse response) {
-        List<DeptConfig> retList = Lists.newLinkedList();
         List<DeptConfig> originList = ExcelUtils.importExcel(file, 0, 1, DeptConfig.class);
+        List<DeptConfig> retList = dataProcess(originList);
+        String fileName = "科室关联数据（预匹配）.xls";
+        ExcelUtils.exportExcel(retList, null, "sheet1", DeptConfig.class, fileName, response, 12.8f);
+    }
+
+    /**
+     * 导入数据验证
+     *
+     * @param file
+     * @return
+     */
+    public Boolean dataVerify(MultipartFile file) {
+        List<DeptConfig> originList = ExcelUtils.importExcel(file, 0, 1, DeptConfig.class);
+        List<DeptConfig> retList = dataProcess(originList);
+        return true;
+    }
+
+    /**
+     * 数据处理
+     *
+     * @param originList
+     * @return
+     */
+    public List<DeptConfig> dataProcess(List<DeptConfig> originList) {
+        List<DeptConfig> retList = Lists.newLinkedList();
         Map<String, List<DeptConfig>> allMap = getAll();
 
         //去除空格
@@ -495,9 +519,7 @@ public class DeptConfigFacade {
         retList = retList.stream()
                 .distinct()
                 .collect(Collectors.toList());
-
-        String fileName = "科室关联数据（预匹配）.xls";
-        ExcelUtils.exportExcel(retList, null, "sheet1", DeptConfig.class, fileName, response, 12.8f);
+        return retList;
     }
 
     /**

cdssman-service/src/main/java/com/diagbot/facade/DiseaseConfigFacade.java

@@ -414,8 +414,33 @@ public class DiseaseConfigFacade {
      * @param response
      */
     public void precDataMatch(MultipartFile file,HttpServletResponse response) {
-        List<DiseaseConfig> retList = Lists.newLinkedList();
         List<DiseaseConfig> originList = ExcelUtils.importExcel(file, 0, 1, DiseaseConfig.class);
+        List<DiseaseConfig> retList = dataProcess(originList);
+
+        String fileName = "诊断关联数据（预匹配）.xls";
+        ExcelUtils.exportExcel(retList, null, "sheet1", DiseaseConfig.class, fileName, response, 12.8f);
+    }
+
+    /**
+     * 导入数据验证
+     *
+     * @param file
+     * @return
+     */
+    public Boolean dataVerify(MultipartFile file) {
+        List<DiseaseConfig> originList = ExcelUtils.importExcel(file, 0, 1, DiseaseConfig.class);
+        List<DiseaseConfig> retList = dataProcess(originList);
+        return true;
+    }
+
+    /**
+     * 数据处理
+     *
+     * @param originList
+     * @return
+     */
+    public List<DiseaseConfig> dataProcess(List<DiseaseConfig> originList) {
+        List<DiseaseConfig> retList = Lists.newLinkedList();
         Map<String, List<DiseaseConfig>> allMap = getAll();
 
         //去除空格
@@ -462,9 +487,7 @@ public class DiseaseConfigFacade {
         retList = retList.stream()
                 .distinct()
                 .collect(Collectors.toList());
-
-        String fileName = "诊断关联数据（预匹配）.xls";
-        ExcelUtils.exportExcel(retList, null, "sheet1", DiseaseConfig.class, fileName, response, 12.8f);
+        return retList;
     }
 
     /**

cdssman-service/src/main/java/com/diagbot/facade/DrugConfigFacade.java

@@ -642,8 +642,33 @@ public class DrugConfigFacade {
      * @param response
      */
     public void precDataMatch(MultipartFile file,HttpServletResponse response) {
-        List<DrugConfig> retList = Lists.newLinkedList();
         List<DrugConfig> originList = ExcelUtils.importExcel(file, 1, 1, DrugConfig.class);
+        List<DrugConfig> retList = dataProcess(originList);
+
+        String fileName = "药品关联数据（预匹配）.xls";
+        ExcelUtils.exportExcel(retList, getFrom(), "sheet1", DrugConfig.class, fileName, response, 12.8f);
+    }
+
+    /**
+     * 导入数据验证
+     *
+     * @param file
+     * @return
+     */
+    public Boolean dataVerify(MultipartFile file) {
+        List<DrugConfig> originList = ExcelUtils.importExcel(file, 0, 1, DrugConfig.class);
+        List<DrugConfig> retList = dataProcess(originList);
+        return true;
+    }
+
+    /**
+     * 数据处理
+     *
+     * @param originList
+     * @return
+     */
+    public List<DrugConfig> dataProcess(List<DrugConfig> originList) {
+        List<DrugConfig> retList = Lists.newLinkedList();
         Map<String, List<DrugConfig>> allMap = getAll();
 
         //药品剂型
@@ -705,8 +730,7 @@ public class DrugConfigFacade {
                 .distinct()
                 .collect(Collectors.toList());
 
-        String fileName = "药品关联数据（预匹配）.xls";
-        ExcelUtils.exportExcel(retList, getFrom(), "sheet1", DrugConfig.class, fileName, response, 12.8f);
+        return retList;
     }
 
     /**

cdssman-service/src/main/java/com/diagbot/facade/LisConfigFacade.java

@@ -492,9 +492,34 @@ public class LisConfigFacade{
      * @param response
      */
     public void precDataMatch(MultipartFile file,HttpServletResponse response) {
-        List<LisConfig> retList = Lists.newLinkedList();
         List<LisConfig> originList = ExcelUtils.importExcel(file, 0, 1, LisConfig.class);
-        Map<String,Map<String, List<LisConfig>>> allMap = getAll();
+        List<LisConfig> retList = dataProcess(originList);
+
+        String fileName = "检验关联数据（预匹配）.xls";
+        ExcelUtils.exportExcel(retList, null, "sheet1", LisConfig.class, fileName, response, 12.8f);
+    }
+
+    /**
+     * 导入数据验证
+     *
+     * @param file
+     * @return
+     */
+    public Boolean dataVerify(MultipartFile file) {
+        List<LisConfig> originList = ExcelUtils.importExcel(file, 0, 1, LisConfig.class);
+        List<LisConfig> retList = dataProcess(originList);
+        return true;
+    }
+
+    /**
+     * 数据处理
+     *
+     * @param originList
+     * @return
+     */
+    public List<LisConfig> dataProcess(List<LisConfig> originList) {
+        List<LisConfig> retList = Lists.newLinkedList();
+        Map<String, Map<String, List<LisConfig>>> allMap = getAll();
 
         //去除空格
         originList.forEach(item -> {
@@ -532,7 +557,7 @@ public class LisConfigFacade{
                 }
                 if (allMap.containsKey(originItem.getHisName())
                         && allMap.get(originItem.getHisName()).containsKey(originItem.getHisDetailName())) {
-                    List<LisConfig> items=allMap.get(originItem.getHisName()).get(originItem.getHisDetailName());
+                    List<LisConfig> items = allMap.get(originItem.getHisName()).get(originItem.getHisDetailName());
                     boolean flag = false;
                     for (LisConfig item : items) {
                         if (lisPackNames.contains(item.getUniqueName())
@@ -553,9 +578,7 @@ public class LisConfigFacade{
         retList = retList.stream()
                 .distinct()
                 .collect(Collectors.toList());
-
-        String fileName = "检验关联数据（预匹配）.xls";
-        ExcelUtils.exportExcel(retList, null, "sheet1", LisConfig.class, fileName, response, 12.8f);
+        return retList;
     }
 
     /**

cdssman-service/src/main/java/com/diagbot/facade/OperationConfigFacade.java

@@ -423,8 +423,33 @@ public class OperationConfigFacade {
      * @param response
      */
     public void precDataMatch(MultipartFile file,HttpServletResponse response) {
-        List<OperationConfig> retList = Lists.newLinkedList();
         List<OperationConfig> originList = ExcelUtils.importExcel(file, 0, 1, OperationConfig.class);
+        List<OperationConfig> retList = dataProcess(originList);
+
+        String fileName = "手术和操作关联数据（预匹配）.xls";
+        ExcelUtils.exportExcel(retList, null, "sheet1", OperationConfig.class, fileName, response, 12.8f);
+    }
+
+    /**
+     * 导入数据验证
+     *
+     * @param file
+     * @return
+     */
+    public Boolean dataVerify(MultipartFile file) {
+        List<OperationConfig> originList = ExcelUtils.importExcel(file, 0, 1, OperationConfig.class);
+        List<OperationConfig> retList = dataProcess(originList);
+        return true;
+    }
+
+    /**
+     * 数据处理
+     *
+     * @param originList
+     * @return
+     */
+    public List<OperationConfig> dataProcess(List<OperationConfig> originList) {
+        List<OperationConfig> retList = Lists.newLinkedList();
         Map<String, List<OperationConfig>> allMap = getAll();
 
         //去除空格
@@ -471,9 +496,7 @@ public class OperationConfigFacade {
         retList = retList.stream()
                 .distinct()
                 .collect(Collectors.toList());
-
-        String fileName = "手术和操作关联数据（预匹配）.xls";
-        ExcelUtils.exportExcel(retList, null, "sheet1", OperationConfig.class, fileName, response, 12.8f);
+        return retList;
     }
 
     /**

cdssman-service/src/main/java/com/diagbot/facade/PacsConfigFacade.java

@@ -421,8 +421,33 @@ public class PacsConfigFacade {
      * @param response
      */
     public void precDataMatch(MultipartFile file,HttpServletResponse response) {
-        List<PacsConfig> retList = Lists.newLinkedList();
         List<PacsConfig> originList = ExcelUtils.importExcel(file, 0, 1, PacsConfig.class);
+        List<PacsConfig> retList = dataProcess(originList);
+
+        String fileName = "检查关联数据（预匹配）.xls";
+        ExcelUtils.exportExcel(retList, null, "sheet1", PacsConfig.class, fileName, response, 12.8f);
+    }
+
+    /**
+     * 导入数据验证
+     *
+     * @param file
+     * @return
+     */
+    public Boolean dataVerify(MultipartFile file) {
+        List<PacsConfig> originList = ExcelUtils.importExcel(file, 0, 1, PacsConfig.class);
+        List<PacsConfig> retList = dataProcess(originList);
+        return true;
+    }
+
+    /**
+     * 数据处理
+     *
+     * @param originList
+     * @return
+     */
+    public List<PacsConfig> dataProcess(List<PacsConfig> originList) {
+        List<PacsConfig> retList = Lists.newLinkedList();
         Map<String, List<PacsConfig>> allMap = getAll();
 
         //去除空格
@@ -469,9 +494,7 @@ public class PacsConfigFacade {
         retList = retList.stream()
                 .distinct()
                 .collect(Collectors.toList());
-
-        String fileName = "检查关联数据（预匹配）.xls";
-        ExcelUtils.exportExcel(retList, null, "sheet1", PacsConfig.class, fileName, response, 12.8f);
+        return retList;
     }
 
     /**

cdssman-service/src/main/java/com/diagbot/facade/TransfusionConfigFacade.java

@@ -421,8 +421,33 @@ public class TransfusionConfigFacade {
      * @param response
      */
     public void precDataMatch(MultipartFile file,HttpServletResponse response) {
-        List<TransfusionConfig> retList = Lists.newLinkedList();
         List<TransfusionConfig> originList = ExcelUtils.importExcel(file, 0, 1, TransfusionConfig.class);
+        List<TransfusionConfig> retList = dataProcess(originList);
+
+        String fileName = "输血关联数据（预匹配）.xls";
+        ExcelUtils.exportExcel(retList, null, "sheet1", TransfusionConfig.class, fileName, response, 12.8f);
+    }
+
+    /**
+     * 导入数据验证
+     *
+     * @param file
+     * @return
+     */
+    public Boolean dataVerify(MultipartFile file) {
+        List<TransfusionConfig> originList = ExcelUtils.importExcel(file, 0, 1, TransfusionConfig.class);
+        List<TransfusionConfig> retList = dataProcess(originList);
+        return true;
+    }
+
+    /**
+     * 数据处理
+     *
+     * @param originList
+     * @return
+     */
+    public List<TransfusionConfig> dataProcess(List<TransfusionConfig> originList) {
+        List<TransfusionConfig> retList = Lists.newLinkedList();
         Map<String, List<TransfusionConfig>> allMap = getAll();
 
         //去除空格
@@ -461,8 +486,7 @@ public class TransfusionConfigFacade {
                 .distinct()
                 .collect(Collectors.toList());
 
-        String fileName = "输血关联数据（预匹配）.xls";
-        ExcelUtils.exportExcel(retList, null, "sheet1", TransfusionConfig.class, fileName, response, 12.8f);
+        return retList;
     }
 
     /**

cdssman-service/src/main/java/com/diagbot/web/DeptConfigController.java

@@ -203,4 +203,18 @@ public class DeptConfigController {
     public void precDataMatch(@RequestParam("file") MultipartFile file, HttpServletResponse response) {
         deptConfigFacade.precDataMatch(file, response);
     }
+
+    /**
+     * 导入数据预匹配
+     *
+     * @return
+     */
+    @ApiOperation(value = "导入数据验证[by:zhaops]",
+            notes = "")
+    @PostMapping("/dataVerify")
+    @SysLogger("dataVerify")
+    public RespDTO<Boolean> dataVerify(@RequestParam("file") MultipartFile file) {
+        Boolean data = deptConfigFacade.dataVerify(file);
+        return RespDTO.onSuc(data);
+    }
 }

cdssman-service/src/main/java/com/diagbot/web/DiseaseConfigController.java

@@ -202,4 +202,18 @@ public class DiseaseConfigController {
     public void precDataMatch(@RequestParam("file") MultipartFile file, HttpServletResponse response) {
         diseaseConfigFacade.precDataMatch(file, response);
     }
+
+    /**
+     * 导入数据预匹配
+     *
+     * @return
+     */
+    @ApiOperation(value = "导入数据验证[by:zhaops]",
+            notes = "")
+    @PostMapping("/dataVerify")
+    @SysLogger("dataVerify")
+    public RespDTO<Boolean> dataVerify(@RequestParam("file") MultipartFile file) {
+        Boolean data = diseaseConfigFacade.dataVerify(file);
+        return RespDTO.onSuc(data);
+    }
 }

cdssman-service/src/main/java/com/diagbot/web/DrugConfigController.java

@@ -203,4 +203,18 @@ public class DrugConfigController {
     public void precDataMatch(@RequestParam("file") MultipartFile file, HttpServletResponse response) {
         drugConfigFacade.precDataMatch(file, response);
     }
+
+    /**
+     * 导入数据预匹配
+     *
+     * @return
+     */
+    @ApiOperation(value = "导入数据验证[by:zhaops]",
+            notes = "")
+    @PostMapping("/dataVerify")
+    @SysLogger("dataVerify")
+    public RespDTO<Boolean> dataVerify(@RequestParam("file") MultipartFile file) {
+        Boolean data = drugConfigFacade.dataVerify(file);
+        return RespDTO.onSuc(data);
+    }
 }

cdssman-service/src/main/java/com/diagbot/web/LisConfigController.java

@@ -201,4 +201,18 @@ public class LisConfigController {
     public void precDataMatch(@RequestParam("file") MultipartFile file, HttpServletResponse response) {
         lisConfigFacade.precDataMatch(file, response);
     }
+
+    /**
+     * 导入数据预匹配
+     *
+     * @return
+     */
+    @ApiOperation(value = "导入数据验证[by:zhaops]",
+            notes = "")
+    @PostMapping("/dataVerify")
+    @SysLogger("dataVerify")
+    public RespDTO<Boolean> dataVerify(@RequestParam("file") MultipartFile file) {
+        Boolean data = lisConfigFacade.dataVerify(file);
+        return RespDTO.onSuc(data);
+    }
 }

cdssman-service/src/main/java/com/diagbot/web/OperationConfigController.java

@@ -203,4 +203,19 @@ public class OperationConfigController {
     public void precDataMatch(@RequestParam("file") MultipartFile file, HttpServletResponse response) {
         operationConfigFacade.precDataMatch(file, response);
     }
+
+    /**
+     * 导入数据预匹配
+     *
+     * @return
+     */
+    @ApiOperation(value = "导入数据验证[by:zhaops]",
+            notes = "")
+    @PostMapping("/dataVerify")
+    @SysLogger("dataVerify")
+    public RespDTO<Boolean> dataVerify(@RequestParam("file") MultipartFile file) {
+        Boolean data = operationConfigFacade.dataVerify(file);
+        return RespDTO.onSuc(data);
+    }
+
 }

cdssman-service/src/main/java/com/diagbot/web/PacsConfigController.java

@@ -204,4 +204,18 @@ public class PacsConfigController {
     public void precDataMatch(@RequestParam("file") MultipartFile file, HttpServletResponse response) {
         pacsConfigFacade.precDataMatch(file, response);
     }
+
+    /**
+     * 导入数据预匹配
+     *
+     * @return
+     */
+    @ApiOperation(value = "导入数据验证[by:zhaops]",
+            notes = "")
+    @PostMapping("/dataVerify")
+    @SysLogger("dataVerify")
+    public RespDTO<Boolean> dataVerify(@RequestParam("file") MultipartFile file) {
+        Boolean data = pacsConfigFacade.dataVerify(file);
+        return RespDTO.onSuc(data);
+    }
 }

cdssman-service/src/main/java/com/diagbot/web/TransfusionConfigController.java

@@ -199,4 +199,18 @@ public class TransfusionConfigController {
     public void precDataMatch(@RequestParam("file") MultipartFile file, HttpServletResponse response) {
         transfusionConfigFacade.precDataMatch(file, response);
     }
+
+    /**
+     * 导入数据预匹配
+     *
+     * @return
+     */
+    @ApiOperation(value = "导入数据验证[by:zhaops]",
+            notes = "")
+    @PostMapping("/dataVerify")
+    @SysLogger("dataVerify")
+    public RespDTO<Boolean> dataVerify(@RequestParam("file") MultipartFile file) {
+        Boolean data = transfusionConfigFacade.dataVerify(file);
+        return RespDTO.onSuc(data);
+    }
 }