liquanyu / regional-platform

Download as
Browse Code ยป

Commit 21d8a25aca6eeac995b274c666e6ce7a80ddee35

Authored by liquanyu
1 parent cddef924d1
Exists in master and in 1 other branch dev

update

Showing 3 changed files with 9 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java View file @ 21d8a25
... ... @@ -707,7 +707,7 @@
707 707 ResidentsArchiveQuery residentsArchiveQuery = new ResidentsArchiveQuery();
708 708 residentsArchiveQuery.setYn(YnEnums.YES.getId());
709 709 residentsArchiveQuery.setBuildDateStart(start);
710   - residentsArchiveQuery.setBuildDateEnd(new Date());
  710 + residentsArchiveQuery.setBuildDateEnd(DateUtil.addMonth(new Date(),10));
711 711 List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(residentsArchiveQuery);
712 712 if (CollectionUtils.isNotEmpty(modelList))
713 713 {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java View file @ 21d8a25
... ... @@ -191,6 +191,7 @@
191 191 model.setProfessionTypeId(professionTypeId);
192 192 model.setHospitalId(hospitalId);
193 193 model.setAge(age);
  194 + model.setType(type);
194 195  
195 196 model.setSpouseName(spouseName);
196 197 model.setSpouseCardNo(spouseCardNo);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java View file @ 21d8a25
... ... @@ -665,13 +665,13 @@
665 665 }
666 666 }
667 667 Integer month = model.getCheckMonth();
668   - int [] months = null;
669   - months = getInts(months, month);
670   - int month1 = months[0];
671   - List<BabyEvaluationCriterionModel> ecmodels = mongoTemplate.find(Query.query(Criteria.where("month").lt(month1).and("type").is(3)), BabyEvaluationCriterionModel.class);
672   - for (BabyEvaluationCriterionModel m : ecmodels) {
673   - zl += m.getProjectVal();
674   - }
  668 +// int [] months = null;
  669 +// months = getInts(months, month);
  670 +// int month1 = months[0];
  671 +// List<BabyEvaluationCriterionModel> ecmodels = mongoTemplate.find(Query.query(Criteria.where("month").lt(month1).and("type").is(3)), BabyEvaluationCriterionModel.class);
  672 +// for (BabyEvaluationCriterionModel m : ecmodels) {
  673 +// zl += m.getProjectVal();
  674 +// }
675 675  
676 676 DecimalFormat df = new DecimalFormat("0.00");
677 677 String zlStr = "";