diff --git a/src/api/applyregistration/deviceManage/index.ts b/src/api/applyregistration/deviceManage/index.ts
index 1e7d20bf..68f11fc6 100644
--- a/src/api/applyregistration/deviceManage/index.ts
+++ b/src/api/applyregistration/deviceManage/index.ts
@@ -28,7 +28,3 @@ export const DeviceManageApi = {
     return await request.delete({ url: `/test/device/delete?id=` + id })
   },
 }
-
-
-/** 防空作用域 **/
-console.log(request)
\ No newline at end of file
diff --git a/src/api/applyregistration/diagnosisTemplate/index.ts b/src/api/applyregistration/diagnosisTemplate/index.ts
index 977d20d6..78225696 100644
--- a/src/api/applyregistration/diagnosisTemplate/index.ts
+++ b/src/api/applyregistration/diagnosisTemplate/index.ts
@@ -10,7 +10,7 @@ export const DiagnosisTemplateApi = {
     return await request.get({ url: `/org/org/getlist` })
   },
    getDoctorList: async () => {
-    return await request.get({ url: `/doctor/getlist` })
+    return await request.get({ url: `/doctor/getAlllist` })
   },
    getPage: async (params: any) => {
     return await request.get({ url: `/test/reporttemplate/page`, params })
@@ -28,7 +28,3 @@ export const DiagnosisTemplateApi = {
     return await request.delete({ url: `/test/reporttemplate/delete?id=` + id })
   },
 }
-
-
-/** 防空作用域 **/
-console.log(request)
\ No newline at end of file
diff --git a/src/api/applyregistration/exampartManage/index.ts b/src/api/applyregistration/exampartManage/index.ts
index b282b285..c7bddaaf 100644
--- a/src/api/applyregistration/exampartManage/index.ts
+++ b/src/api/applyregistration/exampartManage/index.ts
@@ -25,7 +25,3 @@ export const ExampartManageApi = {
     return await request.delete({ url: `/test/exampart/delete?id=` + id })
   },
 }
-
-
-/** 防空作用域 **/
-console.log(request)
\ No newline at end of file
diff --git a/src/api/applyregistration/illnessCase/index.ts b/src/api/applyregistration/illnessCase/index.ts
index 99ec139f..ad1b50f3 100644
--- a/src/api/applyregistration/illnessCase/index.ts
+++ b/src/api/applyregistration/illnessCase/index.ts
@@ -16,7 +16,3 @@ export const IllnessCaseApi = {
     return await request.get({ url: `/tblist/patientexamlist/pageIllnessCase`, params })
   }
 }
-
-
-/** 防空作用域 **/
-console.log(request)
\ No newline at end of file
diff --git a/src/api/applyregistration/reportPrintStatistics/index.ts b/src/api/applyregistration/reportPrintStatistics/index.ts
index 6e451e71..b1bbf6ab 100644
--- a/src/api/applyregistration/reportPrintStatistics/index.ts
+++ b/src/api/applyregistration/reportPrintStatistics/index.ts
@@ -9,17 +9,10 @@ export const ReportPrintStatisticsApi = {
   getDeviceList: async () => {
     return await request.get({ url: `/test/device/getlist` })
   },
-  getExamitemsList: async () => {
-    return await request.get({ url: `/examitems/examitems/getlist` })
-  },
   getPage: async (params: any) => {
     return await request.get({ url: `/tblist/patientexamlist/pageReportPrintStatistics`, params })
   },
-   updateExamItemName: async (params: any) => {
+  updateExamItemName: async (params: any) => {
     return await request.put({ url: `/tblist/patientexamlist/updateExamItemName`, params })
   }
 }
-
-
-/** 防空作用域 **/
-console.log(request)
\ No newline at end of file
diff --git a/src/api/applyregistration/reservationInfo/index.ts b/src/api/applyregistration/reservationInfo/index.ts
index 8cf89abd..d2be2787 100644
--- a/src/api/applyregistration/reservationInfo/index.ts
+++ b/src/api/applyregistration/reservationInfo/index.ts
@@ -20,10 +20,5 @@ export const ReservationInfoApi = {
   },
   create: async (data: any) => {
     return await request.post({ url: `/applyregistration/applyform/createReservationInfo`, data })
-  },
-
-
+  }
 }
-
-/** 防空作用域 **/
-console.log(request)
\ No newline at end of file
diff --git a/src/views/applyregistration/deviceManage/DeviceManageForm.vue b/src/views/applyregistration/deviceManage/DeviceManageForm.vue
index 4b757743..9a90a3ad 100644
--- a/src/views/applyregistration/deviceManage/DeviceManageForm.vue
+++ b/src/views/applyregistration/deviceManage/DeviceManageForm.vue
@@ -4,7 +4,7 @@
       <el-form
         ref="formRef"
         :model="formData"
-        size="small"
+        size="default"
         label-width="100px"
         label-position="right"
         label-suffix=""
@@ -22,7 +22,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="7">
             <el-form-item label="设备状态" prop="deviceStatus" class="item-style">
               <el-radio-group v-model="formData.deviceStatus" class="item-width radio-group">
                 <el-radio value="1" style="margin-left: 12px; margin-right: 10px">有效</el-radio>
diff --git a/src/views/applyregistration/deviceManage/index.vue b/src/views/applyregistration/deviceManage/index.vue
index e08430ea..e1f86f58 100644
--- a/src/views/applyregistration/deviceManage/index.vue
+++ b/src/views/applyregistration/deviceManage/index.vue
@@ -4,15 +4,14 @@
       <el-form
         ref="queryFormRef"
         :model="queryParams"
-        size="small"
-        label-width="68px"
+        size="default"
+        label-width="78px"
         label-position="right"
         label-suffix=""
         class="-mb-15px"
       >
         <el-row>
           <el-col :span="6" v-if="false">
-            <!-- Notes: -->
             <el-form-item
               label="名称/类型/型号"
               prop="deviceDesc"
@@ -27,8 +26,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <!-- Notes: -->
+          <el-col :span="8">
             <el-form-item label="科室" prop="departmentCode" class="item-style">
               <el-select
                 v-model="deviceDepartmentInfo"
@@ -47,8 +45,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <!-- Notes: -->
+          <el-col :span="8">
             <el-form-item label="设备名称" prop="deviceName" class="item-style">
               <el-input
                 v-model="queryParams.deviceName"
@@ -58,8 +55,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <!-- Notes: -->
+          <el-col :span="8">
             <el-form-item label="设备类型" prop="deviceType" class="item-style">
               <el-select
                 v-model="queryParams.deviceType"
@@ -74,8 +70,9 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <!-- Notes: -->
+        </el-row>
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="设备型号" prop="deviceModel" class="item-style">
               <el-input
                 v-model="queryParams.deviceModel"
@@ -85,32 +82,42 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :offset="18" :span="6">
-            <!-- Notes: -->
-            <el-form-item label-width="8px" class="item-style">
-              <el-button @click="handleQuery">
-                <Icon icon="ep:search" class="mr-5px" /> 搜索
-              </el-button>
-              <el-button type="primary" plain @click="openForm('create')">
-                <Icon icon="ep:plus" class="mr-5px" /> 新增
-              </el-button>
-            </el-form-item>
+          <el-col :offset="10" :span="6" style="text-align: right">
+            <el-button
+              @click="handleQuery"
+              style="background-color: rgba(56, 119, 246, 1); color: rgba(255, 255, 255, 1)"
+            >
+              <Icon icon="ep:search" class="mr-5px" /> 搜索
+            </el-button>
           </el-col>
         </el-row>
       </el-form>
     </ContentWrap>
 
+    <ContentWrap style="height: 64px">
+      <el-row>
+        <el-col :offset="18" :span="6" style="text-align: right">
+          <el-button
+            @click="openForm('create')"
+            style="background-color: rgb(28, 176, 117); color: rgb(255, 255, 255)"
+          >
+            <Icon icon="ep:plus" class="mr-5px" /> 新增
+          </el-button>
+        </el-col>
+      </el-row>
+    </ContentWrap>
+
     <ContentWrap class="mb-1px">
       <el-table
         v-loading="loading"
-        size="small"
+        size="default"
         border
         :stripe="true"
         :show-overflow-tooltip="true"
         :data="list_devices"
-        height="max(53vh,80px)"
+        :header-cell-style="{ background: 'rgb(235, 241, 250)', height: '40px', color: '#333333' }"
+        :row-style="{ height: '40px' }"
+        height="max(calc(100vh - 465px),80px)"
       >
         <el-table-column type="index" label="序号" align="center" width="54px" />
         <el-table-column label="科室" align="center" prop="deviceDepartment" />
@@ -119,20 +126,24 @@
         <el-table-column label="设备型号" align="center" prop="deviceModel" />
         <el-table-column label="设备AET" align="center" prop="scheduledAET" />
         <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="操作" align="center">
+        <el-table-column label="操作" align="center" fixed="right" width="180px">
           <template #default="scope">
-            <el-button link type="primary" @click="openForm('update', scope.row.id)">
+            <el-button
+              link
+              @click="openForm('update', scope.row.id)"
+              style="color: rgb(56, 119, 246)"
+            >
               编辑
             </el-button>
-            <el-button link type="danger" @click="handleDelete(scope.row.id)"> 删除 </el-button>
+            <el-button link @click="handleDelete(scope.row.id)" style="color: rgb(223, 65, 65)">
+              删除
+            </el-button>
           </template>
         </el-table-column>
         <!-- 数据列 -->
       </el-table>
-      <div style="display: flex; justify-content: center">
+      <div>
         <Pagination
-          small
-          size="small"
           :total="total"
           v-model:page="queryParams.pageNo"
           v-model:limit="queryParams.pageSize"
diff --git a/src/views/applyregistration/diagnosisTemplate/DiagnosisTemplateForm.vue b/src/views/applyregistration/diagnosisTemplate/DiagnosisTemplateForm.vue
index bdb6b826..af9d1903 100644
--- a/src/views/applyregistration/diagnosisTemplate/DiagnosisTemplateForm.vue
+++ b/src/views/applyregistration/diagnosisTemplate/DiagnosisTemplateForm.vue
@@ -4,7 +4,7 @@
       <el-form
         ref="formRef"
         :model="formData"
-        size="small"
+        size="default"
         label-width="70px"
         label-position="right"
         label-suffix=""
@@ -50,23 +50,6 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="机构" prop="orgId" class="item-style">
-              <el-select
-                v-model="formData.orgId"
-                placeholder="请选择机构"
-                clearable
-                class="item-width"
-              >
-                <el-option
-                  v-for="item in orgList"
-                  :key="item.orgID"
-                  :label="item.orgName"
-                  :value="item.orgID"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="医生" prop="privateDoctorId" class="item-style">
               <el-select
@@ -84,6 +67,23 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="机构" prop="orgId" class="item-style">
+              <el-select
+                v-model="formData.orgId"
+                placeholder="请选择机构"
+                clearable
+                class="item-width"
+              >
+                <el-option
+                  v-for="item in orgList"
+                  :key="item.orgID"
+                  :label="item.orgName"
+                  :value="item.orgID"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
 
