jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 37 additions and 2 deletions

...	...	@@ -210,6 +210,10 @@
210	210
211	211	//分娩孕周
212	212	private Integer dueWeek;
	213	+
	214	+ //分娩孕周整周后的天
	215	+ private Integer dueDay;
	216	+
213	217	//0-转诊待接收 0-转诊待接收 1-转诊已接收 2-孕妇或儿童区域下隐藏建档，默认是母档案为null
214	218	private String enable;
215	219	//操作人
...	...	@@ -315,6 +319,14 @@
315	319	private boolean jxXtx;
316	320	//其他(写明病名并详细描述)
317	321	private Map<String,Object> jxOther;
	322	+
	323	+ public Integer getDueDay() {
	324	+ return dueDay;
	325	+ }
	326	+
	327	+ public void setDueDay(Integer dueDay) {
	328	+ this.dueDay = dueDay;
	329	+ }
318	330
319	331	public Integer getDataStatus() {
320	332	return dataStatus;

...	...	@@ -1188,6 +1188,7 @@
1188	1188	}
1189	1189
1190	1190	bm.setDueWeek(b.getDueWeek());
	1191	+ bm.setDueDay(b.getDueDay());
1191	1192	bm.setBabyDiagnosis(b.getBabyDiagnosis());
1192	1193	bm.setBlNo(b.getBlNo());
1193	1194
...	...	@@ -1426,6 +1427,7 @@
1426	1427	result.setBabyDiagnosis(model.getBabyDiagnosis());
1427	1428	result.setBlNo(model.getBlNo());
1428	1429	result.setDueWeek(model.getDueWeek());
	1430	+ result.setDueDay(model.getDueDay());
1429	1431
1430	1432	if (StringUtils.isNotEmpty(model.getDeliverOrg()))
1431	1433	{

...	...	@@ -300,6 +300,10 @@
300	300	//分娩孕周
301	301	private Integer dueWeek;
302	302
	303	+
	304	+ //分娩孕周整周后的天
	305	+ private Integer dueDay;
	306	+
303	307	//儿童诊断
304	308	private String babyDiagnosis;
305	309
306	310
...	...	@@ -310,10 +314,16 @@
310	314
311	315	private Integer couponType;
312	316
313		-
314	317	//档案编号滦平需求
315	318	private String fileCode;
316	319
	320	+ public Integer getDueDay() {
	321	+ return dueDay;
	322	+ }
	323	+
	324	+ public void setDueDay(Integer dueDay) {
	325	+ this.dueDay = dueDay;
	326	+ }
317	327
318	328	public String getNbnaNum() {
319	329	return nbnaNum;

...	...	@@ -252,6 +252,9 @@
252	252	private Integer dueWeek;
253	253
254	254
	255	+ //分娩孕周整周后的天
	256	+ private Integer dueDay;
	257	+
255	258	//儿童诊断
256	259	private String babyDiagnosis;
257	260
...	...	@@ -267,6 +270,14 @@
267	270
268	271	//显示服务信息
269	272	private List<PatientSerResult> patientSerResults;
	273	+
	274	+ public Integer getDueDay() {
	275	+ return dueDay;
	276	+ }
	277	+
	278	+ public void setDueDay(Integer dueDay) {
	279	+ this.dueDay = dueDay;
	280	+ }
270	281
271	282	public String getNbnaNum() {
272	283	return nbnaNum;

...	...	@@ -994,7 +994,7 @@
994	994
995	995	if (destModel.getDueWeek() != null)
996	996	{
997		- setDueWeek(destModel.getDueWeek() + "周");
	997	+ setDueWeek(destModel.getDueWeek() + "周" + (destModel.getDueDay() != null ? String.valueOf(destModel.getDueDay()) +"天" : ""));
998	998	}
999	999
1000	1000	setDueType(FmTypeEnums.getFmNameById(destModel.getDueType()));