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

# Conflicts:
#	openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java

openhis-ui-vue3/src/views/consultationmanagement/consultationapplication/api.js

@@ -135,3 +135,14 @@ export function getConsultationOpinions(consultationId) {
   })
 }
 
+/**
+ * 根据ID查询会诊申请详情
+ * @param {Number} id 会诊申请ID
+ */
+export function getConsultationById(id) {
+  return request({
+    url: `/consultation/detail/${id}`,
+    method: 'get'
+  })
+}
+

openhis-ui-vue3/src/views/consultationmanagement/consultationapplication/index.vue

@@ -81,6 +81,15 @@
           />
         </el-form-item>
 
+        <el-form-item label="会诊ID">
+          <el-input
+            v-model="queryParams.consultationId"
+            placeholder="请输入会诊ID"
+            clearable
+            style="width: 180px"
+          />
+        </el-form-item>
+
         <el-form-item>
           <el-button type="primary" @click="handleQuery">
             <el-icon><Search /></el-icon> 查询
@@ -394,7 +403,8 @@ const queryParams = reactive({
   applyDoctor: '',
   urgency: '',
   consultationStatus: '',
-  patientName: ''
+  patientName: '',
+  consultationId: ''
 })
 
 // 会诊状态常量
@@ -702,7 +712,8 @@ const loadData = async () => {
       consultationStatus: queryParams.consultationStatus,
       patientName: queryParams.patientName,
       consultationRequestDate: queryParams.startTime,
-      consultationUrgency: queryParams.urgency
+      consultationUrgency: queryParams.urgency,
+      consultationId: queryParams.consultationId
     }
 
     const res = await queryConsultationListPage(queryData, pagination.currentPage, pagination.pageSize)