@@ -194,7 +194,6 @@ onMounted(async () => {
 console.log(dateFormatter)
 console.log(message)
 console.log(t)
-console.log(DiagnosisTemplateApi)
 console.log(formData0)
 //console.log(null)
 
diff --git a/src/views/applyregistration/diagnosisTemplate/index.vue b/src/views/applyregistration/diagnosisTemplate/index.vue
index 9e75c29f..bd9c8d83 100644
--- a/src/views/applyregistration/diagnosisTemplate/index.vue
+++ b/src/views/applyregistration/diagnosisTemplate/index.vue
@@ -4,15 +4,14 @@
       <el-form
         ref="queryFormRef"
         :model="queryParams"
-        size="small"
-        label-width="68px"
+        size="default"
+        label-width="78px"
         label-position="right"
         label-suffix=""
         class="-mb-15px"
       >
         <el-row>
-          <el-col :span="8">
-            <!-- Notes: -->
+          <el-col :span="9">
             <el-form-item label="节点" prop="templateName" class="item-style">
               <el-input
                 v-model="queryParams.templateName"
@@ -23,61 +22,76 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <!-- Notes: -->
             <el-form-item label="模板类型" prop="templateLimitsType" class="item-style">
               <el-radio-group
                 v-model="queryParams.templateLimitsType"
                 class="item-width radio-group"
               >
-                <el-radio value="all" style="margin-left: 12px; margin-right: 20px">全部</el-radio>
-                <el-radio value="public" style="margin-right: 20px">公共</el-radio>
+                <el-radio value="all" style="margin-left: 15px; margin-right: 25px">全部</el-radio>
+                <el-radio value="public" style="margin-right: 25px">公共</el-radio>
                 <el-radio value="private" style="margin-right: 4px">私有</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
-            <!-- Notes: -->
-            <el-form-item class="item-style">
-              <el-button @click="handleQuery">
-                <Icon icon="ep:search" class="mr-5px" /> 搜索
-              </el-button>
-              <el-button type="primary" plain @click="openForm('create')">
-                <Icon icon="ep:plus" class="mr-5px" /> 新增
-              </el-button>
-            </el-form-item>
+          <el-col :span="9" style="text-align: right">
+            <el-button
+              @click="handleQuery"
+              style="background-color: rgba(56, 119, 246, 1); color: rgba(255, 255, 255, 1)"
+            >
+              <Icon icon="ep:search" class="mr-5px" /> 搜索
+            </el-button>
           </el-col>
         </el-row>
       </el-form>
     </ContentWrap>
 
+    <ContentWrap style="height: 64px">
+      <el-row>
+        <el-col :offset="15" :span="9" style="text-align: right">
+          <el-button
+            @click="openForm('create')"
+            style="background-color: rgb(28, 176, 117); color: rgb(255, 255, 255)"
+          >
+            <Icon icon="ep:plus" class="mr-5px" /> 新增
+          </el-button>
+        </el-col>
+      </el-row>
+    </ContentWrap>
+
     <ContentWrap class="mb-1px">
       <el-table
         v-loading="loading"
-        size="small"
+        size="default"
         border
         :stripe="true"
         :show-overflow-tooltip="true"
         :data="list_templates"
-        height="max(53vh,80px)"
+        :header-cell-style="{ background: 'rgb(235, 241, 250)', height: '40px', color: '#333333' }"
+        :row-style="{ height: '40px' }"
+        height="max(calc(100vh - 422px),80px)"
       >
-        <el-table-column type="index" label="序号" align="center" width="50px" />
+        <el-table-column type="index" label="序号" align="center" width="54px" />
         <el-table-column label="节点" align="center" prop="templateName" />
         <el-table-column label="所见" align="center" prop="examDescription" />
         <el-table-column label="所得" align="center" prop="diagResults" />
-        <el-table-column label="操作" align="center">
+        <el-table-column label="操作" align="center" fixed="right" width="180px">
           <template #default="scope">
-            <el-button link type="primary" @click="openForm('update', scope.row.id)">
+            <el-button
+              link
+              @click="openForm('update', scope.row.id)"
+              style="color: rgb(56, 119, 246)"
+            >
               编辑
             </el-button>
-            <el-button link type="danger" @click="handleDelete(scope.row.id)"> 删除 </el-button>
+            <el-button link @click="handleDelete(scope.row.id)" style="color: rgb(223, 65, 65)">
+              删除
+            </el-button>
           </template>
         </el-table-column>
         <!-- 数据列 -->
       </el-table>
-      <div style="display: flex; justify-content: center">
+      <div>
         <Pagination
-          small
-          size="small"
           :total="total"
           v-model:page="queryParams.pageNo"
           v-model:limit="queryParams.pageSize"
@@ -173,8 +187,6 @@ console.log(dateFormatter)
 console.log(download)
 console.log(message)
 console.log(t)
-console.log(DiagnosisTemplateApi)
-console.log(DiagnosisTemplateForm)
 console.log(queryParams0)
 //console.log(null)
 
diff --git a/src/views/applyregistration/exampartManage/ExampartManageForm.vue b/src/views/applyregistration/exampartManage/ExampartManageForm.vue
index 23168f8d..21ed01a9 100644
--- a/src/views/applyregistration/exampartManage/ExampartManageForm.vue
+++ b/src/views/applyregistration/exampartManage/ExampartManageForm.vue
@@ -4,11 +4,11 @@
       <el-form
         ref="formRef"
         :model="formData"
-        size="small"
+        size="default"
         label-width="100px"
         label-position="right"
         label-suffix=""
-        class="-ml-30px"
+        class="-ml-2px"
         v-loading="formLoading"
       >
         <el-row>
@@ -16,7 +16,7 @@
             <el-form-item label="检查部位编码" prop="examPartCode" class="item-style">
               <el-input
                 v-model="formData.examPartCode"
-                placeholder="请输入检查部位编码"
+                placeholder="请输入编码"
                 clearable
                 class="item-width"
               />
@@ -28,7 +28,7 @@
             <el-form-item label="检查部位名称" prop="examPartName" class="item-style">
               <el-input
                 v-model="formData.examPartName"
-                placeholder="请输入检查部位名称"
+                placeholder="请输入名称"
                 clearable
                 class="item-width"
               />
diff --git a/src/views/applyregistration/exampartManage/index.vue b/src/views/applyregistration/exampartManage/index.vue
index 6996d1a1..051bdc32 100644
--- a/src/views/applyregistration/exampartManage/index.vue
+++ b/src/views/applyregistration/exampartManage/index.vue
@@ -4,15 +4,14 @@
       <el-form
         ref="queryFormRef"
         :model="queryParams"
-        size="small"
-        label-width="90px"
+        size="default"
+        label-width="106px"
         label-position="right"
         label-suffix=""
         class="-mb-15px"
       >
         <el-row>
-          <el-col :span="8">
-            <!-- Notes: -->
+          <el-col :span="9">
             <el-form-item label="检查部位名称" prop="examPartName" class="item-style">
               <el-input
                 v-model="queryParams.examPartName"
@@ -22,8 +21,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <!-- Notes: -->
+          <el-col :span="9">
             <el-form-item label="检查部位编码" prop="examPartCode" class="item-style">
               <el-input
                 v-model="queryParams.examPartCode"
@@ -33,48 +31,65 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="" label-width="42px" class="item-style">
-              <el-button @click="handleQuery">
-                <Icon icon="ep:search" class="mr-5px" /> 搜索
-              </el-button>
-              <el-button type="primary" plain @click="openForm('create')">
-                <Icon icon="ep:plus" class="mr-5px" /> 新增
-              </el-button>
-            </el-form-item>
+          <el-col :span="6" style="text-align: right">
+            <el-button
+              @click="handleQuery"
+              style="background-color: rgba(56, 119, 246, 1); color: rgba(255, 255, 255, 1)"
+            >
+              <Icon icon="ep:search" class="mr-5px" /> 搜索
+            </el-button>
           </el-col>
         </el-row>
       </el-form>
     </ContentWrap>
 
+    <ContentWrap style="height: 64px">
+      <el-row>
+        <el-col :offset="18" :span="6" style="text-align: right">
+          <el-button
+            @click="openForm('create')"
+            style="background-color: rgb(28, 176, 117); color: rgb(255, 255, 255)"
+          >
+            <Icon icon="ep:plus" class="mr-5px" /> 新增
+          </el-button>
+        </el-col>
+      </el-row>
+    </ContentWrap>
+
     <ContentWrap class="mb-1px">
       <el-table
         v-loading="loading"
-        size="small"
+        size="default"
         border
         :stripe="true"
         :show-overflow-tooltip="true"
         :data="list_examparts"
-        height="max(53vh,80px)"
+        :header-cell-style="{ background: 'rgb(235, 241, 250)', height: '40px', color: '#333333' }"
+        :row-style="{ height: '40px' }"
+        height="max(calc(100vh - 423px),80px)"
       >
         <el-table-column type="index" label="序号" align="center" width="54px" />
         <el-table-column label="检查部位编码" align="center" prop="examPartCode" />
         <el-table-column label="检查部位名称" align="center" prop="examPartName" />
         <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="操作" align="center">
+        <el-table-column label="操作" align="center" fixed="right" width="180px">
           <template #default="scope">
-            <el-button link type="primary" @click="openForm('update', scope.row.id)">
+            <el-button
+              link
+              @click="openForm('update', scope.row.id)"
+              style="color: rgb(56, 119, 246)"
+            >
               编辑
             </el-button>
-            <el-button link type="danger" @click="handleDelete(scope.row.id)"> 删除 </el-button>
+            <el-button link @click="handleDelete(scope.row.id)" style="color: rgb(223, 65, 65)">
+              删除
+            </el-button>
           </template>
         </el-table-column>
         <!-- 数据列 -->
       </el-table>
-      <div style="display: flex; justify-content: center">
+      <div>
         <Pagination
-          small
-          size="small"
           :total="total"
           v-model:page="queryParams.pageNo"
           v-model:limit="queryParams.pageSize"
diff --git a/src/views/applyregistration/illnessCase/index.vue b/src/views/applyregistration/illnessCase/index.vue
index 769646e7..36a2638c 100644
--- a/src/views/applyregistration/illnessCase/index.vue
+++ b/src/views/applyregistration/illnessCase/index.vue
@@ -1,275 +1,296 @@
 <template>
   <div>
-    <el-row>
-      <el-col :span="24">
-        <el-card shadow="never" style="margin-bottom: 4px">
-          <el-form
-            ref="queryFormRef"
-            :model="queryParams"
-            size="small"
-            label-width="68px"
-            label-position="right"
-            label-suffix=""
-            class="-mb-15px"
-          >
-            <el-row>
-              <el-col :span="8">
-                <el-form-item label="登记号" prop="regId" class="item-style">
-                  <el-input
-                    v-model="queryParams.regId"
-                    placeholder="请输入登记号"
-                    clearable
-                    class="item-width"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="检查号" prop="examId" class="item-style">
-                  <el-input
-                    v-model="queryParams.examId"
-                    placeholder="请输入检查号"
-                    clearable
-                    class="item-width"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <!-- Notes: -->
-                <el-form-item label="检查日期" prop="examDate_ge" class="item-style date-picker">
-                  <el-date-picker
-                    v-model="queryParams.examDate_ge"
-                    type="date"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                    placeholder="开始日期"
-                    class="item-width"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <!-- Notes: -->
-                <el-form-item
-                  label=""
-                  label-width="0px"
-                  prop="examDate_le"
-                  class="item-style date-picker"
-                >
-                  <el-date-picker
-                    v-model="queryParams.examDate_le"
-                    type="date"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                    placeholder="结束日期"
-                    class="item-width"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="7" v-if="false">
-                <!-- Notes: -->
-                <el-form-item label="患者来源" prop="regSource" class="item-style">
-                  <el-radio-group class="item-width radio-group">
-                    <el-radio value="全部" style="margin-left: 6px; margin-right: 16px"
-                      >全部</el-radio
-                    >
-                    <el-radio value="门诊" style="margin-right: 16px">门诊</el-radio>
-                    <el-radio value="住院" style="margin-right: 16px">住院</el-radio>
-                    <el-radio value="体检" style="margin-right: 4px">体检</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="8">
-                <!-- Notes: -->
-                <el-form-item label="影像设备" prop="deviceName" class="item-style">
-                  <el-select
-                    v-model="queryParams.deviceName"
-                    placeholder="请选择影像设备"
-                    clearable
-                    class="item-width"
-                  >
-                    <el-option
-                      v-for="item in deviceList"
-                      :key="item.deviceId"
-                      :label="item.deviceName"
-                      :value="item.deviceName"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <!-- Notes: -->
-                <el-form-item label="设备类型" prop="deviceType" class="item-style">
-                  <el-select
-                    v-model="queryParams.deviceType"
-                    placeholder="请选择设备类型"
-                    clearable
-                    class="item-width"
-                  >
-                    <el-option label="DR" value="DR" />
-                    <el-option label="CT" value="CT" />
-                    <el-option label="MR" value="MR" />
-                    <el-option label="超声" value="超声" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <!-- Notes: -->
-                <el-form-item label="阴性阳性" prop="diagFlag" class="item-style">
-                  <el-radio-group v-model="queryParams.diagFlag" class="item-width radio-group">
-                    <el-radio value="" style="margin-left: 12px; margin-right: 18px">全部</el-radio>
-                    <el-radio value="0" style="margin-right: 18px">阴性</el-radio>
-                    <el-radio value="1" style="margin-right: 18px">阳性</el-radio>
-                    <el-radio value="2" style="margin-right: 4px">重大阳性</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="8">
-                <!-- Notes: -->
-                <el-form-item label="检查部位" prop="examItemName" class="item-style">
-                  <el-select
-                    v-model="queryParams.examItemName"
-                    placeholder="请选择检查部位"
-                    clearable
-                    class="item-width"
-                  >
-                    <el-option
-                      v-for="item in examitemsList"
-                      :key="item.examItemCode"
-                      :label="item.examItemName"
-                      :value="item.examItemName"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <!-- Notes: -->
-                <el-form-item label="报告状态" prop="reportstatus" class="item-style">
-                  <el-select
-                    v-model="queryParams.reportstatus"
-                    placeholder="请选择报告状态"
-                    clearable
-                    class="item-width"
-                  >
-                    <el-option label="已分检" value="已分检" />
-                    <el-option label="待分析" value="待分析" />
-                    <el-option label="已分析" value="已分析" />
-                    <el-option label="已审核" value="已审核" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="8">
-                <!-- Notes: -->
-                <el-form-item label="患者姓名" prop="pname" class="item-style">
-                  <el-input
-                    v-model="queryParams.pname"
-                    placeholder="请输入患者姓名"
-                    clearable
-                    class="item-width"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="4">
-                <!-- Notes: -->
-                <el-form-item label="性别" prop="gender" class="item-style">
-                  <el-select
-                    v-model="queryParams.gender"
-                    placeholder="请选择性别"
-                    clearable
-                    class="item-width"
-                  >
-                    <el-option label="男" value="男" />
-                    <el-option label="女" value="女" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col
-                :offset="4"
-                :span="8"
-                style="text-align: left; padding-left: 10px; margin-bottom: 6px"
+    <ContentWrap>
+      <el-form
+        ref="queryFormRef"
+        :model="queryParams"
+        size="default"
+        label-width="78px"
+        label-position="right"
+        label-suffix=""
+        class="-mb-15px"
+      >
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="登记号" prop="regId" class="item-style">
+              <el-input
+                v-model="queryParams.regId"
+                placeholder="请输入登记号"
+                clearable
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检查号" prop="examId" class="item-style">
+              <el-input
+                v-model="queryParams.examId"
+                placeholder="请输入检查号"
+                clearable
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="检查日期" prop="examDate_ge" class="item-style date-picker">
+              <el-date-picker
+                v-model="queryParams.examDate_ge"
+                type="date"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期"
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-form-item
+              label=""
+              label-width="0px"
+              prop="examDate_le"
+              class="item-style date-picker"
+            >
+              <el-date-picker
+                v-model="queryParams.examDate_le"
+                type="date"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期"
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7" v-if="false">
+            <el-form-item label="患者来源" prop="regSource" class="item-style">
+              <el-radio-group class="item-width radio-group">
+                <el-radio value="全部" style="margin-left: 6px; margin-right: 16px">全部</el-radio>
+                <el-radio value="门诊" style="margin-right: 16px">门诊</el-radio>
+                <el-radio value="住院" style="margin-right: 16px">住院</el-radio>
+                <el-radio value="体检" style="margin-right: 4px">体检</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="影像设备" prop="deviceName" class="item-style">
+              <el-select
+                v-model="queryParams.deviceName"
+                placeholder="请选择影像设备"
+                clearable
+                class="item-width"
               >
-                <el-button @click="handleQuery">
-                  <Icon icon="ep:search" class="mr-5px" /> 搜索
-                </el-button>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-card>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="16">
-        <el-card shadow="never" style="min-height: 400px">
-          <el-table
-            v-loading="loading"
-            size="small"
-            border
-            fit
-            :stripe="true"
-            :show-overflow-tooltip="true"
-            :data="list_IllnessCase"
-            height="max(45vh,330px)"
-            @row-click="handleRowClick"
-          >
-            <el-table-column type="index" label="序号" align="center" width="54px" />
-            <el-table-column label="登记号" align="center" prop="regId" width="120px" />
-            <el-table-column label="检查号" align="center" prop="examId" width="120px" />
-            <el-table-column label="患者姓名" align="center" prop="pname" width="100px" />
-            <el-table-column label="性别" align="center" prop="gender" width="48px" />
-            <el-table-column
-              label="出生日期"
-              align="center"
-              prop="birthday"
-              :formatter="dateFormatter2"
-              width="90px"
-            />
-            <el-table-column
-              label="检查日期"
-              align="center"
-              prop="examDate"
-              :formatter="dateFormatter2"
-              width="90px"
-            />
-            <el-table-column
-              label="检查部位"
-              header-align="center"
-              prop="examItemName"
-              width="160px"
-            />
-            <el-table-column
-              label="影像设备"
-              header-align="center"
-              prop="deviceName"
-              width="160px"
-            />
-            <el-table-column label="阴性阳性" align="center" prop="diagFlag">
-              <template #default="scope">
-                <el-tag v-if="scope.row.diagFlag == '0'">阴性</el-tag>
-                <el-tag v-else-if="scope.row.diagFlag == '1'">阳性</el-tag>
-                <el-tag v-else-if="scope.row.diagFlag == '2'">重大阳性</el-tag>
-                <el-tag type="danger" v-else>暂无</el-tag>
-              </template>
-            </el-table-column>
-            <!-- 数据列 -->
-          </el-table>
-          <div style="display: flex; justify-content: center">
-            <Pagination
-              small
-              size="small"
-              :total="total"
-              v-model:page="queryParams.pageNo"
-              v-model:limit="queryParams.pageSize"
-              @pagination="getList"
-            />
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :span="8">
-        <el-card shadow="never" style="height: 100%" class="ml-1">
+                <el-option
+                  v-for="item in deviceList"
+                  :key="item.deviceId"
+                  :label="item.deviceName"
+                  :value="item.deviceName"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备类型" prop="deviceType" class="item-style">
+              <el-select
+                v-model="queryParams.deviceType"
+                placeholder="请选择设备类型"
+                clearable
+                class="item-width"
+              >
+                <el-option label="DR" value="DR" />
+                <el-option label="CT" value="CT" />
+                <el-option label="MR" value="MR" />
+                <el-option label="超声" value="超声" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="阴性阳性" prop="diagFlag" class="item-style">
+              <el-radio-group v-model="queryParams.diagFlag" class="item-width radio-group">
+                <el-radio value="" style="margin-left: 12px; margin-right: 18px">全部</el-radio>
+                <el-radio value="0" style="margin-right: 18px">阴性</el-radio>
+                <el-radio value="1" style="margin-right: 18px">阳性</el-radio>
+                <el-radio value="2" style="margin-right: 4px">重大阳性</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="检查部位" prop="examItemName" class="item-style">
+              <el-select
+                v-model="queryParams.examItemName"
+                placeholder="请选择检查部位"
+                clearable
+                class="item-width"
+              >
+                <el-option
+                  v-for="item in examitemsList"
+                  :key="item.examItemCode"
+                  :label="item.examItemName"
+                  :value="item.examItemName"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="报告状态" prop="reportstatus" class="item-style">
+              <el-select
+                v-model="queryParams.reportstatus"
+                placeholder="请选择报告状态"
+                clearable
+                class="item-width"
+              >
+                <el-option label="已分检" value="已分检" />
+                <el-option label="待分析" value="待分析" />
+                <el-option label="已分析" value="已分析" />
+                <el-option label="已审核" value="已审核" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="患者姓名" prop="pname" class="item-style">
+              <el-input
+                v-model="queryParams.pname"
+                placeholder="请输入患者姓名"
+                clearable
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="性别" prop="gender" class="item-style">
+              <el-select
+                v-model="queryParams.gender"
+                placeholder="请选择性别"
+                clearable
+                class="item-width"
+              >
+                <el-option label="男" value="男" />
+                <el-option label="女" value="女" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :offset="4" :span="8" style="text-align: right">
+            <el-button
+              @click="handleQuery"
+              style="background-color: rgba(56, 119, 246, 1); color: rgba(255, 255, 255, 1)"
+            >
+              <Icon icon="ep:search" class="mr-5px" /> 搜索
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </ContentWrap>
+
+    <ContentWrap class="mb-1px">
+      <el-table
+        v-loading="loading"
+        size="default"
+        border
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        :data="list_IllnessCase"
+        :header-cell-style="{
+          background: 'rgb(235, 241, 250)',
+          height: '40px',
+          color: '#333333'
+        }"
+        :row-style="{ height: '40px' }"
+        height="max(calc(100vh - 464px),100px)"
+      >
+        <el-table-column type="index" label="序号" align="center" width="54px" />
+        <el-table-column label="登记号" align="center" prop="regId" width="240px" />
+        <el-table-column label="检查号" align="center" prop="examId" width="240px" />
+        <el-table-column label="患者姓名" align="center" prop="pname" width="130px" />
+        <el-table-column label="性别" align="center" prop="gender" width="54px" />
+        <el-table-column
+          label="出生日期"
+          align="center"
+          prop="birthday"
+          :formatter="dateFormatter2"
+          width="110px"
+        />
+        <el-table-column
+          label="检查日期"
+          align="center"
+          prop="examDate"
+          :formatter="dateFormatter2"
+          width="110px"
+        />
+        <el-table-column
+          label="检查部位"
+          header-align="center"
+          prop="examItemName"
+          min-width="260px"
+        />
+        <el-table-column
+          label="影像设备"
+          header-align="center"
+          prop="deviceName"
+          min-width="260px"
+        />
+        <el-table-column
+          label="阴性阳性"
+          align="center"
+          prop="diagFlag"
+          fixed="right"
+          width="100px"
+        >
+          <template #default="scope">
+            <el-tag v-if="scope.row.diagFlag == '0'" effect="plain" style="width: 74px"
+              >阴性</el-tag
+            >
+            <el-tag
+              v-else-if="scope.row.diagFlag == '1'"
+              effect="plain"
+              type="danger"
+              style="width: 74px"
+              >阳性</el-tag
+            >
+            <el-tag
+              v-else-if="scope.row.diagFlag == '2'"
+              effect="plain"
+              type="warning"
+              style="width: 74px"
+              >重大阳性</el-tag
+            >
+            <el-tag v-else effect="plain" type="info" style="width: 74px">暂无</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" fixed="right" width="60px">
+          <template #default="scope">
+            <el-button link @click="handleRowClick(scope.row)" style="color: rgb(56, 119, 246)">
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+        <!-- 数据列 -->
+      </el-table>
+      <div>
+        <Pagination
+          :total="total"
+          v-model:page="queryParams.pageNo"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div>
+    </ContentWrap>
+
+    <el-drawer v-model="activeDrawer" direction="rtl" :with-header="false" size="42%">
+      <div style="position: relative; z-index: 100">
+        <el-button
+          link
+          @click="activeDrawer = false"
+          style="position: absolute; top: 3px; right: 1px"
+        >
+          <Icon icon="ep:close" />
+        </el-button>
+      </div>
+      <el-tabs v-model="activeTabName" style="margin-top: -8px">
+        <el-tab-pane label="诊断信息" name="diagnosisInfo">
           <el-scrollbar>
-            <el-form size="small" label-width="68px" label-position="top" label-suffix="">
+            <el-form size="default" label-width="78px" label-position="top" label-suffix="">
               <el-row>
                 <el-col :span="24">
                   <el-form-item label="检查描述" class="item-style">
@@ -298,9 +319,9 @@
               </el-row>
             </el-form>
           </el-scrollbar>
-        </el-card>
-      </el-col>
-    </el-row>
+        </el-tab-pane>
+      </el-tabs>
+    </el-drawer>
     <!-- 可参考内容 -->
   </div>
 </template>
@@ -323,6 +344,8 @@ const queryFormRef = ref()
 /** 数据结构 **/
 const message = useMessage()
 const { t } = useI18n()
+const activeDrawer = ref(false)
+const activeTabName = ref('diagnosisInfo')
 const diagnosisDesc = ref('')
 const examitemsDesc = ref('')
 const deviceList = ref<any[]>([])
@@ -368,8 +391,6 @@ const getList = async () => {
   loading.value = true
   try {
     const data = await IllnessCaseApi.getPage(queryParams.value)
-    console.log('---------------------')
-    console.log(data.list)
     list_IllnessCase.value = data.list
     total.value = data.total
   } finally {
@@ -385,6 +406,7 @@ const handleQuery = async () => {
 const handleRowClick = async (row) => {
   examitemsDesc.value = row ? row.examDescription : ''
   diagnosisDesc.value = row ? row.diagResults : ''
+  activeDrawer.value = true
 }
 
 /** 钩子方法 **/
diff --git a/src/views/applyregistration/reportPrintStatistics/index.vue b/src/views/applyregistration/reportPrintStatistics/index.vue
index 5b589c27..6569b779 100644
--- a/src/views/applyregistration/reportPrintStatistics/index.vue
+++ b/src/views/applyregistration/reportPrintStatistics/index.vue
@@ -1,96 +1,361 @@
 <template>
   <div>
-    <el-row>
-      <el-col :span="9">
-        <el-card shadow="never" style="min-height: 460px; height: 100%">
+    <ContentWrap>
+      <el-form
+        ref="queryFormRef"
+        :model="queryParams"
+        size="default"
+        label-width="78px"
+        label-position="right"
+        label-suffix=""
+        class="-mb-15px"
+      >
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="登记号" prop="regId" class="item-style">
+              <el-input
+                v-model="queryParams.regId"
+                placeholder="请输入登记号"
+                clearable
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检查号" prop="examId" class="item-style">
+              <el-input
+                v-model="queryParams.examId"
+                placeholder="请输入检查号"
+                clearable
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="检查日期" prop="examDate_ge" class="item-style date-picker">
+              <el-date-picker
+                v-model="queryParams.examDate_ge"
+                type="date"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期"
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-form-item
+              label=""
+              label-width="0px"
+              prop="examDate_le"
+              class="item-style date-picker"
+            >
+              <el-date-picker
+                v-model="queryParams.examDate_le"
+                type="date"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期"
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="影像设备" prop="deviceName" class="item-style">
+              <el-select
+                v-model="queryParams.deviceName"
+                placeholder="请选择设备"
+                clearable
+                class="item-width"
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :key="item.deviceId"
+                  :label="item.deviceName"
+                  :value="item.deviceName"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="患者姓名" prop="pname" class="item-style">
+              <el-input
+                v-model="queryParams.pname"
+                placeholder="请输入患者姓名"
+                clearable
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" style="text-align: right">
+            <el-button
+              @click="handleQuery"
+              style="background-color: rgba(56, 119, 246, 1); color: rgba(255, 255, 255, 1)"
+            >
+              <Icon icon="ep:search" class="mr-5px" /> 搜索
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </ContentWrap>
+
+    <ContentWrap style="height: 64px" v-show="false">
+      <el-row>
+        <el-col :offset="16" :span="8" style="text-align: right">
+          <el-button
+            @click="handlePrint"
+            style="background-color: rgb(28, 176, 117); color: rgb(255, 255, 255)"
+          >
+            <Icon icon="ep:printer" class="mr-5px" /> 打印
+          </el-button>
+        </el-col>
+      </el-row>
+    </ContentWrap>
+
+    <ContentWrap class="mb-1px">
+      <el-table
+        ref="infoTableRef"
+        v-loading="loading"
+        size="default"
+        border
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        :data="list_infos"
+        :header-cell-style="{ background: 'rgb(235, 241, 250)', height: '40px', color: '#333333' }"
+        :row-style="{ height: '40px' }"
+        height="max(calc(100vh - 465px),100px)"
+      >
+        <el-table-column type="selection" align="center" width="44px" />
+        <el-table-column label="序号" align="center" width="54px">
+          <template #default="scope"> {{ scope.$index + 1 }} </template>
+        </el-table-column>
+        <el-table-column label="登记号" align="center" prop="regId" width="240px" />
+        <el-table-column label="检查号" align="center" prop="examId" width="240px" />
+        <el-table-column label="患者姓名" align="center" prop="pname" width="130px" />
+        <el-table-column label="性别" align="center" prop="gender" width="54px" />
+        <el-table-column
+          label="出生日期"
+          align="center"
+          prop="birthday"
+          :formatter="dateFormatter2"
+          width="110px"
+        />
+        <el-table-column
+          label="检查日期"
+          align="center"
+          prop="examDate"
+          :formatter="dateFormatter2"
+          width="110px"
+        />
+        <el-table-column
+          label="检查项目"
+          header-align="center"
+          prop="examItemName"
+          min-width="260px"
+        />
+        <el-table-column
+          label="影像设备"
+          header-align="center"
+          prop="deviceName"
+          min-width="260px"
+        />
+        <el-table-column
+          label="阴性阳性"
+          align="center"
+          prop="diagFlag"
+          fixed="right"
+          width="100px"
+        >
+          <template #default="scope">
+            <el-tag v-if="scope.row.diagFlag == '0'" effect="plain" style="width: 74px"
+              >阴性</el-tag
+            >
+            <el-tag
+              v-else-if="scope.row.diagFlag == '1'"
+              effect="plain"
+              type="danger"
+              style="width: 74px"
+              >阳性</el-tag
+            >
+            <el-tag
+              v-else-if="scope.row.diagFlag == '2'"
+              effect="plain"
+              type="warning"
+              style="width: 74px"
+              >重大阳性</el-tag
+            >
+            <el-tag v-else effect="plain" type="info" style="width: 74px">暂无</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" fixed="right" width="60px">
+          <template #default="scope">
+            <el-button link @click="handleRowClick(scope.row)" style="color: rgb(56, 119, 246)">
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+        <!-- 数据列 -->
+      </el-table>
+      <div>
+        <Pagination
+          :total="total"
+          v-model:page="queryParams.pageNo"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div>
+    </ContentWrap>
+
+    <el-drawer v-model="activeDrawer" direction="rtl" :with-header="false" size="74%">
+      <div style="position: relative; z-index: 100">
+        <el-button
+          link
+          @click="activeDrawer = false"
+          style="position: absolute; top: 3px; right: 1px"
+        >
+          <Icon icon="ep:close" />
+        </el-button>
+      </div>
+      <el-tabs v-model="activeTabName" style="margin-top: -8px; height: 100%">
+        <el-tab-pane label="诊断信息" name="diagnosisInfo">
           <el-form
-            ref="queryFormRef"
-            :model="queryParams"
-            size="small"
-            label-width="64px"
+            ref="infoFormRef"
+            :model="infoParams"
+            size="default"
+            label-width="74px"
             label-position="right"
             label-suffix=""
-            class="mb-2px -ml-14px"
+            class="mb-20px -ml-10px"
           >
             <el-row>
-              <el-col :span="24">
+              <el-col :span="8">
                 <el-form-item label="登记号" prop="regId" class="item-style">
                   <el-input
-                    v-model="queryParams.regId"
-                    placeholder="请输入登记号"
+                    v-model="infoParams.regId"
                     clearable
+                    :readonly="diagnosisInfo_readonly"
                     class="item-width"
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
+              <el-col :span="8">
                 <el-form-item label="检查号" prop="examId" class="item-style">
                   <el-input
-                    v-model="queryParams.examId"
-                    placeholder="请输入检查号"
+                    v-model="infoParams.examId"
                     clearable
+                    :readonly="diagnosisInfo_readonly"
                     class="item-width"
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="13">
-                <el-form-item label="检查日期" prop="examDate_ge" class="item-style date-picker">
-                  <el-date-picker
-                    v-model="queryParams.examDate_ge"
-                    type="date"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                    placeholder="开始日期"
-                    class="item-width"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11">
+              <el-col :span="8">
                 <el-form-item
-                  label=""
-                  label-width="0px"
-                  prop="examDate_le"
+                  label="检查日期"
+                  prop="applicationDate"
                   class="item-style date-picker"
                 >
                   <el-date-picker
-                    v-model="queryParams.examDate_le"
-                    type="date"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                    placeholder="结束日期"
+                    v-model="infoParams.applicationDate"
+                    type="datetime"
+                    :readonly="diagnosisInfo_readonly"
                     class="item-width"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="24">
-                <el-form-item label="影像设备" prop="deviceName" class="item-style">
-                  <el-select
-                    v-model="queryParams.deviceName"
-                    placeholder="请选择设备"
+              <el-col :span="8">
+                <el-form-item label="姓名" prop="pname" class="item-style">
+                  <el-input
+                    v-model="infoParams.pname"
                     clearable
+                    :readonly="diagnosisInfo_readonly"
+                    class="item-width"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item label="性别" prop="gender" class="item-style">
+                  <el-select
+                    v-model="infoParams.gender"
+                    placeholder=""
+                    clearable
+                    :disabled="diagnosisInfo_readonly"
                     class="item-width"
                   >
-                    <el-option
-                      v-for="item in deviceList"
-                      :key="item.deviceId"
-                      :label="item.deviceName"
-                      :value="item.deviceName"
-                    />
+                    <el-option label="男" value="男" />
+                    <el-option label="女" value="女" />
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="4">
+                <el-form-item label="年龄" class="item-style">
+                  <el-input
+                    v-model="age"
+                    clearable
+                    :readonly="diagnosisInfo_readonly"
+                    class="item-width"
+                  >
+                    <template #append>
+                      <span style="width: 1px">岁</span>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="出生日期" prop="birthday" class="item-style date-picker">
+                  <el-date-picker
+                    v-model="infoParams.birthday"
+                    type="date"
+                    :readonly="diagnosisInfo_readonly"
+                    class="item-width"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="送检科室" prop="billDoctorDepartment" class="item-style">
+                  <el-input
+                    v-model="infoParams.billDoctorDepartment"
+                    clearable
+                    :readonly="diagnosisInfo_readonly"
+                    class="item-width"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="检查项目" class="item-style">
+                  <el-input
+                    v-model="examItemNameEdit"
+                    clearable
+                    :readonly="false"
+                    class="item-width"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" v-show="examItemNameEditShow">
+                <el-button class="ml-10px -mr-6px" type="primary" @click="examItemNameEdit_save">
+                  保存
+                </el-button>
+                <el-button @click="examItemNameEdit_reset"> 重置 </el-button>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="11" v-if="false">
+                <el-form-item label="申请医生" prop="it_14" class="item-style">
+                  <el-input clearable :readonly="true" class="item-width" />
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="患者姓名" prop="pname" class="item-style">
+                <el-form-item label="所见" prop="examDescription" class="item-style">
                   <el-input
-                    v-model="queryParams.pname"
-                    placeholder="请输入患者姓名"
-                    clearable
+                    v-model="infoParams.examDescription"
+                    type="textarea"
+                    :autosize="{ minRows: 5, maxRows: 9 }"
+                    :readonly="diagnosisInfo_readonly"
                     class="item-width"
                   />
                 </el-form-item>
@@ -98,399 +363,170 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <div style="text-align: right" class="item-style">
-                  <el-button @click="handleQuery">
-                    <Icon icon="ep:search" class="mr-2px" /> 搜索
-                  </el-button>
-                  <el-button type="primary" plain v-if="false">
-                    <Icon icon="ep:printer" class="mr-2px" /> 打印
-                  </el-button>
-                </div>
+                <el-form-item label="结论" prop="diagResults" class="item-style">
+                  <el-input
+                    v-model="infoParams.diagResults"
+                    type="textarea"
+                    :autosize="{ minRows: 5, maxRows: 9 }"
+                    :readonly="diagnosisInfo_readonly"
+                    class="item-width"
+                  />
+                </el-form-item>
               </el-col>
             </el-row>
           </el-form>
-          <el-table
-            v-loading="loading"
-            size="small"
-            border
-            :stripe="true"
-            :show-overflow-tooltip="true"
-            :data="list_infos"
-            height="max(calc(100vh - 460px),280px)"
-            @row-click="handleRowClick"
+        </el-tab-pane>
+        <el-tab-pane label="报告单" name="reportInfo">
+          <div
+            class="flex-center"
+            id="printMe"
+            style="min-height: calc(100% - 15px)"
+            v-if="reportInfoType == 'us'"
           >
-            <el-table-column type="index" label="序号" align="center" width="54px" />
-            <el-table-column label="登记号" align="center" prop="regId" width="120px" />
-            <el-table-column label="检查号" align="center" prop="examId" width="120px" />
-            <el-table-column label="患者姓名" align="center" prop="pname" width="100px" />
-            <el-table-column label="性别" align="center" prop="gender" width="48px" />
-            <el-table-column
-              label="出生日期"
-              align="center"
-              prop="birthday"
-              :formatter="dateFormatter2"
-              width="90px"
-            />
-            <el-table-column
-              label="检查日期"
-              align="center"
-              prop="examDate"
-              :formatter="dateFormatter2"
-              width="90px"
-            />
-            <el-table-column
-              label="检查项目"
-              header-align="center"
-              prop="examItemName"
-              width="160px"
-            />
-            <el-table-column
-              label="影像设备"
-              header-align="center"
-              prop="deviceName"
-              width="160px"
-            />
-            <el-table-column label="阴性阳性" align="center" prop="diagFlag">
-              <template #default="scope">
-                <el-tag v-if="scope.row.diagFlag == '0'">阴性</el-tag>
-                <el-tag v-else-if="scope.row.diagFlag == '1'">阳性</el-tag>
-                <el-tag v-else-if="scope.row.diagFlag == '2'">重大阳性</el-tag>
-                <el-tag type="danger" v-else>暂无</el-tag>
-              </template>
-            </el-table-column>
-            <!-- 数据列 -->
-          </el-table>
-          <div style="display: flex; justify-content: center">
-            <Pagination
-              small
-              size="small"
-              :total="total"
-              v-model:page="queryParams.pageNo"
-              v-model:limit="queryParams.pageSize"
-              @pagination="getList"
-            />
+            <div class="ultrasound-report" id="PDF">
+              <h2>超声检查报告单</h2>
+              <hr />
+              <div class="patient-info">
+                <p class="info-item">门诊号:{{ infoParams.regId }}</p>
+                <p class="info-item">姓名:{{ infoParams.pname }}</p>
+                <p class="info-item">性别:{{ infoParams.gender }}</p>
+                <p class="info-item">年龄:{{ age }}岁</p>
+                <p class="info-item">检查号:{{ infoParams.examId }}</p>
+                <p class="info-item">检查项目:{{ infoParams.examItemName }}</p>
+                <p class="info-item">设备:{{ infoParams.deviceName }}</p>
+                <p class="info-item">送检科室:{{ infoParams.billDoctorDepartment }}</p>
+              </div>
+              <hr />
+              <h3>超声图像:</h3>
+              <div class="image-gallery">
+                <div v-for="image in reportimages" :key="image.id">
+                  <img
+                    alt=""
+                    style="width: 140px; height: 140px"
+                    :src="image.imgUrl"
+                    v-if="false"
+                  />
+                  <el-image
+                    alt=""
+                    fit="fill"
+                    style="width: 99%; height: 99%"
+                    :src="image.imgUrl"
+                    :preview-src-list="[image.imgUrl]"
+                    v-if="true"
+                  />
+                </div>
+              </div>
+              <div class="ultrasound-findings">
+                <h3>超声所见:</h3>
+                <p>{{ infoParams.examDescription }}</p>
+              </div>
+              <div class="ultrasound-recommendation">
+                <h3>超声提示:</h3>
+                <p>{{ infoParams.diagResults }}</p>
+              </div>
+              <div style="position: absolute; bottom: 20px; right: 20px">
+                <p>医生签名:{{ infoParams.reviewDoctor }}</p>
+              </div>
+            </div>
+            <el-divider class="ignore-print" />
+            <div style="text-align: center; margin-top: 10px; margin-bottom: 12px">
+              <el-button type="primary" style="width: 90px" class="ignore-print" v-print="'printMe'"
+                >打印</el-button
+              >
+            </div>
           </div>
-        </el-card>
-      </el-col>
-      <el-col :span="15">
-        <el-tabs v-model="activeTabName" type="border-card" style="height: 100%" class="ml-1">
-          <el-tab-pane label="诊断信息" name="diagnosisInfo">
-            <el-form
-              ref="infoFormRef"
-              :model="infoParams"
-              size="small"
-              label-width="64px"
-              label-position="right"
-              label-suffix=""
-              class="mb-20px -ml-4px"
-            >
-              <el-row>
+          <div
+            class="flex-center"
+            id="printMe2"
+            style="min-height: calc(100% - 15px)"
+            v-if="reportInfoType == 'ct'"
+          >
+            <div class="ultrasound-report2" id="PDF">
+              <el-row style="font-size: 14px">
+                <el-col :span="12">
+                  <h2 class="ml-6px">科右前旗康立寿医院</h2>
+                </el-col>
+                <el-col :span="12">
+                  <h2 style="text-align: right" class="mr-6px">CT检查报告单</h2>
+                </el-col>
+              </el-row>
+              <hr />
+              <el-row style="font-size: 14px">
                 <el-col :span="13">
-                  <el-form-item label="登记号" prop="regId" class="item-style">
-                    <el-input
-                      v-model="infoParams.regId"
-                      clearable
-                      :readonly="diagnosisInfo_readonly"
-                      class="item-width"
-                    />
-                  </el-form-item>
+                  <div class="ml-6px">患者编号:</div>
+                  <div class="ml-6px">{{ infoParams.regId }}</div>
                 </el-col>
                 <el-col :span="11">
-                  <el-form-item label="检查号" prop="examId" class="item-style">
-                    <el-input
-                      v-model="infoParams.examId"
-                      clearable
-                      :readonly="diagnosisInfo_readonly"
-                      class="item-width"
-                    />
-                  </el-form-item>
+                  <div class="ml-6px">检查编号:</div>
+                  <div class="ml-6px">{{ infoParams.examId }}</div>
                 </el-col>
               </el-row>
-              <el-row>
-                <el-col :span="13">
-                  <el-form-item label="姓名" prop="pname" class="item-style">
-                    <el-input
-                      v-model="infoParams.pname"
-                      clearable
-                      :readonly="diagnosisInfo_readonly"
-                      class="item-width"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="性别" prop="gender" class="item-style">
-                    <el-select
-                      v-model="infoParams.gender"
-                      placeholder=""
-                      clearable
-                      :disabled="diagnosisInfo_readonly"
-                      class="item-width"
-                    >
-                      <el-option label="男" value="男" />
-                      <el-option label="女" value="女" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="13">
-                  <el-form-item label="出生日期" prop="birthday" class="item-style date-picker">
-                    <el-date-picker
-                      v-model="infoParams.birthday"
-                      type="date"
-                      :readonly="diagnosisInfo_readonly"
-                      class="item-width"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="年龄" class="item-style">
-                    <el-input
-                      v-model="age"
-                      clearable
-                      :readonly="diagnosisInfo_readonly"
-                      class="item-width"
-                    >
-                      <template #append>岁</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="13">
-                  <el-form-item label="送检科室" prop="billDoctorDepartment" class="item-style">
-                    <el-input
-                      v-model="infoParams.billDoctorDepartment"
-                      clearable
-                      :readonly="diagnosisInfo_readonly"
-                      class="item-width"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="11" v-if="false">
-                  <el-form-item label="申请医生" prop="it_14" class="item-style">
-                    <el-input clearable :readonly="true" class="item-width" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="13">
-                  <el-form-item
-                    label="检查日期"
-                    prop="applicationDate"
-                    class="item-style date-picker"
-                  >
-                    <el-date-picker
-                      v-model="infoParams.applicationDate"
-                      type="datetime"
-                      :readonly="diagnosisInfo_readonly"
-                      class="item-width"
-                    />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="13">
-                  <el-form-item label="检查项目" class="item-style">
-                    <el-input
-                      v-model="examItemNameEdit"
-                      clearable
-                      :readonly="false"
-                      class="item-width"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="11" v-show="examItemNameEditShow">
-                  <el-button class="ml-10px -mr-8px" type="primary" @click="examItemNameEdit_save">
-                    保存
-                  </el-button>
-                  <el-button @click="examItemNameEdit_reset"> 重置 </el-button>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="所见" prop="examDescription" class="item-style">
-                    <el-input
-                      v-model="infoParams.examDescription"
-                      type="textarea"
-                      :autosize="{ minRows: 6, maxRows: 9 }"
-                      :readonly="diagnosisInfo_readonly"
-                      class="item-width"
-                    />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="结论" prop="diagResults" class="item-style">
-                    <el-input
-                      v-model="infoParams.diagResults"
-                      type="textarea"
-                      :autosize="{ minRows: 6, maxRows: 9 }"
-                      :readonly="diagnosisInfo_readonly"
-                      class="item-width"
-                    />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </el-tab-pane>
-          <el-tab-pane label="报告单" name="reportInfo">
-            <div
-              class="flex-center"
-              id="printMe"
-              style="min-height: calc(100% - 15px)"
-              v-if="reportInfoType == 'us'"
-            >
-              <div class="ultrasound-report" id="PDF">
-                <h2>超声检查报告单</h2>
-                <hr />
-                <div class="patient-info">
-                  <p class="info-item">门诊号:{{ infoParams.regId }}</p>
-                  <p class="info-item">姓名:{{ infoParams.pname }}</p>
-                  <p class="info-item">性别:{{ infoParams.gender }}</p>
-                  <p class="info-item">年龄:{{ age }}岁</p>
-                  <p class="info-item">检查号:{{ infoParams.examId }}</p>
-                  <p class="info-item">检查项目:{{ infoParams.examItemName }}</p>
-                  <p class="info-item">设备:{{ infoParams.deviceName }}</p>
-                  <p class="info-item">送检科室:{{ infoParams.billDoctorDepartment }}</p>
-                </div>
-                <hr />
-                <h3>超声图像:</h3>
-                <div class="image-gallery">
-                  <div v-for="image in reportimages" :key="image.id">
-                    <img
-                      alt=""
-                      style="width: 140px; height: 140px"
-                      :src="image.imgUrl"
-                      v-if="false"
-                    />
-                    <el-image
-                      alt=""
-                      fit="fill"
-                      style="width: 99%; height: 99%"
-                      :src="image.imgUrl"
-                      :preview-src-list="[image.imgUrl]"
-                      v-if="true"
-                    />
-                  </div>
-                </div>
-                <div class="ultrasound-findings">
-                  <h3>超声所见:</h3>
-                  <p>{{ infoParams.examDescription }}</p>
-                </div>
-                <div class="ultrasound-recommendation">
-                  <h3>超声提示:</h3>
-                  <p>{{ infoParams.diagResults }}</p>
-                </div>
-                <div style="position: absolute; bottom: 20px; right: 20px">
-                  <p>医生签名:{{ infoParams.reviewDoctor }}</p>
-                </div>
+              <hr />
+              <div class="patient-info2">
+                <p class="info-item" v-if="false">门诊号:{{ infoParams.regId }}</p>
+                <p class="info-item">姓名:{{ infoParams.pname }}</p>
+                <p class="info-item">性别:{{ infoParams.gender }}</p>
+                <p class="info-item">年龄:{{ age }}岁</p>
+                <p class="info-item" v-if="false">检查号:{{ infoParams.examId }}</p>
+                <p class="info-item" v-if="false">检查项目:{{ infoParams.examItemName }}</p>
+                <p class="info-item">设备:{{ infoParams.deviceName }}</p>
+                <p class="info-item">送检科室:{{ infoParams.billDoctorDepartment }}</p>
               </div>
-              <el-divider />
-              <div>
-                <el-button
-                  type="primary"
-                  style="width: 100px; float: right"
-                  class="ignore-print"
-                  v-print="'printMe'"
-                  >打印</el-button
-                >
+              <hr />
+              <div class="ultrasound-findings">
+                <h3>检查项目:</h3>
+                <p>{{ infoParams.examItemName }}</p>
               </div>
-            </div>
-            <div
-              class="flex-center"
-              id="printMe2"
-              style="min-height: calc(100% - 15px)"
-              v-if="reportInfoType == 'ct'"
-            >
-              <div class="ultrasound-report2" id="PDF">
-                <el-row style="font-size: 14px">
-                  <el-col :span="12">
-                    <h2 class="ml-6px">科右前旗康立寿医院</h2>
-                  </el-col>
-                  <el-col :span="12">
-                    <h2 style="text-align: right" class="mr-6px">CT检查报告单</h2>
-                  </el-col>
-                </el-row>
+              <div class="ultrasound-findings">
+                <h3>影像学表现:</h3>
+                <p>{{ infoParams.examDescription }}</p>
+              </div>
+              <div class="ultrasound-recommendation">
+                <h3>影像学诊断:</h3>
+                <p>{{ infoParams.diagResults }}</p>
+              </div>
+              <div style="width: 94%; position: absolute; bottom: 20px; right: 20px">
                 <hr />
                 <el-row style="font-size: 14px">
-                  <el-col :span="13">
-                    <div class="ml-6px">患者编号:</div>
-                    <div class="ml-6px">{{ infoParams.regId }}</div>
-                  </el-col>
-                  <el-col :span="11">
-                    <div class="ml-6px">检查编号:</div>
-                    <div class="ml-6px">{{ infoParams.examId }}</div>
-                  </el-col>
-                </el-row>
-                <hr />
-                <div class="patient-info2">
-                  <p class="info-item" v-if="false">门诊号:{{ infoParams.regId }}</p>
-                  <p class="info-item">姓名:{{ infoParams.pname }}</p>
-                  <p class="info-item">性别:{{ infoParams.gender }}</p>
-                  <p class="info-item">年龄:{{ age }}岁</p>
-                  <p class="info-item" v-if="false">检查号:{{ infoParams.examId }}</p>
-                  <p class="info-item" v-if="false">检查项目:{{ infoParams.examItemName }}</p>
-                  <p class="info-item">设备:{{ infoParams.deviceName }}</p>
-                  <p class="info-item">送检科室:{{ infoParams.billDoctorDepartment }}</p>
-                </div>
-                <hr />
-                <div class="ultrasound-findings">
-                  <h3>检查项目:</h3>
-                  <p>{{ infoParams.examItemName }}</p>
-                </div>
-                <div class="ultrasound-findings">
-                  <h3>影像学表现:</h3>
-                  <p>{{ infoParams.examDescription }}</p>
-                </div>
-                <div class="ultrasound-recommendation">
-                  <h3>影像学诊断:</h3>
-                  <p>{{ infoParams.diagResults }}</p>
-                </div>
-                <div style="width: 94%; position: absolute; bottom: 20px; right: 20px">
-                  <hr />
-                  <el-row style="font-size: 14px">
-                    <el-col :span="6" class="pl-6px">报告医师:{{ infoParams.diagDoctor }}</el-col>
-                    <el-col :span="6"
-                      >报告日期:{{
-                        formatDate(infoParams.diagDate as unknown as Date, 'YYYY-MM-DD')
-                      }}</el-col
-                    >
-                    <el-col :span="6">审核医师:{{ infoParams.reviewDoctor }}</el-col>
-                    <el-col :span="6"
-                      >审核日期:{{
-                        formatDate(infoParams.reviewDate as unknown as Date, 'YYYY-MM-DD')
-                      }}</el-col
-                    >
-                  </el-row>
-                  <div
-                    style="
-                      font-size: 11px;
-                      text-align: center;
-                      margin-top: 12px;
-                      margin-bottom: -14px;
-                    "
+                  <el-col :span="6" class="pl-6px">报告医师:{{ infoParams.diagDoctor }}</el-col>
+                  <el-col :span="6"
+                    >报告日期:{{
+                      formatDate(infoParams.diagDate as unknown as Date, 'YYYY-MM-DD')
+                    }}</el-col
                   >
-                    本报告只作临床参考,不作证明材料
-                  </div>
-                </div>
-              </div>
-              <el-divider />
-              <div>
-                <el-button
-                  type="primary"
-                  style="width: 100px; float: right"
-                  class="ignore-print"
-                  v-print="'printMe2'"
-                  >打印</el-button
+                  <el-col :span="6">审核医师:{{ infoParams.reviewDoctor }}</el-col>
+                  <el-col :span="6"
+                    >审核日期:{{
+                      formatDate(infoParams.reviewDate as unknown as Date, 'YYYY-MM-DD')
+                    }}</el-col
+                  >
+                </el-row>
+                <div
+                  style="
+                    font-size: 11px;
+                    text-align: center;
+                    margin-top: 12px;
+                    margin-bottom: -14px;
+                  "
                 >
+                  本报告只作临床参考,不作证明材料
+                </div>
               </div>
             </div>
-          </el-tab-pane>
-        </el-tabs>
-      </el-col>
-    </el-row>
+            <el-divider class="ignore-print" />
+            <div style="text-align: center; margin-top: 10px; margin-bottom: 12px">
+              <el-button
+                type="primary"
+                style="width: 90px"
+                class="ignore-print"
+                v-print="'printMe2'"
+                >打印</el-button
+              >
+            </div>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </el-drawer>
     <!-- 可参考内容 -->
   </div>
 </template>
@@ -511,10 +547,12 @@ defineOptions({ name: 'ReportPrintStatistics' })
 /** 组件引用 **/
 const queryFormRef = ref()
 const infoFormRef = ref()
+const infoTableRef = ref()
 
 /** 数据结构 **/
 const message = useMessage()
 const { t } = useI18n()
+const activeDrawer = ref(false)
 const activeTabName = ref('diagnosisInfo')
 const reportInfoType = ref('') //us、ct
 const diagnosisInfo_readonly = ref(true)
@@ -657,12 +695,12 @@ const getList = async () => {
   }
 }
 
-const handleQuery = () => {
+const handleQuery = async () => {
   queryParams.value.pageNo = 1
   getList()
 }
 
-const handleRowClick = (row) => {
+const handleRowClick = async (row) => {
   resetDiagnosisInfo()
   if (row) {
     infoParams.value = row
@@ -674,6 +712,12 @@ const handleRowClick = (row) => {
       loadimage(row.orgId, row.regId)
     } else reportInfoType.value = 'ct'
   }
+  activeTabName.value = 'diagnosisInfo'
+  activeDrawer.value = true
+}
+
+const handlePrint = async () => {
+  console.log(infoTableRef.value.getSelectionRows())
 }
 
 /** 钩子方法 **/
@@ -704,7 +748,7 @@ console.log(infoParams0)
 }
 
 .item-style {
-  margin-bottom: 6px;
+  margin-bottom: 8px;
 }
 
 .item-width {
diff --git a/src/views/applyregistration/reservationInfo/index.vue b/src/views/applyregistration/reservationInfo/index.vue
index ab9205ff..729a6b51 100644
--- a/src/views/applyregistration/reservationInfo/index.vue
+++ b/src/views/applyregistration/reservationInfo/index.vue
@@ -1,287 +1,272 @@
 <template>
   <div>
-    <el-row>
-      <el-col :span="10">
-        <el-card shadow="never" v-loading="formLoading" style="min-height: 540px; height: 76vh">
-          <el-form
-            ref="infoFormRef"
-            :model="infoParams"
-            size="small"
-            label-width="68px"
-            label-position="right"
-            label-suffix=""
-            class="-mb-10px"
-            :disabled="infoFormRef_disabled"
-          >
-            <el-row>
-              <el-col :span="13">
-                <!-- Notes: -->
-                <el-form-item label="登记号" prop="regId" class="item-style">
-                  <el-input
-                    v-model="infoParams.regId"
-                    placeholder="请输入登记号"
-                    clearable
-                    class="item-width"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11">
-                <!-- Notes: -->
-                <el-form-item label="患者来源" prop="regSource" class="item-style">
-                  <el-select
-                    v-model="infoParams.regSource"
-                    placeholder="请选择患者来源"
-                    clearable
-                    class="item-width"
-                  >
-                    <el-option label="门诊" value="门诊" />
-                    <el-option label="住院" value="住院" />
-                    <el-option label="体检" value="体检" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="13">
-                <!-- Notes: -->
-                <el-form-item label="申请单号" class="item-style">
-                  <el-input
-                    v-model="examIdFirst"
-                    placeholder="申请单号"
-                    :disabled="true"
-                    class="item-width"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <!-- Notes: -->
-                <el-form-item label="姓名" prop="pname" class="item-style">
-                  <el-input
-                    v-model="infoParams.pname"
-                    placeholder="请输入姓名"
-                    clearable
-                    class="item-width"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="10">
-                <!-- Notes: -->
-                <el-form-item label="性别" prop="gender" class="item-style">
-                  <el-select
-                    v-model="infoParams.gender"
-                    placeholder="请选择性别"
-                    clearable
-                    class="item-width"
-                  >
-                    <el-option label="男" value="男" />
-                    <el-option label="女" value="女" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="14">
-                <!-- Notes: -->
-                <el-form-item label="联系电话" prop="contactTel" class="item-style">
-                  <el-input
-                    v-model="infoParams.contactTel"
-                    placeholder="请输入联系电话"
-                    clearable
-                    class="item-width"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="13">
-                <!-- Notes: -->
-                <el-form-item label="出生日期" prop="birthday" class="item-style date-picker">
-                  <el-date-picker
-                    v-model="infoParams.birthday"
-                    type="date"
-                    value-format="x"
-                    placeholder="请选择出生日期"
-                    class="item-width"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" v-if="false">
-                <!-- Notes: -->
-                <el-form-item label="年龄" prop="it_6" class="item-style">
-                  <el-input placeholder="请输入年龄" clearable class="item-width">
-                    <template #append>岁</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <!-- Notes: -->
-                <el-form-item label="检查设备" prop="deviceId" class="item-style">
-                  <el-select
-                    v-model="deviceInfo"
-                    value-key="deviceId"
-                    placeholder="请选择检查设备"
-                    clearable
-                    class="item-width"
-                    @change="deviceInfo_change"
-                  >
-                    <el-option
-                      v-for="item in deviceList"
-                      :key="item.deviceId"
-                      :label="item.deviceName"
-                      :value="item"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <!-- Notes: -->
-                <el-form-item label="开单科室" prop="billDoctorDepartment" class="item-style">
-                  <el-select
-                    v-model="infoParams.billDoctorDepartment"
-                    placeholder="请选择开单科室"
-                    clearable
-                    class="item-width"
-                  >
-                    <el-option
-                      v-for="item in departmentList"
-                      :key="item.departmentCode"
-                      :label="item.departmentName"
-                      :value="item.departmentName"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <!-- Notes: -->
-                <el-form-item label="开单医生" prop="billgDoctor" class="item-style">
-                  <el-select
-                    v-model="infoParams.billgDoctor"
-                    placeholder="请选择开单医生"
-                    clearable
-                    class="item-width"
-                  >
-                    <el-option
-                      v-for="item in doctorList"
-                      :key="item.doctorID"
-                      :label="item.doctorName"
-                      :value="item.doctorName"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="13">
-                <!-- Notes: -->
-                <el-form-item label="开单时间" prop="regDate" class="item-style date-picker">
-                  <el-date-picker
-                    v-model="infoParams.regDate"
-                    type="datetime"
-                    value-format="x"
-                    placeholder="请选择开单时间"
-                    class="item-width"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" v-if="false">
-                <!-- Notes: -->
-                <el-form-item label="床号" prop="it_12" class="item-style">
-                  <el-input placeholder="请输入床号" clearable class="item-width" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row v-if="false">
-              <el-col :span="24">
-                <!-- Notes: -->
-                <el-form-item label="诊断" prop="it_14" class="item-style">
-                  <el-input
-                    placeholder="请输入诊断"
-                    type="textarea"
-                    :autosize="{ minRows: 4 }"
-                    class="item-width"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <!-- Notes: -->
-                <el-form-item label="备注" prop="remark" class="item-style">
-                  <el-input
-                    v-model="infoParams.remark"
-                    placeholder="请输入备注"
-                    type="textarea"
-                    :autosize="{ minRows: 7 }"
-                    class="item-width"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-          <el-row>
-            <el-col
-              :span="24"
-              style="text-align: center; margin-left: 8px; margin-top: 16px; margin-bottom: 10px"
-            >
-              <el-button type="primary" size="small" v-show="btnAdd_show" @click="btnAdd_click">
-                <Icon icon="ep:plus" class="mr-10px" /> 新增
-              </el-button>
-              <el-button
-                type="primary"
-                size="small"
-                v-show="btnSubmit_show"
-                @click="btnSubmit_click"
-              >
-                <Icon icon="ep:check" class="mr-10px" /> 保存
-              </el-button>
-              <el-button
-                type="default"
-                size="small"
-                v-show="btnCancel_show"
-                @click="btnCancel_click"
-              >
-                <Icon icon="ep:close" class="mr-10px" /> 取消
-              </el-button>
-            </el-col>
-          </el-row>
-        </el-card>
-      </el-col>
-
-      <el-col :span="14">
-        <el-card shadow="never" class="card-right ml-2">
-          <el-scrollbar>
-            <el-checkbox-group
-              v-model="infoParams.examItems"
-              v-loading="formLoading"
-              :disabled="infoFormRef_disabled"
-              style="
-                display: flex;
-                flex-direction: column;
-                flex-wrap: wrap;
-                min-height: 410px;
-                height: 64vh;
-              "
-            >
-              <el-checkbox
-                v-for="item in examitemsList"
-                :key="item.examItemCode"
-                :label="item.examItemName"
-                :value="{ examItemCode: item.examItemCode, examItemName: item.examItemName }"
-                style="margin-right: 15px; margin-bottom: -8px"
+    <ContentWrap
+      v-loading="formLoading"
+      style="min-height: 550px; height: max(calc(100vh - 195px), 550px)"
+    >
+      <el-form
+        ref="infoFormRef"
+        :model="infoParams"
+        size="default"
+        label-width="78px"
+        label-position="right"
+        label-suffix=""
+        class="-mb-7px"
+        :disabled="infoFormRef_disabled"
+      >
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="申请单号" class="item-style">
+              <el-input
+                v-model="examIdFirst"
+                placeholder="申请单号"
+                :disabled="true"
+                class="item-width"
               />
-            </el-checkbox-group>
-          </el-scrollbar>
-        </el-card>
-      </el-col>
-    </el-row>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="登记号" prop="regId" class="item-style">
+              <el-input
+                v-model="infoParams.regId"
+                placeholder="请输入登记号"
+                clearable
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="患者来源" prop="regSource" class="item-style">
+              <el-select
+                v-model="infoParams.regSource"
+                placeholder="请选择患者来源"
+                clearable
+                class="item-width"
+              >
+                <el-option label="门诊" value="门诊" />
+                <el-option label="住院" value="住院" />
+                <el-option label="体检" value="体检" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="姓名" prop="pname" class="item-style">
+              <el-input
+                v-model="infoParams.pname"
+                placeholder="请输入姓名"
+                clearable
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="性别" prop="gender" class="item-style">
+              <el-select
+                v-model="infoParams.gender"
+                placeholder="请选择性别"
+                clearable
+                class="item-width"
+              >
+                <el-option label="男" value="男" />
+                <el-option label="女" value="女" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="出生日期" prop="birthday" class="item-style date-picker">
+              <el-date-picker
+                v-model="infoParams.birthday"
+                type="date"
+                value-format="x"
+                placeholder="请选择出生日期"
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="联系电话" prop="contactTel" class="item-style">
+              <el-input
+                v-model="infoParams.contactTel"
+                placeholder="请输入联系电话"
+                clearable
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="开单医生" prop="billgDoctor" class="item-style">
+              <el-select
+                v-model="infoParams.billgDoctor"
+                placeholder="请选择开单医生"
+                clearable
+                class="item-width"
+              >
+                <el-option
+                  v-for="item in doctorList"
+                  :key="item.doctorID"
+                  :label="item.doctorName"
+                  :value="item.doctorName"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="开单科室" prop="billDoctorDepartment" class="item-style">
+              <el-select
+                v-model="infoParams.billDoctorDepartment"
+                placeholder="请选择开单科室"
+                clearable
+                class="item-width"
+              >
+                <el-option
+                  v-for="item in departmentList"
+                  :key="item.departmentCode"
+                  :label="item.departmentName"
+                  :value="item.departmentName"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="检查设备" prop="deviceId" class="item-style">
+              <el-select
+                v-model="deviceInfo"
+                value-key="deviceId"
+                placeholder="请选择检查设备"
+                clearable
+                class="item-width"
+                @change="deviceInfo_change"
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :key="item.deviceId"
+                  :label="item.deviceName"
+                  :value="item"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="开单时间" prop="regDate" class="item-style date-picker">
+              <el-date-picker
+                v-model="infoParams.regDate"
+                type="datetime"
+                value-format="x"
+                placeholder="请选择开单时间"
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark" class="item-style">
+              <el-input
+                v-model="infoParams.remark"
+                placeholder="请输入备注"
+                type="textarea"
+                :autosize="{ minRows: 5 }"
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8" v-if="false">
+            <el-form-item label="年龄" prop="it_6" class="item-style">
+              <el-input placeholder="请输入年龄" clearable class="item-width">
+                <template #append>岁</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="false">
+            <el-form-item label="床号" prop="it_12" class="item-style">
+              <el-input placeholder="请输入床号" clearable class="item-width" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24" v-if="false">
+            <el-form-item label="诊断" prop="it_14" class="item-style">
+              <el-input
+                placeholder="请输入诊断"
+                type="textarea"
+                :autosize="{ minRows: 4 }"
+                class="item-width"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div
+        style="
+          border: 1px solid silver;
+          background-color: #f5f7fa;
+          margin-top: 8px;
+          padding: 2px 18px;
+        "
+      >
+        <el-scrollbar>
+          <el-checkbox-group
+            v-model="infoParams.examItems"
+            v-loading="formLoading"
+            :disabled="infoFormRef_disabled"
+            style="
+              display: flex;
+              flex-direction: column;
+              flex-wrap: wrap;
+              min-height: 200px;
+              height: 27vh;
+            "
+          >
+            <el-checkbox
+              v-for="item in examitemsList"
+              :key="item.examItemCode"
+              :label="item.examItemName"
+              :value="{ examItemCode: item.examItemCode, examItemName: item.examItemName }"
+              style="margin-right: 15px; margin-bottom: -6px"
+            />
+          </el-checkbox-group>
+        </el-scrollbar>
+      </div>
+
+      <div style="text-align: center; margin-top: 12px">
+        <el-button
+          type="primary"
+          size="default"
+          v-show="btnAdd_show"
+          style="width: 80px"
+          @click="btnAdd_click"
+        >
+          新增
+        </el-button>
+        <el-button
+          type="primary"
+          size="default"
+          v-show="btnSubmit_show"
+          style="width: 80px"
+          @click="btnSubmit_click"
+        >
+          保存
+        </el-button>
+        <el-button
+          type="default"
+          size="default"
+          v-show="btnCancel_show"
+          style="width: 80px"
+          @click="btnCancel_click"
+        >
+          取消
+        </el-button>
+      </div>
+    </ContentWrap>
   </div>
 </template>
 
@@ -478,9 +463,6 @@ console.log(infoParams0)
 .el-form-item__label {
   white-space: nowrap;
 }
-.card-right {
-  height: 100%;
-}
 
 .item-style {
   margin-bottom: 8px;
diff --git a/src/views/tblist/patientexamlist/index.vue b/src/views/tblist/patientexamlist/index.vue
index 1a371b76..5701429b 100644
--- a/src/views/tblist/patientexamlist/index.vue
+++ b/src/views/tblist/patientexamlist/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <ContentWrap style="height: 145px;">
+  <ContentWrap style="height: 145px">
     <!-- 搜索工作栏 影像工作站-->
     <el-form
       class="-mb-15px"
@@ -50,7 +50,6 @@
               clearable
               class="!w-160px"
             >
-              <el-option label="待分检" value="待分检" />
               <el-option label="已分检" value="已分检" />
               <el-option label="已分析" value="已分析" />
               <el-option label="待分析" value="待分析" />
@@ -90,13 +89,21 @@
       </el-col>
     </el-form>
     <el-form-item>
-        <el-button
-          @click="handleQuery"
-         style="margin-right: 0px; margin-left: auto; background-color: rgba(56, 119, 246, 1);font-size: 14px; color: rgba(255, 255, 255, 1);"
-          ><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
-        >
-        <el-button @click="resetQuery" style=""><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <!-- <el-button
+      <el-button
+        @click="handleQuery"
+        style="
+          margin-right: 0px;
+          margin-left: auto;
+          background-color: rgba(56, 119, 246, 1);
+          font-size: 14px;
+          color: rgba(255, 255, 255, 1);
+        "
+        ><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
+      >
+      <el-button @click="resetQuery" style=""
+        ><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button
+      >
+      <!-- <el-button
           type="primary"
           plain
           @click="openForm('create')"
@@ -105,22 +112,34 @@
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button> -->
-      </el-form-item>
+    </el-form-item>
   </ContentWrap>
 
-  <ContentWrap style="height: 65px;">
+  <ContentWrap style="height: 65px">
     <el-form-item>
       <el-button
-       style="margin-right: 0px; margin-left: auto; background-color: rgb(56, 119, 246); font-size: 14px; color: rgb(255, 255, 255);"
+        style="
+          margin-right: 0px;
+          margin-left: auto;
+          background-color: rgb(56, 119, 246);
+          font-size: 14px;
+          color: rgb(255, 255, 255);
+        "
         @click="handleExport"
         :loading="exportLoading"
         v-hasPermi="['tblist:patientexamlist:export']"
       >
         <Icon icon="ep:download" class="mr-5px" /> 导出
       </el-button>
-      <el-button @click="dicomDataSync" style="background-color: rgb(28, 176, 117);font-size: 14; color: rgb(255, 255, 255);"><Icon icon="ep:refresh" class="mr-5px" /> 同步</el-button>
-      <el-button @click="dicomDataRefresh"
-      style="background-color: rgb(28, 176, 117);font-size: 14; color: rgb(255, 255, 255);" ><Icon icon="ep:refresh" class="mr-5px" /> 刷新</el-button
+      <el-button
+        @click="dicomDataSync"
+        style="background-color: rgb(28, 176, 117); font-size: 14; color: rgb(255, 255, 255)"
+        ><Icon icon="ep:refresh" class="mr-5px" /> 同步</el-button
+      >
+      <el-button
+        @click="dicomDataRefresh"
+        style="background-color: rgb(28, 176, 117); font-size: 14; color: rgb(255, 255, 255)"
+        ><Icon icon="ep:refresh" class="mr-5px" /> 刷新</el-button
       >
     </el-form-item>
   </ContentWrap>
@@ -132,8 +151,8 @@
       :stripe="true"
       :show-overflow-tooltip="true"
       @row-dblclick="handleEdit"
-      :header-cell-style="{ background: 'rgb(235, 241, 250)',height:'56px',color:'#333333' }" 
-      :row-style="{height:'56px'}"
+      :header-cell-style="{ background: 'rgb(235, 241, 250)', height: '56px', color: '#333333' }"
+      :row-style="{ height: '56px' }"
     >
       <el-table-column type="index" width="50px" />
       <el-table-column label="" width="100px">
@@ -226,8 +245,8 @@
       <el-table-column label="操作" align="center" fixed="right">
         <template #default="scope">
           <el-button
-             link
-           style="color: rgb(56, 119, 246);"
+            link
+            style="color: rgb(56, 119, 246)"
             size="small"
             type="primary"
             @click="getuporghiorgid(scope.row.id, scope.row.orgId, scope.row.reportstatus)"
@@ -286,7 +305,7 @@ const queryParams = reactive({
   deviceType: '',
   seDc: undefined,
   examItemName: undefined,
-  reportstatus: undefined,
+  reportstatus: '',
   applicationDate: [],
   uploadDate: [],
   orgName: undefined,
@@ -385,9 +404,21 @@ const getList = async () => {
 }
 
 const dicomDataSync = async () => {
-  await PatientexamlistApi.dicomDataSync()
-  message.success('同步成功')
+  const data = await PatientexamlistApi.dicomDataSync()
+  if (data.code == 'success') {
+    if (data.syncItems == '0') {
+      message.info('暂无可同步数据')
+    } else {
+      queryParams.reportstatus = '待分析'
+      examDate_radio_value.value = 0
+      examDate_radio_change()
+      message.success('数据同步成功')
+    }
+  } else {
+    message.error('数据同步失败')
+  }
 }
+
 // 分检数据刷新
 const dicomDataRefresh = async () => {
   await PatientexamlistApi.dicomDataRefresh()
diff --git a/src/views/tblist/patientexamlistultrasonic/index.vue b/src/views/tblist/patientexamlistultrasonic/index.vue
index ec13a545..44d06149 100644
--- a/src/views/tblist/patientexamlistultrasonic/index.vue
+++ b/src/views/tblist/patientexamlistultrasonic/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <ContentWrap style="height: 145px;">
+  <ContentWrap style="height: 145px">
     <!-- 搜索工作栏 超声工作站-->
     <el-form
       class="-mb-15px"
@@ -23,7 +23,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4" >
+            <el-col :span="4">
               <el-form-item label="患者姓名" prop="pName">
                 <el-input
                   v-model="queryParams.pname"
@@ -44,9 +44,9 @@
                   clearable
                   class="!w-160px"
                 >
-                  <el-option label="待分检" value="待分检" />
                   <el-option label="已分检" value="已分检" />
                   <el-option label="已分析" value="已分析" />
+                  <el-option label="待分析" value="待分析" />
                   <el-option label="已审核" value="已审核" />
                 </el-select>
               </el-form-item>
@@ -99,11 +99,21 @@
       </el-row>
     </el-form>
     <el-form-item>
-        <el-button @click="handleQuery" style=" margin-right: 0px; margin-left: auto; background-color: rgba(56, 119, 246, 1);font-size: 14px; color: rgba(255, 255, 255, 1);"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-      </el-form-item>
+      <el-button
+        @click="handleQuery"
+        style="
+          margin-right: 0px;
+          margin-left: auto;
+          background-color: rgba(56, 119, 246, 1);
+          font-size: 14px;
+          color: rgba(255, 255, 255, 1);
+        "
+        ><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
+      >
+      <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+    </el-form-item>
   </ContentWrap>
-  <ContentWrap style="height: 65px;">
+  <ContentWrap style="height: 65px">
     <el-form-item>
       <!--     <el-button
       type="primary"
@@ -115,17 +125,25 @@
       <Icon icon="ep:plus" class="mr-5px" /> 新增
     </el-button> -->
       <el-button
-      style="margin-right: 0px; margin-left: auto; background-color: rgb(56, 119, 246); font-size: 14px; color: rgb(255, 255, 255);"
-      @click="handleExport"
-      :loading="exportLoading"
-      v-hasPermi="['tblist:patientexamlist:export']"
-    >
-      <Icon icon="ep:download" class="mr-5px" /> 导出
-    </el-button>
-    <el-button @click="dicomDataSync"   style="background-color: rgb(28, 176, 117);font-size: 14; color: rgb(255, 255, 255);"><Icon icon="ep:refresh" class="mr-5px" /> 同步</el-button>
+        style="
+          margin-right: 0px;
+          margin-left: auto;
+          background-color: rgb(56, 119, 246);
+          font-size: 14px;
+          color: rgb(255, 255, 255);
+        "
+        @click="handleExport"
+        :loading="exportLoading"
+        v-hasPermi="['tblist:patientexamlist:export']"
+      >
+        <Icon icon="ep:download" class="mr-5px" /> 导出
+      </el-button>
+      <el-button
+        @click="dicomDataSync"
+        style="background-color: rgb(28, 176, 117); font-size: 14; color: rgb(255, 255, 255)"
+        ><Icon icon="ep:refresh" class="mr-5px" /> 同步</el-button
+      >
     </el-form-item>
-
-   
   </ContentWrap>
   <!-- 列表 -->
   <ContentWrap>
@@ -135,8 +153,8 @@
       :stripe="true"
       :show-overflow-tooltip="true"
       @row-dblclick="handleEdit"
-      :header-cell-style="{ background: 'rgb(235, 241, 250)',height:'56px' ,color:'#333333'}" 
-      :row-style="{height:'56px'}"
+      :header-cell-style="{ background: 'rgb(235, 241, 250)', height: '56px', color: '#333333' }"
+      :row-style="{ height: '56px' }"
     >
       <el-table-column type="index" width="50px" />
       <el-table-column label="" width="100px">
@@ -234,7 +252,7 @@
             type="primary"
             @click="getuporghiorgid(scope.row.id, scope.row.orgId, scope.row.reportstatus)"
             v-hasPermi="['tblist:patientexamlist:query']"
-              style="color: rgb(56, 119, 246);"
+            style="color: rgb(56, 119, 246)"
           >
             申请
           </el-button>
@@ -291,7 +309,7 @@ const queryParams = reactive({
   deviceType: '',
   seDc: undefined,
   examItemName: undefined,
-  reportstatus: undefined,
+  reportstatus: '',
   applicationDate: [],
   uploadDate: [],
   orgName: undefined,
@@ -388,8 +406,19 @@ const getList = async () => {
 }
 
 const dicomDataSync = async () => {
-  await PatientexamlistApi.dicomDataSync()
-  message.success('同步成功')
+  const data = await PatientexamlistApi.dicomDataSync()
+  if (data.code == 'success') {
+    if (data.syncItems == '0') {
+      message.info('暂无可同步数据')
+    } else {
+      queryParams.reportstatus = '待分析'
+      examDate_radio_value.value = 0
+      examDate_radio_change()
+      message.success('数据同步成功')
+    }
+  } else {
+    message.error('数据同步失败')
+  }
 }
 
 /** 搜索按钮操作 */