diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 29cde86..82415b0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1561,11 +1561,18 @@ public class MatDeliverFacade { maternalDeliverResult.setDeliverDoctor(map); //分娩记录加住院管床大夫 if (StringUtils.isNotEmpty(deliverModel.getGcdfDoctorId())) { - Users users = usersService.getUsers(Integer.valueOf(deliverModel.getGcdfDoctorId())); - Map map1 = new HashMap<>(); - if (null != users) { - map1.put("id", users.getId() + ""); - map1.put("name", users.getName()); + + Map map1 = null; + try { + Users users = usersService.getUsers(Integer.valueOf(deliverModel.getGcdfDoctorId())); + map1 = new HashMap <>(); + if (null != users) { + map1.put("id", users.getId() + ""); + map1.put("name", users.getName()); + } + } catch (NumberFormatException e) { + map.put("id", "-1"); + map1.put("name", deliverModel.getGcdfDoctorId()); } maternalDeliverResult.setGcdfDoctorId(map1); } 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 20e4ab3..c8ecef4 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 @@ -3637,15 +3637,11 @@ public class ViewFacade { } } catch (NumberFormatException e) { e.printStackTrace(); + map.put("gcdfDoctorId", data.getGcdfDoctorId()); } } - if (StringUtils.isNotEmpty( data.getGcdfDoctorId())) { - Users users = usersService.getUsers(Integer.valueOf( data.getGcdfDoctorId())); - if (null != users) { - map.put("gcdfDoctorId", users.getName()); - } - } + if (StringUtils.isNotEmpty(data.getFmType())) { map.put("fmType", FmTypeEnums.getFmDzNameById(data.getFmType())); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java index f0f0b0b..eee0b3d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java @@ -32,7 +32,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert> { chanResult.setfCh(""); } if (StringUtils.isNotEmpty(maternalDeliverModels.get(0).getGcdfDoctorId())) { - Users users = usersService.getUsers(Integer.valueOf(maternalDeliverModels.get(0).getGcdfDoctorId())); - Map map1 = new HashMap <>(); - if (null != users) { - chanResult.setGcdfDoctorId(users.getName());//分娩时的管床大夫 + + try { + Users users = usersService.getUsers(Integer.valueOf(maternalDeliverModels.get(0).getGcdfDoctorId())); + Map map1 = new HashMap <>(); + if (null != users) { + chanResult.setGcdfDoctorId(users.getName());//分娩时的管床大夫 + } + } catch (NumberFormatException e) { + e.printStackTrace(); + chanResult.setGcdfDoctorId(maternalDeliverModels.get(0).getGcdfDoctorId());//分娩时的管床大夫 } }