jiangjiazhi / regional-platform

Commit dbd50f594eeec3e8df4551afe643db7782276bc0

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

update code

Showing 5 changed files with 58 additions and 20 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/TrackCountRecord.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java

...	...	@@ -17,6 +17,7 @@
17	17
18	18	private String id;
19	19	private String hospitalId;
	20	+ private String pid;
20	21	private String patientId;
21	22	//预约产检状态
22	23	private Integer orderStatus;
...	...	@@ -39,6 +40,14 @@
39	40	private Date nextCheckTime;
40	41	private Date created;
41	42	private Date modified;
	43	+
	44	+ public String getPid() {
	45	+ return pid;
	46	+ }
	47	+
	48	+ public void setPid(String pid) {
	49	+ this.pid = pid;
	50	+ }
42	51
43	52	public Date getNextCheckTime() {
44	53	return nextCheckTime;

...	...	@@ -197,11 +197,11 @@
197	197	*查询处方计划配置项c
198	198	* @return
199	199	*/
200		- @RequestMapping(method = RequestMethod.GET, value = "/queryCheckItemConfig")
	200	+ @RequestMapping(method = RequestMethod.GET, value = "/queryCheckItemConfig/{hospitalId}")
201	201	@ResponseBody
202	202	@TokenRequired
203		- public BaseResponse queryCheckItemConfig( HttpServletRequest request) {
204		- return basicConfigFacade.queryCheckItemConfig(getUserId(request));
	203	+ public BaseResponse queryCheckItemConfig(@PathVariable String hospitalId, HttpServletRequest request) {
	204	+ return basicConfigFacade.queryCheckItemConfig(hospitalId);
205	205	}
206	206
207	207	/**
208	208
...	...	@@ -248,11 +248,11 @@
248	248	* @param request
249	249	* @return
250	250	*/
251		- @RequestMapping(method = RequestMethod.GET, value = "/queryTrackDayConfig")
	251	+ @RequestMapping(method = RequestMethod.GET, value = "/queryTrackDayConfig/{hospitalId}")
252	252	@ResponseBody
253	253	@TokenRequired
254		- public BaseResponse queryTrackDayConfig( HttpServletRequest request) {
255		- return basicConfigFacade.queryTrackDayConfig(getUserId(request));
	254	+ public BaseResponse queryTrackDayConfig(@PathVariable String hospitalId, HttpServletRequest request) {
	255	+ return basicConfigFacade.queryTrackDayConfig(hospitalId);
256	256	}
257	257
258	258

...	...	@@ -1156,9 +1156,44 @@
1156	1156	} catch (Exception e) {
1157	1157	e.printStackTrace();
1158	1158	}
	1159	+
	1160	+ try {
	1161	+ //追访统计
	1162	+ saveTrackCount(DateUtil.parseYMD(excAddRequest.getNextCheckTime()), patients);
	1163	+ } catch (Exception e) {
	1164	+ e.printStackTrace();
	1165	+ }
1159	1166	}
1160	1167	});
1161	1168	}
	1169	+
	1170	+ public void saveTrackCount(Date nextCheckTime,Patients patients)
	1171	+ {
	1172	+ AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
	1173	+ antExRecordQuery.setPid(patients.getPid());
	1174	+ List<AntExRecordModel> recordModels = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "checkTime");
	1175	+ if (CollectionUtils.isNotEmpty(recordModels))
	1176	+ {
	1177	+ AntExRecordModel recordModel = recordModels.get(0);
	1178	+// if ()
	1179	+// {
	1180	+//
	1181	+// }
	1182	+ }
	1183	+ }
	1184	+
	1185	+ public void updateTrackCount(Date nextCheckTime,Patients patients)
	1186	+ {
	1187	+ AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
	1188	+ antExRecordQuery.setPid(patients.getPid());
	1189	+ List<AntExRecordModel> recordModels = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "checkTime");
	1190	+ if (CollectionUtils.isNotEmpty(recordModels))
	1191	+ {
	1192	+ AntExRecordModel recordModel = recordModels.get(0);
	1193	+
	1194	+ }
	1195	+ }
	1196	+
