jiangjiazhi / regional-platform

Authored by [wangbo] almost 6 years ago

1 parent 24a9441967

Exists in master and in 6 other branches

Showing 4 changed files with 28 additions and 5 deletions

...	...	@@ -94,6 +94,16 @@
94	94	private String diagnosis;
95	95	//其他诊断
96	96	private String otherDiagn;
	97	+ //拒绝原因
	98	+ private String reason;
	99	+
	100	+ public String getReason() {
	101	+ return reason;
	102	+ }
	103	+
	104	+ public void setReason(String reason) {
	105	+ this.reason = reason;
	106	+ }
97	107
98	108	public List<String> getRiskFactorId() {
99	109	return riskFactorId;

...	...	@@ -180,8 +180,8 @@
180	180	@RequestMapping(method = RequestMethod.GET, value = "/auditMessages")
181	181	@TokenRequired
182	182	@ResponseBody
183		- public BaseResponse auditMessages(HttpServletRequest request, String id, String state) {
184		- return applyOrderFacade.auditMessages(getUserId(request), id, state);
	183	+ public BaseResponse auditMessages(HttpServletRequest request, String id, String state, String reason) {
	184	+ return applyOrderFacade.auditMessages(getUserId(request), id, state, reason);
185	185	}
186	186
187	187	}

...	...	@@ -965,7 +965,7 @@
965	965
966	966	applyOrderResult.setrRisk(stringBuilder.toString());
967	967	applyOrderResult.setScore(orderModel.getScore());
968		-
	968	+ applyOrderResult.setReason(StringUtils.isNotEmpty(orderModel.getReason()) ? orderModel.getReason() : "--");
969	969	List rLevel = new ArrayList();
970	970	if (CollectionUtils.isNotEmpty(orderModel.getrLevel())) {
971	971	try {
...	...	@@ -997,6 +997,7 @@
997	997	applyOrderResult.setcDueWeek("已分娩");
998	998	}
999	999	}
	1000	+
1000	1001	data.add(applyOrderResult);
1001	1002	}
1002	1003	}
1003	1004
...	...	@@ -1357,13 +1358,14 @@
1357	1358	}
1358	1359	}
1359	1360
1360		- public BaseResponse auditMessages(Integer userId, String id, String state) {
	1361	+ public BaseResponse auditMessages(Integer userId, String id, String state, String reason) {
1361	1362	ReferralApplyOrderModel referralApplyOrderModel = applyOrderService.findByIdReferralApplyOrder(id);
1362	1363	String hospital = autoMatchFacade.getHospitalId(userId);
1363	1364	if (null != referralApplyOrderModel) {
1364	1365	ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
1365	1366	referralApplyOrderQuery.setId(id);
1366	1367	referralApplyOrderModel.setStatus(Integer.parseInt(state));
	1368	+ referralApplyOrderModel.setReason(reason);
1367	1369	applyOrderService.updateByParentId(referralApplyOrderQuery, referralApplyOrderModel);
1368	1370	}
1369	1371	return new BaseObjectResponse().setData("").setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");

...	...	@@ -71,6 +71,17 @@
71	71
72	72	private String diagnosis;
73	73
	74	+ //拒绝接收的原因
	75	+ private String reason;
	76	+
	77	+ public String getReason() {
	78	+ return reason;
	79	+ }
	80	+
	81	+ public void setReason(String reason) {
	82	+ this.reason = reason;
	83	+ }
	84	+
74	85	public String getDiagnosis() {
75	86	return diagnosis;
76	87	}
...	...	@@ -356,7 +367,7 @@
356	367	setName(destModel.getName());
357	368	setScore(destModel.getScore());
358	369	if (null != destModel.getDueWeek()) {
359		- if (destModel.getpStatus()==1) {
	370	+ if (destModel.getpStatus() == 1) {
360	371	setDueWeek("已分娩");
361	372	setIsGravida("0");
362	373	} else {