From 21d8a25aca6eeac995b274c666e6ce7a80ddee35 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 29 Jul 2021 10:41:19 +0800
Subject: [PATCH] update

---
 .../main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java |  2 +-
 .../operate/web/request/ResidentsArchiveAddRequest.java    |  1 +
 .../service/impl/BabyEvaluationCriterionServiceImpl.java   | 14 +++++++-------
 3 files changed, 9 insertions(+), 8 deletions(-)

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<ResidentsArchiveModel> 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<Resident
         model.setProfessionTypeId(professionTypeId);
         model.setHospitalId(hospitalId);
         model.setAge(age);
+        model.setType(type);
 
         model.setSpouseName(spouseName);
         model.setSpouseCardNo(spouseCardNo);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java
index 0c48b84..a36d435 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java
@@ -665,13 +665,13 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri
                         }
                     }
                     Integer month = model.getCheckMonth();
-                    int [] months = null;
-                    months = getInts(months, month);
-                    int month1 = months[0];
-                    List<BabyEvaluationCriterionModel> 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<BabyEvaluationCriterionModel> 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 = "";
-- 
1.8.3.1