From e559c8f2baca6f4815ca14ec0bcda1df16d04093 Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Wed, 28 Aug 2024 14:24:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8C=BB=E7=94=9F=E9=80=89=E9=A1=B9=20=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=AE=8C=E6=9C=BA=E6=9E=84=E5=90=8E=20=E5=87=BA=E6=9D=A5?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E9=80=89=E6=8B=A9=E6=9C=BA=E6=9E=84=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E7=94=A8=E6=88=B7=E7=9A=84=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E8=B6=85=E5=A3=B0=E5=92=8C=E5=BD=B1=E5=83=8F=E5=88=86?= =?UTF-8?q?=E5=BC=80=E6=9D=83=E9=99=90=20=E5=A2=9E=E5=8A=A0=E5=8C=BB?= =?UTF-8?q?=E7=94=9F=E6=A0=B9=E6=8D=AE=E6=9C=BA=E6=9E=84ID=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=8C=BB=E7=94=9F=E5=88=97=E8=A1=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/doctor/DoctorController.java | 8 +++++++ .../user/vo/profile/UserProfileRespVO.java | 6 ++++++ .../admin/user/vo/user/UserPageReqVO.java | 4 ++++ .../admin/user/vo/user/UserRespVO.java | 5 +++++ .../admin/user/vo/user/UserSaveReqVO.java | 6 ++++++ .../admin/user/vo/user/UserSimpleRespVO.java | 6 ++++++ .../dal/dataobject/user/AdminUserDO.java | 21 ++++++++++++++++++- .../PatientexamlistController.java | 6 +++--- .../vo/PatientexamlistPageReqVO.java | 6 ++++++ .../vo/PatientexamlistRespVO.java | 3 +++ .../vo/PatientexamlistSaveReqVO.java | 3 +++ .../ultrasonic/ultrasonicController.java | 2 +- 12 files changed, 71 insertions(+), 5 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctor/DoctorController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctor/DoctorController.java index c8033e8bb..dee6ecc05 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctor/DoctorController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctor/DoctorController.java @@ -154,5 +154,13 @@ public class DoctorController { List doctorDOs= Service.getDoctorList(user.getOrgId()); return success(doctorDOs); } + @GetMapping("/getdoctorlist") + @Operation(summary = "根据传入的机构获得医生list") + @PreAuthorize("@ss.hasPermission('doctor::query')") + public CommonResult> getdoctorlist(@RequestParam("orgId") String orgId) { + + List doctorDOs= Service.getDoctorList(orgId); + return success(doctorDOs); + } } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java index 1b4c3e70f..5f7562bd6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java @@ -74,4 +74,10 @@ public class UserProfileRespVO { private String orgId; private String isexamine; + + private String isimageexamine; + + private String doctorID; + + private String doctorname; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java index 54920f89e..30c46ddf0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java @@ -39,4 +39,8 @@ public class UserPageReqVO extends PageParam { private String orgId; private String isexamine; + + private String isimageexamine; + private String doctorID; + private String doctorname; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java index 4dc690427..611110999 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java @@ -74,4 +74,9 @@ public class UserRespVO{ private String orgId; private String isexamine; + + private String isimageexamine; + + private String doctorID; + private String doctorname; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java index 9a582335b..75c011c54 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java @@ -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") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java index d36bf9dd0..3c22b4cdd 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java @@ -24,4 +24,10 @@ public class UserSimpleRespVO { private String orgId; private String isexamine; + + private String isimageexamine; + + private String doctorID; + + private String doctorname; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java index 0c90c103f..8a6c6efca 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java @@ -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; + } diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java index 49c5ac9e8..342f13826 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java @@ -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 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("已审核"); diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistPageReqVO.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistPageReqVO.java index c9eda3e68..f5b70d646 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistPageReqVO.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistPageReqVO.java @@ -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; diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistRespVO.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistRespVO.java index 9f27443f9..1b283e468 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistRespVO.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistRespVO.java @@ -93,6 +93,9 @@ public class PatientexamlistRespVO { @ExcelProperty("诊断医生") private String diagDoctor; + @Schema(description = "诊断ID") + private String diagDoctorId; + @Schema(description = "审核医生") @ExcelProperty("审核医生") private String reviewDoctor; diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistSaveReqVO.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistSaveReqVO.java index b49dfbbd6..c1266ea65 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistSaveReqVO.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistSaveReqVO.java @@ -70,6 +70,9 @@ public class PatientexamlistSaveReqVO { @Schema(description = "诊断医生") private String diagDoctor; + @Schema(description = "诊断ID") + private String diagDoctorId; + @Schema(description = "审核医生ID") private String reviewDoctorId; 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 6c48686bd..3244ae70c 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 @@ -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()); }