diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index e9f878b..7a13efc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -484,12 +484,12 @@ public class UsersController extends BaseController { // } String ip = IpUtils.getIpAddress(request); - System.out.println("userIp="+ip); -// if ("2100001452".equals(u.getOrgId().toString()) && "192.168.100.101".equals(ip)) { -// ResultUtils.buildParameterErrorResultAndWrite(response, ""); -// return; -// } - + if ("xxx".equals(u.getRemarks())){ + if ("2100001452".equals(u.getOrgId().toString()) && "10.0.61.50".equals(ip)) { + ResultUtils.buildParameterErrorResultAndWrite(response, ""); + return; + } + } if (null != u.getOrgId()) { Organization organization = organizationService.getOrganization(u.getOrgId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index 7ae3a85..5208756 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -862,14 +862,18 @@ public class MeasureInfoFacade { } patientsQuery.setExtSource(false); - //patientsQuery.setHospitalId(hospitalId); + patientsQuery.setHospitalId(hospitalId); patientsQuery.setType(1); patientsQuery.setYn(YnEnums.YES.getId()); List patientses = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isEmpty(patientses)) { - objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); - objectResponse.setErrormsg("测量用户还未建档"); - return objectResponse; + patientsQuery.setHospitalId(null); + patientses = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isEmpty(patientses)) { + objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); + objectResponse.setErrormsg("测量用户还未建档"); + return objectResponse; + } } Patients pat = patientses.get(0); @@ -983,13 +987,12 @@ public class MeasureInfoFacade { } public BaseObjectResponse addNutritionInfo(NutritionInfoRequest nutritionInfoRequest) { - + String hospitalId = nutritionInfoRequest.getHospitalId().trim(); Patients patients = patientsService.findOnePatientById(nutritionInfoRequest.getPatientId()); nutritionInfoRequest.setPid(patients.getPid()); List patientWeights = patientWeightService2.queryPatientWeight(Query.query( - Criteria.where("pid").is(patients.getPid()).and("yn").is("1").and("created").gte(patients.getLastMenses()))); - String hospitalId = nutritionInfoRequest.getHospitalId().trim(); - + Criteria.where("pid").is(patients.getPid()).and("yn").is("1") + .and("created").gte(patients.getLastMenses()).and("hospitalId").is(hospitalId))); Map dayWeights = new LinkedHashMap<>(); List> dayWeights2 = new ArrayList<>(); @@ -1198,7 +1201,7 @@ public class MeasureInfoFacade { } - bp = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(p.getPid())), BloodPressure.class); + bp = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(p.getPid()).and("hospitalId").is(hospitalId)), BloodPressure.class); } if (bp == null) { String parentId = mongoUtil.doHidePatient(bloodPressure.getParentId(), hospitalId); @@ -1348,7 +1351,9 @@ public class MeasureInfoFacade { public BaseResponse addBloodSugar(BloodSugar bloodSugar) { BaseObjectResponse objectResponse = new BaseObjectResponse(); - BloodSugar one = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(mongoUtil.getPid(bloodSugar.getParentId())).and("created").gt(DateUtil.getYMDTime()).and("bloodSugarType").is(bloodSugar.getBloodSugarType())), BloodSugar.class); + BloodSugar one = mongoTemplate.findOne(Query.query(Criteria.where("pid") + .is(mongoUtil.getPid(bloodSugar.getParentId())).and("created") + .gt(DateUtil.getYMDTime()).and("bloodSugarType").is(bloodSugar.getBloodSugarType()).and("hospitalId").is(bloodSugar.getHospitalId())), BloodSugar.class); Patients patients = patientsService.findOnePatientById(bloodSugar.getParentId());