From dbd50f594eeec3e8df4551afe643db7782276bc0 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 10 Feb 2020 16:27:01 +0800 Subject: [PATCH] update code --- .../com/lyms/platform/pojo/TrackCountRecord.java | 9 ++++++ .../web/controller/BasicConfigController.java | 12 ++++---- .../web/facade/AntenatalExaminationFacade.java | 35 ++++++++++++++++++++++ .../operate/web/facade/BasicConfigFacade.java | 10 ++----- .../operate/web/facade/TrackDownFacade.java | 12 ++++---- 5 files changed, 58 insertions(+), 20 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackCountRecord.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackCountRecord.java index 809da51..dc79354 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackCountRecord.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackCountRecord.java @@ -17,6 +17,7 @@ public class TrackCountRecord extends BaseModel { private String id; private String hospitalId; + private String pid; private String patientId; //预约产检状态 private Integer orderStatus; @@ -40,6 +41,14 @@ public class TrackCountRecord extends BaseModel { private Date created; private Date modified; + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public Date getNextCheckTime() { return nextCheckTime; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java index ac84b7e..dcf613d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java @@ -197,11 +197,11 @@ public class BasicConfigController extends BaseController { *查询处方计划配置项c * @return */ - @RequestMapping(method = RequestMethod.GET, value = "/queryCheckItemConfig") + @RequestMapping(method = RequestMethod.GET, value = "/queryCheckItemConfig/{hospitalId}") @ResponseBody @TokenRequired - public BaseResponse queryCheckItemConfig( HttpServletRequest request) { - return basicConfigFacade.queryCheckItemConfig(getUserId(request)); + public BaseResponse queryCheckItemConfig(@PathVariable String hospitalId, HttpServletRequest request) { + return basicConfigFacade.queryCheckItemConfig(hospitalId); } /** @@ -248,11 +248,11 @@ public class BasicConfigController extends BaseController { * @param request * @return */ - @RequestMapping(method = RequestMethod.GET, value = "/queryTrackDayConfig") + @RequestMapping(method = RequestMethod.GET, value = "/queryTrackDayConfig/{hospitalId}") @ResponseBody @TokenRequired - public BaseResponse queryTrackDayConfig( HttpServletRequest request) { - return basicConfigFacade.queryTrackDayConfig(getUserId(request)); + public BaseResponse queryTrackDayConfig(@PathVariable String hospitalId, HttpServletRequest request) { + return basicConfigFacade.queryTrackDayConfig(hospitalId); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index e4d59b6..7d9c9ce 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -1156,9 +1156,44 @@ public class AntenatalExaminationFacade { } catch (Exception e) { e.printStackTrace(); } + + try { + //追访统计 + saveTrackCount(DateUtil.parseYMD(excAddRequest.getNextCheckTime()), patients); + } catch (Exception e) { + e.printStackTrace(); + } } }); } + + public void saveTrackCount(Date nextCheckTime,Patients patients) + { + AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); + antExRecordQuery.setPid(patients.getPid()); + List recordModels = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "checkTime"); + if (CollectionUtils.isNotEmpty(recordModels)) + { + AntExRecordModel recordModel = recordModels.get(0); +// if () +// { +// +// } + } + } + + public void updateTrackCount(Date nextCheckTime,Patients patients) + { + AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); + antExRecordQuery.setPid(patients.getPid()); + List recordModels = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "checkTime"); + if (CollectionUtils.isNotEmpty(recordModels)) + { + AntExRecordModel recordModel = recordModels.get(0); + + } + } + public void saveCheckItem(Date nextCheckTime,Patients patients) { List itemConfigs = mongoTemplate.find(Query.query(Criteria.where("hospitalId").is(patients.getHospitalId())), CheckItemConfig.class); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index 5c1411a..f072652 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -584,16 +584,13 @@ public class BasicConfigFacade { return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - public BaseResponse queryCheckItemConfig(Integer userId) { - String hospitalId = autoMatchFacade.getHospitalId(userId); + public BaseResponse queryCheckItemConfig(String hospitalId) { List itemConfigs = mongoTemplate.find(Query.query(Criteria.where("hospitalId").is(hospitalId)), CheckItemConfig.class); return new BaseObjectResponse().setData(itemConfigs).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } public BaseResponse addCheckItemConfig(CheckItemConfig itemConfig,Integer userId) { - String hospitalId = autoMatchFacade.getHospitalId(userId); - itemConfig.setHospitalId(hospitalId); itemConfig.setCreated(new Date()); itemConfig.setModified(new Date()); mongoTemplate.save(itemConfig); @@ -616,15 +613,12 @@ public class BasicConfigFacade { mongoTemplate.updateFirst(query, update, TrackDayConfig.class); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - String hospitalId = autoMatchFacade.getHospitalId(userId); - trackDayConfig.setHospitalId(hospitalId); trackDayConfig.setCreated(new Date()); mongoTemplate.save(trackDayConfig); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - public BaseResponse queryTrackDayConfig(Integer userId) { - String hospitalId = autoMatchFacade.getHospitalId(userId); + public BaseResponse queryTrackDayConfig(String hospitalId) { TrackDayConfig trackDayConfig = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").is(hospitalId)), TrackDayConfig.class); return new BaseObjectResponse().setData(trackDayConfig).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index ffb5368..34e5186 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -24,6 +24,7 @@ import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import com.mongodb.BasicDBObject; import com.mongodb.DBObject; +import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1280,15 +1281,15 @@ public class TrackDownFacade { long orderCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end))), TrackCountRecord.class); data.put("orderCount",String.valueOf(orderCount)); - 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); - data.put("oneTrackCount",String.valueOf(oneTrackCount)); - - 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); - data.put("twoTrackCount",String.valueOf(twoTrackCount)); + long oneTrackCount = orderCount * 2; + data.put("oneTrackCount", String.valueOf(oneTrackCount)); 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); data.put("zsCheckCount",String.valueOf(zsCheckCount)); + long twoTrackCount = orderCount - zsCheckCount; + data.put("twoTrackCount",String.valueOf(twoTrackCount)); + 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); data.put("jsCheckCount",String.valueOf(jsCheckCount)); @@ -1324,5 +1325,4 @@ public class TrackDownFacade { return total; } - } -- 1.8.3.1