From baef69d1084320237f29b4193ff760689c5ca160 Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Mon, 9 Dec 2024 16:27:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=83=E7=94=B5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/admin/warning/WarningController.java | 4 ++-- .../admin/ecganalysisparas/EcganalysisparasController.java | 7 ++++--- .../service/ecganalysisparas/EcganalysisparasService.java | 2 +- .../ecganalysisparas/EcganalysisparasServiceImpl.java | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/warning/WarningController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/warning/WarningController.java index 2db70c7ee..385db6eec 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/warning/WarningController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/warning/WarningController.java @@ -92,7 +92,7 @@ public class WarningController { @GetMapping("/updateWarningdate") @Operation(summary = "更新危急值接收时间和发送回执记录") - public CommonResult updateWarningdate( @RequestParam("id") String id,@RequestParam("readDateTime") String readDateTime,@RequestParam("receiptDateTime") String receiptDateTime) { + public CommonResult updateWarningdate( @RequestParam("id") String id,@RequestParam("readDateTime") String readDateTime,@RequestParam("receiptDateTime") String receiptDateTime,@RequestParam("orgID") String orgID) { WarningDO warningDO=new WarningDO(); warningDO.setId(id); @@ -107,7 +107,7 @@ public class WarningController { LocalDateTime dateTime = LocalDateTime.parse(receiptDateTime, DateTimeFormatter.ofPattern("yyyy-M-d H:mm:ss")); warningDO.setReceiptDateTime(dateTime); } - + warningDO.setOrgId(orgID); warningMapper.updateById(warningDO); return success(true); diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/EcganalysisparasController.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/EcganalysisparasController.java index 0106963c5..e974aae9b 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/EcganalysisparasController.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/EcganalysisparasController.java @@ -108,10 +108,11 @@ public class EcganalysisparasController { } @GetMapping("/list") @Operation(summary = "获得心电分析所有数据") - public CommonResult> selectEcglist(@RequestParam("regId") String regId) + public CommonResult> selectEcglist(@RequestParam("regId") String regId,@RequestParam("orgId") String orgId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("regId", regId); + queryWrapper.eq("orgId", orgId); List doList= ecganalysisparasMapper.selectList(queryWrapper); return success(doList); } @@ -131,8 +132,8 @@ public class EcganalysisparasController { @GetMapping("/getexamIDdata") @Operation(summary = "根据examId获得心电数据") @Parameter(name = "examID", description = "检查编号", required = true, example = "1024") - public CommonResult getexamIDdata(@RequestParam("examId") String examId) { - EcganalysisparasDO ecganalysisparas= ecganalysisparasService.getexamIDdata(examId); + public CommonResult getexamIDdata(@RequestParam("examId") String examId,@RequestParam("orgId") String orgId) { + EcganalysisparasDO ecganalysisparas= ecganalysisparasService.getexamIDdata(examId,orgId); return success(BeanUtils.toBean(ecganalysisparas, EcganalysisparasRespVO.class)); } } \ No newline at end of file diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/service/ecganalysisparas/EcganalysisparasService.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/service/ecganalysisparas/EcganalysisparasService.java index ed009248f..139c98f2c 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/service/ecganalysisparas/EcganalysisparasService.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/service/ecganalysisparas/EcganalysisparasService.java @@ -68,6 +68,6 @@ public interface EcganalysisparasService extends IService { * @param examID 编号 * @return 心电分析数据 */ - EcganalysisparasDO getexamIDdata(String examID); + EcganalysisparasDO getexamIDdata(String examID,String orgId); } \ No newline at end of file diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/service/ecganalysisparas/EcganalysisparasServiceImpl.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/service/ecganalysisparas/EcganalysisparasServiceImpl.java index 9b701088b..895ef7289 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/service/ecganalysisparas/EcganalysisparasServiceImpl.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/service/ecganalysisparas/EcganalysisparasServiceImpl.java @@ -87,10 +87,10 @@ public class EcganalysisparasServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("examId", examID); - + queryWrapper.eq("orgId", orgId); return ecganalysisparasMapper.selectOne(queryWrapper); } From 793b9cd7c17aca4ce6873056c7fa167662e9d431 Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Mon, 9 Dec 2024 16:31:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=83=E7=94=B5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EcganalysisparasController.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/EcganalysisparasController.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/EcganalysisparasController.java index e974aae9b..6d7f3acf7 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/EcganalysisparasController.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/EcganalysisparasController.java @@ -136,4 +136,17 @@ public class EcganalysisparasController { EcganalysisparasDO ecganalysisparas= ecganalysisparasService.getexamIDdata(examId,orgId); return success(BeanUtils.toBean(ecganalysisparas, EcganalysisparasRespVO.class)); } + + @GetMapping("/getDateStaAndEndData") + @Operation(summary = "根据时间获得心电数据") + public CommonResult> getDateStaAndEndData(@RequestParam("orgId") String orgid, @RequestParam("TimeSta") String TimeSta,@RequestParam("TimeEnd") String TimeEnd) + { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("orgId",orgid); + queryWrapper.ge("doctorDiagTime", TimeSta).le("doctorDiagTime",TimeEnd); + List doList= ecganalysisparasMapper.selectList(queryWrapper); + + return success(doList); + } } \ No newline at end of file