Merge remote-tracking branch 'origin/master'

luoyisheng

2025-03-25 b03d89e792a34c486f0afeab69e837f85d8cbe16

 medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMedicalInstitutionController.java

@@ -41,8 +41,8 @@
     * @param query
     * @return
     */
    @PostMapping("/page")
    @ApiOperation("医疗机构分页列表")
    @PostMapping("/page")
    public R<PageDTO<MedicalInstitutionVO>> pageList(@RequestBody DepartmentQuery query) {
        return R.ok(sysDepartmentService.pageMedicalList(query));
    }
@@ -52,8 +52,8 @@
     *
     * @param dto
     */
    @PostMapping("/add")
    @ApiOperation("新增医疗机构")
    @PostMapping("/add")
    public R<?> add(@Valid @RequestBody MedicalInstitutionDTO dto) {
        sysDepartmentService.addMedical(dto);
        return R.ok();
@@ -65,8 +65,8 @@
     * @param id
     * @return
     */
    @GetMapping("/getDisposalList/{id}")
    @ApiOperation("根据父级区域id查询处置单位列表")
    @GetMapping("/getDisposalList/{id}")
    public R<List<DisposalUnitVO>> getDisposalUnitList(@ApiParam(name = "id", value = "父级区域id") @PathVariable("id") Long id) {
        return R.ok(sysDepartmentService.getDisposalUnitListByParentId(id));
    }
@@ -77,8 +77,8 @@
     * @param dto
     * @return
     */
    @PostMapping("/edit")
    @ApiOperation("编辑医疗机构")
    @PostMapping("/edit")
    public R<?> edit(@Valid @RequestBody MedicalInstitutionDTO dto) {
        sysDepartmentService.editMedical(dto);
        return R.ok();
@@ -90,8 +90,8 @@
     * @param id
     * @return
     */
    @GetMapping("/detail/{id}")
    @ApiOperation("医疗机构详情")
    @GetMapping("/detail/{id}")
    public R<MedicalInstitutionVO> detail(@ApiParam(name = "id", value = "医疗机构id", required = true) @PathVariable("id") Long id) {
        return R.ok(sysDepartmentService.getMedicalDetailById(id));
    }
@@ -101,8 +101,8 @@
     *
     * @param id
     */
    @DeleteMapping("/{id}")
    @ApiOperation("删除医疗机构")
    @DeleteMapping("/{id}")
    public R<?> delete(@ApiParam(name = "id", value = "医疗机构id", required = true) @PathVariable("id") Long id) {
        sysDepartmentService.deleteMedical(id);
        return R.ok();