diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java index 9e95438..9eef870 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java @@ -34,7 +34,7 @@ public class AntExRecordModel extends BaseModel { private String phone; //状态 1 已分娩 2未分娩 private int status; - //类型 1 初诊 2复诊 + //类型 1 复诊 2 初诊 private Integer type; //产检医生 private String checkDoctor; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index d9a686d..6e5352f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -521,11 +521,15 @@ public class ApplyOrderFacade { List> screenList = antenatalExaminationFacade.getscreenResult(patients.getScreenResult()); referralApplyOrderResult.setScreenResult(screenList); + + Map recDoctorMap = new HashMap<>(); //接诊医生 if (NumberUtils.isNumber(referralApplyOrderModel.getRecDoctor())) { + recDoctorMap.put("id",referralApplyOrderModel.getRecDoctor()); Users users = usersService.getUsers(NumberUtils.toInt(referralApplyOrderModel.getRecDoctor())); if (null != users) { - referralApplyOrderResult.setRecDoctor(users.getName()); + recDoctorMap.put("name",users.getName()); + referralApplyOrderResult.setRecDoctor(recDoctorMap); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java index 441942f..2338861 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java @@ -69,17 +69,17 @@ public class ReferralApplyOrderResult { //转入医院 private String zhuanRname; //接诊医生 - private String recDoctor; + private Map recDoctor; //目前诊断 private List diagnosis; //其他诊断 private String otherDiagn; - public String getRecDoctor() { + public Map getRecDoctor() { return recDoctor; } - public void setRecDoctor(String recDoctor) { + public void setRecDoctor(Map recDoctor) { this.recDoctor = recDoctor; }