From 86c6675b1f8d751bdb709a8e668c6bb19bcbdbbd Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 25 Oct 2017 14:39:02 +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 --- .../web/controller/BabyBuildController.java | 2 +- .../operate/web/facade/BabyBookbuildingFacade.java | 110 +++------------------ .../operate/web/facade/BookbuildingFacade.java | 10 +- .../operate/web/facade/OperateLogFacade.java | 5 +- 4 files changed, 29 insertions(+), 98 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 4c9171a..bb3f6d6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -81,7 +81,7 @@ public class BabyBuildController extends BaseController { @ResponseBody public BaseResponse deleteBabyBuildById(@PathVariable("id") String id, HttpServletRequest request) { - return babyBookbuildingFacade.deleteBabyBuildById(id); + return babyBookbuildingFacade.deleteBabyBuildById(id,getUserId(request)); } 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 fae4983..0f2b087 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 @@ -126,6 +126,9 @@ public class BabyBookbuildingFacade { @Autowired private OrganizationGroupsFacade groupsFacade; + @Autowired + private OperateLogFacade operateLogFacade; + @Autowired @Qualifier("commonThreadPool") @@ -401,8 +404,10 @@ public class BabyBookbuildingFacade { } } - babyBookbuildingService.updateBabyBuild(model, request.getId()); + + operateLogFacade.addOptLog(userId, Integer.valueOf(model.getHospitalId()), list.get(0), model, OptActionEnums.UPDATE.getId(), "修改儿童建档"); + model.setId(request.getId()); model.setPid(pid); patientsService.updateRefer(model); @@ -604,6 +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,"",OptActionEnums.ADD.getId(),"儿童建档时候添加孕妇建档"); } } @@ -629,6 +635,8 @@ public class BabyBookbuildingFacade { patient.setPid(yunModel.getId()); patient.setCreated(new Date()); patients = yunBookbuildingService.addPregnantBookbuilding(patient); + + operateLogFacade.addOptLog(userId,Integer.valueOf(patients.getHospitalId()),patients,"",OptActionEnums.ADD.getId(),"儿童建档时候添加孕妇建档"); } @@ -664,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,"",OptActionEnums.ADD.getId(),"儿童建档"); if (model == null || model.getId() == null) { br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); @@ -1146,7 +1154,7 @@ public class BabyBookbuildingFacade { * * @param id */ - public BaseResponse deleteBabyBuildById(String id) { + public BaseResponse deleteBabyBuildById(String id,Integer userId) { BabyModel babyModel = mongoTemplate.findById(id, BabyModel.class); BabyCheckModelQuery query = new BabyCheckModelQuery(); @@ -1172,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(), "删除儿童建档"); } babyBookbuildingService.deleteBabyById(id); @@ -1947,10 +1955,10 @@ public class BabyBookbuildingFacade { } } - String hospital = autoMatchFacade.getHospitalId(userId); - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(hospital) && !hospitalIdList.contains(hospital)) { - hospitalIdList.add(hospital); - } +// String hospital = autoMatchFacade.getHospitalId(userId); +// if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(hospital) && !hospitalIdList.contains(hospital)) { +// hospitalIdList.add(hospital); +// } List permissions = new ArrayList<>(); DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); @@ -2016,92 +2024,6 @@ public class BabyBookbuildingFacade { } } } - -// if (CollectionUtils.isNotEmpty(models)) { -// for (BabyModel model : models) { -// BabyManageListResult result = new BabyManageListResult(); -// result.setId(model.getId()); -// if (model.getLastHighRisk() == null || model.getLastHighRisk() == 0) { -// result.setHighRisk("健康"); -// } else { -// result.setHighRisk("高危"); -// } -// result.setSex(StringUtils.emptyDeal(SexEnum.getTextById(model.getSex()))); -// result.setBabyName(StringUtils.emptyDeal(model.getName())); -// result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth()))); -// result.setMommyName(StringUtils.emptyDeal(model.getMname())); -// result.setMommnyPhone(StringUtils.emptyDeal(model.getMphone())); -// result.setMommnyEncryptPhone(StringUtils.encryPhone(model.getMphone())); -// result.setServiceStatus(StringUtils.emptyDeal(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus()))); -// result.setServiceType(StringUtils.emptyDeal(model.getServiceType() == null ? "" : ServiceTypeEnums.getTitleById(model.getServiceType()))); -// result.setNextDate(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getNextDate()))); -// result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date()))); -// result.setPatientId(model.getParentId()); -// result.setBuildTime(DateUtil.getyyyy_MM_dd(model.getBuildDate())); -// result.setHospitalName(organizationService.getOrganization(Integer.valueOf(model.getHospitalId())).getName()); -// -// if(String.valueOf("true").equals(request.getIsArea())) { -// // 开始查询省市区街道 -// // 省 -// BasicConfig provinceName = basicConfigService.getOneBasicConfigById(model.getProvinceId()); -// // 市 -// BasicConfig cityName = basicConfigService.getOneBasicConfigById(model.getCityId()); -// // 区 -// BasicConfig areaName = basicConfigService.getOneBasicConfigById(model.getAreaId()); -// // 街道 -// BasicConfig streetName = basicConfigService.getOneBasicConfigById(model.getStreetId()); -// // 具体 -// String address = model.getAddress(); -// String completeAddress = ""; -// if (provinceName != null) { -// completeAddress += provinceName.getName(); -// } -// if (cityName != null) { -// completeAddress += cityName.getName(); -// } -// if (areaName != null) { -// completeAddress += areaName.getName(); -// } -// if (streetName != null) { -// completeAddress += streetName.getName(); -// } -// if (!StringUtils.isEmpty(address)) { -// completeAddress += address; -// } -// if (completeAddress.length() == 0) { -// completeAddress = "-"; -// } -// result.setCompleteAddress(completeAddress); -// } -// String diagnose = ""; -//// if (!StringUtils.isEmpty(model.getDiagnose())) { -//// List diagList = JsonUtil.toList(model.getDiagnose(), List.class); -//// if (CollectionUtils.isNotEmpty(diagList)) { -//// diagnose = ""; -//// for (Object obj : diagList) { -//// BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String) obj); -//// if (basicConfig != null) { -//// diagnose += basicConfig.getName() + " "; -//// } -//// } -//// } -//// } -// if (StringUtils.isNotEmpty(model.getPid())) { -// List diagList = babyCheckFacade.getBabyLastDiagnose(model.getPid()); -// if (CollectionUtils.isNotEmpty(diagList)) { -// for (Object obj : diagList) { -// BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String) obj); -// if (basicConfig != null) { -// diagnose += basicConfig.getName() + " "; -// } -// } -// } -// } -// result.setDiagnose(StringUtils.emptyDeal(diagnose)); -// list.add(result); -// } -// } - BaseListResponse objectResponse = new BaseListResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setData(list); 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 3b488ef..f6086ed 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()),JsonUtil.array2JsonString(p),"",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,6 +461,8 @@ public class BookbuildingFacade { patient.setOperator(userId); Patients p = yunBookbuildingService.addPregnantBookbuilding(patient); + operateLogFacade.addOptLog(userId, Integer.valueOf(patient.getHospitalId()), p, null, OptActionEnums.UPDATE.getId(), "孕妇建档修改"); + if (p == null || p.getId() == null) { br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); br.setErrormsg("建档失败，保存异常"); @@ -872,8 +874,12 @@ public class BookbuildingFacade { patient.setOperator(userId); + Patients beforePatient = yunBookbuildingService.findOneById(id); + yunBookbuildingService.updatePregnant(patient, id); + operateLogFacade.addOptLog(userId, Integer.valueOf(patient.getHospitalId()), beforePatient, patient, OptActionEnums.UPDATE.getId(), "孕妇建档修改"); + //如果当前是建档医院,那么需要修改其他非建档医院的数据 if (autoMatchFacade.checkBStatus(userId)) { patientsService.updateBaseData(patient); @@ -1385,6 +1391,8 @@ public class BookbuildingFacade { String hospital = autoMatchFacade.getHospitalId(userId); Patients patients = yunBookbuildingService.findOneById(id); + operateLogFacade.addOptLog(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 3c92b42..5112143 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 @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.OperateLogService; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.model.UsersQuery; import com.lyms.platform.permission.service.UsersService; @@ -47,8 +48,8 @@ public class OperateLogFacade { } model.setOperateAction(operateAction); - model.setOperateAfterContent(operateAfterContent); - model.setOperateBeforeContent(operateBeforeContent); + model.setOperateAfterContent(JsonUtil.array2JsonString(operateAfterContent)); + model.setOperateBeforeContent(JsonUtil.array2JsonString(operateBeforeContent)); model.setOperateRemark(operateRemark); model.setOperateHospitalId(hospitalId); -- 1.8.3.1