From 03d980e0cf16d7fbbc1dd0c61813997b490b6de8 Mon Sep 17 00:00:00 2001 From: Ranyunqiao <2499115710@qq.com> Date: Tue, 24 Mar 2026 17:22:16 +0800 Subject: [PATCH] =?UTF-8?q?246=20=E6=89=8B=E6=9C=AF=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E3=80=8B=E9=97=A8=E8=AF=8A=E6=89=8B=E6=9C=AF=E5=AE=89=E6=8E=92?= =?UTF-8?q?=EF=BC=9A=E7=82=B9=E5=87=BB=E3=80=90=E7=BC=96=E8=BE=91=E3=80=91?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E6=89=8B=E6=9C=AF=E8=BF=87=E7=A8=8B=E7=9A=84?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E5=80=BC?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E3=80=90=E4=BF=9D=E5=AD=98=E3=80=91=E6=8A=A5?= =?UTF-8?q?=E9=94=99=20251=20=E6=89=8B=E6=9C=AF=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E3=80=8B=E9=97=A8=E8=AF=8A=E6=89=8B=E6=9C=AF=E5=AE=89=E6=8E=92?= =?UTF-8?q?=EF=BC=9A=E3=80=90=E6=96=B0=E5=A2=9E=E6=89=8B=E6=9C=AF=E5=AE=89?= =?UTF-8?q?=E6=8E=92=E3=80=91=E7=95=8C=E9=9D=A2=E5=AE=89=E6=8E=92=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5=E7=9A=84=E6=97=B6=E5=88=86=E7=A7=92?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=80=89=E5=80=BC=E5=92=8C=E6=9C=AA=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=20252=20=E6=89=8B=E6=9C=AF=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E3=80=8B=E9=97=A8=E8=AF=8A=E6=89=8B=E6=9C=AF=E5=AE=89=E6=8E=92?= =?UTF-8?q?=EF=BC=9A=E3=80=90=E6=96=B0=E5=A2=9E=E6=89=8B=E6=9C=AF=E5=AE=89?= =?UTF-8?q?=E6=8E=92=E3=80=91=E7=95=8C=E9=9D=A2=E7=9A=84=E9=BA=BB=E9=86=89?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=AD=97=E6=AE=B5=E6=9C=AA=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E4=BA=8E=E6=89=8B=E6=9C=AF=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=9A=84=E9=BA=BB=E9=86=89=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=9A=84=E5=80=BC=20254=20=E6=89=8B=E6=9C=AF=E7=AE=A1=E7=90=86?= =?UTF-8?q?-=E3=80=8B=E9=97=A8=E8=AF=8A=E6=89=8B=E6=9C=AF=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=9A=E3=80=90=E6=96=B0=E5=A2=9E=E6=89=8B=E6=9C=AF?= =?UTF-8?q?=E5=AE=89=E6=8E=92=E3=80=91=E7=95=8C=E9=9D=A2=E7=9A=84=E5=88=87?= =?UTF-8?q?=E5=8F=A3=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=9C=AA=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/clinicalmanage/dto/OpScheduleDto.java | 2 ++ .../openhis/web/inventorymanage/dto/IssueDto.java | 2 ++ .../clinicalmanage/SurgicalScheduleAppMapper.xml | 1 + .../openhis/surgicalschedule/domain/OpSchedule.java | 12 ++++++------ .../components/surgery/surgeryApplication.vue | 3 +++ openhis-ui-vue3/src/views/surgicalschedule/index.vue | 9 +++++++-- 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java index 8d017a6b..00f25c63 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java @@ -1,5 +1,6 @@ package com.openhis.web.clinicalmanage.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import com.openhis.surgicalschedule.domain.OpSchedule; import lombok.Data; import lombok.EqualsAndHashCode; @@ -55,6 +56,7 @@ public class OpScheduleDto extends OpSchedule { /** * 申请时间开始 */ + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") private String applyTime; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java index a529aa58..92f7c526 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java @@ -100,10 +100,12 @@ public class IssueDto { /** 开始时间 */ @NotNull + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** 结束时间 */ @NotNull + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; /** 单价 */ diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml index adf68611..088a7c42 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml @@ -76,6 +76,7 @@ LEFT JOIN adm_organization o ON cs.org_id = o.id LEFT JOIN doc_request_form drf ON drf.prescription_no=cs.surgery_no WHERE os.schedule_id = #{scheduleId} + LIMIT 1 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java index 5e7e4a65..84c2a9ce 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java @@ -75,11 +75,11 @@ public class OpSchedule extends HisBaseEntity { private String surgerySite; /** 入院时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") private LocalDateTime admissionTime; /** 入手术室时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") private LocalDateTime entryTime; /** 手术室编码 */ @@ -138,19 +138,19 @@ public class OpSchedule extends HisBaseEntity { private String assistant3Code; /** 手术开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") private LocalDateTime startTime; /** 手术结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") private LocalDateTime endTime; /** 麻醉开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") private LocalDateTime anesStart; /** 麻醉结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") private LocalDateTime anesEnd; /** 手术状态 */ diff --git a/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue b/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue index 98485c2f..98bc652e 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue @@ -1048,6 +1048,8 @@ function submitForm() { // 新增手术 addSurgery(form.value).then((res) => { proxy.$modal.msgSuccess('新增成功') + //保存麻醉方式 + seesionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum) open.value = false getList() }).catch(error => { @@ -1058,6 +1060,7 @@ function submitForm() { // 修改手术 updateSurgery(form.value).then((res) => { proxy.$modal.msgSuccess('修改成功') + seesionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum) open.value = false getList() }).catch(error => { diff --git a/openhis-ui-vue3/src/views/surgicalschedule/index.vue b/openhis-ui-vue3/src/views/surgicalschedule/index.vue index 453a4331..99faeef5 100644 --- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue +++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue @@ -1023,15 +1023,20 @@ function mapOperatingRoomToOption(item) { const { surgical_site: surgerySiteList, anesthesia_type: anesthesiaList, - incision_type: incisionTypeList, + incision_level: incisionTypeList, isolation_type: isolationTypeList, surgery_type, surgery_level, surgery_nature: surgeryNatureList -} = useDict('surgical_site', 'anesthesia_type', 'incision_type', 'isolation_type', 'surgery_type', 'surgery_level', 'surgery_nature') +} = useDict('surgical_site', 'anesthesia_type', 'incision_level', 'isolation_type', 'surgery_type', 'surgery_level', 'surgery_nature') // 加载数据 onMounted(() => { + const anesthesiaType = sessionStorage.getItem('anesthesiaType') + if (anesthesiaType) { + form.anesMethod = anesthesiaType + sessionStorage.removeItem('anesthesiaType') + } getPageList() loadOrgList() loadDeptList()