jiangjiazhi / regional-platform | GitLab

Commit 3822f0713f702e116aa22267bc374fef89073fc0

Authored by liquanyu about 5 years ago

1 parent 31c316a62e

Exists in master and in 6 other branches

儿童听力筛查修改

Showing 3 changed files with 13 additions and 9 deletions

platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java

...	...	@@ -231,10 +231,7 @@
231	231	return Math.abs(result);
232	232	}
233	233	public static void main(String[] args) {
234		- Date startDate = DateUtils.getNewDate(new Date(), -1 - 1, "月", 1);
235		- Date endDate = DateUtils.getNewDate(new Date(), -1, "月",2);
236		- System.out.println(DateUtils.getDateStr(startDate, Y_M_D));
237		- System.out.println(DateUtils.getDateStr(endDate,Y_M_D));
	234	+ System.out.println( getWeekOfDate(new Date()));
238	235	}
239	236	}

...	...	@@ -488,6 +488,17 @@
488	488	//babyId
489	489	String babyPatientId = "";
490	490	if (StringUtils.isNotEmpty(baby.getId())) {//更新本院儿童信息
	491	+
	492	+ BabyModel tempBaby = babyService.getOneBabyById(baby.getId());
	493	+ if (tempBaby != null)
	494	+ {
	495	+ if (tempBaby.getDataStatus() != null && tempBaby.getDataStatus() == 1)
	496	+ {
	497	+ baby.setDataStatus(0);
	498	+ baby.setYn(YnEnums.YES.getId());
	499	+ }
	500	+ }
	501	+
491	502	babyService.updateOneBaby(baby, baby.getId());
492	503	babyPatientId = baby.getId();
493	504	} else {//新增

...	...	@@ -246,11 +246,7 @@
246	246	babyModel.setFproTypeId(fproTypeId);
247	247	babyModel.setFileCode(fileCode);
248	248
249		- if (dataStatus != null && dataStatus == 1)
250		- {
251		- babyModel.setDataStatus(0);
252		- babyModel.setYn(YnEnums.YES.getId());
253		- }
	249	+
254	250
255	251	return babyModel;
256	252	}