From 59b0df13e121339f1d31ebea8beaf92b8952c37b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 3 Nov 2017 15:42:40 +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 --- .../java/com/lyms/hospitalapi/dzfy/DzfyFmService.java | 2 +- .../operate/web/controller/CouponPrintController.java | 8 ++++++++ .../operate/web/facade/SieveRecordFacade.java | 19 ++++++++++++++++++- .../web/service/impl/PatientWeightServiceImpl.java | 8 ++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java index 73cdcd6..7f70fd3 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java @@ -65,7 +65,7 @@ public class DzfyFmService { private static Map babyMap = new HashMap<>(); - private static final String HOSPITALID = PropertiesUtils.getPropertyValue("hospitalId"); + private static final String HOSPITALID = "1000000114"; static { ONE_ENUMS.put(0, "长"); ONE_ENUMS.put(1, "次"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java index e696d3b..811da19 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java @@ -13,10 +13,12 @@ import com.lyms.platform.biz.service.AntenatalExaminationService; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; +import com.lyms.platform.common.enums.OptActionEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.facade.OperateLogFacade; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.permission.model.CouponInfo; import com.lyms.platform.permission.model.Organization; @@ -79,6 +81,9 @@ public class CouponPrintController extends BaseController{ @Autowired private AntenatalExaminationService antenatalExaminationService; + @Autowired + private OperateLogFacade operateLogFacade; + /** @@ -291,6 +296,9 @@ public class CouponPrintController extends BaseController{ } } String result = HospitalCouponPrintUtils.qhdCouponUse(model); + + operateLogFacade.addAddOptLog(getUserId(request), Integer.valueOf(hospitalId), model, OptActionEnums.ADD.getId(), "秦皇岛消费优惠劵"); + if("0".equals(result)){ int count = couponService.updateCouponStatus(param); System.out.println("update coupon count " + count); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java index a97a927..97553ed 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java @@ -3,6 +3,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.ExpYunEnums; +import com.lyms.platform.common.enums.OptActionEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; @@ -62,6 +63,9 @@ public class SieveRecordFacade { @Autowired private BookbuildingFacade bookbuildingFacade; + @Autowired + private OperateLogFacade operateLogFacade; + public BaseResponse isSaveSieveRecord(String patientId, Integer userId) { @@ -85,8 +89,19 @@ public class SieveRecordFacade { //id不为空就修改记录 if (StringUtils.isNotEmpty(requestModel.getId())) { + + SieveRecordQuery query = new SieveRecordQuery(); + query.setId(requestModel.getId()); + List list = sieveRecordService.query(query); + model.setModified(new Date()); - sieveRecordService.update(model,requestModel.getId()); + sieveRecordService.update(model, requestModel.getId()); + + if (CollectionUtils.isNotEmpty(list)) + { + operateLogFacade.addModifyOptLog(userId, Integer.valueOf(model.getHospitalId()),list.get(0),model, OptActionEnums.UPDATE.getId(), "修改产筛查询"); + } + } else { @@ -94,6 +109,8 @@ public class SieveRecordFacade { model.setCreated(new Date()); model.setOperUserId(userId); sieveRecordService.save(model); + + operateLogFacade.addAddOptLog(userId, Integer.valueOf(model.getHospitalId()), model, OptActionEnums.ADD.getId(), "添加产筛查询"); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index b863b42..d7dc3b2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -9,6 +9,7 @@ import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.result.ResponseCode; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.facade.OperateLogFacade; import com.lyms.platform.operate.web.service.PatientWeightService; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.MathUtil; @@ -52,6 +53,9 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient @Autowired private CouponMapper couponMapper; + @Autowired + private OperateLogFacade operateLogFacade; + /** * 最低：0~13 : 0~1.9 13~40 1.9~11.9 * 最高： 0~2.2 2.2~15.9 @@ -167,6 +171,8 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient patientWeightService2.add(patientWeight); + operateLogFacade.addAddOptLog(userId, Integer.valueOf(hospitalId), patientWeight, OptActionEnums.ADD.getId(), "添加孕体重"); + /* // 绑定医生和患者的关系 String patSerSyncUrl = Config.getItem("patSer_sync_url", "0"); Map param = new HashMap<>(); @@ -507,10 +513,12 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient @Override public BaseResponse update(final Integer userId, final String id, final String beforeWeight, final String beforeHeight, final String date, final String nowWeight, final String bregmatic, final String bregmaticOther, boolean sync) { PatientWeight patientWeight = mongoTemplate.findById(id, PatientWeight.class); + if(patientWeight == null) { return RespBuilder.buildSuccess("该体重未找到"); } String hospitalId = autoMatchFacade.getHospitalId(userId); + operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), patientWeight, patientWeight,OptActionEnums.UPDATE.getId(), "修改孕体重"); // 绑定医生和患者的关系 String patSerSyncUrl = Config.getItem("patSer_sync_url", "0"); -- 1.8.3.1