From 246cd830efd9e94d883221d5d273b0dce9eaff6b Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Thu, 6 Mar 2025 11:20:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E4=BD=93?= =?UTF-8?q?=E6=A3=80=E7=BC=96=E5=8F=B7=E8=8E=B7=E5=8F=96=E6=82=A3=E8=80=85?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=92=8C=E6=A3=80=E6=9F=A5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectpatient/InspectPatientController.java | 6 ++++++ .../InspectPatientitemsController.java | 9 +++++++++ .../inspectpatient/InspectPatientDO.java | 13 +++++++++---- .../inspectpatient/InspectPatientService.java | 4 ++++ .../inspectpatient/InspectPatientServiceImpl.java | 15 ++++++++++++--- .../InspectPatientitemsService.java | 5 +++++ .../InspectPatientitemsServiceImpl.java | 10 +++++++++- 7 files changed, 54 insertions(+), 8 deletions(-) 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 b061041..0b640ad 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 @@ -81,6 +81,12 @@ public class InspectPatientController { InspectPatientDO patient = patientService.getPatient(id); return success(BeanUtils.toBean(patient, InspectPatientRespVO.class)); } + @GetMapping("/getpatientjson") + @Operation(summary = "根据体检获得患者信息") + public CommonResult getPatientInfo(String medicalSn) + { + return success(patientService.getPatientInfo(medicalSn)); + } @GetMapping("/page") @Operation(summary = "获得患者信息分页") diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/InspectPatientitemsController.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/InspectPatientitemsController.java index 579a51c..47a238b 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/InspectPatientitemsController.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/InspectPatientitemsController.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.inspect.controller.admin.inspectpatientitems; +import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectpatient.InspectPatientDO; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; @@ -76,6 +77,14 @@ public class InspectPatientitemsController { patientitemsService.deletePatientitemcode(medicalSn); return success(true); } + @GetMapping("/getPatientItemJson") + @Operation(summary = "根据体检编号获取患者体检项目") + public CommonResult> GetPatientItemList(@RequestParam("medicalSn") String medicalSn) + { + List patientitems = patientitemsService.GetPatientItemList(medicalSn); + return success(patientitems); + } + @GetMapping("/get") @Operation(summary = "获得患者体检项目") 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 ac7be8a..fbfca52 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 @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.inspect.dal.dataobject.inspectpatient; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -49,7 +50,8 @@ public class InspectPatientDO { * 出生日期 */ @TableField("birthday") - private LocalDate birthday; + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime birthday; /** * 证件类型 */ @@ -94,7 +96,8 @@ public class InspectPatientDO { * 体检登记日期 体检日期 */ @TableField("medicalDateTime") - private LocalDateTime medicalDateTime; + @JsonFormat(pattern = "yyyy-MM-dd yyyy-MM-dd HH:mm:ss") + private LocalDateTime medicalDateTime; /** * 收费方式：现金 微信 刷卡 支票 免费等，从字典表里取 */ @@ -124,7 +127,8 @@ public class InspectPatientDO { * 审核时间 */ @TableField("auditorTime") - private LocalDateTime auditorTime; + @JsonFormat(pattern = "yyyy-MM-dd yyyy-MM-dd HH:mm:ss") + private LocalDateTime auditorTime; /** * 审核状态 */ @@ -140,5 +144,6 @@ public class InspectPatientDO { * 收费时间 */ @TableField("chargetime") - private LocalDateTime chargetime; + @JsonFormat(pattern = "yyyy-MM-dd yyyy-MM-dd HH:mm:ss") + private LocalDateTime chargetime; } \ 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 84ddc3f..9469f58 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 @@ -44,6 +44,10 @@ public interface InspectPatientService { * @return 患者信息 */ InspectPatientDO getPatient(Integer id); + /* + * 根据体检编号获取患者信息的json + * */ + InspectPatientDO getPatientInfo(String medicalSn); /** * 获得患者信息分页 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 a212075..c855512 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 @@ -1,15 +1,15 @@ package cn.iocoder.yudao.module.inspect.service.inspectpatient; +import cn.iocoder.yudao.framework.common.util.json.JsonUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; -import java.util.*; import cn.iocoder.yudao.module.inspect.controller.admin.inspectpatient.vo.*; import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectpatient.InspectPatientDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.inspect.dal.mysql.inspectpatient.InspectPatientMapper; @@ -65,6 +65,15 @@ public class InspectPatientServiceImpl implements InspectPatientService { public InspectPatientDO getPatient(Integer id) { return patientMapper.selectById(id); } + @Override + public InspectPatientDO getPatientInfo(String medicalSn) + { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("medicalSn", medicalSn); + InspectPatientDO patientDO= patientMapper.selectOne(queryWrapper); + + return patientDO; + } @Override public PageResult getPatientPage(InspectPatientPageReqVO pageReqVO) { diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatientitems/InspectPatientitemsService.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatientitems/InspectPatientitemsService.java index 648675f..1221623 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatientitems/InspectPatientitemsService.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatientitems/InspectPatientitemsService.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.inspect.service.inspectpatientitems; import java.util.*; import cn.iocoder.yudao.module.inspect.controller.admin.inspectpatientitems.vo.*; +import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectpatient.InspectPatientDO; import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectpatientitems.InspectPatientitemsDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -48,6 +49,10 @@ public interface InspectPatientitemsService { * 根据条件编号删除对应的数据 * */ void deletePatientitemcode(String medicalSn); + /* + * 根据体检编号查询患者检查项目JSON + * */ + List GetPatientItemList(String medicalSn); /** * 获得患者体检项目 diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatientitems/InspectPatientitemsServiceImpl.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatientitems/InspectPatientitemsServiceImpl.java index 9407e89..dd13f7a 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatientitems/InspectPatientitemsServiceImpl.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatientitems/InspectPatientitemsServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -81,8 +82,15 @@ public class InspectPatientitemsServiceImpl implements InspectPatientitemsServic queryWrapper.eq("medicalSn", medicalSn); patientitemsMapper.delete(queryWrapper); } + @Override + public List GetPatientItemList(String medicalSn) + { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("medicalSn", medicalSn); + List patientDO= patientMapper.selectList(queryWrapper); - + return patientDO; + } private void validatePatientitemsExists(Integer id) { if (patientitemsMapper.selectById(id) == null) {