From 4e7242e46a9621891438027a52ec618db511f5f4 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 27 Oct 2017 11:13:00 +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 --- .../operate/web/facade/OperateLogFacade.java | 2 +- .../operate/web/facade/PostReviewFacade.java | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) 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 9ad085c..817b9b4 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 @@ -73,7 +73,7 @@ public class OperateLogFacade { if (operateAfterContent != null && operateBeforeContent != null) { - String json = JsonUtil.obj2Str(getChangeItems(operateAfterContent, operateBeforeContent)); + String json = JsonUtil.obj2Str(getChangeItems(operateBeforeContent,operateAfterContent)); System.out.print(json); model.setModifyContent(json); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index e7f3e47..7329d46 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.OptActionEnums; import com.lyms.platform.common.enums.ServiceStatusEnums; import com.lyms.platform.common.enums.ServiceTypeEnums; import com.lyms.platform.common.enums.YnEnums; @@ -67,6 +68,9 @@ public class PostReviewFacade { @Autowired private CouponService couponService; + @Autowired + private OperateLogFacade operateLogFacade; + /** * 增加产后复查记录 *

@@ -122,6 +126,10 @@ public class PostReviewFacade { postReviewModel.setPid(patients.getPid()); postReviewService.addPostReview(postReviewModel); + + + operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospital),postReviewModel, OptActionEnums.ADD.getId(),"添加产后复查"); + /** 使用优惠券 */ if(org.apache.commons.lang3.StringUtils.isNotBlank(postReviewRequest.getCouponCode()) && postReviewRequest.getCouponType() != null) { couponService.use(autoMatchFacade.getHospitalId(userId), postReviewRequest.getCouponCode(), userId, postReviewModel.getId()); @@ -189,8 +197,17 @@ public class PostReviewFacade { } patients.setLastCheckEmployeeId(postReviewModel.getProdDoctor()); patientsService.updatePatient(patients); - patientsService.updateNextCheckTime(postReviewRequest.getNextCheckTime(),patients.getId()); + patientsService.updateNextCheckTime(postReviewRequest.getNextCheckTime(), patients.getId()); + + + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + matDeliverQuery.setId(postReviewRequest.getId()); + matDeliverQuery.setYn(YnEnums.YES.getId()); + + List list = matDeliverService.query(matDeliverQuery); postReviewService.updatePostById(postReviewModel, postReviewRequest.getId()); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital), list.get(0),postReviewModel, OptActionEnums.UPDATE.getId(), "修改产后复查"); + syncMaster(patients.getId()); } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); @@ -441,6 +458,8 @@ public class PostReviewFacade { postReviewModel.setOperator(userId); postReviewService.updatePostById(postReviewModel, id); + operateLogFacade.addDeleteOptLog(userId, Integer.parseInt(hospital), list.get(0), OptActionEnums.DELETE.getId(), "删除产后复查"); + PostReviewModel postReviewModel1 = postReviewService.findOneById(id); if (null != postReviewModel1) { -- 1.8.3.1