jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 216795ed948df6b2d11fca792ed31db9ce5e684a

Authored by yangfei
2 parents bf20e8f00d c2d23d695d
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/controller/ReportController.java View file @ 216795e
... ... @@ -439,12 +439,12 @@
439 439 * @param couponType
440 440 */
441 441 @ResponseBody
442   -// @TokenRequired
  442 + @TokenRequired
443 443 @RequestMapping(value = "/coupon/info/export", method = RequestMethod.GET)
444 444 public void couponInfoExport(HttpServletRequest request, HttpServletResponse response, Date startDate, Date endDate, Integer type,
445 445 String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType, Integer exportType) {
446   - Map<String, Object> param = CollectionUtils.createMap("userId", "1000000185", "startDate", startDate,
447   -// Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate,
  446 +// Map<String, Object> param = CollectionUtils.createMap("userId", "1000000185", "startDate", startDate,
  447 + Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate,
448 448 "endDate", endDate != null ? DateUtil.addDay(endDate, 1) : endDate, "hospitalId", CollectionUtils.asList(hospitalId), "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "type", type,
449 449 "tempId", tempId, "couponType",couponType, "exportType", exportType);
450 450 reportService.exportCouponInfo(param, response);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 216795e
... ... @@ -516,7 +516,7 @@
516 516 criteria.and("patientId").in(ids);
517 517 }
518 518  
519   - PageResult pageResult = findMongoPage(PatientWeight.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
  519 + PageResult pageResult = findMongoPage(PatientWeight.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit);
520 520 List<PatientWeight> patientWeights = (List<PatientWeight>) pageResult.getGrid();
521 521 List<Map<String, Object>> restMap = new ArrayList<>();
522 522 if(CollectionUtils.isNotEmpty(patientWeights)) {