jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3b09a0f73b8b9b34a94291d696ba520e64278d21

Authored by yangfei
2 parents fbc2aa615c 1b99cd5ca5
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 3b09a0f
... ... @@ -3795,7 +3795,7 @@
3795 3795 //孕次
3796 3796 tc = chuModel.getPregnancyTimes() == null ? "" : String.valueOf(chuModel.getPregnancyTimes());
3797 3797 // 产次
3798   - tc = chuModel.getProdTime() == null ? "" : String.valueOf(chuModel.getProdTime());
  3798 + cc = chuModel.getProdTime() == null ? "" : String.valueOf(chuModel.getProdTime());
3799 3799 }
3800 3800  
3801 3801 //胎次
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java View file @ 3b09a0f
... ... @@ -228,18 +228,20 @@
228 228 List<Map<String, Object>> restList = new ArrayList<>();
229 229 List<BloodSugar> bloodSugars = mongoTemplate.find(Query.query(Criteria.where("parentId").is(parentId).and("bloodSugarType").is(type)).with(new Sort(Sort.Direction.DESC, "created")), BloodSugar.class);
230 230 Set<String> dayCountSet = new HashSet<>();
  231 + Set<Integer> monthCountSet = new HashSet<>();
231 232 for (BloodSugar bloodSugar : bloodSugars) {
232 233 if(bloodSugar.getBloodSugarType() == type) {
233 234 Map<String, Object> temp = new HashMap<>();
234 235 temp.put("bloodSugar", bloodSugar.getBloodSugar());
235 236 temp.put("craeted", DateUtil.getyyyy_MM_dd_hms(bloodSugar.getCreated()));
  237 + monthCountSet.add(DateUtil.getMonth(bloodSugar.getCreated()));
236 238 temp.put("type", bloodSugar.getBloodSugarType());
237 239 restList.add(temp);
238 240  
239 241 dayCountSet.add(DateUtil.getyyyy_MM_dd(bloodSugar.getCreated()));
240 242 }
241 243 }
242   - return RespBuilder.buildSuccess("restList", restList, "count", bloodSugars.size(), "dayCount", dayCountSet.size());
  244 + return RespBuilder.buildSuccess("restList", restList, "count", bloodSugars.size(), "dayCount", dayCountSet.size(), "month", monthCountSet);
243 245 }
244 246  
245 247 }