jiangjiazhi / regional-platform

Commit dafeb79cc55f26405e9a5f8d9c4d4e2dc6f1e7fb

Authored by [wangbo] over 5 years ago

Exists in master and in 6 other branches

高危转诊bug修改1

Showing 2 changed files with 26 additions and 4 deletions

platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java

...	...	@@ -88,12 +88,23 @@
88	88	* 末次月经
89	89	*/
90	90	private Date lastMensesEnd;
	91	+
	92	+ private Date lastMenses;
91	93	//患者ID
92	94	private List<String> parentIds;
93	95
94	96	//查询号
95	97	private String queryNo;
96	98
	99	+
	100	+ public Date getLastMenses() {
	101	+ return lastMenses;
	102	+ }
	103	+
	104	+ public void setLastMenses(Date lastMenses) {
	105	+ this.lastMenses = lastMenses;
	106	+ }
	107	+
97	108	public String getQueryNo() {
98	109	return queryNo;
99	110	}
...	...	@@ -333,6 +344,11 @@
333	344	if (null != serviceStatus) {
334	345	condition = condition.and("serviceStatus", serviceStatus, MongoOper.IS);
335	346	}
	347	+
	348	+ if (null != lastMenses) {
	349	+ condition = condition.and("lastMenses", lastMenses, MongoOper.IS);
	350	+ }
	351	+
336	352	if (null != status) {
337	353	condition = condition.and("status", status, MongoOper.IS);
338	354	}

...	...	@@ -1364,6 +1364,8 @@
1364	1364
1365	1365	public BaseResponse auditMessages(Integer userId, String id, String state, String reason) {
1366	1366	ReferralApplyOrderModel referralApplyOrderModel = applyOrderService.findByIdReferralApplyOrder(id);
	1367	+
	1368	+ ReferralApplyOrderModel archiveModel = new ReferralApplyOrderModel();
1367	1369	String hospital = autoMatchFacade.getHospitalId(userId);
1368	1370	if (null != referralApplyOrderModel) {
1369	1371	ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
...	...	@@ -1373,10 +1375,14 @@
1373	1375	patients.setEnable("1");
1374	1376	patientsService.updatePatientOne(patients, referralApplyOrderModel.getParentId());
1375	1377	}
1376		- referralApplyOrderQuery.setId(id);
1377		- referralApplyOrderModel.setStatus(Integer.parseInt(state));
1378		- referralApplyOrderModel.setReason(reason);
1379		- applyOrderService.updateByParentId(referralApplyOrderQuery, referralApplyOrderModel);
	1378	+ referralApplyOrderQuery.setPid(referralApplyOrderModel.getPid());
	1379	+ referralApplyOrderQuery.setLastMenses(referralApplyOrderModel.getLastMenses());
	1380	+ referralApplyOrderQuery.setStatus(1);
	1381	+ /* referralApplyOrderQuery.setHospitalId(hospital);
	1382	+ referralApplyOrderQuery.setTransferredHospital(hospital);*/
	1383	+ archiveModel.setStatus(Integer.parseInt(state));
	1384	+ archiveModel.setReason(reason);
	1385	+ applyOrderService.updateByParentId(referralApplyOrderQuery, archiveModel);
1380	1386	}
1381	1387	return new BaseObjectResponse().setData("").setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
1382	1388	}