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 adbcdb5..66facf9 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 @@ -398,7 +398,7 @@ public class BabyHighRiskBabyModelQuery extends BaseQuery implements IConvertToN } if (null != cCDateEnd) { if (null != c) { - c = c.lte(cCDateEnd); + c = c.lte(cCDateEnd).and("caseClosed").is("1"); } else { c = Criteria.where("cCDate").lte(cCDateEnd); } 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 b0726c8..e5b4f2b 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 @@ -340,7 +340,7 @@ public class BabyNutritionSpecialtyModelQuery extends BaseQuery implements IConv } if (null != cCDateEnd) { if (null != c) { - c = c.lte(cCDateEnd); + c = c.lte(cCDateEnd).and("caseClosed").is("1"); } else { c = Criteria.where("cCDate").lte(cCDateEnd); } 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 9881682..22700bd 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 @@ -175,6 +175,7 @@ public class BabyDepartmentReferralFacade { for (int i = 0; i