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 d461e02..c07b580 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 @@ -73,6 +73,7 @@ import javax.validation.Valid; import com.fasterxml.jackson.databind.ObjectMapper; import cn.iocoder.yudao.module.inspect.service.inspectapplylog.InspectApplylogService; +import org.springframework.format.annotation.DateTimeFormat; @Tag(name = "管理后台 - 患者信息") @RestController @@ -1223,8 +1224,10 @@ public class InspectPatientController { @PutMapping("/updatePrintStatus") @Operation(summary = "更新打印状态") - public CommonResult updatePrintStatus(@RequestParam("medicalSn") String medicalSn) { - patientService.isprintupdate(medicalSn); + public CommonResult updatePrintStatus(@RequestParam("medicalSn") String medicalSn, + @RequestParam(value = "printtime", required = false) + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Date printtime) { + patientService.isprintupdate(medicalSn, printtime); 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/InspectPatientInfoVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientInfoVO.java index 3fed9f8..0679381 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientInfoVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientInfoVO.java @@ -62,6 +62,9 @@ public class InspectPatientInfoVO { @Schema(description = "是否打印导检单") private Integer isprint; + @Schema(description = "打印时间") + private String printtime; + @Schema(description = "总检医生id") private Integer chiefinspectorid; 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 f921819..5e14770 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 @@ -121,6 +121,16 @@ public class InspectPatientPageReqVO extends PageParam { @Schema(description = "是否打印导检单") private Integer isprint; + @Schema(description = "打印时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss ", timezone = "GMT+8") + private LocalDateTime printtime; + + @Schema(description = "打印时间范围") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss ", timezone = "GMT+8") + private LocalDateTime[] printTimeRange; + @Schema(description = "总检医生id") private Integer chiefinspectorid; 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 61944c5..6c2fba7 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 @@ -139,6 +139,11 @@ public class InspectPatientRespVO { @Schema(description = "是否打印导检单") private Integer isprint; + @Schema(description = "打印时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss ", timezone = "GMT+8") + private LocalDateTime printtime; + @Schema(description = "总检医生id") private Integer chiefinspectorid; 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 92067fe..33d4650 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 @@ -114,6 +114,9 @@ public class InspectPatientSaveReqVO { @Schema(description = "是否打印导检单") private Integer isprint; + @Schema(description = "打印时间") + private LocalDateTime printtime; + @Schema(description = "总检医生id") private Integer 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 e0cf782..73661d6 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 @@ -200,7 +200,12 @@ public class InspectPatientDO { @TableField("chiefinspector") private String chiefinspector; - + /** + * 打印时间 + */ + @TableField("printtime") + @JsonFormat(pattern = "yyyy-MM-dd yyyy-MM-dd HH:mm:ss") + private LocalDateTime printtime; } \ No newline at end of file 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 05dafa5..c650b3d 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 @@ -43,6 +43,7 @@ public interface InspectPatientMapper extends BaseMapperX { .eqIfPresent(InspectPatientDO::getInspectionOpinion, reqVO.getInspectionOpinion()) .eqIfPresent(InspectPatientDO::getIsprint, reqVO.getIsprint()) .betweenIfPresent(InspectPatientDO::getAuditorTime, reqVO.getAuditorTime()) + .betweenIfPresent(InspectPatientDO::getPrinttime, reqVO.getPrintTimeRange()) .orderByDesc(InspectPatientDO::getId); if (reqVO.getInspectionStatus() != null) { if (reqVO.getInspectionStatus() == 0) { 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 cc3c76d..d492d0a 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 @@ -54,7 +54,7 @@ public interface InspectPatientService { /* * 更新打印状态 * */ - void isprintupdate(String medicalSn); + void isprintupdate(String medicalSn, Date printtime); /** * 删除患者信息 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 d0c4ca5..5b528a7 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 @@ -39,6 +39,7 @@ import java.awt.image.BufferedImage; import java.io.*; import java.text.SimpleDateFormat; import java.time.LocalDateTime; +import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -117,10 +118,16 @@ public class InspectPatientServiceImpl implements InspectPatientService { patientMapper.update(null, updateWrapper); } @Override - public void isprintupdate(String medicalSn) { + public void isprintupdate(String medicalSn, Date printtime) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(InspectPatientDO::getMedicalSn, medicalSn) .set(InspectPatientDO::getIsprint, 1); // 1 表示已打印 + + // 如果printtime不为null,则设置打印时间 + if (printtime != null) { + updateWrapper.set(InspectPatientDO::getPrinttime, printtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); + } + patientMapper.update(null, updateWrapper); } @Override