From a35f96d1e086655a9ee61e997520dbbe0ddc3395 Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Fri, 04 Sep 2020 16:47:25 +0800 Subject: [PATCH] 修改查询科室套餐是否到期的接口,返回字段增加剩余读片量/报告量/剩余天数 删除原有的结束时间参数 --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java index 1efe30b..2ad67ee 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java +++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java @@ -97,7 +97,7 @@ //查询 科室 QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("org_id", sysUserOrg.getUpdateUserId()); + queryWrapper.eq("org_id", sysUserOrg.getOrgId()); queryWrapper.eq("is_del", 0); queryWrapper.eq("enabled", 1); List<SysDepartment> list = sysDepartmentService.list(queryWrapper); @@ -136,7 +136,7 @@ //查询 科室 QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("org_id", sysUserOrg.getUpdateUserId()); + queryWrapper.eq("org_id", sysUserOrg.getOrgId()); queryWrapper.eq("is_del", 0); queryWrapper.eq("enabled", 1); List<SysDepartment> list = sysDepartmentService.list(queryWrapper); @@ -151,9 +151,9 @@ queryWrapper.eq("enabled", 1); List<SysHospital> listHospital = sysHospitalService.list(queryWrapper); if (!listHospital.isEmpty()) { - sysUserOrgTemp.setFromId(listHospital.get(0).getId()); + sysUserOrg.setFromId(listHospital.get(0).getId()); } - sysUserOrgTemp.setFromLevel(1); + sysUserOrg.setFromLevel(1); // sysUserOrg.setUpdateUserId(0L); sysUserOrg.setOrgId(sysOrganization.getOrgParentId()); sysUserOrg.setCreateUserOrgCode(createUserOrgCode); -- Gitblit v1.8.0