diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index e4918d1..6990cdd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -89,6 +89,10 @@ public class AntenatalExaminationFacade { @Autowired private MongoTemplate mongoTemplate; + + @Autowired + private OperateLogFacade operateLogFacade; + /** * 处理区域隐藏建档 * @@ -278,6 +282,12 @@ public class AntenatalExaminationFacade { //复诊,修改产检管理 antenatalExaminationService.updateAntExRecord(antExAddRequest.getId(), 2); + + + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setId(antExAddRequest.getId()); + List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list.get(0), model, OptActionEnums.UPDATE.getId(), "修改复诊"); } else { model.setOperator(userId); model.setYn(YnEnums.YES.getId()); @@ -320,6 +330,9 @@ public class AntenatalExaminationFacade { antenatalExaminationService.addOneBabyAnt(model); + + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), model, OptActionEnums.ADD.getId(), "添加复诊"); + /** 验证产检券是否可用 可用就改为已使用状态 */ if(StringUtils.isNotBlank(antExAddRequest.getCouponCode()) && antExAddRequest.getCouponType() != null) { BaseObjectResponse resp = couponService.validate(antExAddRequest.getCouponCode(), antExAddRequest.getCouponType(), autoMatchFacade.getHospitalId(userId)); @@ -460,6 +473,14 @@ public class AntenatalExaminationFacade { setLashCTimes(antExChuModel.getParentId()); antenatalExaminationService.updateAntExRecord(antExChuModel.getId(), 1); + + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + antExChuQuery.setId(antExChuModel.getId()); + List list = antenatalExaminationService.queryAntExChu(antExChuQuery); + + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list.get(0), antExChuModel, OptActionEnums.UPDATE.getId(), "修改初诊"); + //修改数据 syncMaster(excAddRequest.getParentId(),excAddRequest.getNextCheckTime()); } else { @@ -513,6 +534,10 @@ public class AntenatalExaminationFacade { antExChuModel.setHospitalId(hospitalId); stopWatch.start("queryAntExChu"); antenatalExaminationService.addOneAntEx(antExChuModel); + + + operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospitalId),antExChuModel,OptActionEnums.ADD.getId(),"添加初诊"); + stopWatch.stop(); /** 把优惠券设置为已使用状态 */ stopWatch.start("couponService.use"); 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 e84509a..c8ad932 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 @@ -32,6 +32,7 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; +import org.apache.lucene.util.BytesRefHash; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.Sort; @@ -672,7 +673,7 @@ public class BabyBookbuildingFacade { // String hospitalName = organizationService.getOrganization(Integer.valueOf(request.getHospitalId())).getName(); model = babyBookbuildingService.addBabyBookbuilding(model); - operateLogFacade.addAddOptLog(userId,Integer.valueOf(request.getHospitalId()),model,OptActionEnums.ADD.getId(),"儿童建档"); + operateLogFacade.addAddOptLog(userId, Integer.valueOf(request.getHospitalId()), model, OptActionEnums.ADD.getId(), "儿童建档"); if (model == null || model.getId() == null) { br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); @@ -1932,7 +1933,6 @@ public class BabyBookbuildingFacade { list.add("2"); babyQuery.setEnableListNot(list); OrganizationQuery organizationQuery = new OrganizationQuery(); - if(!StringUtils.isEmpty(request.getHospitalId())){ hospitalIdList.add(request.getHospitalId()); }else if(!StringUtils.isEmpty(request.getHospitalAreaId())){ @@ -1955,11 +1955,6 @@ public class BabyBookbuildingFacade { } } -// 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(); dataPermissionsModelQuery.setUserId(userId); @@ -1973,9 +1968,14 @@ public class BabyBookbuildingFacade { } } - hospitalIdList.retainAll(permissions); - - + if (CollectionUtils.isNotEmpty(hospitalIdList)) + { + hospitalIdList.retainAll(permissions); + } + else + { + hospitalIdList.addAll(permissions); + } }else{ String hospitalId = ""; //得到当前登录的医院id