jiangjiazhi / regional-platform | GitLab

Commit 85456a527487ee8af54d59e4864e708794200cfd

Authored by yangfei over 8 years ago

1 parent 6190d882b8

Exists in master and in 6 other branches

服务同步

Showing 3 changed files with 4 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java

...	...	@@ -617,6 +617,8 @@
617	617	jsonObject.put("parentid", ps.getParentid());
618	618	jsonObject.put("pid", ps.getPid());
619	619	jsonObject.put("serType", ps.getSerType());
	620	+ //服务对象类型 1-孕妇、2-儿童
	621	+ jsonObject.put("perType", ps.getPerType());
620	622	//指定医生
621	623	jsonObject.put("serDoct", ps.getSerDoct() == null ? "" : ps.getSerDoct());
622	624	//服务状态

...	...	@@ -66,6 +66,7 @@
66	66	ps.setCreateUser(null);
67	67	//操作员修改为小程序开通
68	68	ps.setUpdateUser(null);
	69	+ ps.setPerType(patientService.getPerType());
69	70	ps.setSerStatus(patientService.getSerStatus());
70	71	ps.setSerCode(patientService.getSerCode());
71	72	ps.setOrderId(patientService.getOrderId());

...	...	@@ -261,7 +261,7 @@
261	261	}
262	262	}
263	263
264		- if (getContactResultStr() != null && getVisitResult() == 2) {//预约联系失败，不显示预约信息
	264	+ if (getContactResult() != null&&getContactResult() == 2) {//预约联系失败，不显示预约信息
265	265	setMakeTypeStr("");
266	266	setMakeVisitDateStr("");
267	267	}