fix: 梅州三院,未设置管辖科室和医生的 不修改

master
wyb 4 months ago
parent f2599399d0
commit 175dfd01ef

@ -98,9 +98,9 @@ public class MzsyUserInfoSyncServiceImpl implements UserInfoSyncService {
for (PowerUser iuPowerUser : iuPowerUserList) { for (PowerUser iuPowerUser : iuPowerUserList) {
if (existsPowerUserMap.containsKey(iuPowerUser.getUserName())) { if (existsPowerUserMap.containsKey(iuPowerUser.getUserName())) {
PowerUser powerUser = existsPowerUserMap.get(iuPowerUser.getUserName()); PowerUser powerUser = existsPowerUserMap.get(iuPowerUser.getUserName());
// 如果修改的管辖科室不为空,获取原来的,加上现在的,得到最新的,下面管辖医生同理 // 如果修改的管辖科室不为空,并且原来的管辖科室也不为空,获取原来的,加上现在的,得到最新的,下面管辖医生同理
String powerDept = powerUser.getPowerDept(); String powerDept = powerUser.getPowerDept();
if (Func.isNotBlank(iuPowerUser.getPowerDept())) { if (Func.isNotBlank(iuPowerUser.getPowerDept()) && Func.isNotBlank(powerDept)) {
HashSet<String> powerDepts = new HashSet<>(); HashSet<String> powerDepts = new HashSet<>();
if (Func.isNotBlank(powerDept)) { if (Func.isNotBlank(powerDept)) {
Collections.addAll(powerDepts, powerDept.split(delimiter)); Collections.addAll(powerDepts, powerDept.split(delimiter));
@ -109,7 +109,7 @@ public class MzsyUserInfoSyncServiceImpl implements UserInfoSyncService {
powerDept = String.join(delimiter, powerDepts); powerDept = String.join(delimiter, powerDepts);
} }
String powerAttending = powerUser.getPowerAttending(); String powerAttending = powerUser.getPowerAttending();
if (Func.isNotBlank(iuPowerUser.getPowerAttending())) { if (Func.isNotBlank(iuPowerUser.getPowerAttending()) && Func.isNotBlank(powerAttending)) {
HashSet<String> powerAttendings = new HashSet<>(); HashSet<String> powerAttendings = new HashSet<>();
if (Func.isNotBlank(powerAttending)) { if (Func.isNotBlank(powerAttending)) {
Collections.addAll(powerAttendings, powerAttending.split(delimiter)); Collections.addAll(powerAttendings, powerAttending.split(delimiter));

Loading…
Cancel
Save