1、收费工作站-》门诊挂号：将门诊挂号界面的功能按钮统一摆放在标题页，依次摆放整齐。

2、增加挂号单补打功能（差就诊号查询自动填充） 3.患者档案管理：将【修改】和【查询】按钮调出的界面统一修改成图2的新增患者界面。
2025-11-10 16:35:47 +08:00
parent ef52f290fe
commit 69780d204f
6 changed files with 236 additions and 220 deletions
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js
@@ -213,4 +213,31 @@ export function gerPreInfo(userMaessage) {
    method: 'post',
    params: userMaessage
  })
+}
+
+/**
+ * 根据就诊卡号查询挂号记录
+ * 注意：此接口可能不存在，实际使用getOutpatientRegistrationCurrent接口
+ * 保留此函数以便将来使用，目前使用getOutpatientRegistrationCurrent替代
+ */
+export function getRegistrationByCardNo(query) {
+  // 如果后端提供了专门的接口，可以取消注释使用
+  // return request({
+  //   url: '/charge-manage/register/encounter-by-card',
+  //   method: 'get',
+  //   params: query
+  // })
+  // 暂时使用现有的接口
+  return getOutpatientRegistrationCurrent(query);
+}
+
+/**
+ * 补打挂号
+ */
+export function reprintRegistration(data) {
+  return request({
+    url: '/charge-manage/register/reprint',
+    method: 'post',
+    data: data
+  })
 }
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
@@ -3,46 +3,15 @@
  <!-- 添加或修改对话框 -->
  <el-dialog :title="title" v-model="visible" width="1020px" append-to-body>
      <el-form ref="patientRef" :model="form" :rules="rules" label-width="120px" label-position="left">
-      <el-row>
+      <!-- 第一行：姓名、民族、性别 -->
+      <el-row :gutter="10">
        <el-col :span="8">
-          <el-form-item label="姓名" prop="name">
+          <el-form-item label="*姓名" prop="name" label-width="80px">
            <el-input v-model="form.name" clearable :disabled="isViewMode" />
          </el-form-item>
        </el-col>
        <el-col :span="8">
-          <el-form-item label="性别" prop="genderEnum">
-            <el-radio-group v-model="form.genderEnum" :disabled="isViewMode">
-              <el-radio
-                v-for="item in administrativegenderList"
-                :key="item.value"
-                :label="item.value"
-              >
-                {{ item.info }}
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-        <!-- <el-col :span="8">
-          <el-form-item label="活动标识" prop="tempFlag">
-            <el-radio-group v-model="form.tempFlag" :disabled="isViewMode">
-              <el-radio v-for="dict in patient_temp_flag" :key="dict.value" :label="dict.value">
-                {{ dict.label }}
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col> -->
-        <el-col :span="8">
-          <el-form-item label="联系方式" prop="phone">
-            <el-input v-model="form.phone" clearable :disabled="isViewMode" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="证件号码" prop="idCard">
-            <el-input v-model="form.idCard" clearable :disabled="isViewMode" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="民族" prop="nationalityCode">
+          <el-form-item label="民族" prop="nationalityCode" label-width="80px">
            <el-select v-model="form.nationalityCode" clearable filterable :disabled="isViewMode">
              <el-option
                v-for="item in nationality_code"
@@ -54,10 +23,22 @@
          </el-form-item>
        </el-col>
        <el-col :span="8">
-          <el-form-item label="卡类别" prop="typeCode">
+          <el-form-item label="性别" prop="genderEnum" label-width="80px">
+            <el-radio-group v-model="form.genderEnum" :disabled="isViewMode">
+              <el-radio label="M">男性</el-radio>
+              <el-radio label="F">女性</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      
+      <!-- 第二行：证件类别、证件号码、*年龄 -->
+      <el-row :gutter="10">
+        <el-col :span="8">
+          <el-form-item label="证件类别" prop="typeCode" label-width="80px">
            <el-select
              v-model="form.typeCode"
-              placeholder="卡类别"
+              placeholder="就诊卡"
              clearable
              :disabled="isViewMode"
            >
@@ -71,7 +52,47 @@
          </el-form-item>
        </el-col>
        <el-col :span="8">
