diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java index 29ad48c..adbcdb5 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java @@ -300,7 +300,7 @@ public class BabyHighRiskBabyModelQuery extends BaseQuery implements IConvertToN //结案 转归 1痊愈□ 2好转□ 3转院□ 4失访□ if (StringUtils.isNotEmpty(cCOutcome)) { - condition = condition.and("cCOutcome", cCOutcome, MongoOper.IS); + condition = condition.and("cCOutcome", cCOutcome, MongoOper.IS).and("caseClosed", "1", MongoOper.IS); } if (StringUtils.isNotEmpty(caseClosed)) { diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionSpecialtyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionSpecialtyModelQuery.java index d435f2f..b0726c8 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionSpecialtyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionSpecialtyModelQuery.java @@ -254,8 +254,7 @@ public class BabyNutritionSpecialtyModelQuery extends BaseQuery implements IConv } //结案 转归 1痊愈□ 2好转□ 3转院□ 4失访□ if (StringUtils.isNotEmpty(cCOutcome)) { - - condition = condition.and("cCOutcome", cCOutcome, MongoOper.IS); + condition = condition.and("cCOutcome", cCOutcome, MongoOper.IS).and("caseClosed", "1", MongoOper.IS); } Criteria c = null; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyDepartmentReferralFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyDepartmentReferralFacade.java index 13daf55..59d470e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyDepartmentReferralFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyDepartmentReferralFacade.java @@ -373,8 +373,13 @@ public class BabyDepartmentReferralFacade { babyQuery.setSort("createDate"); List departmentReferralModels = babyDepartmentReferralService.queryOne(babyQuery); if (CollectionUtils.isNotEmpty(departmentReferralModels)) { - model.setStatus(2); //接受状态 - model.setAcceptDate(new Date()); + for (int i = 0; i < departmentReferralModels.size(); i++) { + DepartmentReferralModel departmentReferralModel = departmentReferralModels.get(i); + if(departmentReferralModel.getStatus()!=null && departmentReferralModel.getStatus()==1){ + model.setStatus(2); //接受状态 + model.setAcceptDate(new Date()); + } + } } } //erbao 儿保检查