diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectorg/InspectOrgController.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectorg/InspectOrgController.java index 461cdb3..56fe52b 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectorg/InspectOrgController.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectorg/InspectOrgController.java @@ -42,14 +42,12 @@ public class InspectOrgController { @PostMapping("/create") @Operation(summary = "创建机构") - @PreAuthorize("@ss.hasPermission('tb:inspect-org:create')") public CommonResult createInspectOrg(@Valid @RequestBody InspectOrgSaveReqVO createReqVO) { return success(inspectOrgService.createInspectOrg(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新机构") - @PreAuthorize("@ss.hasPermission('tb:inspect-org:update')") public CommonResult updateInspectOrg(@Valid @RequestBody InspectOrgSaveReqVO updateReqVO) { inspectOrgService.updateInspectOrg(updateReqVO); return success(true); @@ -58,7 +56,6 @@ public class InspectOrgController { @DeleteMapping("/delete") @Operation(summary = "删除机构") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('tb:inspect-org:delete')") public CommonResult deleteInspectOrg(@RequestParam("id") Long id) { inspectOrgService.deleteInspectOrg(id); return success(true); @@ -67,7 +64,6 @@ public class InspectOrgController { @GetMapping("/get") @Operation(summary = "获得机构") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('tb:inspect-org:query')") public CommonResult getInspectOrg(@RequestParam("id") Long id) { InspectOrgDO inspectOrg = inspectOrgService.getInspectOrg(id); return success(BeanUtils.toBean(inspectOrg, InspectOrgRespVO.class)); @@ -75,14 +71,12 @@ public class InspectOrgController { @GetMapping("/page") @Operation(summary = "获得机构分页") - @PreAuthorize("@ss.hasPermission('tb:inspect-org:query')") public CommonResult> getInspectOrgPage(@Valid InspectOrgPageReqVO pageReqVO) { PageResult pageResult = inspectOrgService.getInspectOrgPage(pageReqVO); return success(BeanUtils.toBean(pageResult, InspectOrgRespVO.class)); } @GetMapping("/all") @Operation(summary = "获得所有机构信息") - @PreAuthorize("@ss.hasPermission('tb:inspect-org:query')") public CommonResult> getInspectOrgList(@Valid InspectOrgPageReqVO pageReqVO) { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); PageResult pageResult = inspectOrgService.getInspectOrgPage(pageReqVO); @@ -91,7 +85,6 @@ public class InspectOrgController { @GetMapping("/export-excel") @Operation(summary = "导出机构 Excel") - @PreAuthorize("@ss.hasPermission('tb:inspect-org:export')") @ApiAccessLog(operateType = EXPORT) public void exportInspectOrgExcel(@Valid InspectOrgPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java index 620daef..f2e02d6 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java @@ -1979,4 +1979,13 @@ public class InspectPatientController { patientService.updateBarcodeTime(medicalSn, barcodetime); return success(true); } + + @PutMapping("/updatePatientOrg") + @Operation(summary = "根据体检编号更新患者归属医院") + public CommonResult updatePatientOrg(@RequestParam("medicalSn") String medicalSn, + @RequestParam("examhoscode") String examhoscode, + @RequestParam("examhosname") String examhosname) { + patientService.updatePatientOrg(medicalSn, examhoscode, examhosname); + return success(true); + } } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientInfoVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientInfoVO.java index 0679381..3c08390 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientInfoVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientInfoVO.java @@ -70,4 +70,10 @@ public class InspectPatientInfoVO { @Schema(description = "总检医生") private String chiefinspector; + + @Schema(description = "体检医院编码") + private String examhoscode; + + @Schema(description = "体检医院名称") + private String examhosname; } diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientPageReqVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientPageReqVO.java index 31ff6d9..153537f 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientPageReqVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientPageReqVO.java @@ -145,4 +145,10 @@ public class InspectPatientPageReqVO extends PageParam { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss ", timezone = "GMT+8") private LocalDateTime barcodetime; + @Schema(description = "体检医院编码") + private String examhoscode; + + @Schema(description = "体检医院名称") + private String examhosname; + } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientRespVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientRespVO.java index eb7e1d4..24295b0 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientRespVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientRespVO.java @@ -155,4 +155,10 @@ public class InspectPatientRespVO { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss ", timezone = "GMT+8") private LocalDateTime barcodetime; + @Schema(description = "体检医院编码") + private String examhoscode; + + @Schema(description = "体检医院名称") + private String examhosname; + } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientSaveReqVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientSaveReqVO.java index 7589930..c0d9f4a 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientSaveReqVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientSaveReqVO.java @@ -128,4 +128,10 @@ public class InspectPatientSaveReqVO { @Schema(description = "报告地址") private String pdfurl; + + @Schema(description = "体检医院编码") + private String examhoscode; + + @Schema(description = "体检医院名称") + private String examhosname; } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectpatient/InspectPatientDO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectpatient/InspectPatientDO.java index 8dc00d6..69a7980 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectpatient/InspectPatientDO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectpatient/InspectPatientDO.java @@ -260,7 +260,15 @@ public class InspectPatientDO { */ @TableField("pulflag") private String pulflag; - - + /** + * 体检医院编码 + */ + @TableField("examhoscode") + private String examhoscode; + /** + * 体检医院名称 + */ + @TableField("examhosname") + private String examhosname; } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientService.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientService.java index d074b4f..bb2f815 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientService.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientService.java @@ -57,6 +57,11 @@ public interface InspectPatientService { * 更新打印状态 * */ void isprintupdate(String medicalSn, Date printtime); + + /* + * 根据体检编号更新患者归属医院信息 + */ + void updatePatientOrg(String medicalSn, String examhoscode, String examhosname); /** * 删除患者信息 diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java index 9ce7df4..1d6eb12 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java @@ -138,6 +138,14 @@ public class InspectPatientServiceImpl implements InspectPatientService { patientMapper.update(null, updateWrapper); } @Override + public void updatePatientOrg(String medicalSn, String examhoscode, String examhosname) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(InspectPatientDO::getMedicalSn, medicalSn) + .set(InspectPatientDO::getExamhoscode, examhoscode) + .set(InspectPatientDO::getExamhosname, examhosname); + patientMapper.update(null, updateWrapper); + } + @Override public void deletePatient(Integer id) { // 校验存在 validatePatientExists(id);