jiangjiazhi / regional-platform

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 50 additions and 17 deletions

...	...	@@ -99,8 +99,10 @@
99	99	private String highRiskQt;
100	100	//住院号
101	101	private String zyh;
	102	+
102	103	//住院时间
103		- private Date hospitalDate;
	104	+ private Date hospitalDateStatr;
	105	+ private Date hospitalDateEnd;
104	106	//出院诊断
105	107	private String cyzd;
106	108	//既往检查
107	109
...	...	@@ -475,12 +477,20 @@
475	477	this.zyh = zyh;
476	478	}
477	479
478		- public Date getHospitalDate() {
479		- return hospitalDate;
	480	+ public Date getHospitalDateStatr() {
	481	+ return hospitalDateStatr;
480	482	}
481	483
482		- public void setHospitalDate(Date hospitalDate) {
483		- this.hospitalDate = hospitalDate;
	484	+ public void setHospitalDateStatr(Date hospitalDateStatr) {
	485	+ this.hospitalDateStatr = hospitalDateStatr;
	486	+ }
	487	+
	488	+ public Date getHospitalDateEnd() {
	489	+ return hospitalDateEnd;
	490	+ }
	491	+
	492	+ public void setHospitalDateEnd(Date hospitalDateEnd) {
	493	+ this.hospitalDateEnd = hospitalDateEnd;
484	494	}
485	495
486	496	public String getCyzd() {

...	...	@@ -119,7 +119,8 @@
119	119	model.setHighRiskDiagnose(request.getHighRiskDiagnose());
120	120	model.setHighRiskQt(request.getHighRiskQt());
121	121	model.setZyh(request.getZyh());
122		- model.setHospitalDate(DateUtil.parseYMD(request.getHospitalDate()));
	122	+ model.setHospitalDateStatr(DateUtil.parseYMD(request.getHospitalDateStatr()));
	123	+ model.setHospitalDateEnd(DateUtil.parseYMD(request.getHospitalDateEnd()));
123	124	model.setCyzd(request.getCyzd());
124	125	model.setJwjc(request.getJwjc());
125	126	model.setHeight(request.getHeight());
...	...	@@ -185,6 +186,8 @@
185	186	operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), models, model, OptActionEnums.UPDATE.getId(), "高危儿专科检查");
186	187	}
187	188	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	189	+
	190	+
188	191	}
189	192
190	193	/**

...	...	@@ -102,7 +102,8 @@
102	102	//住院号
103	103	private String zyh;
104	104	//住院时间
105		- private String hospitalDate;
	105	+ private String hospitalDateStatr;
	106	+ private String hospitalDateEnd;
106	107	//出院诊断
107	108	private String cyzd;
108	109	//既往检查
109	110
...	...	@@ -497,12 +498,20 @@
497	498	this.zyh = zyh;
498	499	}
499	500
500		- public String getHospitalDate() {
501		- return hospitalDate;
	501	+ public String getHospitalDateStatr() {
	502	+ return hospitalDateStatr;
502	503	}
503	504
504		- public void setHospitalDate(String hospitalDate) {
505		- this.hospitalDate = hospitalDate;
	505	+ public void setHospitalDateStatr(String hospitalDateStatr) {
	506	+ this.hospitalDateStatr = hospitalDateStatr;
	507	+ }
	508	+
	509	+ public String getHospitalDateEnd() {
	510	+ return hospitalDateEnd;
	511	+ }
	512	+
	513	+ public void setHospitalDateEnd(String hospitalDateEnd) {
	514	+ this.hospitalDateEnd = hospitalDateEnd;
506	515	}
507	516
508	517	public String getCyzd() {

...	...	@@ -97,7 +97,9 @@
97	97	//住院号
98	98	private String zyh;
99	99	//住院时间
100		- private String hospitalDate;
	100	+ private String hospitalDateStatr;
	101	+ private String hospitalDateEnd;
	102	+
101	103	//出院诊断
102	104	private String cyzd;
103	105	//既往检查
104	106
105	107
...	...	@@ -489,14 +491,22 @@
489	491	this.zyh = zyh;
490	492	}
491	493
492		- public String getHospitalDate() {
493		- return hospitalDate;
	494	+ public String getHospitalDateStatr() {
	495	+ return hospitalDateStatr;
494	496	}
495	497
496		- public void setHospitalDate(String hospitalDate) {
497		- this.hospitalDate = hospitalDate;
	498	+ public void setHospitalDateStatr(String hospitalDateStatr) {
	499	+ this.hospitalDateStatr = hospitalDateStatr;
498	500	}
499	501
	502	+ public String getHospitalDateEnd() {
	503	+ return hospitalDateEnd;
	504	+ }
	505	+
	506	+ public void setHospitalDateEnd(String hospitalDateEnd) {
	507	+ this.hospitalDateEnd = hospitalDateEnd;
	508	+ }
	509	+
500	510	public String getCyzd() {
501	511	return cyzd;
502	512	}
...	...	@@ -730,7 +740,8 @@
730	740	// setHighRiskDiagnose(destModel.getHighRiskDiagnose());
731	741	setHighRiskQt(destModel.getHighRiskQt());
732	742	setZyh(destModel.getZyh());
733		- setHospitalDate(DateUtil.getYyyyMmDd(destModel.getHospitalDate()));
	743	+ setHospitalDateStatr(DateUtil.getYyyyMmDd(destModel.getHospitalDateStatr()));
	744	+ setHospitalDateEnd(DateUtil.getYyyyMmDd(destModel.getHospitalDateEnd()));
734	745	setCyzd(destModel.getCyzd());
735	746	setJwjc(destModel.getJwjc());
736	747	setHeight(destModel.getHeight());