预匹配数据校验

cdssman-service/src/main/java/com/diagbot/client/CdssClient.java

@@ -37,6 +37,15 @@ public interface CdssClient {
     @PostMapping("/tran/mappingConfig/exportExcelModule")
     void exportExcelModule(@RequestBody @Valid MappingConfigVO mappingConfigVO);
 
+    /**
+     * 预匹配导入术语校验
+     * @param file
+     * @param type
+     */
+    @PostMapping(value = "/tran/mappingConfig/dataVerify", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    RespDTO<Boolean> dataVerify(@RequestPart("file") MultipartFile file,
+                           @RequestParam("type") Integer type);
+
     /**
      * 预匹配
      *

cdssman-service/src/main/java/com/diagbot/client/hystrix/CdssHystrix.java

@@ -34,6 +34,13 @@ public class CdssHystrix implements CdssClient {
         log.error("【hystrix】调用{}异常", "exportExcelModule");
     }
 
+    @Override
+    public RespDTO<Boolean> dataVerify(@RequestParam("file") MultipartFile file,
+                                       @RequestParam("type") Integer type) {
+        log.error("【hystrix】调用{}异常", "dataVerify");
+        return null;
+    }
+
     @Override
     public void precDataMatch(MultipartFile file, HttpServletResponse response, Integer type) {
         log.error("【hystrix】调用{}异常", "precDataMatch");

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

@@ -206,6 +206,20 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
         }
     }
 
+    /**
+     * 导入数据预匹配校验
+     *
+     * @param file
+     * @param type
+     */
+    public Boolean dataVerify(MultipartFile file, Integer type) {
+        RespDTO<Boolean> respDTO = cdssClient.dataVerify(file, type);
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            return respDTO.data;
+        } else {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, respDTO.msg);
+        }
+    }
 
     /**
      * 导入数据预匹配

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

@@ -50,6 +50,16 @@ public class MappingConfigController {
         mappingConfigFacade.exportExcelModule(response, mappingConfigVO);
     }
 
+    @ApiOperation(value = "预匹配导入术语校验[by:zhaops]",
+            notes = "file（必填）：预匹配文件 <br>" +
+                    "type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉 <br>")
+    @PostMapping(value = "/dataVerify", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @SysLogger("dataVerify")
+    public RespDTO<Boolean> dataVerify(@RequestParam("file") MultipartFile file,
+                                       @RequestParam("type") Integer type) {
+        Boolean data = mappingConfigFacade.dataVerify(file, type);
+        return RespDTO.onSuc(data);
+    }
 
     @ApiOperation(value = "预匹配[by:zhaops]",
             notes = "file（必填）：预匹配文件 <br>" +