1、配置

2、术语关联

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

@@ -1,3 +1,4 @@
+/*
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -41,11 +42,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+*/
 /**
  * @Description:
  * @Author:zhaops
  * @time: 2020/8/12 14:25
- */
+ *//*
+
 @Component
 public class DeptConfigFacade {
     @Autowired
@@ -53,25 +56,29 @@ public class DeptConfigFacade {
     @Autowired
     private CdssCoreClient cdssCoreClient;
 
-    /**
+    */
+/**
      * 判断是否已存在
      *
      * @param deptConfig
      * @return
-     */
+     *//*
+
     public Boolean isExistRecord(DeptConfig deptConfig) {
         QueryWrapper<DeptConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", deptConfig.getHospitalId())
                 .eq("his_name", deptConfig.getHisName())
                 .eq("unique_name", deptConfig.getUniqueName());
-       /* if (StringUtil.isNotBlank(deptConfig.getHisCode())) {
+       */
+/* if (StringUtil.isNotBlank(deptConfig.getHisCode())) {
             queryWrapper.eq("his_code", deptConfig.getHisCode());
         } else {
             queryWrapper.and(i -> i.isNull("his_code")
                     .or()
                     .eq("his_code", ""));
-        }*/
+        }*//*
+
         DeptConfig oldRecord = deptConfigService.getOne(queryWrapper, false);
         if (deptConfig.getId() == null
                 && oldRecord != null) {
@@ -85,12 +92,14 @@ public class DeptConfigFacade {
         return false;
     }
 
-    /**
+    */
+/**
      * 保存记录-单条
      *
      * @param deptConfig
      * @return
-     */
+     *//*
+
     public Boolean saveOrUpdateRecord(DeptConfig deptConfig) {
         String userId = UserUtils.getCurrentPrincipleID();
         Date now = DateUtil.now();
@@ -101,13 +110,15 @@ public class DeptConfigFacade {
                 .eq("hospital_id", deptConfig.getHospitalId())
                 .eq("his_name", deptConfig.getHisName())
                 .eq("unique_name", deptConfig.getUniqueName());
-        /*if (StringUtil.isNotBlank(deptConfig.getHisCode())) {
+        */
+/*if (StringUtil.isNotBlank(deptConfig.getHisCode())) {
             queryWrapper.eq("his_code", deptConfig.getHisCode());
         } else {
             queryWrapper.and(i -> i.isNull("his_code")
                     .or()
                     .eq("his_code", ""));
-        }*/
+        }*//*
+
         DeptConfig oldRecord = deptConfigService.getOne(queryWrapper, false);
         if (deptConfig.getId() == null
                 && oldRecord != null) {
@@ -130,12 +141,14 @@ public class DeptConfigFacade {
         return true;
     }
 
-    /**
+    */
+/**
      * 保存记录-批量
      *
      * @param deptConfigListVO
      * @return
-     */
+     *//*
+
     public Boolean saveOrUpdateRecords(DeptConfigListVO deptConfigListVO) {
         if (ListUtil.isEmpty(deptConfigListVO.getDeptConfigList())) {
             return false;
@@ -143,12 +156,14 @@ public class DeptConfigFacade {
         return saveOrUpdateRecords(deptConfigListVO.getDeptConfigList());
     }
 
-    /**
+    */
+/**
      * 批量保存
      *
      * @param deptConfigList
      * @return
-     */
+     *//*
+
     public Boolean saveOrUpdateRecords(List<DeptConfig> deptConfigList) {
         if (ListUtil.isEmpty(deptConfigList)) {
             return false;
@@ -198,12 +213,14 @@ public class DeptConfigFacade {
         return true;
     }
 
-    /**
+    */
+/**
      * 删除记录-单条
      *
      * @param idVO
      * @return
-     */
+     *//*
+
     public Boolean deleteRecord(IdVO idVO) {
         UpdateWrapper<DeptConfig> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", idVO.getId())
@@ -212,12 +229,14 @@ public class DeptConfigFacade {
         return true;
     }
 
-    /**
+    */
+/**
      * 删除记录-批量
      *
      * @param idListVO
      * @return
-     */
+     *//*
+
     public Boolean deleteRecords(IdListVO idListVO) {
         if (ListUtil.isEmpty(idListVO.getIds())) {
             return false;
@@ -229,22 +248,26 @@ public class DeptConfigFacade {
         return true;
     }
 
-    /**
+    */
+/**
      * 分页查询
      *
      * @param deptConfigPageVO
      * @return
-     */
+     *//*
+
     public IPage<DeptConfig> getPage(DeptConfigPageVO deptConfigPageVO) {
         return deptConfigService.getPage(deptConfigPageVO);
     }
 
-    /**
+    */
+/**
      * 数据导入
      *
      * @param file
      * @param hospitalIdVO
-     */
+     *//*
+
     public void importExcel(MultipartFile file, HospitalIdVO hospitalIdVO) {
         List<DeptConfig> deptConfigList = ExcelUtils.importExcel(file, 0, 1, DeptConfig.class);
         if (ListUtil.isNotEmpty(deptConfigList)) {
@@ -257,12 +280,14 @@ public class DeptConfigFacade {
         }
     }
 
-    /**
+    */
+/**
      * 数据导入
      *
      * @param deptConfigList
      * @return
-     */
+     *//*
+
     public Boolean importExcelRecords(List<DeptConfig> deptConfigList, HospitalIdVO hospitalIdVO) {
         Long hospitalId = hospitalIdVO.getHospitalId();
         String userId = UserUtils.getCurrentPrincipleID();
@@ -332,7 +357,8 @@ public class DeptConfigFacade {
             });
 
         //标准术语校验
-       /* List<String> errorNumList = Lists.newLinkedList();
+       */
+/* List<String> errorNumList = Lists.newLinkedList();
         List<String> uniqueNames = deptConfigList.stream()
                 .map(i -> i.getUniqueName())
                 .distinct()
@@ -353,7 +379,8 @@ public class DeptConfigFacade {
                     "以下行数（不计空行）标准术语在数据库中不存在："
                             + errorNumList.stream().collect(Collectors.joining("、"))
                             + "。导入取消，请修改后再试。");
-        }*/
+        }*//*
+
 
         //重复数据过滤
         deptConfigList = deptConfigList
@@ -369,15 +396,18 @@ public class DeptConfigFacade {
         return true;
     }
 
-    /**
+    */
+/**
      * 获取映射关系-公表名
      *
      * @param hospitalId
      * @param hisNames
      * @param uniqueNames
      * @return
-     */
-    public Map<String, Map<String, List<Long>>> getConfigMap(Long hospitalId, List<String> hisNames, List<String> uniqueNames) {
+     *//*
+
+    */
+/*public Map<String, Map<String, List<Long>>> getConfigMap(Long hospitalId, List<String> hisNames, List<String> uniqueNames) {
         Map<String, Map<String, List<Long>>> retMap = new HashMap<>();
         QueryWrapper<DeptConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -404,14 +434,17 @@ public class DeptConfigFacade {
             }
         }
         return retMap;
-    }
+    }*//*
 
-    /**
+
+    */
+/**
      * 数据导出
      *
      * @param response
      * @param hospitalIdVO
-     */
+     *//*
+
     public void exportExcel(HttpServletResponse response, HospitalIdVO hospitalIdVO) {
         QueryWrapper<DeptConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -422,32 +455,38 @@ public class DeptConfigFacade {
         ExcelUtils.exportExcel(records, null, "sheet1", DeptConfig.class, fileName, response, 12.8f);
     }
 
-    /**
+    */
+/**
      * 各医院映射关系数列表
      *
      * @param hosRelationNumPageVO
      * @return
-     */
+     *//*
+
     public IPage<HosRelationNumDTO> getRelationNumPage(HosRelationNumPageVO hosRelationNumPageVO) {
         return deptConfigService.getRelationNumPage(hosRelationNumPageVO);
     }
 
-    /**
+    */
+/**
      * 数据导入模板导出
      *
      * @param response
-     */
+     *//*
+
     public void exportExcelModule(HttpServletResponse response) {
         String fileName = "科室映射模板.xls";
         ExcelUtils.exportExcel(new ArrayList<>(), null, "sheet1", DeptConfig.class, fileName, response, 12.8f);
     }
 
-    /**
+    */
+/**
      * 导入数据预匹配
      *
      * @param file
      * @param response
-     */
+     *//*
+
     public void precDataMatch(MultipartFile file, HttpServletResponse response) {
         List<DeptConfig> originList = ExcelUtils.importExcel(file, 0, 1, DeptConfig.class);
         List<DeptConfig> retList = dataProcess(originList);
@@ -455,24 +494,28 @@ public class DeptConfigFacade {
         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();
         List<String> hisNameList = originList.stream().map(i -> i.getHisName()).distinct().collect(Collectors.toList());
@@ -494,7 +537,8 @@ public class DeptConfigFacade {
         }
         precUniqueName = precUniqueName.stream().distinct().collect(Collectors.toList());
 
-        /*ConceptVO conceptVO = new ConceptVO();
+        */
+/*ConceptVO conceptVO = new ConceptVO();
         conceptVO.setNames(precUniqueName);
         conceptVO.setType(ConceptTypeEnum.Dept.getKey());
         RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
@@ -519,7 +563,8 @@ public class DeptConfigFacade {
                     retList.add(originItem);
                 }
             }
-        }*/
+        }*//*
+
 
         retList = retList.stream()
                 .distinct()
@@ -527,11 +572,13 @@ public class DeptConfigFacade {
         return retList;
     }
 
-    /**
+    */
+/**
      * 获取所有医院映射数据
      *
      * @return
-     */
+     *//*
+
     public Map<String, List<DeptConfig>> getAll(List<String> hisNameList) {
         Map<String, List<DeptConfig>> retMap = new HashMap<>();
         QueryWrapper<DeptConfig> queryWrapper = new QueryWrapper<>();
@@ -563,16 +610,18 @@ public class DeptConfigFacade {
         return retMap;
     }
 
-    /**
+    */
+/**
      * 查找指定医院映射关系
      *
      * @param hospitalId
      * @return
-     */
+     *//*
+
     public List<DeptConfig> getListByHospitalId(Long hospitalId) {
         QueryWrapper<DeptConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId);
         return deptConfigService.list(queryWrapper);
     }
-}
+}*/

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

@@ -6,7 +6,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.HosRelationNumDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DeptConfig;
-import com.diagbot.facade.DeptConfigFacade;
+//import com.diagbot.facade.DeptConfigFacade;
 import com.diagbot.vo.DeptConfigListVO;
 import com.diagbot.vo.DeptConfigPageVO;
 import com.diagbot.vo.HosRelationNumPageVO;
@@ -40,15 +40,15 @@ import javax.validation.Valid;
 @Api(value = "科室公表映射API", tags = { "科室公表映射API" })
 @SuppressWarnings("unchecked")
 public class DeptConfigController {
-    @Autowired
+    /*@Autowired
     private DeptConfigFacade deptConfigFacade;
 
-    /**
+    *//**
      * 映射关系是否已存在
      *
      * @param deptConfig
      * @return
-     */
+     *//*
     @ApiOperation(value = "映射关系是否已存在[by:zhaops]", notes = "")
     @PostMapping("/isExistRecord")
     @SysLogger("isExistRecord")
@@ -57,12 +57,12 @@ public class DeptConfigController {
         return RespDTO.onSuc(data);
     }
 
-    /**
+    *//**
      * 保存或修改映射关系
      *
      * @param deptConfig
      * @return
-     */
+     *//*
     @ApiOperation(value = "保存或修改映射关系[by:zhaops]", notes = "")
     @PostMapping("/saveOrUpdateRecord")
     @SysLogger("saveOrUpdateRecord")
@@ -72,12 +72,12 @@ public class DeptConfigController {
         return RespDTO.onSuc(data);
     }
 
-    /**
+    *//**
      * 批量保存或修改映射关系
      *
      * @param deptConfigListVO
      * @return
-     */
+     *//*
     @ApiOperation(value = "批量保存或修改映射关系[by:zhaops]", notes = "")
     @PostMapping("/saveOrUpdateRecords")
     @SysLogger("saveOrUpdateRecords")
@@ -87,12 +87,12 @@ public class DeptConfigController {
         return RespDTO.onSuc(data);
     }
 
-    /**
+    *//**
      * 删除映射关系
      *
      * @param idVO
      * @return
-     */
+     *//*
     @ApiOperation(value = "删除映射关系[by:zhaops]", notes = "")
     @PostMapping("/deleteRecord")
     @SysLogger("deleteRecord")
@@ -102,12 +102,12 @@ public class DeptConfigController {
         return RespDTO.onSuc(data);
     }
 
-    /**
+    *//**
      * 批量删除映射关系
      *
      * @param idListVO
      * @return
-     */
+     *//*
     @ApiOperation(value = "批量删除映射关系[by:zhaops]", notes = "")
     @PostMapping("/deleteRecords")
     @SysLogger("deleteRecords")
@@ -117,12 +117,12 @@ public class DeptConfigController {
         return RespDTO.onSuc(data);
     }
 
-    /**
+    *//**
      * 分页查询
      *
      * @param deptConfigPageVO
      * @return
-     */
+     *//*
     @ApiOperation(value = "分页查询[by:zhaops]", notes = "")
     @PostMapping("/getPage")
     @SysLogger("getPage")
@@ -131,13 +131,13 @@ public class DeptConfigController {
         return RespDTO.onSuc(data);
     }
 
-    /**
+    *//**
      * 数据导入
      *
      * @param file
      * @param hospitalId
      * @return
-     */
+     *//*
     @ApiOperation(value = "数据导入[by:zhaops]",
             notes = "")
     @PostMapping("/importExcel")
@@ -149,12 +149,12 @@ public class DeptConfigController {
         deptConfigFacade.importExcel(file, hospitalIdVO);
     }
 
-    /**
+    *//**
      * 数据导出
      *
      * @param response
      * @param hospitalIdVO
-     */
+     *//*
     @ApiOperation(value = "数据导出[by:zhaops]",
             notes = "")
     @PostMapping("/exportExcel")
@@ -163,12 +163,12 @@ public class DeptConfigController {
         deptConfigFacade.exportExcel(response, hospitalIdVO);
     }
 
-    /**
+    *//**
      * 各医院映射关系数列表
      *
      * @param hosRelationNumPageVO
      * @return
-     */
+     *//*
     @ApiOperation(value = "各医院映射关系数列表[by:zhaops]",
             notes = "")
     @PostMapping("/getRelationNumPage")
@@ -178,11 +178,11 @@ public class DeptConfigController {
         return RespDTO.onSuc(data);
     }
 
-    /**
+    *//**
      * 数据导入模板导出
      *
      * @return
-     */
+     *//*
     @ApiOperation(value = "数据导入模板导出[by:zhaops]",
             notes = "")
     @PostMapping("/exportExcelModule")
@@ -191,11 +191,11 @@ public class DeptConfigController {
         deptConfigFacade.exportExcelModule(response);
     }
 
-    /**
+    *//**
      * 导入数据预匹配
      *
      * @return
-     */
+     *//*
     @ApiOperation(value = "导入数据预匹配[by:zhaops]",
             notes = "")
     @PostMapping("/precDataMatch")
@@ -204,11 +204,11 @@ public class DeptConfigController {
         deptConfigFacade.precDataMatch(file, response);
     }
 
-    /**
+    *//**
      * 导入数据预匹配
      *
      * @return
-     */
+     *//*
     @ApiOperation(value = "导入数据验证[by:zhaops]",
             notes = "")
     @PostMapping("/dataVerify")
@@ -216,5 +216,5 @@ public class DeptConfigController {
     public RespDTO<Boolean> dataVerify(@RequestParam("file") MultipartFile file) {
         Boolean data = deptConfigFacade.dataVerify(file);
         return RespDTO.onSuc(data);
-    }
+    }*/
 }