shiyang / regional-platform

Commit e7c70d89874a0b23663ac64b80ef31cc662e48df

Authored by jiangjiazhi over 9 years ago

1 parent c79a8a2059

增加设置parentid

Showing 3 changed files with 31 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java

...	...	@@ -8,6 +8,7 @@
8	8	import com.lyms.platform.common.result.BaseObjectResponse;
9	9	import com.lyms.platform.common.result.BaseResponse;
10	10	import com.lyms.platform.common.utils.Assert;
	11	+import com.lyms.platform.common.utils.DateUtil;
11	12	import com.lyms.platform.common.utils.JsonUtil;
12	13	import com.lyms.platform.operate.web.request.PostReviewQueryRequest;
13	14	import com.lyms.platform.operate.web.request.PostReviewRequest;
14	15
...	...	@@ -60,9 +61,19 @@
60	61	if(CollectionUtils.isNotEmpty(list1)){
61	62	postReviewModel.setHospitalId(list1.get(0)+"");
62	63	}
63		- postReviewModel.setPid(patientsService.findOnePatientById(postReviewRequest.getParentId()).getPid());
	64	+ Patients patients = patientsService.findOnePatientById(postReviewRequest.getParentId());
	65	+ if(StringUtils.isNotEmpty(postReviewRequest.getDueDate())){
	66	+ patients.setFmDate(DateUtil.parseYMD(postReviewRequest.getDueDate()));
	67	+ patientsService.updatePatient(patients);
	68	+ }
	69	+ postReviewModel.setPid(patients.getPid());
64	70	postReviewService.addPostReview(postReviewModel);
65	71	} else {
	72	+ Patients patients = patientsService.findOnePatientById(postReviewRequest.getParentId());
	73	+ if(StringUtils.isNotEmpty(postReviewRequest.getDueDate())){
	74	+ patients.setFmDate(DateUtil.parseYMD(postReviewRequest.getDueDate()));
	75	+ patientsService.updatePatient(patients);
	76	+ }
66	77	postReviewService.updatePostById(postReviewRequest.convertToDataModel(), postReviewRequest.getId());
67	78	}
68	79	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");

...	...	@@ -24,6 +24,8 @@
24	24	@FormParam
25	25	@NotEmpty(message = "产妇id不能为空")
26	26	private String parentId;
	27	+ //分娩时间，自动分娩补录情况
	28	+ private String dueDate;
27	29
28	30	//分娩天数
29	31	private String day;
30	32
...	...	@@ -92,7 +94,13 @@
92	94	private Map nextCheckTime;
93	95
94	96
	97	+ public String getDueDate() {
	98	+ return dueDate;
	99	+ }
95	100
	101	+ public void setDueDate(String dueDate) {
	102	+ this.dueDate = dueDate;
	103	+ }
96	104
97	105	public String getBasin() {
98	106	return basin;

...	...	@@ -36,10 +36,20 @@
36	36	private String lastMenses;
37	37	//分娩时间
38	38	private String dueDate;
	39	+
	40	+ private String addDueDate="0";
39	41	//<!---------基本信息----------->
40	42	private List data = new ArrayList();
41	43	private String cTime;
42	44
	45	+ public String getAddDueDate() {
	46	+ return addDueDate;
	47	+ }
	48	+
	49	+ public void setAddDueDate(String addDueDate) {
	50	+ this.addDueDate = addDueDate;
	51	+ }
	52	+
43	53	public String getcTime() {
44	54	return cTime;
45	55	}
46	56
...	...	@@ -153,10 +163,10 @@
153	163	}
154	164	} catch (Exception e) {
155	165	}
	166	+ setAddDueDate(patients.getBuildType()==2?"1":"0");
156	167	setName(patients.getUsername());
157	168	setPhone(patients.getPhone());
158	169	setRemarks(patients.getMremark());
159		- setRiskScore("60");
160	170	if (null != patients.getDueDate()) {
161	171	setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
162	172	}
...	...	@@ -165,7 +175,6 @@
165	175	if (null != patients.getLastMenses()) {
166	176	setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
167	177	}
168		-
169	178
170	179	setcTime(DateUtil.getyyyy_MM_dd(new Date()));
171	180	return this;