From 137de4c9dc3744c4a7385d968b1cda7ffce703b5 Mon Sep 17 00:00:00 2001 From: Euni4U <958079825@qq.com> Date: Wed, 23 Apr 2025 10:57:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=A1=E5=BD=A2?= =?UTF-8?q?=E7=A0=81=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InspectPatientController.java | 9 +++++++ .../vo/InspectPatientPageReqVO.java | 5 ++++ .../vo/InspectPatientRespVO.java | 5 ++++ .../vo/InspectPatientSaveReqVO.java | 3 +++ .../inspectpatient/InspectPatientDO.java | 6 +++++ .../inspectpatient/InspectPatientMapper.java | 26 ++++++++++++++++--- .../inspectpatient/InspectPatientService.java | 8 ++++++ .../InspectPatientServiceImpl.java | 11 ++++++++ 8 files changed, 69 insertions(+), 4 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 fef03ae..e9cf1ce 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 @@ -1953,4 +1953,13 @@ public class InspectPatientController { /*ExcelUtils.write(response, "统计.xls", "数据", InspectDoctorRespVO.class, BeanUtils.toBean(list, InspectDoctorRespVO.class));*/ } + + @PutMapping("/updateBarcodeTime") + @Operation(summary = "更新条码时间") + public CommonResult updateBarcodeTime(@RequestParam("medicalSn") String medicalSn, + @RequestParam(value = "barcodetime", required = false) + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Date barcodetime) { + patientService.updateBarcodeTime(medicalSn, barcodetime); + 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/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 0d828a1..31ff6d9 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 @@ -140,4 +140,9 @@ public class InspectPatientPageReqVO extends PageParam { @Schema(description = "报告地址") private String pdfurl; + @Schema(description = "条形码打印时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss ", timezone = "GMT+8") + private LocalDateTime barcodetime; + } \ 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 fdb07b3..eb7e1d4 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 @@ -150,4 +150,9 @@ public class InspectPatientRespVO { @Schema(description = "总检医生") private String chiefinspector; + @Schema(description = "条形码打印时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss ", timezone = "GMT+8") + private LocalDateTime barcodetime; + } \ 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 e885f49..7589930 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 @@ -117,6 +117,9 @@ public class InspectPatientSaveReqVO { @Schema(description = "打印时间") private LocalDateTime printtime; + @Schema(description = "条行码打印时间") + private LocalDateTime barcodetime; + @Schema(description = "总检医生id") private String chiefinspectorid; 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 866c4e8..8dc00d6 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 @@ -206,6 +206,12 @@ public class InspectPatientDO { @TableField("printtime") @JsonFormat(pattern = "yyyy-MM-dd yyyy-MM-dd HH:mm:ss") private LocalDateTime printtime; + /** + * 条行码打印时间 + */ + @TableField("barcodetime") + @JsonFormat(pattern = "yyyy-MM-dd yyyy-MM-dd HH:mm:ss") + private LocalDateTime barcodetime; /** * 报告地址 diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectpatient/InspectPatientMapper.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectpatient/InspectPatientMapper.java index 39b70ec..1346654 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectpatient/InspectPatientMapper.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectpatient/InspectPatientMapper.java @@ -40,11 +40,11 @@ public interface InspectPatientMapper extends BaseMapperX { .eqIfPresent(InspectPatientDO::getSummaryResult, reqVO.getSummaryResult()) .eqIfPresent(InspectPatientDO::getAuditor, reqVO.getAuditor()) .eqIfPresent(InspectPatientDO::getAuditStatus, reqVO.getAuditStatus()) - //.eqIfPresent(InspectPatientDO::getInspectionOpinion, reqVO.getInspectionOpinion()) + // .eqIfPresent(InspectPatientDO::getInspectionOpinion, reqVO.getInspectionOpinion()) .eqIfPresent(InspectPatientDO::getIsprint, reqVO.getIsprint()) // .betweenIfPresent(InspectPatientDO::getAuditorTime, reqVO.getAuditorTime()) - .betweenIfPresent(InspectPatientDO::getPrinttime, reqVO.getPrintTimeRange()) - .orderByDesc(InspectPatientDO::getId); + .betweenIfPresent(InspectPatientDO::getPrinttime, reqVO.getPrintTimeRange()); + // .orderByDesc(InspectPatientDO::getId); // if (reqVO.getInspectionStatus() != null) { // if (reqVO.getInspectionStatus() == 0) { // // 如果传过来的值为0，查询InspectionOpinion字段不为空 @@ -55,7 +55,25 @@ public interface InspectPatientMapper extends BaseMapperX { // queryWrapper.and(wrapper -> wrapper.isNull(InspectPatientDO::getSummaryResult).or().eq(InspectPatientDO::getSummaryResult, "")); // } // } - + // 只查询需要的字段 + queryWrapper.select( + InspectPatientDO::getId, + InspectPatientDO::getMedicalSn, + InspectPatientDO::getPName, + InspectPatientDO::getGender, + InspectPatientDO::getBirthday, + InspectPatientDO::getCardType, + InspectPatientDO::getCardId, + InspectPatientDO::getPhoneNum, + InspectPatientDO::getStatus, + InspectPatientDO::getMedicalDateTime, + InspectPatientDO::getHeadPicUrl, + InspectPatientDO::getSummaryResult, + InspectPatientDO::getAuditor, + InspectPatientDO::getAuditStatus, + InspectPatientDO::getIsprint, + InspectPatientDO::getPrinttime + ); return selectPage(reqVO, queryWrapper); } 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 dbe6c56..d074b4f 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 @@ -160,4 +160,12 @@ public interface InspectPatientService { List getPatientSupplementsByDates(List dates); void exportStatistics(List dates, HttpServletResponse response); + + /** + * 根据体检编号更新条码时间 + * + * @param medicalSn 体检编号 + * @param barcodetime 条码时间 + */ + void updateBarcodeTime(String medicalSn, Date barcodetime); } \ 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/InspectPatientServiceImpl.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java index 946b765..2df1cb4 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 @@ -1013,4 +1013,15 @@ public class InspectPatientServiceImpl implements InspectPatientService { // 转换为Excel VO对象 return BeanUtils.toBean(patientList, InspectPatientExcelVO.class); } + + @Override + public void updateBarcodeTime(String medicalSn, Date barcodetime) { + // 构建更新条件 + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(InspectPatientDO::getMedicalSn, medicalSn) + .set(InspectPatientDO::getBarcodetime, barcodetime); + + // 执行更新 + patientMapper.update(null, updateWrapper); + } } \ No newline at end of file From fade2e68887e5b4764acb74607909c64217be09b Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Wed, 23 Apr 2025 17:44:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=82=A3=E8=80=85=E4=BF=A1=E6=81=AFpage?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=20?= =?UTF-8?q?=E4=B8=8D=E6=9F=A5=E8=AF=A2=E5=A4=B4=E5=83=8F=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/dal/mysql/inspectpatient/InspectPatientMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectpatient/InspectPatientMapper.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectpatient/InspectPatientMapper.java index 1346654..ae2c642 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectpatient/InspectPatientMapper.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectpatient/InspectPatientMapper.java @@ -67,7 +67,7 @@ public interface InspectPatientMapper extends BaseMapperX { InspectPatientDO::getPhoneNum, InspectPatientDO::getStatus, InspectPatientDO::getMedicalDateTime, - InspectPatientDO::getHeadPicUrl, + // InspectPatientDO::getHeadPicUrl, InspectPatientDO::getSummaryResult, InspectPatientDO::getAuditor, InspectPatientDO::getAuditStatus,