From ce76b2f98d2dbbba445c7311c816b9fa7b180956 Mon Sep 17 00:00:00 2001 From: Auora <14587305+auoraasd@user.noreply.gitee.com> Date: Fri, 24 Oct 2025 11:56:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=A8=E8=AF=8A=E7=97=85?= =?UTF-8?q?=E5=8E=86=E7=9A=84=E6=A0=87=E9=A2=98=EF=BC=9A=E9=97=A8=E8=AF=8A?= =?UTF-8?q?=E5=88=9D=E8=AF=8A=E7=97=85=E5=8E=86/=E9=97=A8=E8=AF=8A?= =?UTF-8?q?=E5=A4=8D=E8=AF=8A=E7=97=85=E5=8E=86=EF=BC=8C=E5=BD=93=E6=82=A3?= =?UTF-8?q?=E8=80=85=E6=98=AF=E5=88=9D=E6=97=B6-=E3=80=8B=E9=97=A8?= =?UTF-8?q?=E8=AF=8A=E5=88=9D=E8=AF=8A=E7=97=85=E5=8E=86=EF=BC=8C=E5=BD=93?= =?UTF-8?q?=E6=82=A3=E8=80=85=E4=B8=BA=E5=A4=8D=E8=AF=8A=E6=97=B6-?= =?UTF-8?q?=E3=80=8B=E9=97=A8=E8=AF=8A=E5=A4=8D=E8=AF=8A=E7=97=85=E5=8E=86?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 标题下面增加：就诊卡号、姓名、性别、年龄以及就诊日期（默认创建病历的当前时间）和就诊科室（患者当前开单科室），系统自动获取患者的档案信息。 --- .../web/doctorstation/dto/PatientInfoDto.java | 5 ++ .../DoctorStationMainAppMapper.xml | 1 + .../doctorstation/components/emr/emr.vue | 53 +++++++++++++++++++ .../src/views/doctorstation/index.vue | 1 + 4 files changed, 60 insertions(+) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java index e3fb069c..55c99889 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java @@ -40,6 +40,11 @@ public class PatientInfoDto { @JsonSerialize(using = ToStringSerializer.class) private Long orgId; + /** + * 科室名称 + */ + private String organizationName; + /** * 患者姓名 */ diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml index 0081ccd8..43777621 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml @@ -19,6 +19,7 @@ T10.type_code, T10.contract_name, T10.org_id, + T10.organization_name, T10.register_time, T10.reception_time, T10.practitioner_user_id, diff --git a/openhis-ui-vue3/src/views/doctorstation/components/emr/emr.vue b/openhis-ui-vue3/src/views/doctorstation/components/emr/emr.vue index 66b45843..c4cab1ea 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/emr/emr.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/emr/emr.vue @@ -15,7 +15,42 @@ -->
+
+ {{ visitType === 'FIRST' ? '门诊初诊病历' : '门诊复诊病历' }} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -168,6 +203,20 @@ import { saveEmr, getEmrDetail, saveEmrTemplate } from '../api'; import emrTemplate from '../emr/emrtemplate.vue'; import emrhistory from '../emr/emrhistory.vue'; +import { ref, computed } from 'vue'; + +// 2. 当前就诊日期（默认为当前时间） +const currentVisitDate = computed(() => { + return new Date().toLocaleString('zh-CN', { + year: 'numeric', + month: '2-digit', + day: '2-digit', + hour: '2-digit', + minute: '2-digit', + second: '2-digit', + }); +}); + const form = ref({}); const emrTitle = ref(''); const radio = ref(1); @@ -184,6 +233,10 @@ const props = defineProps({ type: Object, required: true, }, + visitType: { // ✅ 接收父组件传来的值 + type: String, + default: '', + }, }); watch( diff --git a/openhis-ui-vue3/src/views/doctorstation/index.vue b/openhis-ui-vue3/src/views/doctorstation/index.vue index 2256b178..9322cfe9 100644 --- a/openhis-ui-vue3/src/views/doctorstation/index.vue +++ b/openhis-ui-vue3/src/views/doctorstation/index.vue @@ -147,6 +147,7 @@ saveStatus = value; } " + :visitType="visitType" />