-          <el-form-item label="就诊卡号" prop="identifierNo">
+          <el-form-item label="证件号码" prop="idCard" label-width="80px">
+            <el-input v-model="form.idCard" clearable :disabled="isViewMode" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="*年龄" prop="age" label-width="80px">
+            <el-input
+              v-model="form.age"
+              :disabled="isViewMode"
+              @input="handleAgeInput"
+              placeholder="请输入年龄"
+            >
+              <template #suffix>岁</template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      
+      <!-- 第三行：国家编码、*联系方式、工作单位 -->
+      <el-row :gutter="10">
+        <el-col :span="8">
+          <el-form-item label="国家编码" prop="countryCode" label-width="80px">
+            <el-input v-model="form.countryCode" clearable :disabled="isViewMode" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="*联系方式" prop="phone" label-width="80px">
+            <el-input v-model="form.phone" clearable :disabled="isViewMode" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="工作单位" prop="workCompany" label-width="80px">
+            <el-input v-model="form.workCompany" clearable :disabled="isViewMode" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      
+      <!-- 第三行：就诊卡号、国家编码、出生日期 -->
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="*就诊卡号" prop="identifierNo">
            <el-input v-model="form.identifierNo" clearable :disabled="isViewMode" />
          </el-form-item>
        </el-col>
@@ -94,11 +115,8 @@
          </el-form-item>
        </el-col>
      </el-row>
-      <!-- <el-col :span="6">
-						<el-form-item label="年龄" prop="age">
-						   <el-input v-model="form.age" clearable :disabled="isViewMode"/>
-						</el-form-item>
-				</el-col> -->
+      
+      <!-- 第四行：职业、工作单位、年龄 -->
      <el-row>
        <el-col :span="8">
          <el-form-item label="职业" prop="prfsEnum">
@@ -118,7 +136,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="8">
-          <el-form-item label="年龄" prop="age">
+          <el-form-item label="*年龄" prop="age">
            <el-input
              v-model="form.age"
              :disabled="isViewMode"
@@ -130,6 +148,8 @@
          </el-form-item>
        </el-col>
      </el-row>
+      
+      <!-- 第五行：地址选择、详细地址 -->
      <el-row>
        <el-col :span="8">
          <el-form-item label="地址选择" prop="addressSelect">
@@ -147,12 +167,14 @@
            </el-cascader>
          </el-form-item>
        </el-col>
-        <el-col :span="8">
+        <el-col :span="16">
          <el-form-item label="详细地址" prop="address">
            <el-input v-model="form.address" clearable :disabled="isViewMode" />
          </el-form-item>
        </el-col>
      </el-row>
+      
+      <!-- 第六行：血型ABO、血型RH -->
      <el-row>
        <el-col :span="8">
          <el-form-item label="血型ABO" prop="bloodAbo">
@@ -184,6 +206,8 @@
          </el-form-item>
        </el-col>
      </el-row>
+      
+      <!-- 第七行：婚姻状态、死亡时间 -->
      <el-row>
        <el-col :span="8">
          <el-form-item label="婚姻状态" prop="maritalStatusEnum">
@@ -202,7 +226,7 @@
            </el-select>
          </el-form-item>
        </el-col>
-        <el-col :span="8">
+        <el-col :span="16">
          <el-form-item label="死亡时间" prop="deceasedDate">
            <el-date-picker
              v-model="form.deceasedDate"
@@ -215,7 +239,9 @@
          </el-form-item>
        </el-col>
      </el-row>
-       <el-row>
+      
+      <!-- 第八行：监护人、监护人关系、监护人电话 -->
+      <el-row>
        <el-col :span="8">
          <el-form-item label="监护人" prop="guardianName">
            <el-input v-model="form.guardianName" clearable :disabled="isViewMode" placeholder="请输入监护人" />
@@ -233,6 +259,10 @@
            <el-input v-model="form.guardianPhone" clearable :disabled="isViewMode" placeholder="请输入监护人电话" />
          </el-form-item>
        </el-col>
+      </el-row>
+      
+      <!-- 第九行：监护人证件类型、监护人证件号码 -->
+      <el-row>
        <el-col :span="8">
          <el-form-item label="监护人证件类型" prop="guardianIdType">
            <el-select v-model="form.guardianIdType" placeholder="请选择" clearable :disabled="isViewMode">
@@ -242,12 +272,14 @@
            </el-select>
          </el-form-item>
        </el-col>
-        <el-col :span="8">
-          <el-form-item label="监护人证件号码" prop="guardianIdNo" label-width="140px">
+        <el-col :span="16">
+          <el-form-item label="监护人证件号码" prop="guardianIdNo">
            <el-input v-model="form.guardianIdNo" clearable :disabled="isViewMode" placeholder="请输入监护人证件号码" />
          </el-form-item>
        </el-col>
      </el-row>