1162	1197	public void saveCheckItem(Date nextCheckTime,Patients patients)
1163	1198	{
1164	1199	List<CheckItemConfig> itemConfigs = mongoTemplate.find(Query.query(Criteria.where("hospitalId").is(patients.getHospitalId())), CheckItemConfig.class);

...	...	@@ -584,16 +584,13 @@
584	584	return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
585	585	}
586	586
587		- public BaseResponse queryCheckItemConfig(Integer userId) {
588		- String hospitalId = autoMatchFacade.getHospitalId(userId);
	587	+ public BaseResponse queryCheckItemConfig(String hospitalId) {
589	588	List<CheckItemConfig> itemConfigs = mongoTemplate.find(Query.query(Criteria.where("hospitalId").is(hospitalId)), CheckItemConfig.class);
590	589
591	590	return new BaseObjectResponse().setData(itemConfigs).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
592	591	}
593	592
594	593	public BaseResponse addCheckItemConfig(CheckItemConfig itemConfig,Integer userId) {
595		- String hospitalId = autoMatchFacade.getHospitalId(userId);
596		- itemConfig.setHospitalId(hospitalId);
597	594	itemConfig.setCreated(new Date());
598	595	itemConfig.setModified(new Date());
599	596	mongoTemplate.save(itemConfig);
600	597
...	...	@@ -616,15 +613,12 @@
616	613	mongoTemplate.updateFirst(query, update, TrackDayConfig.class);
617	614	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
618	615	}
619		- String hospitalId = autoMatchFacade.getHospitalId(userId);
620		- trackDayConfig.setHospitalId(hospitalId);
621	616	trackDayConfig.setCreated(new Date());
622	617	mongoTemplate.save(trackDayConfig);
623	618	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
624	619	}
625	620
626		- public BaseResponse queryTrackDayConfig(Integer userId) {
627		- String hospitalId = autoMatchFacade.getHospitalId(userId);
	621	+ public BaseResponse queryTrackDayConfig(String hospitalId) {
628	622	TrackDayConfig trackDayConfig = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").is(hospitalId)), TrackDayConfig.class);
629	623	return new BaseObjectResponse().setData(trackDayConfig).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
630	624	}

...	...	@@ -24,6 +24,7 @@
24	24	import com.lyms.platform.query.*;
25	25	import com.mongodb.BasicDBObject;
26	26	import com.mongodb.DBObject;
	27	+import net.sf.json.JSONObject;
27	28	import org.apache.commons.collections.CollectionUtils;
28	29	import org.slf4j.Logger;
29	30	import org.slf4j.LoggerFactory;
30	31
31	32
...	...	@@ -1280,15 +1281,15 @@
1280	1281	long orderCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end))), TrackCountRecord.class);
1281	1282	data.put("orderCount",String.valueOf(orderCount));
1282	1283
1283		- long oneTrackCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("oneTrackStatus").is(1)), TrackCountRecord.class);
1284		- data.put("oneTrackCount",String.valueOf(oneTrackCount));
	1284	+ long oneTrackCount = orderCount * 2;
	1285	+ data.put("oneTrackCount", String.valueOf(oneTrackCount));
1285	1286
1286		- long twoTrackCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("twoTrackStatus").is(1)), TrackCountRecord.class);
1287		- data.put("twoTrackCount",String.valueOf(twoTrackCount));
1288		-
1289	1287	long zsCheckCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("zsCheckStatus").is(1)), TrackCountRecord.class);
1290	1288	data.put("zsCheckCount",String.valueOf(zsCheckCount));
1291	1289
	1290	+ long twoTrackCount = orderCount - zsCheckCount;
	1291	+ data.put("twoTrackCount",String.valueOf(twoTrackCount));
	1292	+
1292	1293	long jsCheckCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("jsCheckStatus").is(1)), TrackCountRecord.class);
1293	1294	data.put("jsCheckCount",String.valueOf(jsCheckCount));
1294	1295
...	...	@@ -1323,7 +1324,6 @@
1323	1324	}
1324	1325	return total;
1325	1326	}
1326		-
1327	1327
1328	1328	}