jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ef5805a4c38e6b331580bb47f82070dc83e3e3f7

Authored by yangfei
2 parents aef3158acc 5574ae78d3
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/PremaritalCheckupFacade.java View file @ ef5805a
... ... @@ -2241,8 +2241,8 @@
2241 2241 checkupResult.setYiGanHeXinKangTi(handleYY(result.getYiGanHeXinKangTi()));
2242 2242  
2243 2243 //肾功能
2244   - checkupResult.setXueQingJiGan(UnitHandle(result.getXueQingJiGan(), UnitConstants.UL));
2245   - checkupResult.setXueNiaoSuDan(UnitHandle(result.getXueNiaoSuDan(), UnitConstants.UL));
  2244 + checkupResult.setXueQingJiGan(UnitHandle(result.getXueQingJiGan(), UnitConstants.UMOLL));
  2245 + checkupResult.setXueNiaoSuDan(UnitHandle(result.getXueNiaoSuDan(), UnitConstants.MMOLL));
2246 2246  
2247 2247 //梅毒血清实验
2248 2248 checkupResult.setShiYanJieGuo(handleYY(result.getShiYanJieGuo()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ ef5805a
... ... @@ -680,13 +680,14 @@
680 680  
681 681 @Override
682 682 public BaseObjectResponse couponInfo(Map<String, Object> param) {
  683 + Integer currentPage = (Integer) param.get("currentPage");
683 684 PageUtil.setPageInfo(param);
684 685 if(param.get("hospitalId") == null) {
685 686 param.put("hospitalId", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + ""))); /** 根据登陆人id 查询出来的医院 */
686 687 }
687 688 doHospitalFilter(param);
688 689 if(param.get("hospitalId") == null) {
689   - return RespBuilder.buildSuccess(new PageResult(0, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", new ArrayList<>())));
  690 + return RespBuilder.buildSuccess(new PageResult(0, currentPage ,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", new ArrayList<>())));
690 691 }
691 692 Integer type = (Integer) param.get("type");
692 693  
... ... @@ -738,7 +739,7 @@
738 739 }
739 740 }
740 741 int count = couponMapper.findCouponInfoCount(param);
741   - PageResult pageResult = new PageResult(count, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", couponInfos, "subTitle", subTitle));
  742 + PageResult pageResult = new PageResult(count, currentPage,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", couponInfos, "subTitle", subTitle));
742 743 return RespBuilder.buildSuccess(pageResult);
743 744 } if(type == 1) { /** 发放人数统计 */
744 745 List<Map<String,Object>> userSendInfo = couponMapper.findUserSendInfo(param);
... ... @@ -757,7 +758,7 @@
757 758  
758 759 }
759 760 }
760   - PageResult pageResult = new PageResult(count, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos", userSendInfo));
  761 + PageResult pageResult = new PageResult(count, currentPage,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos", userSendInfo));
761 762 return RespBuilder.buildSuccess(pageResult);
762 763 } else if(type == 999) { /** 先占位置 */
763 764