jiangjiazhi / regional-platform

Authored by liquanyu about 1 year ago

Exists in dev

Showing 2 changed files with 34 additions and 2 deletions

...	...	@@ -73,7 +73,27 @@
73	73
74	74	//拒绝接收的原因
75	75	private String reason;
	76	+ //转入科室
	77	+ private String transferredDepartment;
	78	+ //转出科室
	79	+ private String outDepartment;
76	80
	81	+ public String getTransferredDepartment() {
	82	+ return transferredDepartment;
	83	+ }
	84	+
	85	+ public void setTransferredDepartment(String transferredDepartment) {
	86	+ this.transferredDepartment = transferredDepartment;
	87	+ }
	88	+
	89	+ public String getOutDepartment() {
	90	+ return outDepartment;
	91	+ }
	92	+
	93	+ public void setOutDepartment(String outDepartment) {
	94	+ this.outDepartment = outDepartment;
	95	+ }
	96	+
77	97	public String getReason() {
78	98	return reason;
79	99	}
...	...	@@ -400,6 +420,8 @@
400	420	setCardNo(destModel.getCardNo());
401	421	setPhone(StringUtils.encryPhone(destModel.getPhone()));
402	422	setRealPhone(destModel.getPhone());
	423	+ setOutDepartment(destModel.getOutDepartment());
	424	+ setTransferredDepartment(destModel.getTransferredDepartment());
403	425	return this;
404	426	}
405	427	}

...	...	@@ -72,7 +72,17 @@
72	72	private List diagnosis;
73	73	//其他诊断
74	74	private String otherDiagn;
	75	+ //转出科室
	76	+ private String outDepartment;
75	77
	78	+ public String getOutDepartment() {
	79	+ return outDepartment;
	80	+ }
	81	+
	82	+ public void setOutDepartment(String outDepartment) {
	83	+ this.outDepartment = outDepartment;
	84	+ }
	85	+
76	86	public Map getRecDoctor() {
77	87	return recDoctor;
78	88	}
...	...	@@ -294,8 +304,8 @@
294	304	setTransferredDisease(destModel.getTransferredDisease());
295	305	setPotentialRisk(destModel.getPotentialRisk());
296	306	setTransferMode(destModel.getTransferMode());
297		-
298		-
	307	+ setTransferredDepartment(destModel.getTransferredDepartment());
	308	+ setOutDepartment(destModel.getOutDepartment());
299	309	setZhuanCName(zhuanCName);
300	310	setZhuanRname(zhuanRname);
301	311	if(null!=patients){