From a8a74d6081d25e7e32b98252bad2eca23cfe3fd5 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 26 Oct 2017 18:11:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 6 ++++++ .../lyms/platform/operate/web/facade/BabyBookbuildingFacade.java | 2 +- .../com/lyms/platform/operate/web/facade/BookbuildingFacade.java | 4 ++-- .../java/com/lyms/platform/operate/web/facade/OperateLogFacade.java | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) 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 6990cdd..3bf9404 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 @@ -1727,6 +1727,9 @@ public class AntenatalExaminationFacade { updateLastRisk(antenatalExaminationModel.getParentId()); recordService.handExRecord(antenatalExaminationModel.getPid()); + + operateLogFacade.addDeleteOptLog(userId, Integer.parseInt(localAntModel.getHospitalId()), localAntModel, OptActionEnums.DELETE.getId(), "删除复诊"); + } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("当前产检记录不是本院最新的产检记录,不能删除"); } @@ -1747,6 +1750,9 @@ public class AntenatalExaminationFacade { setLashCTimes(antExChuModel1.getParentId()); updateLastRisk(antExChuModel1.getParentId()); recordService.handExRecord(antExChuModel1.getPid()); + + operateLogFacade.addDeleteOptLog(userId, Integer.parseInt(antExChuModel11.getHospitalId()), antExChuModel11, OptActionEnums.DELETE.getId(), "删除初诊"); + } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("当前产检记录不是本院最新的产检记录,不能删除"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 6a94307..999b2b6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1180,7 +1180,7 @@ public class BabyBookbuildingFacade { personService.updatePerson(personModel, allModels.get(0).getPid()); } } - operateLogFacade.addDelteOptLog(userId, Integer.valueOf(models.get(0).getHospitalId()), models.get(0), OptActionEnums.DELETE.getId(), "删除儿童建档"); + operateLogFacade.addDeleteOptLog(userId, Integer.valueOf(models.get(0).getHospitalId()), models.get(0), OptActionEnums.DELETE.getId(), "删除儿童建档"); } babyBookbuildingService.deleteBabyById(id); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index b9d7cac..c3622de 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -252,7 +252,7 @@ public class BookbuildingFacade { patient.setOperator(userId); Patients p = yunBookbuildingService.addPregnantBookbuilding(patient); - operateLogFacade.addAddOptLog(userId,Integer.valueOf(yunRequest.getHospitalId()),p,OptActionEnums.ADD.getId(),"孕妇建档"); + operateLogFacade.addAddOptLog(userId, Integer.valueOf(yunRequest.getHospitalId()), p, OptActionEnums.ADD.getId(), "孕妇建档"); /** 孕妇建档后把所有以前未使用的优惠券作废 */ couponService.invalid(p.getPid(), "1,2,3,4,5,6,7,8"); @@ -1391,7 +1391,7 @@ public class BookbuildingFacade { String hospital = autoMatchFacade.getHospitalId(userId); Patients patients = yunBookbuildingService.findOneById(id); - operateLogFacade.addDelteOptLog(userId, Integer.valueOf(patients.getHospitalId()), patients, OptActionEnums.DELETE.getId(), "删除孕妇建档"); + operateLogFacade.addDeleteOptLog(userId, Integer.valueOf(patients.getHospitalId()), patients, OptActionEnums.DELETE.getId(), "删除孕妇建档"); if (!deleteProcessHandler.deleteBookBuild(patients.getPid(), patients.getBookbuildingDate(), hospital)) { return new BaseResponse().setErrorcode(ErrorCodeConstants.DONT_DELETE).setErrormsg("孕妇存在检查记录,不能删除建档"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java index 95ef4e2..d664770 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java @@ -133,7 +133,7 @@ public class OperateLogFacade { * @param operateAction * @param operateRemark 备注 */ - public void addDelteOptLog(Integer userId,Integer hospitalId, + public void addDeleteOptLog(Integer userId,Integer hospitalId, Object operateBeforeContent, String operateAction, String operateRemark) -- 1.8.3.1