jiangjiazhi / regional-platform

Commit eb31871dc7d22571ee66fc617f01fd8fd3aadf0d

Authored by jiangjiazhi almost 9 years ago

Exists in master and in 8 other branches

增加是否通知

Showing 3 changed files with 71 additions and 16 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java

...	...	@@ -199,13 +199,19 @@
199	199	if(CollectionUtils.isNotEmpty(orderModels)){
200	200	for(ReferralApplyOrderModel applyOrderModel:orderModels){
201	201	BabyApplyOrderResult babyApplyOrderResult=new BabyApplyOrderResult();
202		- babyApplyOrderResult.convert(applyOrderModel);
203		- if(StringUtils.isNotEmpty(applyOrderModel.getTransferredHospital())){
204		- Organization organization = organizationService.getOrganization(Integer.valueOf(applyOrderModel.getTransferredHospital()));
205		- if(null!=organization){
206		- babyApplyOrderResult.setTransferredHospital(organization.getName());
207		- }
	202	+
	203	+ String zhuanchu =applyOrderModel.getOutHospitalId();
	204	+ Organization zhuanc =organizationService.getOrganization(Integer.valueOf(zhuanchu));
	205	+ String zhuanCName=""; String zhuanRname="";
	206	+ if(null!=zhuanc){
	207	+ zhuanCName= zhuanc.getName();
208	208	}
	209	+ Organization zhuanc1 =organizationService.getOrganization(Integer.valueOf(zhuanchu));
	210	+ if(null!=zhuanc1){
	211	+ zhuanRname =zhuanc1.getName();
	212	+ }
	213	+
	214	+ babyApplyOrderResult.convert(applyOrderModel,zhuanCName,zhuanRname);
209	215	babyApplyOrderResults.add(babyApplyOrderResult);
210	216	}
211	217	}
212	218
...	...	@@ -251,13 +257,17 @@
251	257	if (CollectionUtils.isNotEmpty(orderModels)) {
252	258	for (ReferralApplyOrderModel orderModel : orderModels) {
253	259	ApplyOrderOutResult applyOrderResult = new ApplyOrderOutResult();
254		- applyOrderResult.convertToResult(orderModel);
255		- if(StringUtils.isNotEmpty(orderModel.getTransferredHospital())){
256		- Organization organization = organizationService.getOrganization(Integer.valueOf(orderModel.getTransferredHospital()));
257		- if(null!=organization){
258		- applyOrderResult.setTransferredHospital(organization.getName());
259		- }
	260	+ String zhuanchu =orderModel.getOutHospitalId();
	261	+ Organization zhuanc =organizationService.getOrganization(Integer.valueOf(zhuanchu));
	262	+ String zhuanCName=""; String zhuanRname="";
	263	+ if(null!=zhuanc){
	264	+ zhuanCName= zhuanc.getName();
260	265	}
	266	+ Organization zhuanc1 =organizationService.getOrganization(Integer.valueOf(zhuanchu));
	267	+ if(null!=zhuanc1){
	268	+ zhuanRname =zhuanc1.getName();
	269	+ }
	270	+ applyOrderResult.convertToResult(orderModel,zhuanCName,zhuanRname);
261	271
262	272	data.add(applyOrderResult);
263	273	}

...	...	@@ -12,7 +12,7 @@
12	12	* 高危转诊(转出)
13	13	* Created by Administrator on 2016/6/27 0027.
14	14	*/
15		-public class ApplyOrderOutResult implements IBasicResultConvert<ApplyOrderOutResult,ReferralApplyOrderModel> {
	15	+public class ApplyOrderOutResult {
16	16	private String id;
17	17	//名字
18	18	private String name;
...	...	@@ -47,6 +47,27 @@
47	47	private String created;
48	48	private String status;
49	49
	50	+ //转出医院
	51	+ private String zhuanCName;
	52	+ //转入医院
	53	+ private String zhuanRname;
	54	+
	55	+ public String getZhuanCName() {
	56	+ return zhuanCName;
	57	+ }
	58	+
	59	+ public void setZhuanCName(String zhuanCName) {
	60	+ this.zhuanCName = zhuanCName;
	61	+ }
	62	+
	63	+ public String getZhuanRname() {
	64	+ return zhuanRname;
	65	+ }
	66	+
	67	+ public void setZhuanRname(String zhuanRname) {
	68	+ this.zhuanRname = zhuanRname;
	69	+ }
	70	+
50	71	public String getPhone() {
51	72	return phone;
52	73	}
...	...	@@ -199,8 +220,9 @@
199	220	this.transferredDisease = transferredDisease;
200	221	}
201	222
202		- @Override
203		- public ApplyOrderOutResult convertToResult(ReferralApplyOrderModel destModel) {
	223	+ public ApplyOrderOutResult convertToResult(ReferralApplyOrderModel destModel,String zhuanCName,String zhuanRname) {
	224	+ setZhuanCName(zhuanCName);
	225	+ setZhuanRname(zhuanRname);
204	226	setId(destModel.getId());
205	227	setName(destModel.getName());
206	228	setScore(destModel.getScore());

...	...	@@ -39,6 +39,27 @@
39	39	private String phone;
40	40	private String babyId;
41	41
	42	+ //转出医院
	43	+ private String zhuanCName;
	44	+ //转入医院
	45	+ private String zhuanRname;
	46	+
	47	+ public String getZhuanCName() {
	48	+ return zhuanCName;
	49	+ }
	50	+
	51	+ public void setZhuanCName(String zhuanCName) {
	52	+ this.zhuanCName = zhuanCName;
	53	+ }
	54	+
	55	+ public String getZhuanRname() {
	56	+ return zhuanRname;
	57	+ }
	58	+
	59	+ public void setZhuanRname(String zhuanRname) {
	60	+ this.zhuanRname = zhuanRname;
	61	+ }
	62	+
42	63	public String getBabyId() {
43	64	return babyId;
44	65	}
...	...	@@ -47,7 +68,9 @@
47	68	this.babyId = babyId;
48	69	}
49	70
50		- public BabyApplyOrderResult convert(ReferralApplyOrderModel referralApplyOrderModel) {
	71	+ public BabyApplyOrderResult convert(ReferralApplyOrderModel referralApplyOrderModel, String zhuanCName,String zhuanRname) {
	72	+ setZhuanRname(zhuanRname);
	73	+ setZhuanCName(zhuanCName);
51	74	setId(referralApplyOrderModel.getId());
52	75	setName(referralApplyOrderModel.getName());
53	76	setBabyId(referralApplyOrderModel.getParentId());