用户 增加医生选项 选择完机构后 出来当前选择机构的数据 用户的审核超声和影像分开权限 增加医生根据机构ID获取医生列表方法
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled

This commit is contained in:
lxd 2024-08-28 14:24:15 +08:00
parent 0b8568689c
commit e559c8f2ba
12 changed files with 71 additions and 5 deletions

View File

@ -154,5 +154,13 @@ public class DoctorController {
List<DoctorDO> doctorDOs= Service.getDoctorList(user.getOrgId());
return success(doctorDOs);
}
@GetMapping("/getdoctorlist")
@Operation(summary = "根据传入的机构获得医生list")
@PreAuthorize("@ss.hasPermission('doctor::query')")
public CommonResult<List<DoctorDO>> getdoctorlist(@RequestParam("orgId") String orgId) {
List<DoctorDO> doctorDOs= Service.getDoctorList(orgId);
return success(doctorDOs);
}
}

View File

@ -74,4 +74,10 @@ public class UserProfileRespVO {
private String orgId;
private String isexamine;
private String isimageexamine;
private String doctorID;
private String doctorname;
}

View File

@ -39,4 +39,8 @@ public class UserPageReqVO extends PageParam {
private String orgId;
private String isexamine;
private String isimageexamine;
private String doctorID;
private String doctorname;
}

View File

@ -74,4 +74,9 @@ public class UserRespVO{
private String orgId;
private String isexamine;
private String isimageexamine;
private String doctorID;
private String doctorname;
}

View File

@ -72,6 +72,12 @@ public class UserSaveReqVO {
private String orgId;
private String isexamine;
private String isimageexamine;
private String doctorID;
private String doctorname;
// ========== 创建需要传递的字段 ==========
@Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")

View File

@ -24,4 +24,10 @@ public class UserSimpleRespVO {
private String orgId;
private String isexamine;
private String isimageexamine;
private String doctorID;
private String doctorname;
}

View File

@ -98,9 +98,28 @@ public class AdminUserDO extends TenantBaseDO {
@TableField("orgId")
private String orgId;
/**
* 是否有审核权限
* 超声是否有审核权限
*/
@TableField("isexamine")
private String isexamine;
/**
* 影像是否有审核权限
*/
@TableField("isimageexamine")
private String isimageexamine;
/**
* 关联医生ID
*/
@TableField("doctorID")
private String doctorID;
/**
* 关联医生
*/
@TableField("doctorname")
private String doctorname;
}

View File

@ -237,7 +237,7 @@ public class PatientexamlistController {
}
@GetMapping("/examine")
@Operation(summary = "超声保存更新数据")
@Operation(summary = "超声审核更新数据")
@PreAuthorize("@ss.hasPermission('tblist:patientexamlist:update')")
@LogRecord(type = "超声审核", subType = "审核", bizNo = "{{#updateReqVO.getId}}", success = "审核ID为{{#id}}的患者")
public CommonResult<Boolean> examine(@RequestParam("id") String id) {
@ -248,8 +248,8 @@ public class PatientexamlistController {
AdminUserDO user = userService.getUser(getLoginUserId());
PatientexamlistSaveReqVO updateReqVO = new PatientexamlistSaveReqVO();
updateReqVO.setId(id);
updateReqVO.setReviewDoctorId(String.valueOf(user.getId()));
updateReqVO.setReviewDoctor(user.getUsername());
updateReqVO.setReviewDoctorId(user.getDoctorID());
updateReqVO.setReviewDoctor(user.getDoctorname());
updateReqVO.setReviewDate(dateTime);
updateReqVO.setReviewStatus("1");
updateReqVO.setReportstatus("已审核");

View File

@ -78,9 +78,15 @@ public class PatientexamlistPageReqVO extends PageParam {
@Schema(description = "诊断医生")
private String diagDoctor;
@Schema(description = "诊断ID")
private String diagDoctorId;
@Schema(description = "审核医生")
private String reviewDoctor;
@Schema(description = "审核医生ID")
private String reviewDoctorId;
@Schema(description = "审核日期:年月日时分秒")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] reviewDate;

View File

@ -93,6 +93,9 @@ public class PatientexamlistRespVO {
@ExcelProperty("诊断医生")
private String diagDoctor;
@Schema(description = "诊断ID")
private String diagDoctorId;
@Schema(description = "审核医生")
@ExcelProperty("审核医生")
private String reviewDoctor;

View File

@ -70,6 +70,9 @@ public class PatientexamlistSaveReqVO {
@Schema(description = "诊断医生")
private String diagDoctor;
@Schema(description = "诊断ID")
private String diagDoctorId;
@Schema(description = "审核医生ID")
private String reviewDoctorId;

View File

@ -107,7 +107,7 @@ public class ultrasonicController {
if (isprivate.equals("1")) {
// 筛选条件
filteredList = filteredList.stream()
.filter(ultrasonicDO -> Objects.equals(ultrasonicDO.getPrivateDoctorId(), user.getId().toString()))
.filter(ultrasonicDO -> Objects.equals(ultrasonicDO.getPrivateDoctorId(), user.getDoctorID()))
.collect(Collectors.toList());
}