增加门诊病历的标题：门诊初诊病历/门诊复诊病历，当患者是初时-》门诊初诊病历，当患者为复诊时-》门诊复诊病历。

标题下面增加：就诊卡号、姓名、性别、年龄以及就诊日期（默认创建病历的当前时间）和就诊科室（患者当前开单科室），系统自动获取患者的档案信息。

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;
+
     /**
      * 患者姓名
      */

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,

openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue

@@ -7,7 +7,7 @@
           <el-form :model="form" :rules="rules" ref="outpatientRegistrationRef" label-width="110px">
             <el-row :gutter="24">
               <el-col :span="5">
-                <el-form-item label="病历号/姓名/卡号:" prop="searchKey">
+                <el-form-item label="患者身份信息:" prop="searchKey">
                   <el-popover
                     :popper-style="{ padding: '0' }"
                     placement="bottom-start"
@@ -22,7 +22,7 @@
                         @blur="handleBlur"
                         @input="handleSearchPatient"
                         v-model="form.searchKey"
-                        placeholder="请输入姓名/拼音/身份证"
+                        placeholder="请输入姓名/身份证/就诊卡号"
                       />
                     </template>
                   </el-popover>

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue

@@ -139,8 +139,9 @@
             <el-table-column label="诊断医生" align="center" prop="diagnosisDoctor" width="120" />
             <el-table-column label="诊断时间" align="center" prop="diagnosisTime" width="150" />
             <el-table-column label="诊断代码" align="center" prop="ybNo" width="180" />
-            <el-table-column label="诊断类型" align="center" prop="maindiseFlag">
+            <el-table-column label="诊断类型" align="center" prop="maindiseFlag" width="120">
               <template #default="scope">
+              <div style="display:flex;flex-direction:column;align-items:center;gap:5px;">
                 <el-checkbox
                   label="主诊断"
                   :trueLabel="1"
@@ -153,7 +154,7 @@
                 <el-select
                   v-model="scope.row.verificationStatusEnum"
                   placeholder=" "
-                  style="width: 40%; padding-bottom: 5px; padding-left: 10px"
+                  style="width: 100%; padding-bottom: 5px; padding-left: 10px"
                   size="small"
                 >
                   <el-option
@@ -163,6 +164,7 @@
                     :value="item.value"
                   />
                 </el-select>
+              </div>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="130">

openhis-ui-vue3/src/views/doctorstation/components/emr/emr.vue

@@ -15,7 +15,42 @@
     </el-button> -->
   </div>
   <div style="max-height: 650px; overflow-y: auto; overflow-x: hidden">
+        <div style="text-align: center; font-size: 18px; font-weight: bold; margin-bottom: 10px;">
+      {{ visitType === 'FIRST' ? '门诊初诊病历' : '门诊复诊病历' }}
+    </div>
     <el-form ref="emrRef" :model="form" :rules="rules" label-width="80px">
+      <el-row :gutter="4">
+        <el-col :span="4">
+          <el-form-item label="就诊卡号" prop="patientId" style="width: 100%">
+            <el-input placeholder="" v-model="patientInfo.patientId" class="input-with-bottom-border"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="姓名" prop="patientName" style="width: 100%">
+            <el-input placeholder="" v-model="patientInfo.patientName" class="input-with-bottom-border"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="性别" prop="genderEnum_enumText" style="width: 100%">
+            <el-input placeholder="" v-model="patientInfo.genderEnum_enumText" class="input-with-bottom-border"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="年龄" prop="age" style="width: 100%">
+            <el-input placeholder="" v-model="patientInfo.age" class="input-with-bottom-border"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="就诊日期" prop="currentVisitDate" style="width: 100%">
+            <el-input placeholder="" v-model="currentVisitDate" class="input-with-bottom-border"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="就诊科室" prop="organizationName" style="width: 100%">
+            <el-input placeholder="" v-model="patientInfo.organizationName" class="input-with-bottom-border"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row :gutter="24">
         <el-col :span="6">
           <el-form-item label="身高" prop="height" style="width: 100%">
@@ -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(

openhis-ui-vue3/src/views/doctorstation/index.vue

@@ -147,6 +147,7 @@
                   saveStatus = value;
                 }
               "
+              :visitType="visitType" 
             />
           </el-tab-pane>
           <el-tab-pane label="诊断" name="diagnosis">