diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index f31323f..7aa09cb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -4593,13 +4593,13 @@ public class BabyCheckFacade extends BaseServiceImpl { Integer uId = user.getId(); //儿保检查 - int checkCount = (int)mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospialId).and("checkDate").gte(startDate).lte(endDate).and("yn").is(YnEnums.YES.getId())),BabyCheckModel.class); + int checkCount = (int)mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospialId).and("checkDate").gte(startDate).lte(endDate).and("yn").is(YnEnums.YES.getId()).and("checkDoctor").is(String.valueOf(user.getId()))), BabyCheckModel.class); //营养专科 - int babyNutritioncount = (int)mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospialId).and("checkDate").gte(startDate).lte(endDate).and("yn").is(YnEnums.YES.getId())),BabyNutritionSpecialtyModel.class); + int babyNutritioncount = (int)mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospialId).and("checkDate").gte(startDate).lte(endDate).and("yn").is(YnEnums.YES.getId()).and("checkDoctor").is(String.valueOf(user.getId()))),BabyNutritionSpecialtyModel.class); //高危儿专科 - int babyHightcount = (int)mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospialId).and("checkDate").gte(startDate).lte(endDate).and("yn").is(YnEnums.YES.getId())),BabyHighRiskBabyModel.class); + int babyHightcount = (int)mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospialId).and("checkDate").gte(startDate).lte(endDate).and("yn").is(YnEnums.YES.getId()).and("checkDoctor").is(String.valueOf(user.getId()))),BabyHighRiskBabyModel.class); //心里专科 - int babyPsychologiscount = (int)mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospialId).and("checkDate").gte(startDate).lte(endDate).and("yn").is(YnEnums.YES.getId())),BabyPsychologistModel.class); + int babyPsychologiscount = (int)mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospialId).and("checkDate").gte(startDate).lte(endDate).and("yn").is(YnEnums.YES.getId()).and("checkDoctor").is(String.valueOf(user.getId()))),BabyPsychologistModel.class); int count = checkCount+babyNutritioncount+babyHightcount+babyPsychologiscount; if (count == 0)