From bd27ee66e552c9aa51e5b2ac116324663dab154d Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Thu, 7 Dec 2017 15:39:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=AD=95=E5=A6=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/RemoteController.java | 4 +-- .../platform/operate/web/facade/RemoteFacade.java | 30 ++++++++++------------ 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java index be30710..7457e5a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java @@ -56,8 +56,8 @@ public class RemoteController extends BaseController { @ResponseBody @RequestMapping(value = "/error/fy/list", method = RequestMethod.GET) - public BaseResponse errorYfList(@RequestParam String operaterId, String parentIds) { - return RespBuilder.buildSuccess(remoteFacade.errorYfList(operaterId, parentIds)); + public BaseResponse errorYfList() { + return RespBuilder.buildSuccess(remoteFacade.errorYfList()); } @RequestMapping(value = "/bookArchive",method = RequestMethod.GET) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java index 9c5188a..be21ca1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java @@ -28,19 +28,13 @@ public class RemoteFacade { @Autowired private MongoTemplate mongoTemplate; - public List> errorYfList(String operaterId, String parentIds) { + public List> errorYfList() { Date yesterday = DateUtil.getYesterday(); List> restList = new ArrayList<>(); - Query pwQuery = Query.query(Criteria.where("operaterId").is(operaterId)).with(new Sort(Sort.Direction.ASC, "created")); - Query bpQuery = Query.query(Criteria.where("operaterId").is(operaterId).and("modified").gt(yesterday)).with(new Sort(Sort.Direction.ASC, "created")); - Query bsQuery = Query.query(Criteria.where("operaterId").is(operaterId).and("modified").gt(yesterday)).with(new Sort(Sort.Direction.ASC, "created")); - Query tempQuery = Query.query(Criteria.where("operaterId").is(operaterId).and("modified").gt(yesterday)).with(new Sort(Sort.Direction.ASC, "created")); - if(StringUtils.isNotEmpty(parentIds)) { - List list = CollectionUtils.asList(parentIds, String.class); - pwQuery.addCriteria(Criteria.where("patientId").in(list)); - bpQuery.addCriteria(Criteria.where("parentId").in(list)); - tempQuery.addCriteria(Criteria.where("parentId").in(list)); - } + Query pwQuery = Query.query(new Criteria()); + Query bpQuery = Query.query(Criteria.where("modified").gt(yesterday)).with(new Sort(Sort.Direction.ASC, "created")); + Query bsQuery = Query.query(Criteria.where("modified").gt(yesterday)).with(new Sort(Sort.Direction.ASC, "created")); + Query tempQuery = Query.query(Criteria.where("modified").gt(yesterday)).with(new Sort(Sort.Direction.ASC, "created")); /** 体重未记录修改日期 所以全表扫描 */ List patientWeights = mongoTemplate.find(pwQuery, PatientWeight.class); @@ -58,7 +52,7 @@ public class RemoteFacade { if(StringUtils.isNotEmpty(bpStatus)) { patients = (patients == null ? mongoTemplate.findById(bloodPressure.getParentId(), Patients.class) : patients); setTempInfo(bloodPressure.getId() + ID_SEPARATOR + entry.getKey(), temp, patients, - entry.getValue().get("ssy") + "/" + entry.getValue().get("szy") + "mmHg", bpStatus, "（收缩压：90-140 舒张压：60-90）", ErrorPatientEnums.BLOOD_PRESSURE); + entry.getValue().get("ssy") + "/" + entry.getValue().get("szy") + "mmHg", bpStatus, "（收缩压：90-140 舒张压：60-90）", ErrorPatientEnums.BLOOD_PRESSURE, bloodPressure.getModified()); } } } @@ -91,7 +85,7 @@ public class RemoteFacade { temp.put("name", BloodSugarEnums.getName(bloodSugar.getBloodSugarType())); bloodSugarCache.put(bloodSugar.getId(), temp); setTempInfo(bloodSugar.getId(), temp, mongoTemplate.findById(bloodSugar.getParentId(), Patients.class), bloodSugar.getBloodSugar(), Double.parseDouble(bloodSugar.getBloodSugar()) > max ? "高血糖" : "低血糖", - "（" + min +"-" + max + "）", ErrorPatientEnums.BLOOD_SUGAR); + "（" + min +"-" + max + "）", ErrorPatientEnums.BLOOD_SUGAR, bloodSugar.getModified()); } } restList.addAll(bloodSugarCache.values()); @@ -105,8 +99,9 @@ public class RemoteFacade { setMapInfo(highMap, lowMap, bmi); Map dayWeights = patientWeight.getDayWeights(); Map temp = new HashMap<>(); - if(MapUtils.isNotEmpty(dayWeights)) { + if(MapUtils.isNotEmpty(dayWeights) && CollectionUtils.isNotEmpty(dayWeights.entrySet())) { for (Map.Entry entry : dayWeights.entrySet()) { + System.out.println(patientWeight.getId() + ">>> " + entry); if(DateUtil.parseYMD(entry.getKey()).getTime() >= yesterday.getTime()) { patients = (patients == null ? mongoTemplate.findById(patientWeight.getPatientId(), Patients.class) : patients); Integer week = DateUtil.getWeek2(patients.getLastMenses(), DateUtil.parseYMD(entry.getKey())); @@ -115,7 +110,7 @@ public class RemoteFacade { Double high = highMap.get(week); if(addWeight < low || addWeight > high) { setTempInfo(patientWeight.getId() + ID_SEPARATOR + entry.getKey(), temp, patients, null, addWeight < low ? "增重过少" : "增重过多", - "（" + lowMap.get(0) + "~" + highMap.get(0) + "）", ErrorPatientEnums.PATIENT_WEIGHT); + "（" + lowMap.get(0) + "~" + highMap.get(0) + "）", ErrorPatientEnums.PATIENT_WEIGHT, patientWeight.getCreated()); temp.put("beforeWeight", patientWeight.getBeforeWeight()); temp.put("nowWeight", patientWeight.getNowWeight()); temp.put("addWeight", addWeight); @@ -138,7 +133,7 @@ public class RemoteFacade { if(entry.getValue() < 36D || entry.getValue() > 38.5D ) { patients = (patients == null ? mongoTemplate.findById(tempModel.getParentId(), Patients.class) : patients); setTempInfo(tempModel.getId() + ID_SEPARATOR + entry.getKey(), temp, patients, entry.getValue() + " °C", entry.getValue() < 36D ? "低热" : "高热", - "（36-37.4）", ErrorPatientEnums.TEMP); + "（36-37.4）", ErrorPatientEnums.TEMP, tempModel.getModified()); } } } @@ -149,7 +144,7 @@ public class RemoteFacade { return restList; } - private void setTempInfo(String id, Map temp, Patients patients, String value, String desc, String ckz, ErrorPatientEnums errorPatientEnums) { + private void setTempInfo(String id, Map temp, Patients patients, String value, String desc, String ckz, ErrorPatientEnums errorPatientEnums, Date modified) { if(patients == null) return; temp.put("id", id); temp.put("username", patients.getUsername()); @@ -159,6 +154,7 @@ public class RemoteFacade { temp.put("desc", desc); temp.put("ckz", ckz); temp.put("type", errorPatientEnums.getId()); + temp.put("modified", modified); } private String getBpStatus(String ssy, String szy) { -- 1.8.3.1