diff --git a/yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/applyform/vo/ApplyformRespVO.java b/yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/applyform/vo/ApplyformRespVO.java index 0ddb11255..f396fdef5 100644 --- a/yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/applyform/vo/ApplyformRespVO.java +++ b/yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/applyform/vo/ApplyformRespVO.java @@ -84,7 +84,6 @@ public class ApplyformRespVO { private LocalDateTime createDate; @Schema(description = "检查项目代码") - @ExcelProperty("检查项目代码") private String examItemCode; @Schema(description = "机构ID", example = "31976") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/examitems/examitemsController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/examitems/examitemsController.java index 4020ecb15..c7ac092b4 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/examitems/examitemsController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/examitems/examitemsController.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.system.controller.admin.examitems; +import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.iocoder.yudao.module.system.service.user.AdminUserService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -24,6 +26,7 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; import cn.iocoder.yudao.module.system.controller.admin.examitems.vo.*; import cn.iocoder.yudao.module.system.dal.dataobject.examitems.examitemsDO; @@ -41,7 +44,8 @@ public class examitemsController { @Resource private examitemsService examitemsService; - + @Resource + private AdminUserService userService; @PostMapping("/create") @Operation(summary = "创建检查部位") @PreAuthorize("@ss.hasPermission('examitems:examitems:create')") @@ -109,6 +113,13 @@ public class examitemsController { @Operation(summary = "获得检查部位分页") @PreAuthorize("@ss.hasPermission('examitems:examitems:query')") public CommonResult> getexamitemsPage(@Valid examitemsPageReqVO pageReqVO) { + //获取当前登陆用户 + AdminUserDO user = userService.getUser(getLoginUserId()); + String creator=user.getCreator(); + if(!creator.equals("admin")) + { + pageReqVO.setOrgId(user.getOrgId()); + } PageResult pageResult = examitemsService.getexamitemsPage(pageReqVO); return success(BeanUtils.toBean(pageResult, examitemsRespVO.class)); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/examitems/vo/examitemsPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/examitems/vo/examitemsPageReqVO.java index 10891b3c6..035850cd4 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/examitems/vo/examitemsPageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/examitems/vo/examitemsPageReqVO.java @@ -23,5 +23,7 @@ public class examitemsPageReqVO extends PageParam { @Schema(description = "检查部位代码") private String examPartCode; + @Schema(description = "机构ID", example = "32037") + private String orgId; } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/examitems/examitemsMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/examitems/examitemsMapper.java index f5593cc3e..2cca9220e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/examitems/examitemsMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/examitems/examitemsMapper.java @@ -27,6 +27,7 @@ public interface examitemsMapper extends BaseMapperX { .likeIfPresent(examitemsDO::getExamItemCode, reqVO.getExamItemCode()) .likeIfPresent(examitemsDO::getExamPartCode, reqVO.getExamPartCode()) .eq(examitemsDO::getIsdelete, '0') + .eqIfPresent(examitemsDO::getOrgId,reqVO.getOrgId()) .orderByDesc(examitemsDO::getId)); } diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java index edd8e9d39..de73e59fb 100644 --- a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java @@ -244,7 +244,7 @@ public class ultrasonicController { public CommonResult GetDcmList() { - String Res="{\"status\":\"success\",\"patientname\":\"朱晓珍\",\"hospital\":\"东营康惠健康体检中心\",\"seriesList\":[{\"thumbUrl\":\"/public/static/101缩略图.jpg\",\"seriesdesc\":\"CHEST\",\"instanceList\":[{\"imageid\":\"/public/static/49814@101@1@1.2.156.112605.189250948694021.20221211000237.4.28076.1.dcm\"}]},{\"thumbUrl\":\"/public/static/201缩略图.jpg\",\"seriesdesc\":\"CHEST\",\"instanceList\":[{\"imageid\":\"/public/static/49814@201@1@1.2.156.112605.189250948694021.20221211000325.4.16016.1.dcm\"},{\"imageid\":\"/public/static/49814@201@2@1.2.156.112605.189250948694021.20221211000325.4.16016.2.dcm\"},{\"imageid\":\"/public/static/49814@201@3@1.2.156.112605.189250948694021.20221211000325.4.16016.3.dcm\"},{\"imageid\":\"/public/static/49814@201@4@1.2.156.112605.189250948694021.20221211000326.4.16016.1.dcm\"},{\"imageid\":\"/public/static/49814@201@5@1.2.156.112605.189250948694021.20221211000326.4.16016.2.dcm\"}]}]}"; + String Res="{\"status\":\"success\",\"patientname\":\"朱晓珍\",\"hospital\":\"东营康惠健康体检中心\",\"seriesList\":[{\"thumbUrl\":\"/static/101缩略图.jpg\",\"seriesdesc\":\"CHEST\",\"instanceList\":[{\"imageid\":\"/static/49814@101@1@1.2.156.112605.189250948694021.20221211000237.4.28076.1.dcm\"}]},{\"thumbUrl\":\"/static/201缩略图.jpg\",\"seriesdesc\":\"CHEST\",\"instanceList\":[{\"imageid\":\"/static/49814@201@1@1.2.156.112605.189250948694021.20221211000325.4.16016.1.dcm\"},{\"imageid\":\"/static/49814@201@2@1.2.156.112605.189250948694021.20221211000325.4.16016.2.dcm\"},{\"imageid\":\"/static/49814@201@3@1.2.156.112605.189250948694021.20221211000325.4.16016.3.dcm\"},{\"imageid\":\"/static/49814@201@4@1.2.156.112605.189250948694021.20221211000326.4.16016.1.dcm\"},{\"imageid\":\"/static/49814@201@5@1.2.156.112605.189250948694021.20221211000326.4.16016.2.dcm\"}]}]}"; return success(Res); }