|
@@ -28,6 +28,7 @@ import com.google.common.collect.Lists;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
+
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.LinkedHashMap;
|
|
@@ -222,7 +223,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(); // 与其他医院重复
|
|
@@ -230,7 +232,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);
|