lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改登记单列表业务逻辑、检查项目
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
Details
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
lxd 2024-08-09 10:58:20 +08:00
parent 2edb0b4a3e
commit a4470879c6
5 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/applyform/vo/ApplyformRespVO.java
View File

@ -84,7 +84,6 @@ public class ApplyformRespVO {
private LocalDateTime createDate;
@Schema(description = "检查项目代码")
@ExcelProperty("检查项目代码")
private String examItemCode;
@Schema(description = "机构ID", example = "31976")

13
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/examitems/examitemsController.java
View File

@ -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<PageResult<examitemsRespVO>> getexamitemsPage(@Valid examitemsPageReqVO pageReqVO) {
//获取当前登陆用户
AdminUserDO user = userService.getUser(getLoginUserId());
String creator=user.getCreator();
if(!creator.equals("admin"))
{
pageReqVO.setOrgId(user.getOrgId());
}
PageResult<examitemsDO> pageResult = examitemsService.getexamitemsPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, examitemsRespVO.class));
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/examitems/vo/examitemsPageReqVO.java
View File

@ -23,5 +23,7 @@ public class examitemsPageReqVO extends PageParam {
@Schema(description = "检查部位代码")
private String examPartCode;
@Schema(description = "机构ID", example = "32037")
private String orgId;
}

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/examitems/examitemsMapper.java
View File

@ -27,6 +27,7 @@ public interface examitemsMapper extends BaseMapperX<examitemsDO> {
.likeIfPresent(examitemsDO::getExamItemCode, reqVO.getExamItemCode())
.likeIfPresent(examitemsDO::getExamPartCode, reqVO.getExamPartCode())
.eq(examitemsDO::getIsdelete, '0')
.eqIfPresent(examitemsDO::getOrgId,reqVO.getOrgId())
.orderByDesc(examitemsDO::getId));
}

2
yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java
View File

@ -244,7 +244,7 @@ public class ultrasonicController {
public CommonResult<String> 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);
}