From a39ead87ad9fa0bb85a8e60c2aa466ddec1fd661 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 31 Aug 2016 20:07:02 +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 --- .../src/main/java/com/lyms/platform/biz/service/SieveService.java | 2 +- .../java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java index dc8680a..99f43f0 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java @@ -88,7 +88,7 @@ public class SieveService { sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); sieveApplyOrderQuery.setHospitalId(hospitalId); List list = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery()); - if (CollectionUtils.isNotEmpty(list)) { + if (CollectionUtils.isEmpty(list)) { //做分娩的时候需要删除产筛数据 SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setParentId(parentId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 930bfc0..cd15c53 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -167,11 +167,11 @@ public class MatDeliverFacade { maternalDeliverModel.setHospitalId(hospitalId); //做分娩的时候需要删除产筛数据 - SieveQuery sieveQuery = new SieveQuery(); + /* SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setParentId(deliverAddRequest.getParentId()); sieveQuery.setYn(YnEnums.YES.getId()); - sieveQuery.setHospitalId(hospitalId); - sieveService.deleteById(sieveQuery); + sieveQuery.setHospitalId(hospitalId);*/ + sieveService.deleteSieve(deliverAddRequest.getParentId(),hospitalId,null); maternalDeliverModel.setYn(YnEnums.YES.getId()); matDeliverService.addMatDeliver(maternalDeliverModel); -- 1.8.3.1