From 09e0691feb8a2837db5d32c30e4343d50b5cb402 Mon Sep 17 00:00:00 2001
From: duzhongxu <15039018447@163.com>
Date: Fri, 10 Apr 2026 13:51:09 +0800
Subject: [PATCH] =?UTF-8?q?346=20=E6=82=A3=E8=80=85=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=82=A3=E8=80=85=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BF=85=E5=A1=AB=E9=A1=B9=E2=80=9C=E5=B0=B1?=
 =?UTF-8?q?=E8=AF=8A=E5=8D=A1=E5=8F=B7=E2=80=9D=E6=95=B0=E6=8D=AE=E6=9C=AA?=
 =?UTF-8?q?=E5=9B=9E=E5=A1=AB/=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../patientmanage/PatientManageMapper.xml     | 154 ++++++++++--------
 .../components/patientAddDialog.vue           |   7 +-
 2 files changed, 88 insertions(+), 73 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
index 1428cd34..221a7fa1 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
@@ -3,80 +3,90 @@
 <mapper namespace="com.openhis.web.patientmanage.mapper.PatientManageMapper">
     <!-- 病人信息相关查询-->
     <select id="getPatientPage" resultType="com.openhis.web.patientmanage.dto.PatientBaseInfoDto">
-        SELECT T1.tenant_id,
-               T1.id,
-               T1.active_flag,
-               T1.temp_flag,
-               T1.name,
-               T1.name_json,
-               T1.bus_no,
-               T1.gender_enum,
-               T1.birth_date,
-               T1.deceased_date,
-               T1.marital_status_enum,
-               T1.prfs_enum,
-               T1.phone,
-               T1.address,
-               T1.address_province,
-               T1.address_city,
-               T1.address_district,
-               T1.address_street,
-               T1.address_json,
-               T1.nationality_code,
-               T1.id_card,
-               T1.py_str,
-               T1.wb_str,
-               T1.blood_abo,
-               T1.blood_rh,
-               T1.work_company,
-               T1.native_place,
-               T1.country_code,
-               T1.link_name,
-               T1.link_relation_code,
-               T1.link_telcom,
-               T1.link_jsons,
-               T1.organization_id,
-               T1.create_time
+        SELECT
+               pt.identifier_no,
+               pt.tenant_id,
+               pt.id,
+               pt.active_flag,
+               pt.temp_flag,
+               pt.name,
+               pt.name_json,
+               pt.bus_no,
+               pt.gender_enum,
+               pt.birth_date,
+               pt.deceased_date,
+               pt.marital_status_enum,
+               pt.prfs_enum,
+               pt.phone,
+               pt.address,
+               pt.address_province,
+               pt.address_city,
+               pt.address_district,
+               pt.address_street,
+               pt.address_json,
+               pt.nationality_code,
+               pt.id_card,
+               pt.py_str,
+               pt.wb_str,
+               pt.blood_abo,
+               pt.blood_rh,
+               pt.work_company,
+               pt.native_place,
+               pt.country_code,
+               pt.link_name,
+               pt.link_relation_code,
+               pt.link_telcom,
+               pt.link_jsons,
+               pt.organization_id,
+               pt.create_time
         FROM (
-                 SELECT pt.tenant_id,
-                        pt.id,
-                        pt.active_flag,
-                        pt.temp_flag,
-                        pt.name,
-                        pt.name_json,
-                        pt.bus_no,
-                        pt.gender_enum,
-                        pt.birth_date,
-                        pt.deceased_date,
-                        pt.marital_status_enum,
-                        pt.prfs_enum,
-                        pt.phone,
-                        pt.address,
-                        pt.address_province,
-                        pt.address_city,
-                        pt.address_district,
-                        pt.address_street,
-                        pt.address_json,
-                        pt.nationality_code,
-                        pt.id_card,
-                        pt.py_str,
-                        pt.wb_str,
-                        pt.blood_abo,
-                        pt.blood_rh,
-                        pt.work_company,
-                        pt.native_place,
-                        pt.country_code,
-                        pt.link_name,
-                        pt.link_relation_code,
-                        pt.link_telcom,
-                        pt.link_jsons,
-                        pt.organization_id,
-                        pt.create_time
-                 FROM adm_patient pt
-                 where pt.delete_flag = '0'
-                 ORDER BY pt.bus_no DESC
-             ) AS T1
+                 SELECT
+                        (
+                            SELECT api.identifier_no
+                            FROM adm_patient_identifier api
+                            WHERE api.tenant_id = p.tenant_id
+                              AND api.patient_id = p.id
+                            LIMIT 1
+                        ) AS identifier_no,
+                        p.tenant_id,
+                        p.id,
+                        p.active_flag,
+                        p.temp_flag,
+                        p.name,
+                        p.name_json,
+                        p.bus_no,
+                        p.gender_enum,
+                        p.birth_date,
+                        p.deceased_date,
+                        p.marital_status_enum,
+                        p.prfs_enum,
+                        p.phone,
+                        p.address,
+                        p.address_province,
+                        p.address_city,
+                        p.address_district,
+                        p.address_street,
+                        p.address_json,
+                        p.nationality_code,
+                        p.id_card,
+                        p.py_str,
+                        p.wb_str,
+                        p.blood_abo,
+                        p.blood_rh,
+                        p.work_company,
+                        p.native_place,
+                        p.country_code,
+                        p.link_name,
+                        p.link_relation_code,
+                        p.link_telcom,
+                        p.link_jsons,
+                        p.organization_id,
+                        p.create_time
+                 FROM adm_patient p
+                 where p.delete_flag = '0'
+             ) AS pt
             ${ew.customSqlSegment}
+            ORDER BY pt.bus_no DESC
     </select>
 
     <select id="getPatientIdInfo" resultType="com.openhis.web.patientmanage.dto.PatientIdInfoDto">
diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
index 1231db37..80a11916 100644
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
@@ -124,7 +124,7 @@
       <el-row :gutter="10">
         <el-col :span="8">
           <el-form-item label="就诊卡号" prop="identifierNo">
-            <el-input v-model="form.identifierNo" clearable :disabled="isViewMode" />
+            <el-input v-model="form.identifierNo" clearable :disabled="isEditMode || isViewMode" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -1421,6 +1421,11 @@ function setFormData(rowData) {
   // 深拷贝数据以避免引用问题
   form.value = JSON.parse(JSON.stringify(rowData));
   
+  // 从 patientIdInfoList 中获取 identifierNo（就诊卡号实际存储在此处）
+  if (rowData.patientIdInfoList && rowData.patientIdInfoList.length > 0) {
+    form.value.identifierNo = rowData.patientIdInfoList[0].identifierNo;
+  }
+  
   // 确保性别值为字符串类型，以便与下拉框选项匹配
   if (form.value.genderEnum !== undefined && form.value.genderEnum !== null) {
     form.value.genderEnum = String(form.value.genderEnum);