From 03116a38f7f4b7e341153908f5548f63f4085919 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 23 Aug 2016 15:51:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/ApplyOrderFacade.java | 15 +++++++++++---- .../com/lyms/platform/operate/web/facade/SieveFacade.java | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index dda5178..1812189 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -221,10 +221,17 @@ public class ApplyOrderFacade { if (null != orderModel.getParentId()) { Patients patients = patientsService.findOnePatientById(orderModel.getParentId()); if (null != patients) { - SieveModel sieveModel = patientsService.convertToModel(patients); - sieveModel.setFrom("2"); - sieveModel.setHospitalId(orderModel.getHospitalId()); - sieveService.addChanQianSieve(sieveModel); + SieveQuery sieveQuery=new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setHospitalId(hospitalId); + sieveQuery.setParentId(patients.getId()); + List modelList = sieveService.queryList(sieveQuery); + if(CollectionUtils.isEmpty(modelList)){ + SieveModel sieveModel = patientsService.convertToModel(patients); + sieveModel.setFrom("2"); + sieveModel.setHospitalId(orderModel.getHospitalId()); + sieveService.addChanQianSieve(sieveModel); + } } idList.add(orderModel.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 359a261..a4b65c6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -140,7 +140,7 @@ public class SieveFacade { sieveQuery.setDueWeekStart(7*Integer.valueOf(cqSieveQueryRequest.getDueWeekStart())); } if(null!=cqSieveQueryRequest.getDueWeekEnd()){ - sieveQuery.setDueWeekEnd(7*Integer.valueOf(cqSieveQueryRequest.getDueWeekEnd())); + sieveQuery.setDueWeekEnd(7*Integer.valueOf(cqSieveQueryRequest.getDueWeekEnd())+6); } sieveQuery.setZtfx(cqSieveQueryRequest.getZtfx()); sieveQuery.setIsNotify(cqSieveQueryRequest.getIsNotify()); -- 1.8.3.1