jiangjiazhi / regional-platform

Authored by [wangbo] over 6 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 34 additions and 10 deletions

...	...	@@ -22,20 +22,22 @@
22	22	*/
23	23	public interface ITrackDownRecordDao {
24	24
25		- TrackDownRecord addTrackDown(TrackDownRecord downRecord);
	25	+ TrackDownRecord addTrackDown(TrackDownRecord downRecord);
26	26
27		- void updateTrackDown(TrackDownRecord obj, String id);
	27	+ void updateTrackDown(TrackDownRecord obj, String id);
28	28
29		- void deleteTrackDown(String id);
	29	+ void updateTrackDownPaparent(TrackDownRecord obj, String patientId);
30	30
31		- TrackDownRecord getTrackDown(String id);
	31	+ void deleteTrackDown(String id);
32	32
33		- int queryTrackDownCount(MongoQuery query);
	33	+ TrackDownRecord getTrackDown(String id);
34	34
35		- List<TrackDownRecord> queryTrackDown(MongoQuery query);
	35	+ int queryTrackDownCount(MongoQuery query);
36	36
37		- Page<TrackDownRecord> findPage(MongoQuery query);
	37	+ List<TrackDownRecord> queryTrackDown(MongoQuery query);
38	38
39		- void findAndModify(MongoQuery query, TrackDownRecord obj);
	39	+ Page<TrackDownRecord> findPage(MongoQuery query);
	40	+
	41	+ void findAndModify(MongoQuery query, TrackDownRecord obj);
40	42	}

...	...	@@ -38,6 +38,7 @@
38	38	public void findAndModify(MongoQuery query, TrackDownRecord obj) {
39	39	updateMulti(query.convertToMongoQuery(), obj);
40	40	}
	41	+
41	42	@Override
42	43	public TrackDownRecord addTrackDown(TrackDownRecord downRecord) {
43	44	return save(downRecord);
...	...	@@ -46,6 +47,11 @@
46	47	@Override
47	48	public void updateTrackDown(TrackDownRecord obj, String id) {
48	49	update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj);
	50	+ }
	51	+
	52	+ @Override
	53	+ public void updateTrackDownPaparent(TrackDownRecord obj, String patientId) {
	54	+ update(new MongoQuery(new MongoCondition("parentId", patientId, MongoOper.IS)).convertToMongoQuery(), obj);
49	55	}
50	56
51	57	@Override

...	...	@@ -82,6 +82,10 @@
82	82	iTrackDownRecordDao.updateTrackDown(obj, id);
83	83	}
84	84
	85	+ public void updateTrackDownParent(TrackDownRecord obj, String parentId) {
	86	+ iTrackDownRecordDao.updateTrackDownPaparent(obj, parentId);
	87	+ }
	88	+
85	89	public void deleteTrackDown(String id) {
86	90	iTrackDownRecordDao.deleteTrackDown(id);
87	91	}

...	...	@@ -135,7 +135,6 @@
135	135	/**
136	136	* 孕妇追访管理历史数据处理
137	137	*/
138		-
139	138	@RequestMapping(value = "/historyData", method = RequestMethod.GET)
140	139	public void historyData(Date startTime, Date endTime) {
141	140	downFacade.historyData(startTime, endTime);

...	...	@@ -366,7 +366,12 @@
366	366	sieveDao.updateChanQianSieve(sieveModel);
367	367	}
368	368	}
369		-
	369	+ /*修改孕妇追访管理修改/
	370	+ if (StringUtils.isNotEmpty(antExAddRequest.getNextCheckTime()) && StringUtils.isNotEmpty(antExAddRequest.getParentId())) {
	371	+ TrackDownRecord trackDownRecord = new TrackDownRecord();
	372	+ trackDownRecord.setAppointmentDate(DateUtil.parseYMD(antExAddRequest.getNextCheckTime()));
	373	+ trackDownRecordService.updateTrackDownParent(trackDownRecord, antExAddRequest.getParentId());
	374	+ }
370	375	antenatalExaminationService.addOneBabyAnt(model);
371	376
372	377	/** 验证产检券是否可用可用就改为已使用状态 */
...	...	@@ -650,6 +655,14 @@
650	655	antExChuModel.setYn(YnEnums.YES.getId());
651	656	antExChuModel.setHospitalId(hospitalId);
652	657	stopWatch.start("queryAntExChu");
	658	+
	659	+
	660	+ /*孕妇追访功能下次预约时间修改/
	661	+ if (StringUtils.isNotEmpty(excAddRequest.getNextCheckTime()) && StringUtils.isNotEmpty(excAddRequest.getParentId())) {
	662	+ TrackDownRecord trackDownRecord = new TrackDownRecord();
	663	+ trackDownRecord.setAppointmentDate(DateUtil.parseYMD(excAddRequest.getNextCheckTime()));
	664	+ trackDownRecordService.updateTrackDownParent(trackDownRecord, excAddRequest.getParentId());
	665	+ }
653	666	antenatalExaminationService.addOneAntEx(antExChuModel);
654	667	excAddRequest.setId(antExChuModel.getId());
655	668