+      
+      <!-- 第十行：监护人地址 -->
      <el-row>
        <el-col :span="24">
          <el-form-item label="监护人地址" prop="guardianAddress">
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
@@ -15,6 +15,7 @@
                <el-button type="primary" plain @click="handleReadCard('03')" size="small">医保卡</el-button>
                <el-button type="warning" plain icon="CircleClose" @click="handleClear" size="small">清空</el-button>
                <el-button type="primary" icon="Plus" @click="handleAdd" size="small">保存挂号</el-button>
+                <el-button type="success" icon="Printer" @click="handleReprint" size="small">补打挂号</el-button>
              </div>
            </div>
          </template>
@@ -571,6 +572,17 @@
      :paymentId="paymentId"
      :chargeItemIds="chargeItemIdList"
    />
+    <ReprintDialog
+      :open="openReprintDialog"
+      @close="
+        (value) => {
+          if (value == 'success') {
+            getList();
+          }
+          openReprintDialog = false;
+        }
+      "
+    />
  </div>
 </template>

@@ -597,6 +609,7 @@ import patientList from './components/patientList';
 import { nextTick, ref } from 'vue';
 import ChargeDialog from './components/chargeDialog.vue';
 import RefundDialog from './components/refundDialog.vue';
+import ReprintDialog from './components/reprintDialog.vue';
 import { handleColor } from '@/utils/his';
 import useUserStore from '@/store/modules/user';
 import { formatDate, formatDateStr } from '@/utils/index';
@@ -645,6 +658,7 @@ const doctorRef = ref(null);
 const ybTypeRef = ref(null);
 const openDialog = ref(false);
 const openRefundDialog = ref(false);
+const openReprintDialog = ref(false);
 const totalAmount = ref(0);
 const chargeItemIdList = ref([]);
 const chrgBchnoList = ref([]);
@@ -1194,6 +1208,11 @@ function handleReturnRegister() {
  });
 }

+/** 打开补打挂号对话框 */
+function handleReprint() {
+  openReprintDialog.value = true;
+}
+
 /**
 * 点击患者列表给表单赋值
 */
--- a/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientInfoForm.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientInfoForm.vue
@@ -20,7 +20,7 @@
        </el-form-item>
      </el-col>
      <!-- <el-col :span="6">
-          <el-form-item label="活动标识" prop="tempFlag">
+          <el-form-item label="" prop="tempFlag">
            <el-radio-group v-model="form.tempFlag" :disabled="isViewMode">
              <el-radio v-for="dict in patient_temp_flag" :key="dict.value" :label="dict.value">
                {{ dict.label }}
--- a/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
+++ b/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
@@ -99,23 +99,14 @@
    />

    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" v-model="open" width="980px" append-to-body>
-      <el-form ref="patientRef" :model="form" :rules="rules" label-width="100px">
-        <el-row>
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body>
+      <el-form ref="patientRef" :model="form" :rules="rules" label-width="90px" size="medium">
+        <el-row :gutter="10">
          <el-col :span="6">
            <el-form-item label="姓名" prop="name">
              <el-input v-model="form.name" clearable :disabled="isViewMode" />
            </el-form-item>
          </el-col>
-          <!-- <el-col :span="7">
-            <el-form-item label="其他姓名" prop="nameJson">
-              <el-input
-                v-model="form.nameJson"
-                clearable
-                :disabled="isViewMode"
-              />
-            </el-form-item>
-          </el-col> -->
          <el-col :span="6">
            <el-form-item label="民族" prop="nationalityCode">
              <el-select v-model="form.nationalityCode" filterable clearable :disabled="isViewMode">
@@ -128,11 +119,9 @@
              </el-select>
            </el-form-item>
          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+          <el-col :span="6">
            <el-form-item label="性别" prop="genderEnum">
-              <el-radio-group v-model="form.genderEnum" :disabled="isViewMode">
+              <el-radio-group v-model="form.genderEnum" :disabled="isViewMode" size="small">
                <el-radio
                  v-for="item in administrativegenderList"
                  :key="item.value"
@@ -143,9 +132,9 @@
              </el-radio-group>
            </el-form-item>
          </el-col>
-          <el-col :span="7">
-            <el-form-item label="活动标识" prop="tempFlag">
-              <el-radio-group v-model="form.tempFlag" :disabled="isViewMode">
+          <el-col :span="6">
+            <el-form-item label="" prop="tempFlag">
+              <el-radio-group v-model="form.tempFlag" :disabled="isViewMode" size="small">
                <el-radio v-for="item in tempFlagList" :key="item.value" :label="item.value">
                  {{ item.info }}
                </el-radio>
