jiangjiazhi / regional-platform

Commit 8093ce720fb1e749aac34fad1477b5d879fe5ef0

Authored by [wangbo] over 6 years ago

Exists in master and in 6 other branches

孕妇追访bug1修改

Showing 5 changed files with 17 additions and 12 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java
platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java

...	...	@@ -6,7 +6,6 @@
6	6	import org.springframework.data.mongodb.core.mapping.Document;
7	7
8	8	import java.util.Date;
9		-import java.util.Map;
10	9
11	10	/**
12	11	* 居民健康档案(妇女健康 )模型
...	...	@@ -831,6 +830,7 @@
831	830	record.setStatus(1);
832	831	record.setSex(sex);
833	832	record.setTrackType(TrackDownDateEnums.A.getId());
	833	+ record.setWomanBuildTime(buildDay);
834	834	return record;
835	835	}
836	836	}

...	...	@@ -46,6 +46,7 @@
46	46	private String parentId;
47	47	//妇女建档id
48	48	private String residentsArchiveId;
	49	+ private Date womanBuildTime;
49	50	private String pid;
50	51	private Date modified;
51	52	private String hospitalId;
...	...	@@ -64,6 +65,14 @@
64	65
65	66	//是否终止流程
66	67	private String stop;
	68	+
	69	+ public Date getWomanBuildTime() {
	70	+ return womanBuildTime;
	71	+ }
	72	+
	73	+ public void setWomanBuildTime(Date womanBuildTime) {
	74	+ this.womanBuildTime = womanBuildTime;
	75	+ }
67	76
68	77	public String getStop() {
69	78	return stop;

...	...	@@ -412,16 +412,16 @@
412	412
413	413	if (null != foundStart) {
414	414	if (null != c1) {
415		- c1 = c1.and("created").gte(foundStart);
	415	+ c1 = c1.and("womanBuildTime").gte(foundStart);
416	416	} else {
417		- c1 = Criteria.where("created").gte(foundStart);
	417	+ c1 = Criteria.where("womanBuildTime").gte(foundStart);
418	418	}
419	419	}
420	420	if (null != foundEnd) {
421	421	if (c1 != null) {
422	422	c1 = c1.lte(foundEnd);
423	423	} else {
424		- c1 = Criteria.where("created").lte(foundEnd);
	424	+ c1 = Criteria.where("womanBuildTime").lte(foundEnd);
425	425	}
426	426	}
427	427

...	...	@@ -471,8 +471,8 @@
471	471	downRecordQuery.setNeed("1");
472	472	// downRecordQuery.setSort("modified desc");
473	473	downRecordQuery.setHospitalId(hospitalId);
474		- System.out.println("====>" + downRecordQuery.convertToQuery().convertToMongoQuery());
475	474
	475	+
476	476	return downRecordQuery;
477	477	}
478	478
...	...	@@ -637,10 +637,6 @@
637	637	List<TrackDownRecord> downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery);
638	638	List<Map> data = new ArrayList<>();
639	639	TrackDownTypeHandler downTypeHandler = trackDownTypeHandlerMap.get(downQueryRequest.getTrackType());
640		- /*临时处理/
641		- if (null == downQueryRequest.getEncryption()) {
642		- downQueryRequest.setEncryption(0);
643		- }
644	640	if (CollectionUtils.isNotEmpty(downRecordList) && null != downTypeHandler) {
645	641	for (TrackDownRecord trackDownRecord : downRecordList) {
646	642	//追访类型
...	...	@@ -821,7 +817,7 @@
821	817	// 预约时间
822	818	temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate()));
823	819	//孕妇建档日期
824		- temp.put("womanCreatedTime", downRecord.getCreated());
	820	+ temp.put("womanCreatedTime", downRecord.getWomanBuildTime());
825	821	return temp;
826	822	}
827	823	}
...	...	@@ -857,7 +853,7 @@
857	853
858	854
859	855	//孕妇建档时间
860		- temp.put("womanCreatedTime", DateUtil.getyyyy_MM_dd(downRecord.getCreated()));
	856	+ temp.put("womanCreatedTime", downRecord.getWomanBuildTime() == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getWomanBuildTime()));
861	857	return temp;
862	858	}
863	859	}

...	...	@@ -51,7 +51,7 @@
51	51	*/
52	52	//妇女建档开始日期
53	53	private Date foundDateStart;
54		- //结束日期
	54	+ //妇女建档结束日期
55	55	private Date foundDateEnd;
56	56
57	57	//预约开始追访日期