diff --git a/MD/test/reports/07_full_chain_report.json b/MD/test/reports/07_full_chain_report.json index 92d5f3324..16bd17c6b 100644 --- a/MD/test/reports/07_full_chain_report.json +++ b/MD/test/reports/07_full_chain_report.json @@ -1,5 +1,5 @@ { - "test_time": "2026-06-08T09:11:33.934379", + "test_time": "2026-06-08T11:20:49.248056", "environment": "http://localhost:18082/healthlink-his", "total": 125, "passed": 125, @@ -167,7 +167,7 @@ "id": "OP-PHARM", "name": "待发药列表", "ok": true, - "detail": "待发药=534" + "detail": "待发药=532" }, { "id": "OP-WEST", @@ -377,13 +377,13 @@ "id": "INS-3D", "name": "3D重建任务", "ok": true, - "detail": "任务=0" + "detail": "任务=14" }, { "id": "INS-3D-RPT", "name": "3D重建报告", "ok": true, - "detail": "报告=0" + "detail": "报告=11" }, { "id": "INS-RAD-RPT", @@ -695,7 +695,7 @@ "id": "MR-05-PHARM", "name": "药师→待发药", "ok": true, - "detail": "待发药=534" + "detail": "待发药=532" }, { "id": "MR-06-CHARGE", diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/reconstruction/controller/Reconstruction3DController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/reconstruction/controller/Reconstruction3DController.java index 761c7aeab..a6b86d286 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/reconstruction/controller/Reconstruction3DController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/reconstruction/controller/Reconstruction3DController.java @@ -4,6 +4,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.healthlink.his.reconstruction.domain.*; import com.healthlink.his.reconstruction.service.*; +import com.core.system.service.ISysUserService; +import com.core.system.service.ISysRoleService; +import com.core.common.core.domain.entity.SysRole; +import com.core.common.core.domain.entity.SysUser; import lombok.AllArgsConstructor;import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils;import org.springframework.web.bind.annotation.*; @@ -13,6 +17,8 @@ public class Reconstruction3DController { private final IReconstructionTaskService taskService; private final IReconstructionResultService resultService; private final IReconstructionReportService reportService; + private final ISysUserService userService; + private final ISysRoleService roleService; // ==================== 重建任务 ==================== @GetMapping("/task/page") @@ -100,4 +106,32 @@ public class Reconstruction3DController { stats.put("totalReports", reportService.count()); return R.ok(stats); } + + // ==================== 医生列表 ==================== + @GetMapping("/doctors") + public R getDoctors() { + SysUser query = new SysUser(); + query.setStatus("0"); + query.setDelFlag("0"); + List allUsers = userService.selectUserList(query); + // For each user, check if they have role 200 (doctor) + List> doctors = new ArrayList<>(); + for (SysUser user : allUsers) { + List roles = roleService.selectRolesByUserId(user.getUserId()); + if (roles != null) { + for (SysRole role : roles) { + if (role.getRoleId() != null && role.getRoleId() == 200L) { + Map doc = new HashMap<>(); + doc.put("userId", user.getUserId()); + doc.put("userName", user.getUserName()); + doc.put("nickName", user.getNickName()); + doctors.add(doc); + break; + } + } + } + } + return R.ok(doctors); + } + } diff --git a/healthlink-his-ui/src/views/reconstruction/3d/api.js b/healthlink-his-ui/src/views/reconstruction/3d/api.js index efe1dd2fb..85eec7bff 100644 --- a/healthlink-his-ui/src/views/reconstruction/3d/api.js +++ b/healthlink-his-ui/src/views/reconstruction/3d/api.js @@ -10,5 +10,5 @@ export function addReport(d){return request({url:'/reconstruction/report/add',me export function submitReport(id){return request({url:'/reconstruction/report/submit/'+id,method:'put'})} export function verifyReport(id,doctor){return request({url:'/reconstruction/report/verify/'+id,method:'put',params:{doctor}})} export function getStats(){return request({url:'/reconstruction/stats',method:'get'})} -// 获取医生列表(有医生角色的用户) -export function getDoctorList(){return request({url:'/system/user/list',method:'get',params:{pageSize:200}})} +// Get all active users for doctor selection +export function getDoctorList(){return request({url:'/system/user/list',method:'get',params:{status:'0',pageSize:200}})}