@@ -153,8 +142,9 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <el-row>
-          <el-col :span="7">
+        
+        <el-row :gutter="10">
+          <el-col :span="6">
            <el-form-item label="证件类别" prop="typeCode">
              <el-select
                v-model="form.typeCode"
@@ -179,30 +169,31 @@
              <el-input v-model="form.birthDate" v-show="false" />
            </el-form-item>
          </el-col>
-          <el-col :span="8">
-          <el-form-item label="年龄" prop="age">
-            <el-input
-              v-model="form.age"
-              :disabled="isViewMode"
-              @input="(value) => (form.age = value.replace(/[^0-9]/g, ''))"
-            >
-              <template #suffix>岁</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
          <el-col :span="6">
+            <el-form-item label="年龄" prop="age">
+              <el-input
+                v-model="form.age"
+                :disabled="isViewMode"
+                @input="(value) => (form.age = value.replace(/[^0-9]/g, ''))"
+              >
+                <template #suffix>岁</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
            <el-form-item label="国家编码" prop="countryCode">
              <el-input v-model="form.countryCode" clearable :disabled="isViewMode" />
            </el-form-item>
          </el-col>
        </el-row>
-        <el-row>
-          <el-col :span="7">
+        
+        <el-row :gutter="10">
+          <el-col :span="6">
            <el-form-item label="联系方式" prop="phone">
              <el-input v-model="form.phone" clearable :disabled="isViewMode" />
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
            <el-form-item label="职业" prop="prfsEnum">
              <el-select
                v-model="form.prfsEnum"
@@ -224,14 +215,15 @@
              <el-input v-model="form.workCompany" clearable :disabled="isViewMode" />
            </el-form-item>
          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="7">
+          <el-col :span="6">
            <el-form-item label="联系人" prop="linkName">
              <el-input v-model="form.linkName" clearable :disabled="isViewMode" />
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+        </el-row>
+        
+        <el-row :gutter="10">
+          <el-col :span="6">
            <el-form-item label="联系人关系" prop="linkRelationCode">
              <el-select
                v-model="form.linkRelationCode"
@@ -253,33 +245,7 @@
              <el-input v-model="form.linkTelcom" clearable :disabled="isViewMode" />
            </el-form-item>
          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="地址选择" prop="addressSelect">
-              <!-- <RegionFullGroup v-model="form.addressSelectvalue" @change="handleChangeAddress" :disabled="isViewMode"/> -->
-              <el-cascader
-                :options="options"
-                :props="{ checkStrictly: true, value: 'code', label: 'name' }"
-                v-model="selectedOptions"
-                @change="handleChange"
-                :disabled="isViewMode"
-              >
-                <template #default="{ node, data }">
-                  <span>{{ data.name }}</span>
-                  <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
-                </template>
-              </el-cascader>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="详细地址" prop="address">
-              <el-input v-model="form.address" clearable :disabled="isViewMode" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
+          <el-col :span="6">
            <el-form-item label="血型ABO" prop="bloodAbo">
              <el-select
                v-model="form.bloodAbo"
@@ -296,7 +262,7 @@
              </el-select>
            </el-form-item>
          </el-col>
-          <el-col :span="10">
+          <el-col :span="6">
            <el-form-item label="血型RH" prop="bloodRh">
              <el-select
                v-model="form.bloodRh"
@@ -314,8 +280,31 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <el-row>
-          <el-col :span="10">
+        
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="地址选择" prop="addressSelect">
+              <el-cascader
+                :options="options"
+                :props="{ checkStrictly: true, value: 'code', label: 'name' }"
+                v-model="selectedOptions"
+                @change="handleChange"
+                :disabled="isViewMode"
+                size="small"
+              >
+                <template #default="{ node, data }">
+                  <span>{{ data.name }}</span>
+                  <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+                </template>
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="详细地址" prop="address">
+              <el-input v-model="form.address" clearable :disabled="isViewMode" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
            <el-form-item label="婚姻状态" prop="maritalStatusEnum">
              <el-select
                v-model="form.maritalStatusEnum"
@@ -332,15 +321,16 @@
              </el-select>
            </el-form-item>
          </el-col>
-          <el-col :span="10">
+          <el-col :span="4">
            <el-form-item label="死亡时间" prop="deceasedDate">
              <el-date-picker
                v-model="form.deceasedDate"
                type="datetime"
-                placeholder="请选择时间"
+                placeholder="时间"
                format="YYYY-MM-DD HH:mm:ss"
                :disabled="isViewMode"
                value-format="YYYY-MM-DD HH:mm:ss"
+                size="small"
              />
            </el-form-item>
          </el-col>