From f1a2520a87d7cc5418b4373523e8872b1297adf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com>
Date: Fri, 8 May 2026 11:12:57 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#466:=20=E4=BD=8F=E9=99=A2=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E5=B7=A5=E4=BD=9C=E7=AB=99-=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=9A=E7=94=B3=E8=AF=B7=E5=8D=95=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=BC=BA=E5=A4=B1=E6=A0=B8=E5=BF=83=E8=B4=A8=E6=8E=A7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增申请类型、标本类型、执行时间三个核心字段及表单联动

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../inspection/inspectionApplication.vue      | 52 ++++++++++++++++++-
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue b/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue
index 53b568e6..b4be8325 100755
--- a/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue
@@ -164,6 +164,20 @@
                     />
                   </el-form-item>
                 </el-col>
+                <!--执行时间-->
+                <el-col :span="8">
+                  <el-form-item label="执行时间" style="margin-bottom: 4px">
+                    <el-date-picker
+                      v-model="formData.executeTime"
+                      type="datetime"
+                      placeholder="选择执行时间"
+                      size="small"
+                      format="YYYY-MM-DD HH:mm:ss"
+                      value-format="YYYY-MM-DD HH:mm:ss"
+                      style="width: 100%"
+                    />
+                  </el-form-item>
+                </el-col>
                 <!--申请科室-->
                 <el-col :span="8">
                   <el-form-item label="申请科室" required style="margin-bottom: 4px">
@@ -293,6 +307,34 @@
                 </el-col>
               </el-row>
 
+              <!-- 标本类型、申请类型 -->
+              <el-row :gutter="12" style="margin-bottom: 0">
+                <el-col :span="12">
+                  <el-form-item label="标本类型" style="margin-bottom: 4px">
+                    <el-select v-model="formData.specimenName" placeholder="请选择标本类型" size="small" style="width: 100%">
+                      <el-option label="血液" value="血液" />
+                      <el-option label="尿液" value="尿液" />
+                      <el-option label="粪便" value="粪便" />
+                      <el-option label="痰液" value="痰液" />
+                      <el-option label="咽拭子" value="咽拭子" />
+                      <el-option label="脑脊液" value="脑脊液" />
+                      <el-option label="胸腹水" value="胸腹水" />
+                      <el-option label="关节液" value="关节液" />
+                      <el-option label="分泌物" value="分泌物" />
+                      <el-option label="其他" value="其他" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="申请类型" style="margin-bottom: 4px">
+                    <el-radio-group v-model="formData.applicationType" size="small">
+                      <el-radio :value="0">普通</el-radio>
+                      <el-radio :value="1" border type="warning">急诊</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
               <!-- 检验项目和备注 -->
               <el-row :gutter="12" style="margin-bottom: 0">
                 <el-col :span="12">
@@ -925,7 +967,9 @@ const formData = reactive({
   applyDocCode: '',
   applyDeptCode: '',
   specimenName: '血液',
-  encounterId: ''
+  encounterId: '',
+  executeTime: null,
+  applicationType: 0
 })
 
 // 表单引用
@@ -1476,6 +1520,8 @@ const resetForm = async () => {
     visitNo: '',
     specimenName: '血液',
     encounterId: props.patientInfo.encounterId || '',
+    executeTime: null,
+    applicationType: 0,
   })
   selectedInspectionItems.value = []
 
@@ -1911,7 +1957,9 @@ const loadApplicationToForm = async (row) => {
         auditTime: detail.auditTime,
         visitNo: detail.visitNo,
         specimenName: detail.specimenName,
-        encounterId: detail.encounterId
+        encounterId: detail.encounterId,
+        executeTime: detail.executeTime || null,
+        applicationType: detail.applicationType ?? 0
       })
 
       // 加载检验项目数据