diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/RareBloodGroupServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/RareBloodGroupServiceImpl.java index cbee600..7f4b5a9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/RareBloodGroupServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/RareBloodGroupServiceImpl.java @@ -47,18 +47,19 @@ public class RareBloodGroupServiceImpl extends BaseServiceImpl implements RareBl public BaseResponse addOrUpdate(Integer userId, RareBloodGroupModel rareBloodGroupModel) { String hospitalId = autoMatchFacade.getHospitalId(userId); List babyDietReportList = null; - if(rareBloodGroupModel!=null && rareBloodGroupModel.getParentId()!=null){ - babyDietReportList = mongoTemplate.find( - Query.query(Criteria.where("parentId").is(rareBloodGroupModel.getParentId()).and("yn").is(YnEnums.YES.getId())),RareBloodGroupModel.class); + if (rareBloodGroupModel != null && rareBloodGroupModel.getParentId() != null) { + babyDietReportList = mongoTemplate.find(Query.query(Criteria.where("parentId").is(rareBloodGroupModel.getParentId()). + and("hospitalId").is(hospitalId). + and("yn").is(YnEnums.YES.getId())), RareBloodGroupModel.class); } - if(babyDietReportList!=null && babyDietReportList.size()>0){ + if (babyDietReportList != null && babyDietReportList.size() > 0) { //更新 rareBloodGroupModel.setCreated(new Date()); rareBloodGroupModel.setYn(YnEnums.YES.getId()); rareBloodGroupModel.setHospitalId(hospitalId); Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(rareBloodGroupModel)); mongoTemplate.updateFirst(Query.query(Criteria.where("parentId").is(rareBloodGroupModel.getId())), update, RareBloodGroupModel.class); - }else { + } else { rareBloodGroupModel.setHospitalId(hospitalId); rareBloodGroupModel.setYn(YnEnums.YES.getId()); rareBloodGroupModel.setCreated(new Date());