Преглед на файлове

名称和编码大小写不区分

zhoutg преди 3 години
родител
ревизия
e55a261c25
променени са 1 файла, в които са добавени 3 реда и са изтрити 2 реда
  1. 3 2
      cdssman-service/src/main/java/com/diagbot/facade/HospitalInfoFacade.java

+ 3 - 2
cdssman-service/src/main/java/com/diagbot/facade/HospitalInfoFacade.java

@@ -173,7 +173,8 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
             List<TranHospitalRelation> tranHospitalRelationList = tranHospitalRelationService.list(new QueryWrapper<TranHospitalRelation>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
             );
-            Map<String, Long> relationMap = tranHospitalRelationList.stream().collect(Collectors.toMap(k -> k.getName() + "_" + k.getCode(), v -> v.getHospitalId(), (v1, v2) -> (v2), LinkedHashMap::new));
+            Map<String, Long> relationMap = tranHospitalRelationList.stream().collect(
+                    Collectors.toMap(k -> k.getName().toUpperCase() + "_" + k.getCode().toUpperCase(), v -> v.getHospitalId(), (v1, v2) -> (v2), LinkedHashMap::new));
             List<String> keyExist = Lists.newArrayList(); // 避免重复数据返回
             List<String> keyAll = Lists.newArrayList(); // 当前医院所有key
             List<HospitalRelationVO> errorOther = Lists.newArrayList(); // 与其他医院重复
@@ -181,7 +182,7 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
 
             for (HospitalRelationVO hospitalRelationVO : hospitalRelationVOList) {
                 // 联合key
-                String unionKey = hospitalRelationVO.getName() + "_" + hospitalRelationVO.getCode();
+                String unionKey = hospitalRelationVO.getName().toUpperCase() + "_" + hospitalRelationVO.getCode().toUpperCase();
                 // 判断当前医院重复
                 if (keyAll.contains(unionKey)) {
                     errorCurrent.add(hospitalRelationVO);