diff --git a/platform-dal/src/main/java/com/lyms/platform/query/DischargeAbstractBabyQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/DischargeAbstractBabyQuery.java index c01edda..fe4cf11 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/DischargeAbstractBabyQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/DischargeAbstractBabyQuery.java @@ -3,7 +3,10 @@ package com.lyms.platform.query; import com.lyms.platform.common.base.IConvertToNativeQuery; import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.utils.StringUtils; +import org.bson.types.ObjectId; import org.springframework.data.mongodb.core.query.Criteria; /** @@ -19,6 +22,15 @@ public class DischargeAbstractBabyQuery extends BaseQuery implements IConvertToN * @discription 母亲出院小结表id */ private String motherId; + private String id; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getMotherId() { return motherId; @@ -30,8 +42,16 @@ public class DischargeAbstractBabyQuery extends BaseQuery implements IConvertToN @Override public MongoQuery convertToQuery() { - Criteria criteria = new Criteria(); - criteria.and("motherId").is(motherId); - return new MongoCondition(criteria).toMongoQuery(); + + MongoCondition condition = MongoCondition.newInstance(); + if (null != id) { + condition = condition.and("id", new ObjectId(id), MongoOper.IS); + } + + if (null != motherId) { + condition = condition.and("motherId", motherId, MongoOper.IS); + } + + return condition.toMongoQuery(); } } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/DischargeAbstractMotherQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/DischargeAbstractMotherQuery.java index a5532e5..d108d4e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/DischargeAbstractMotherQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/DischargeAbstractMotherQuery.java @@ -24,12 +24,21 @@ public class DischargeAbstractMotherQuery extends BaseQuery implements IConvertT private String patientId; private String pid; + private String id; private Date start; private Date end; private int yn=-1; + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public Date getStart() { return start; } @@ -76,6 +85,10 @@ public class DischargeAbstractMotherQuery extends BaseQuery implements IConvertT if (patientId != null) { condition = condition.and("patientId", patientId, MongoOper.IS); } + + if (id != null) { + condition = condition.and("id", id, MongoOper.IS); + } if (yn != -1) { condition = condition.and("yn", yn, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index cfa0e01..a4bb092 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -5,6 +5,7 @@ import com.lyms.platform.biz.service.DischargeAbstractBabyService; import com.lyms.platform.biz.service.DischargeAbstractMotherService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.OptActionEnums; import com.lyms.platform.common.enums.RenShenJieJuEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; @@ -68,6 +69,9 @@ public class DischargeAbstractFacade { @Autowired private CouponService couponService; + @Autowired + private OperateLogFacade operateLogFacade; + public DischargeAbstractSaveResult save(DischargeAbstractSaveRequest dischargeAbstractSaveRequest, Integer userId) { DischargeAbstractSaveResult dischargeAbstractSaveResult = new DischargeAbstractSaveResult(); @@ -98,13 +102,21 @@ public class DischargeAbstractFacade { dischargeAbstractMotherModel.setHospitalId(hId); if (StringUtils.isEmpty(dischargeAbstractMotherModel.getId())) { dischargeAbstractMotherModel = dischargeAbstractMotherService.save(dischargeAbstractMotherModel); - + operateLogFacade.addAddOptLog(userId,Integer.parseInt(hId),dischargeAbstractMotherModel, OptActionEnums.ADD.getId(),"添加出院小结母亲内容"); /** 使用优惠券 */ if(StringUtils.isNotBlank(dischargeAbstractSaveRequest.getCouponCode()) && dischargeAbstractSaveRequest.getCouponType() != null) { couponService.use(hId, dischargeAbstractSaveRequest.getCouponCode(), userId, dischargeAbstractMotherModel.getId()); } } else { + + // 查询母亲信息 + DischargeAbstractMotherQuery dischargeAbstractMotherQuery = new DischargeAbstractMotherQuery(); + dischargeAbstractMotherQuery.setId(dischargeAbstractMotherModel.getId()); + dischargeAbstractMotherQuery.setYn(YnEnums.YES.getId()); + List list = dischargeAbstractMotherService.query(dischargeAbstractMotherQuery); dischargeAbstractMotherService.update(dischargeAbstractMotherModel); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hId), list.get(0), dischargeAbstractMotherModel, OptActionEnums.UPDATE.getId(), "修改出院小结母亲内容"); + } // 保存孩子信息 List babyList = dischargeAbstractSaveRequest.getBabyList(); @@ -120,8 +132,14 @@ public class DischargeAbstractFacade { dischargeAbstractBabyModel.setpId(baby.getpId()); if (StringUtils.isEmpty(dischargeAbstractBabyModel.getId())) { dischargeAbstractBabyModelList.add(dischargeAbstractBabyModel); + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hId), dischargeAbstractBabyModel, OptActionEnums.ADD.getId(), "添加出院小结儿童内容添加"); } else { + DischargeAbstractBabyQuery dischargeAbstractBabyQuery = new DischargeAbstractBabyQuery(); + dischargeAbstractBabyQuery.setId(dischargeAbstractBabyModel.getId()); + List list = dischargeAbstractBabyService.query(dischargeAbstractBabyQuery); dischargeAbstractBabyService.update(dischargeAbstractBabyModel); + + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hId), list.get(0),dischargeAbstractBabyModel, OptActionEnums.UPDATE.getId(), "修改出院小结儿童内容"); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 7adbed3..075614f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -89,6 +89,9 @@ public class MatDeliverFacade { @Autowired private CouponService couponService; + @Autowired + private OperateLogFacade operateLogFacade; + private static Map ONE_ENUMS = new HashMap<>(); @@ -267,6 +270,8 @@ public class MatDeliverFacade { maternalDeliverModel.setYn(YnEnums.YES.getId()); matDeliverService.addMatDeliver(maternalDeliverModel); + operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospitalId),maternalDeliverModel,OptActionEnums.ADD.getId(),"添加分娩"); + /** 使用优惠券 */ if(StringUtils.isNotBlank(deliverAddRequest.getCouponCode()) && deliverAddRequest.getCouponType() != null) { couponService.use(hospitalId, deliverAddRequest.getCouponCode(), userId, maternalDeliverModel.getId()); @@ -313,8 +318,15 @@ public class MatDeliverFacade { maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list,patients2.getLastMenses())); } + MatDeliverQuery query = new MatDeliverQuery(); + query.setId(deliverAddRequest.getId()); + query.setYn(YnEnums.YES.getId()); + List results = matDeliverService.query(matDeliverQuery); + matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId()); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), maternalDeliverModel,results.get(0), OptActionEnums.UPDATE.getId(), "修改分娩"); + if (null != deliverAddRequest.getDueDate()) { Date fmDate = DateUtil.parseYMD(deliverAddRequest.getDueDate()); PatientsQuery patientsQuery = new PatientsQuery(); @@ -843,6 +855,8 @@ public class MatDeliverFacade { babyModel.setYn(YnEnums.NO.getId()); babyService.findAndModify(babyModelQuery.convertToQuery(), babyModel); + operateLogFacade.addDeleteOptLog(userId,Integer.parseInt(hospital),matModel,OptActionEnums.DELETE.getId(),"删除分娩"); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("不能删除该条数据");