diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java index 9188032..20f664d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java @@ -231,8 +231,13 @@ public class PostkfFaccade { { MaternalDeliverModel maternalDeliverModel = list2.get(0); info.put("fmDate",maternalDeliverModel.getDueDate()); - info.put("fmDoctor", usersService.getUsers(Integer.parseInt(maternalDeliverModel.getDeliverDoctor())).getName()); - + try { + info.put("fmDoctor", usersService.getUsers(Integer.parseInt(maternalDeliverModel.getDeliverDoctor())).getName()); + } + catch (Exception e) + { + info.put("fmDoctor", maternalDeliverModel.getDeliverDoctor()); + } Patients patients = patientsService.findOnePatientById(maternalDeliverModel.getParentId()); if (patients != null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index ae0ebf1..698eb58 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -6,16 +6,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.math.RoundingMode; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import com.lyms.hospitalapi.qhdfy.QhdfyHisService; import com.lyms.platform.common.constants.*; @@ -8225,7 +8216,7 @@ public class ViewFacade { babyCheckModel.setBuildId(id); babyCheckModel.setYn(YnEnums.YES.getId()); babyCheckModel.setSort("created asc"); - List checkListResults = new ArrayList <>(); + List checkListResults = new LinkedList<>(); List babyCheckList = babyCheckService.queryBabyCheckListRecord(babyCheckModel); if (CollectionUtils.isNotEmpty(babyCheckList)) { for (BabyCheckModel babyCheck : babyCheckList) {