jiangjiazhi / regional-platform

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 18 additions and 3 deletions

...	...	@@ -88,6 +88,9 @@
88	88	model.setModifyDate(new Date());
89	89	//createDate,hospitalId调用外添加赋值
90	90	}
	91	+ if(StringUtils.isEmpty(babyModel.getMname())){
	92	+ model.setMname(request.getMname());
	93	+ }
91	94	model.setMage(request.getMage());
92	95	model.setJwrss(request.getJwrss());
93	96	model.setBirthDueDate(DateUtil.parseYMD(request.getBirthDueDate()));

...	...	@@ -735,7 +735,11 @@
735	735	//checkDoctor
736	736	setNextDate(DateUtil.getYyyyMmDd(destModel.getNextDate()));
737	737	setCaseClosed(destModel.getCaseClosed());
738		- setcCDate(DateUtil.getYyyyMmDd(destModel.getcCDate()));
	738	+ if("2".equals(destModel.getCaseClosed())){
	739	+ setcCDate("");
	740	+ }else {
	741	+ setcCDate(DateUtil.getYyyyMmDd(destModel.getcCDate()));
	742	+ }
739	743	setNumber(destModel.getNumber());
740	744	// setHighRiskDiagnose(destModel.getHighRiskDiagnose());
741	745	setHighRiskQt(destModel.getHighRiskQt());

...	...	@@ -701,7 +701,11 @@
701	701	//checkDoctor
702	702	setNextDate(DateUtil.getYyyyMmDd(destModel.getNextDate()));
703	703	setCaseClosed(destModel.getCaseClosed());
704		- setcCDate(DateUtil.getYyyyMmDd(destModel.getcCDate()));
	704	+ if("2".equals(destModel.getCaseClosed())){
	705	+ setcCDate("");
	706	+ }else {
	707	+ setcCDate(DateUtil.getYyyyMmDd(destModel.getcCDate()));
	708	+ }
705	709	setcCOutcome(destModel.getcCOutcome());
706	710	setStartMdate(destModel.getStartMdate());
707	711	setBirthHistory(destModel.getBirthHistory());
...	...	@@ -778,7 +782,11 @@
778	782	//checkDoctor
779	783	setNextDate(DateUtil.getYyyyMmDd(destModel.getNextDate()));
780	784	setCaseClosed(destModel.getCaseClosed());
781		- setcCDate(DateUtil.getYyyyMmDd(destModel.getcCDate()));
	785	+ if("2".equals(destModel.getCaseClosed())){
	786	+ setcCDate("");
	787	+ }else {
	788	+ setcCDate(DateUtil.getYyyyMmDd(destModel.getcCDate()));
	789	+ }
782	790	setcCOutcome(destModel.getcCOutcome());
783	791	setStartMdate(destModel.getStartMdate());
784	792	//出生史