diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index d2128f4..16123f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -617,6 +617,8 @@ public class PatientServiceFacade { jsonObject.put("parentid", ps.getParentid()); jsonObject.put("pid", ps.getPid()); jsonObject.put("serType", ps.getSerType()); + //服务对象类型 1-孕妇、2-儿童 + jsonObject.put("perType", ps.getPerType()); //指定医生 jsonObject.put("serDoct", ps.getSerDoct() == null ? "" : ps.getSerDoct()); //服务状态 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java index fb48ddf..b76a20b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java @@ -66,6 +66,7 @@ public class PatientServiceSysFacade implements SysBaseFacade { ps.setCreateUser(null); //操作员修改为小程序开通 ps.setUpdateUser(null); + ps.setPerType(patientService.getPerType()); ps.setSerStatus(patientService.getSerStatus()); ps.setSerCode(patientService.getSerCode()); ps.setOrderId(patientService.getOrderId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java index 4c1782b..4560cf5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java @@ -261,7 +261,7 @@ public class MatdeliverFollowResult extends MatdeliverFollowModel { } } - if (getContactResultStr() != null && getVisitResult() == 2) {//预约联系失败,不显示预约信息 + if (getContactResult() != null&&getContactResult() == 2) {//预约联系失败,不显示预约信息 setMakeTypeStr(""); setMakeVisitDateStr(""); }