diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java index da9c15b..704b6dc 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java @@ -707,7 +707,7 @@ public class LhxfyService { ResidentsArchiveQuery residentsArchiveQuery = new ResidentsArchiveQuery(); residentsArchiveQuery.setYn(YnEnums.YES.getId()); residentsArchiveQuery.setBuildDateStart(start); - residentsArchiveQuery.setBuildDateEnd(new Date()); + residentsArchiveQuery.setBuildDateEnd(DateUtil.addMonth(new Date(),10)); List modelList = residentsArchiveService.queryResident(residentsArchiveQuery); if (CollectionUtils.isNotEmpty(modelList)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java index 5fc4b82..6b8d2d0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java @@ -191,6 +191,7 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert ecmodels = mongoTemplate.find(Query.query(Criteria.where("month").lt(month1).and("type").is(3)), BabyEvaluationCriterionModel.class); - for (BabyEvaluationCriterionModel m : ecmodels) { - zl += m.getProjectVal(); - } +// int [] months = null; +// months = getInts(months, month); +// int month1 = months[0]; +// List ecmodels = mongoTemplate.find(Query.query(Criteria.where("month").lt(month1).and("type").is(3)), BabyEvaluationCriterionModel.class); +// for (BabyEvaluationCriterionModel m : ecmodels) { +// zl += m.getProjectVal(); +// } DecimalFormat df = new DecimalFormat("0.00"); String zlStr = "";