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 e9e1c0a..e41a47f 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 @@ -406,7 +406,7 @@ public class BabyBookbuildingFacade { babyBookbuildingService.updateBabyBuild(model, request.getId()); - operateLogFacade.addOptLog(userId, Integer.valueOf(model.getHospitalId()), list.get(0), model, OptActionEnums.UPDATE.getId(), "修改儿童建档"); + operateLogFacade.addModifyOptLog(userId, Integer.valueOf(model.getHospitalId()), list.get(0), model, OptActionEnums.UPDATE.getId(), "修改儿童建档"); model.setId(request.getId()); model.setPid(pid); @@ -609,7 +609,7 @@ public class BabyBookbuildingFacade { patient.setPid(pm.getId()); patient.setCreated(new Date()); patients = yunBookbuildingService.addPregnantBookbuilding(patient); - operateLogFacade.addOptLog(userId,Integer.valueOf(patients.getHospitalId()),patients,null,OptActionEnums.ADD.getId(),"儿童建档时候添加孕妇建档"); + operateLogFacade.addOptLog(userId,Integer.valueOf(patients.getHospitalId()),patients,OptActionEnums.ADD.getId(),"儿童建档时候添加孕妇建档"); } } @@ -636,7 +636,7 @@ public class BabyBookbuildingFacade { patient.setCreated(new Date()); patients = yunBookbuildingService.addPregnantBookbuilding(patient); - operateLogFacade.addOptLog(userId,Integer.valueOf(patients.getHospitalId()),patients,null,OptActionEnums.ADD.getId(),"儿童建档时候添加孕妇建档"); + operateLogFacade.addOptLog(userId,Integer.valueOf(patients.getHospitalId()),patients,OptActionEnums.ADD.getId(),"儿童建档时候添加孕妇建档"); } @@ -672,7 +672,7 @@ public class BabyBookbuildingFacade { // String hospitalName = organizationService.getOrganization(Integer.valueOf(request.getHospitalId())).getName(); model = babyBookbuildingService.addBabyBookbuilding(model); - operateLogFacade.addOptLog(userId,Integer.valueOf(request.getHospitalId()),model,null,OptActionEnums.ADD.getId(),"儿童建档"); + operateLogFacade.addOptLog(userId,Integer.valueOf(request.getHospitalId()),model,OptActionEnums.ADD.getId(),"儿童建档"); if (model == null || model.getId() == null) { br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); @@ -1180,7 +1180,7 @@ public class BabyBookbuildingFacade { personService.updatePerson(personModel, allModels.get(0).getPid()); } } - operateLogFacade.addOptLog(userId, Integer.valueOf(models.get(0).getHospitalId()), models.get(0), null, OptActionEnums.DELETE.getId(), "删除儿童建档"); + operateLogFacade.addDelteOptLog(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 7180941..1f0e162 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.addOptLog(userId,Integer.valueOf(yunRequest.getHospitalId()),p,null,OptActionEnums.ADD.getId(),"孕妇建档"); + operateLogFacade.addOptLog(userId,Integer.valueOf(yunRequest.getHospitalId()),p,OptActionEnums.ADD.getId(),"孕妇建档"); /** 孕妇建档后把所有以前未使用的优惠券作废 */ couponService.invalid(p.getPid(), "1,2,3,4,5,6,7,8"); @@ -461,7 +461,7 @@ public class BookbuildingFacade { patient.setOperator(userId); Patients p = yunBookbuildingService.addPregnantBookbuilding(patient); - operateLogFacade.addOptLog(userId, Integer.valueOf(patient.getHospitalId()), p, null, OptActionEnums.UPDATE.getId(), "孕妇建档修改"); + operateLogFacade.addModifyOptLog(userId, Integer.valueOf(patient.getHospitalId()), p, null, OptActionEnums.UPDATE.getId(), "孕妇建档修改"); if (p == null || p.getId() == null) { br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); @@ -878,7 +878,7 @@ public class BookbuildingFacade { yunBookbuildingService.updatePregnant(patient, id); - operateLogFacade.addOptLog(userId, Integer.valueOf(patient.getHospitalId()), beforePatient, patient, OptActionEnums.UPDATE.getId(), "孕妇建档修改"); + operateLogFacade.addModifyOptLog(userId, Integer.valueOf(patient.getHospitalId()), beforePatient, patient, OptActionEnums.UPDATE.getId(), "孕妇建档修改"); //如果当前是建档医院,那么需要修改其他非建档医院的数据 if (autoMatchFacade.checkBStatus(userId)) { @@ -1391,7 +1391,7 @@ public class BookbuildingFacade { String hospital = autoMatchFacade.getHospitalId(userId); Patients patients = yunBookbuildingService.findOneById(id); - operateLogFacade.addOptLog(userId,Integer.valueOf(patients.getHospitalId()),patients,null,OptActionEnums.DELETE.getId(),"删除孕妇建档"); + operateLogFacade.addDelteOptLog(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 225901b..1a045e0 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 @@ -36,13 +36,13 @@ public class OperateLogFacade { @Autowired private UsersService usersService; - public void addOptLog(Integer userId,Integer hospitalId, - Object operateBeforeContent, - Object operateAfterContent, - String operateAction, - String operateRemark) - { + public void addModifyOptLog(Integer userId,Integer hospitalId, + Object operateBeforeContent, + Object operateAfterContent, + String operateAction, + String operateRemark) + { OperateLogModel model = new OperateLogModel(); UsersQuery usersQuery = new UsersQuery(); @@ -73,6 +73,35 @@ public class OperateLogFacade { operateLogService.addOptLog(model); } + public void addOptLog(Integer userId,Integer hospitalId, + Object operateBeforeContent, + String operateAction, + String operateRemark) + { + + addModifyOptLog( userId, hospitalId, + operateBeforeContent, + null, + operateAction, + operateRemark); + } + + + + public void addDelteOptLog(Integer userId,Integer hospitalId, + Object operateBeforeContent, + String operateAction, + String operateRemark) + { + + addModifyOptLog( userId, hospitalId, + operateBeforeContent, + null, + operateAction, + operateRemark); + } + + /**