jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 35 additions and 8 deletions

...	...	@@ -57,6 +57,17 @@
57	57	//详情
58	58	private String detail;
59	59
	60	+ //转诊状态 0转诊 1待接收 2已转出
	61	+ private Integer referralStatus;
	62	+
	63	+ public Integer getReferralStatus() {
	64	+ return referralStatus;
	65	+ }
	66	+
	67	+ public void setReferralStatus(Integer referralStatus) {
	68	+ this.referralStatus = referralStatus;
	69	+ }
	70	+
60	71	public String getCsRemarkTypeId() {
61	72	return csRemarkTypeId;
62	73	}

...	...	@@ -82,14 +82,30 @@
82	82	sieveListResult.setAge(DateUtil.getAge(patients.getBirth()) + "岁");
83	83	}
84	84
85		-// ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
86		-// referralApplyOrderQuery.setType(2);
87		-// referralApplyOrderQuery.setParentId(sieveModel.getParentId());
88		-// List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
89		-// if (CollectionUtils.isNotEmpty(orderModels))
90		-// {
91		-//
92		-// }
	85	+ //转诊状态 0转诊 1待接收 2已转出
	86	+ Integer referralStatus = 0;
	87	+
	88	+ ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
	89	+ referralApplyOrderQuery.setType(2);
	90	+ referralApplyOrderQuery.setParentId(sieveModel.getParentId());
	91	+ referralApplyOrderQuery.setTransferredHospital(hospitalId);
	92	+ List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
	93	+ if (CollectionUtils.isNotEmpty(orderModels))
	94	+ {
	95	+ ReferralApplyOrderModel model = orderModels.get(0);
	96	+ //申请单状态 0 已接收 1 已转出 2 建议转诊
	97	+ Integer status = model.getStatus();
	98	+ if (status == 0)
	99	+ {
	100	+ referralStatus = 2;
	101	+ }
	102	+ else if (status == 0)
	103	+ {
	104	+ referralStatus = 1;
	105	+ }
	106	+ }
	107	+
	108	+ sieveListResult.setReferralStatus(referralStatus);
93	109
94	110
95	111	results.add(sieveListResult);