diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java index dac0f44..da7453c 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java @@ -234,7 +234,10 @@ public class HsfyFmService { usersQuery.setName(allFm.getDELIVER_DOCTOR()); users = usersService.queryUsers(usersQuery); - if (CollectionUtils.isNotEmpty(users) && users.get(0).getId() != null) { + if (!CollectionUtils.isNotEmpty(users)) { + usersQuery.setName("产房"); + users = usersService.queryUsers(usersQuery); + } Date dateTime = fmt.parse(allFm.getBABY_DELIVERY_TIME()); if(dateTime!=null){ @@ -395,7 +398,6 @@ public class HsfyFmService { baby.setDueTime(fmt.format(dueDate));//分娩时间 babies.add(baby); - } }else{ a=1; //服务器有分娩记录,但是在这边系统没有对应孕妇 取分娩信息建档儿童数据