diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgconfig/EcgconfigController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgconfig/EcgconfigController.java index 5f3bce1..ac614d9 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgconfig/EcgconfigController.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgconfig/EcgconfigController.java @@ -83,16 +83,14 @@ public class EcgconfigController { } @GetMapping("/list-by-conditions") - @Operation(summary = "根据机构ID、检查ID、登记号获得心电图参数配置列表") + @Operation(summary = "根据机构ID、检查ID获得心电图参数配置列表") @Parameter(name = "orgid", description = "机构ID", required = true) @Parameter(name = "examid", description = "检查唯一标识号", required = true) - @Parameter(name = "regid", description = "患者登记号", required = true) public CommonResult> getEcgconfigListByConditions( @RequestParam("orgid") @NotBlank(message = "机构ID不能为空") String orgid, - @RequestParam("examid") @NotBlank(message = "检查唯一标识号不能为空") String examid, - @RequestParam("regid") @NotBlank(message = "患者登记号不能为空") String regid) { + @RequestParam("examid") @NotBlank(message = "检查唯一标识号不能为空") String examid) { try { - List list = ecgconfigService.getEcgconfigListByConditions(orgid, examid, regid); + List list = ecgconfigService.getEcgconfigListByConditions(orgid, examid); CommonResult> result = success(BeanUtils.toBean(list, EcgconfigRespVO.class)); result.setMsg("查询成功"); return result; diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/EcgworkstationController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/EcgworkstationController.java index ac2d27b..3efd3ae 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/EcgworkstationController.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/EcgworkstationController.java @@ -100,4 +100,15 @@ public class EcgworkstationController { return success(true); } + @PutMapping("/updatePdfUrl") + @Operation(summary = "根据机构ID和检查ID更新PDF地址") + public CommonResult updatePdfUrlByOrgidAndExamid(@Valid @RequestBody EcgworkstationUpdatePdfUrlReqVO updateReqVO) { + boolean updateSuccess = ecgworkstationService.updatePdfUrlByOrgidAndExamid(updateReqVO); + if (updateSuccess) { + return success("PDF报告地址更新成功"); + } else { + return CommonResult.error(404, "未找到匹配的记录,PDF地址更新失败"); + } + } + } \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/vo/EcgworkstationPageReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/vo/EcgworkstationPageReqVO.java index 72beab6..6ad989e 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/vo/EcgworkstationPageReqVO.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/vo/EcgworkstationPageReqVO.java @@ -77,4 +77,7 @@ public class EcgworkstationPageReqVO extends PageParam { @Schema(description = "是否回放: 0-否, 1-是") private Integer isreplay; + @Schema(description = "报告地址") + private String pdfurl; + } \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/vo/EcgworkstationRespVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/vo/EcgworkstationRespVO.java index cc6d068..81a5975 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/vo/EcgworkstationRespVO.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/vo/EcgworkstationRespVO.java @@ -96,4 +96,8 @@ public class EcgworkstationRespVO { @ExcelProperty("是否回放: 0-否, 1-是") private Integer isreplay; + @Schema(description = "报告地址") + @ExcelProperty("报告地址") + private String pdfurl; + } \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/vo/EcgworkstationSaveReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/vo/EcgworkstationSaveReqVO.java index 0fafc51..2f001f7 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/vo/EcgworkstationSaveReqVO.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/vo/EcgworkstationSaveReqVO.java @@ -74,4 +74,7 @@ public class EcgworkstationSaveReqVO { @Schema(description = "是否回放: 0-否, 1-是") private Integer isreplay; + @Schema(description = "报告地址") + private String pdfurl; + } \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/vo/EcgworkstationUpdatePdfUrlReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/vo/EcgworkstationUpdatePdfUrlReqVO.java new file mode 100644 index 0000000..aa54aec --- /dev/null +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgworkstation/vo/EcgworkstationUpdatePdfUrlReqVO.java @@ -0,0 +1,25 @@ +package cn.iocoder.yudao.module.system.controller.admin.ecgworkstation.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@Schema(description = "管理后台 - 心电工作站更新PDF地址 Request VO") +@Data +public class EcgworkstationUpdatePdfUrlReqVO { + + @Schema(description = "机构ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23027") + @NotBlank(message = "机构ID不能为空") + private String orgid; + + @Schema(description = "检查ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "29841") + @NotBlank(message = "检查ID不能为空") + private String examid; + + @Schema(description = "报告地址", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "报告地址不能为空") + private String pdfurl; + +} \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/ecgworkstation/EcgworkstationDO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/ecgworkstation/EcgworkstationDO.java index 801e345..373b057 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/ecgworkstation/EcgworkstationDO.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/ecgworkstation/EcgworkstationDO.java @@ -128,6 +128,11 @@ public class EcgworkstationDO { */ @TableField("isreplay") private Integer isreplay; + /** + * 报告地址 + */ + @TableField("pdfurl") + private String pdfurl; } \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/ecgconfig/EcgconfigMapper.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/ecgconfig/EcgconfigMapper.java index 8f8c860..12be87a 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/ecgconfig/EcgconfigMapper.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/ecgconfig/EcgconfigMapper.java @@ -39,11 +39,10 @@ public interface EcgconfigMapper extends BaseMapperX { .orderByDesc(EcgconfigDO::getId)); } - default List selectListByConditions(String orgid, String examid, String regid) { + default List selectListByConditions(String orgid, String examid) { return selectList(new LambdaQueryWrapperX() .eq(EcgconfigDO::getOrgid, orgid) .eq(EcgconfigDO::getExamid, examid) - .eq(EcgconfigDO::getRegid, regid) .orderByDesc(EcgconfigDO::getId)); } diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/ecgworkstation/EcgworkstationMapper.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/ecgworkstation/EcgworkstationMapper.java index 91a8db3..7e0b4ea 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/ecgworkstation/EcgworkstationMapper.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/ecgworkstation/EcgworkstationMapper.java @@ -8,6 +8,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.module.system.dal.dataobject.ecgworkstation.EcgworkstationDO; import org.apache.ibatis.annotations.Mapper; import cn.iocoder.yudao.module.system.controller.admin.ecgworkstation.vo.*; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; /** * 心电工作站患者信息 Mapper @@ -39,7 +40,24 @@ public interface EcgworkstationMapper extends BaseMapperX { .likeIfPresent(EcgworkstationDO::getFilename, reqVO.getFilename()) .likeIfPresent(EcgworkstationDO::getZipname, reqVO.getZipname()) .eqIfPresent(EcgworkstationDO::getIsreplay, reqVO.getIsreplay()) + .likeIfPresent(EcgworkstationDO::getPdfurl, reqVO.getPdfurl()) .orderByDesc(EcgworkstationDO::getId)); } + /** + * 根据机构ID和检查ID更新PDF地址 + * + * @param orgid 机构ID + * @param examid 检查ID + * @param pdfurl PDF地址 + * @return 更新行数 + */ + default int updatePdfUrlByOrgidAndExamid(String orgid, String examid, String pdfurl) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(EcgworkstationDO::getOrgid, orgid) + .eq(EcgworkstationDO::getExamid, examid) + .set(EcgworkstationDO::getPdfurl, pdfurl); + return update(null, updateWrapper); + } + } \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/ecgconfig/EcgconfigService.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/ecgconfig/EcgconfigService.java index bcd6d55..5fa3488 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/ecgconfig/EcgconfigService.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/ecgconfig/EcgconfigService.java @@ -61,14 +61,13 @@ public interface EcgconfigService { PageResult getEcgconfigPage(EcgconfigPageReqVO pageReqVO); /** - * 根据机构ID、检查ID、登记号获得心电图参数配置列表 + * 根据机构ID、检查ID获得心电图参数配置列表 * * @param orgid 机构ID * @param examid 检查唯一标识号 - * @param regid 患者登记号 * @return 心电图参数配置列表 */ - List getEcgconfigListByConditions(String orgid, String examid, String regid); + List getEcgconfigListByConditions(String orgid, String examid); /** * 根据机构ID、检查ID、登记号更新心电图参数配置 diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/ecgconfig/EcgconfigServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/ecgconfig/EcgconfigServiceImpl.java index f720499..e434c35 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/ecgconfig/EcgconfigServiceImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/ecgconfig/EcgconfigServiceImpl.java @@ -89,8 +89,8 @@ public class EcgconfigServiceImpl implements EcgconfigService { } @Override - public List getEcgconfigListByConditions(String orgid, String examid, String regid) { - return ecgconfigMapper.selectListByConditions(orgid, examid, regid); + public List getEcgconfigListByConditions(String orgid, String examid) { + return ecgconfigMapper.selectListByConditions(orgid, examid); } @Override diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/ecgworkstation/EcgworkstationService.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/ecgworkstation/EcgworkstationService.java index 1fd7047..292af94 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/ecgworkstation/EcgworkstationService.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/ecgworkstation/EcgworkstationService.java @@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.system.controller.admin.patientinfo.vo.patientinf import cn.iocoder.yudao.module.system.controller.admin.ecgworkstation.vo.*; import cn.iocoder.yudao.module.system.dal.dataobject.ecgworkstation.EcgworkstationDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.system.controller.admin.ecgworkstation.vo.EcgworkstationUpdatePdfUrlReqVO; /** * 心电工作站患者信息 Service 接口 @@ -66,4 +67,12 @@ public interface EcgworkstationService { */ void insertEcgworkstationPatientData(List patientInfoList); + /** + * 根据机构ID和检查ID更新PDF地址 + * + * @param updateReqVO 更新信息 + * @return 更新结果 + */ + boolean updatePdfUrlByOrgidAndExamid(@Valid EcgworkstationUpdatePdfUrlReqVO updateReqVO); + } \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/ecgworkstation/EcgworkstationServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/ecgworkstation/EcgworkstationServiceImpl.java index 0d5e58a..dfe1c84 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/ecgworkstation/EcgworkstationServiceImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/ecgworkstation/EcgworkstationServiceImpl.java @@ -111,4 +111,14 @@ public class EcgworkstationServiceImpl implements EcgworkstationService { } } + @Override + public boolean updatePdfUrlByOrgidAndExamid(EcgworkstationUpdatePdfUrlReqVO updateReqVO) { + int updateCount = ecgworkstationMapper.updatePdfUrlByOrgidAndExamid( + updateReqVO.getOrgid(), + updateReqVO.getExamid(), + updateReqVO.getPdfurl() + ); + return updateCount > 0; + } + } \ No newline at end of file diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index e4ecdc3..50ab639 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -279,6 +279,7 @@ yudao: ignore-urls: - /jmreport/* # 积木报表,无法携带租户编号 - /admin-api/system/ecgconfig/** # 心电图参数配置,无法携带租户编号 + - /admin-api/system/ecgworkstation/** # 心电工作站,无法携带租户编号 ignore-visit-urls: - /admin-api/system/user/profile/**