1、术语关联映射-预匹配（批量非文件匹配）

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -46,6 +46,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/tran/mappingConfig/exportExcelModule").permitAll()
                 .antMatchers("/tran/mappingConfig/dataVerify").permitAll()
                 .antMatchers("/tran/mappingConfig/precDataMatch").permitAll()
+                .antMatchers("/tran/mappingConfig/precData").permitAll()
                 .antMatchers("/tran/mappingConfig/precDataMatch_remote").permitAll()
                 .antMatchers("/tran/mappingConfig/importExcel").permitAll()
                 .antMatchers("/tran/mappingConfig/exportExcel").permitAll()

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -89,6 +89,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/tran/mappingConfig/exportExcelModule", request)
                 || matchers("/tran/mappingConfig/dataVerify", request)
                 || matchers("/tran/mappingConfig/precDataMatch", request)
+                || matchers("/tran/mappingConfig/precData", request)
                 || matchers("/tran/mappingConfig/precDataMatch_remote", request)
                 || matchers("/tran/mappingConfig/importExcel", request)
                 || matchers("/tran/mappingConfig/exportExcel", request)

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

@@ -45,6 +45,7 @@ import com.diagbot.vo.IdVO;
 import com.diagbot.vo.KllisDetailVO;
 import com.diagbot.vo.MappingConfigPageVO;
 import com.diagbot.vo.MappingConfigVO;
+import com.diagbot.vo.PrecDataVO;
 import com.diagbot.vo.RetrievalVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.BeanUtils;
@@ -409,6 +410,21 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
         return retList;
     }
 
+    /**
+     * 预匹配（非文件匹配）
+     *
+     * @param precDataVO
+     * @return
+     */
+    public List<MappingConfigWrapper> precData(PrecDataVO precDataVO) {
+        if (ListUtil.isEmpty(precDataVO.getOriginList())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请确认术语列表不为空");
+        }
+        List<MappingConfigWrapper> originList = BeanUtil.listCopyTo(precDataVO.getOriginList(), MappingConfigWrapper.class);
+        List<MappingConfigWrapper> data = precDataProcess(originList, precDataVO.getType());
+        return data;
+    }
+
     /**
      * 预匹配数据处理
      *

src/main/java/com/diagbot/vo/PrecDataVO.java

@@ -0,0 +1,19 @@
+package com.diagbot.vo;
+
+import com.diagbot.entity.wrapper.MappingConfigWrapper;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/15 11:38
+ */
+@Data
+public class PrecDataVO {
+    private List<PrecRecordVO> originList;
+    @NotNull(message = "请输入术语类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉 ")
+    private Integer type;
+}

src/main/java/com/diagbot/vo/PrecRecordVO.java

@@ -0,0 +1,35 @@
+package com.diagbot.vo;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/15 13:15
+ */
+@Data
+public class PrecRecordVO {
+    /**
+     * 医院术语名称
+     */
+    private String hisName;
+
+    /**
+     * 医院术语编码
+     */
+    private String hisCode;
+
+    /**
+     * 医院术语细项名称（检验细项）
+     */
+    private String hisDetailName;
+
+    /**
+     * 手术编码、诊断编码、中医疾病编码、中医证候编码
+     */
+    private String code;
+    /**
+     * 药品国药准字
+     */
+    private String approval;
+}

src/main/java/com/diagbot/web/MappingConfigController.java

@@ -12,6 +12,7 @@ import com.diagbot.vo.IdListVO;
 import com.diagbot.vo.IdVO;
 import com.diagbot.vo.MappingConfigPageVO;
 import com.diagbot.vo.MappingConfigVO;
+import com.diagbot.vo.PrecDataVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -83,6 +84,19 @@ public class MappingConfigController {
         return RespDTO.onSuc(data);
     }
 
+    @ApiOperation(value = "预匹配（非文件匹配）[by:zhaops]",
+            notes = "type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉 <br>"+
+                    "hisName（必填）：医院术语名称 <br>" +
+                    "hisDetailName（选填）：医院术语名称-细项 <br>" +
+                    "code（选填）：诊断ICD10编码、手术编码、中医疾病编码、中医证候编码 <br>" +
+                    "approval（选填）：药品国药准字 <br>" )
+    @PostMapping(value = "/precData")
+    @SysLogger("precData")
+    public RespDTO<List<MappingConfigWrapper>> precData(@Valid @RequestBody PrecDataVO precDataVO) {
+        List<MappingConfigWrapper> data = mappingConfigFacade.precData(precDataVO);
+        return RespDTO.onSuc(data);
+    }
+
     @ApiOperation(value = "数据导入[by:zhaops]",
             notes = "file（必填）：导入文件 <br>" +
                     "hospitalId（必填）：医院id <br>" +
@@ -92,9 +106,9 @@ public class MappingConfigController {
     @SysLogger("importExcel")
     @Transactional
     public RespDTO<Boolean> importExcel(@RequestParam("file") MultipartFile file,
-                            @RequestParam("hospitalId") Long hospitalId,
-                            @RequestParam("type") Integer type,
-                            @RequestParam("uesrId") String userId) {
+                                        @RequestParam("hospitalId") Long hospitalId,
+                                        @RequestParam("type") Integer type,
+                                        @RequestParam("uesrId") String userId) {
         Boolean data = mappingConfigFacade.importExcel(file, hospitalId, type, userId);
         return RespDTO.onSuc(data);
     }