jiangjiazhi / regional-platform

Commit 47f8143e265475bc1b115eae7be419b9ede98e26

Authored by liquanyu over 5 years ago

1 parent 89c1957ad7

Exists in master and in 6 other branches

update

Showing 2 changed files with 51 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java

...	...	@@ -74,6 +74,22 @@
74	74
75	75	private Boolean isOpinion;
76	76
	77	+ public Date getNextCheckTimeStart() {
	78	+ return nextCheckTimeStart;
	79	+ }
	80	+
	81	+ public void setNextCheckTimeStart(Date nextCheckTimeStart) {
	82	+ this.nextCheckTimeStart = nextCheckTimeStart;
	83	+ }
	84	+
	85	+ public Date getNextCheckTimeEnd() {
	86	+ return nextCheckTimeEnd;
	87	+ }
	88	+
	89	+ public void setNextCheckTimeEnd(Date nextCheckTimeEnd) {
	90	+ this.nextCheckTimeEnd = nextCheckTimeEnd;
	91	+ }
	92	+
77	93	public Boolean getIsOpinion() {
78	94	return isOpinion;
79	95	}
...	...	@@ -676,6 +692,23 @@
676	692	c = Criteria.where("checkTime").lte(checkTimeEnd);
677	693	}
678	694	}
	695	+
	696	+ if (null != nextCheckTimeStart) {
	697	+ if (null != c) {
	698	+ c = c.and("nextCheckTime").gte(nextCheckTimeStart);
	699	+ } else {
	700	+ c = Criteria.where("nextCheckTime").gte(nextCheckTimeStart);
	701	+ }
	702	+ }
	703	+
	704	+ if (null != nextCheckTimeEnd) {
	705	+ if (null != c) {
	706	+ c = c.lte(nextCheckTimeEnd);
	707	+ } else {
	708	+ c = Criteria.where("nextCheckTime").lte(nextCheckTimeEnd);
	709	+ }
	710	+ }
	711	+
679	712	if (null != checkTimeLt) {
680	713	if (null != c) {
681	714	c = c.lt(checkTimeLt);

1	1	package com.lyms.platform.operate.web.facade;
2	2
	3	+import com.lyms.platform.biz.service.BabyBookbuildingService;
3	4	import com.lyms.platform.biz.service.ChargeRecordService;
4	5	import com.lyms.platform.biz.service.HealthChargeService;
5	6	import com.lyms.platform.biz.service.PatientsService;
...	...	@@ -53,6 +54,9 @@
53	54	@Autowired
54	55	private UsersService usersService;
55	56
	57	+ @Autowired
	58	+ private BabyBookbuildingService babyBookbuildingService;
	59	+
56	60	/**
57	61	* 新增字段：报表解读人孕妇/儿童
58	62	*
59	63
60	64
...	...	@@ -263,16 +267,25 @@
263	267	Patients patients = patientsService.findOnePatientById(model.getForeignId());
264	268	if (patients == null)
265	269	{
266		- return null;
	270	+ BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getForeignId());
	271	+ if (babyModel == null)
	272	+ {
	273	+ return null;
	274	+ }
	275	+ map.put("userName",babyModel.getName());
	276	+ map.put("age", DateUtil.getBabyMonthAge(babyModel.getBirth(), model.getCreated()));
267	277	}
268		- map.put("userName", patients.getUsername());
269		- map.put("age",DateUtil.getAge(patients.getBirth(), model.getCreated()));
270		- map.put("week",patients.getType() == 3 ? "已分娩": DateUtil.getWeekDesc(patients.getLastMenses(),model.getCreated()));
	278	+ else
	279	+ {
	280	+ map.put("userName", patients.getUsername());
	281	+ map.put("age",DateUtil.getAge(patients.getBirth(), model.getCreated()));
	282	+ map.put("week",patients.getType() == 3 ? "已分娩": DateUtil.getWeekDesc(patients.getLastMenses(),model.getCreated()));
	283	+ }
271	284	}
272	285	else
273	286	{
274	287	//获取临时用户信息
275		- getTemporaryUserInfo(map,model.getForeignId(),model.getCreated());
	288	+ getTemporaryUserInfo(map, model.getForeignId(), model.getCreated());
276	289	}
277	290	map.put("status", model.getStatus() == 1 ? "未结算" : "已结算");
278	291	map.put("type", model.getType() == 1 ? "标准报告" : "高危报告");