Merge remote-tracking branch 'origin/develop' into develop

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java

@@ -357,21 +357,21 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
             int index = 0;
             for (OpScheduleDto schedule : scheduleList) {
                 index++;
-                
+
                 // 转换手术类型
                 String surgeryType = convertSurgeryNature(schedule.getSurgeryNature());
-                
+
                 // 转换麻醉方法
                 String anesthesiaMethod = convertAnesMethod(schedule.getAnesMethod());
-                
+
                 // 格式化安排时间
                 String formattedDate = formatScheduleDate(schedule.getScheduleDate());
-                
+
                 writer.printf("%d,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s\n",
                     index, // 序号从1开始
                     schedule.getOrgName() != null ? schedule.getOrgName() : "",
                     schedule.getPatientName() != null ? schedule.getPatientName() : "",
-                    schedule.getVisitId() != null ? schedule.getVisitId().toString() : "",
+                    schedule.getIdentifierNo() != null ? schedule.getIdentifierNo() : "",
                     schedule.getOperCode() != null ? schedule.getOperCode() : "",
                     schedule.getOperName() != null ? schedule.getOperName() : "",
                     schedule.getApplyDeptName() != null ? schedule.getApplyDeptName() : "",

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpCreateScheduleDto.java

@@ -24,6 +24,11 @@ public class OpCreateScheduleDto {
      */
     private Long visitId;
 
+    /**
+     * 就诊卡号
+     */
+    private String identifierNo;
+
     /**
      * 手术编码
      */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormPageDto.java

@@ -93,4 +93,9 @@ public class RequestFormPageDto {
      * 手术等级
      */
     private Integer surgeryLevel;
+
+    /**
+     * 就诊卡号
+     */
+    private String identifierNo;
 }

openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml

@@ -31,7 +31,7 @@
             cs.org_id,
             o.name AS org_name,
             cs.main_surgeon_name AS surgeon_name,
-            pi.identifier_no AS patient_card_no
+            COALESCE(pi.identifier_no, ap.bus_no, '') AS identifierNo
         FROM op_schedule os
         LEFT JOIN adm_patient ap ON os.patient_id = ap.id
         LEFT JOIN cli_surgery cs ON os.oper_code = cs.surgery_no AND cs.delete_flag = '0'
@@ -89,7 +89,7 @@
             cs.apply_doctor_name AS apply_doctor_name,
             drf.create_time AS apply_time,
             os.surgery_nature AS surgeryType,
-            pi.identifier_no AS patient_card_no
+            COALESCE(pi.identifier_no, ap.bus_no, '') AS identifierNo
         FROM op_schedule os
         LEFT JOIN adm_patient ap ON os.patient_id = ap.id
         LEFT JOIN cli_surgery cs ON os.oper_code = cs.surgery_no AND cs.delete_flag = '0'
@@ -150,7 +150,7 @@
             cs.org_id,
             o.name AS org_name,
             cs.main_surgeon_name AS surgeon_name,
-            pi.identifier_no AS patient_card_no
+            COALESCE(pi.identifier_no, ap.bus_no, '') AS identifierNo
         FROM op_schedule os
         LEFT JOIN adm_patient ap ON os.patient_id = ap.id
         LEFT JOIN cli_surgery cs ON os.oper_code = cs.surgery_no AND cs.delete_flag = '0'

openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml

@@ -68,6 +68,7 @@
         <result column="anesthesia_type_enum" property="anesthesiaTypeEnum"/>
         <result column="incision_level" property="incisionLevel"/>
         <result column="surgery_level" property="surgeryLevel"/>
+        <result column="identifier_no" property="identifierNo"/>
     </resultMap>
 
     <!-- 分页查询申请单 -->
@@ -92,7 +93,8 @@
                 cs.anesthesia_type_enum,
                 cs.incision_level,
                 cs.surgery_level,
-                fc.contract_name AS fee_type
+                fc.contract_name AS fee_type,
+                COALESCE(pi.identifier_no, ap.bus_no, '') AS identifier_no
             FROM doc_request_form drf
             LEFT JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no
             LEFT JOIN adm_patient ap ON ap.id = cs.patient_id
@@ -100,6 +102,16 @@
             LEFT JOIN adm_account aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0'
             LEFT JOIN fin_contract fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0'
             LEFT JOIN op_schedule os ON os.apply_id = drf.id AND os.delete_flag = '0'
+            LEFT JOIN (
+                SELECT patient_id, identifier_no
+                FROM (
+                    SELECT patient_id, identifier_no,
+                           ROW_NUMBER() OVER (PARTITION BY patient_id ORDER BY create_time ASC) AS rn
+                    FROM adm_patient_identifier
+                    WHERE delete_flag = '0' AND identifier_no IS NOT NULL AND identifier_no != ''
+                ) t
+                WHERE rn = 1
+            ) pi ON ap.id = pi.patient_id
             <where>
                 <if test="requestFormDto.surgeryNo != null and requestFormDto.surgeryNo != ''">
                     AND drf.prescription_no LIKE CONCAT('%', #{requestFormDto.surgeryNo}, '%')

openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java

@@ -37,6 +37,10 @@ public class OpSchedule extends HisBaseEntity {
     /** 就诊ID */
     private Long visitId;
 
+    /** 就诊卡号 */
+    @TableField(exist = false)
+    private String identifierNo;
+
     /** 手术编码 */
     private String operCode;
 

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

@@ -89,7 +89,7 @@
       </el-table-column>
       <el-table-column label="卫生机构" align="center" prop="orgName" width="120" show-overflow-tooltip />
       <el-table-column label="姓名" align="center" prop="patientName" width="100" />
-      <el-table-column label="就诊卡号" align="center" prop="patientCardNo" width="120" />
+      <el-table-column label="就诊卡号" align="center" prop="identifierNo" width="120" />
       <el-table-column label="手术名称" align="center" prop="operName" min-width="140" show-overflow-tooltip />
       <el-table-column label="申请科室" align="center" prop="applyDeptName" width="100" show-overflow-tooltip>
         <template #default="scope">
@@ -161,9 +161,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="就诊卡号" prop="patientCardNo">
+            <el-form-item label="就诊卡号" prop="identifierNo">
-              <el-tooltip :content="form.patientCardNo" placement="top" :disabled="!form.patientCardNo">
+              <el-tooltip :content="form.identifierNo" placement="top" :disabled="!form.identifierNo">
-                <el-input v-model="form.patientCardNo" :disabled="true" style="width: 100%" />
+                <el-input v-model="form.identifierNo" :disabled="true" style="width: 100%" />
               </el-tooltip>
             </el-form-item>
           </el-col>
@@ -900,6 +900,7 @@ const form = reactive({
   applyId: undefined,
   patientId: undefined,
   visitId: undefined,
+  identifierNo: undefined,
   operCode: undefined,
   operName: undefined,
   preoperativeDiagnosis: undefined,
@@ -1783,7 +1784,7 @@ function confirmApply() {
   form.applyId=selectedRow.applyId// 手术申请id
   form.patientId = selectedRow.patientId// 患者id
   form.visitId = selectedRow.encounterId // id对应填入就诊id
-  form.patientCardNo = selectedRow.patientCardNo // 就诊卡号
+  form.identifierNo = selectedRow.identifierNo || '' // 就诊卡号
   form.operCode = selectedRow.surgeryNo // 手术单号作为手术编码
   form.operName = selectedRow.descJson?.surgeryName//手术名称
   form.preoperativeDiagnosis = selectedRow.preoperativeDiagnosis || selectedRow.descJson?.preoperativeDiagnosis

openhis-ui-vue3/src/views/surgicalschedule/temporaryMedical.vue

@@ -8,7 +8,7 @@
       <div class="patient-info-content">
         <el-descriptions :column="3" border>
           <el-descriptions-item label="患者：">{{ patientInfo.patientName || '-' }}</el-descriptions-item>
-          <el-descriptions-item label="就诊卡号：">{{ patientInfo.visitId || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="就诊卡号：">{{ patientInfo.identifierNo || '-' }}</el-descriptions-item>
           <el-descriptions-item label="手术单号：">{{ patientInfo.operCode || '-' }}</el-descriptions-item>
           <el-descriptions-item label="科室：">{{ patientInfo.roomCode || '-' }}</el-descriptions-item>
           <el-descriptions-item label="医师：">{{ patientInfo.doctorName || '-' }}</el-descriptions-item>