From 3c155614850693dfd9409e16ded9861dfb39685a Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 17 Dec 2024 17:16:56 +0800
Subject: [PATCH] =?UTF-8?q?pacs=E6=8E=A5=E6=94=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BoxContent/index.vue           |   2 +-
 .../system/dicomAE/components/edit-dicom.vue  | 121 ++++++++-
 src/views/system/dicomAE/index.vue            |  33 ++-
 .../components/pull-image-list.vue            | 253 ++++++++++++++----
 .../components/research-trials-list.vue       | 124 +++++----
 .../components/view-study-list.vue            | 128 ++++-----
 src/views/trials/trials-inspection/index.vue  |   6 +-
 7 files changed, 486 insertions(+), 181 deletions(-)

diff --git a/src/components/BoxContent/index.vue b/src/components/BoxContent/index.vue
index 886fd3d..0b63984 100644
--- a/src/components/BoxContent/index.vue
+++ b/src/components/BoxContent/index.vue
@@ -29,7 +29,7 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
   .box-body{
     .search{
       display: flex;
diff --git a/src/views/system/dicomAE/components/edit-dicom.vue b/src/views/system/dicomAE/components/edit-dicom.vue
index 4078b3a..d4a41e7 100644
--- a/src/views/system/dicomAE/components/edit-dicom.vue
+++ b/src/views/system/dicomAE/components/edit-dicom.vue
@@ -3,7 +3,7 @@
     :visible.sync="visible"
     :close-on-click-modal="false"
     :title="title"
-    width="500px"
+    width="600px"
     custom-class="base-dialog-wrapper"
     append-to-body
     :before-close="handleCancel"
@@ -14,7 +14,7 @@
       :model="form"
       :rules="rules"
       size="small"
-      label-width="100px"
+      label-width="150px"
     >
       <div class="base-dialog-body">
         <!--PacsTypeEnum-->
@@ -48,8 +48,46 @@
           <el-input v-model.number="form.Port" type="number" clearable />
         </el-form-item>
         <!--Modality-->
-        <el-form-item :label="$t('system:dicom:form:Modality')" prop="Modality">
-          <el-input v-model="form.Modality" clearable />
+        <el-form-item
+          :label="$t('system:dicom:form:Modality')"
+          prop="ModalityList"
+        >
+          <el-select
+            v-model="form.ModalityList"
+            placeholder=""
+            style="width: 100%"
+            clearable
+            multiple
+          >
+            <el-option
+              v-for="item in $d.modalType"
+              :key="item.id"
+              :label="item.label"
+              :value="item.label"
+            />
+          </el-select>
+        </el-form-item>
+        <!--影像时间范围-->
+        <el-form-item
+          :label="$t('system:dicom:form:timeFrame')"
+          prop="PacsSearchMaxDays"
+        >
+          <el-input
+            v-model.number="form.PacsSearchMaxDays"
+            type="number"
+            clearable
+          />
+        </el-form-item>
+        <!--最大拉取数量-->
+        <el-form-item
+          :label="$t('system:dicom:form:MaxStudyCount')"
+          prop="MaxStudyCount"
+        >
+          <el-input
+            v-model.number="form.MaxStudyCount"
+            type="number"
+            clearable
+          />
         </el-form-item>
         <!--Description-->
         <el-form-item
@@ -111,10 +149,12 @@ export default {
         CalledAE: null,
         IP: null,
         Port: null,
-        Modality: null,
+        ModalityList: null,
         Description: null,
         Id: null,
         PacsTypeEnum: null,
+        PacsSearchMaxDays: null,
+        MaxStudyCount: null,
       },
       rules: {
         PacsTypeEnum: [
@@ -124,6 +164,22 @@ export default {
             trigger: 'blur',
           },
         ],
+        ModalityList: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (!value || (Array.isArray(value) && value.length <= 0)) {
+                callback(new Error(this.$t('common:ruleMessage:select')))
+              } else {
+                callback()
+              }
+            },
+          },
+        ],
         CalledAE: [
           {
             required: true,
@@ -170,6 +226,61 @@ export default {
             trigger: 'blur',
           },
         ],
+        PacsSearchMaxDays: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:PacsSearchMaxDaysPattern'),
+            trigger: 'blur',
+          },
+          {
+            type: 'number',
+            min: 0,
+            max: 365,
+            message: this.$t('common:ruleMessage:PacsSearchMaxDaysPattern'),
+            trigger: 'blur',
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                (String(value).includes('.') ||
+                  new RegExp(/\D/g).test(String(value)))
+              ) {
+                callback(
+                  new Error(
+                    this.$t('common:ruleMessage:PacsSearchMaxDaysPattern')
+                  )
+                )
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
+        ],
+        MaxStudyCount: [
+          // {
+          //   required: true,
+          //   message: this.$t('common:ruleMessage:MaxStudyCountPattern'),
+          //   trigger: 'blur',
+          // },
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                (String(value).includes('.') ||
+                  new RegExp(/\D/g).test(String(value)))
+              ) {
+                callback(
+                  new Error(this.$t('common:ruleMessage:MaxStudyCountPattern'))
+                )
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
+        ],
         Port: [
           {
             required: true,
diff --git a/src/views/system/dicomAE/index.vue b/src/views/system/dicomAE/index.vue
index 3fcf6e6..8db9554 100644
--- a/src/views/system/dicomAE/index.vue
+++ b/src/views/system/dicomAE/index.vue
@@ -69,7 +69,7 @@
         <el-table-column
           :label="$t('system:dicom:table:AETitle')"
           prop="CalledAE"
-          min-width="120"
+          min-width="100"
           show-overflow-tooltip
           sortable="custom"
         />
@@ -77,7 +77,7 @@
         <el-table-column
           :label="$t('system:dicom:table:IP')"
           prop="IP"
-          min-width="120"
+          min-width="100"
           show-overflow-tooltip
           sortable="custom"
         />
@@ -85,7 +85,7 @@
         <el-table-column
           :label="$t('system:dicom:table:Port')"
           prop="Port"
-          min-width="120"
+          min-width="80"
           show-overflow-tooltip
           sortable="custom"
         />
@@ -104,16 +104,36 @@
         <!--Modality-->
         <el-table-column
           :label="$t('system:dicom:table:Modality')"
-          prop="Modality"
+          prop="ModalityList"
           min-width="120"
           show-overflow-tooltip
           sortable="custom"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.ModalityList.join(', ') }}</span>
+          </template>
+        </el-table-column>
+        <!--PacsSearchMaxDays-->
+        <el-table-column
+          :label="$t('system:dicom:table:PacsSearchMaxDays')"
+          prop="PacsSearchMaxDays"
+          min-width="140"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--MaxStudyCount-->
+        <el-table-column
+          :label="$t('system:dicom:table:MaxStudyCount')"
+          prop="MaxStudyCount"
+          min-width="110"
+          show-overflow-tooltip
+          sortable="custom"
         />
         <!--Description-->
         <el-table-column
           :label="$t('system:dicom:table:Description')"
           prop="Description"
-          min-width="120"
+          min-width="100"
           show-overflow-tooltip
           sortable="custom"
         />
@@ -121,7 +141,7 @@
         <el-table-column
           :label="$t('system:dicom:table:IsTestOK')"
           prop="IsTestOK"
-          min-width="120"
+          min-width="80"
           show-overflow-tooltip
           sortable="custom"
         >
@@ -185,6 +205,7 @@
       </div>
     </div>
     <editDicom
+      v-if="editDicomVisible"
       :visible.sync="editDicomVisible"
       :title="editDicomTitle"
       :dicom="DICOM"
diff --git a/src/views/trials/trials-inspection/components/pull-image-list.vue b/src/views/trials/trials-inspection/components/pull-image-list.vue
index acad5f9..18cdef4 100644
--- a/src/views/trials/trials-inspection/components/pull-image-list.vue
+++ b/src/views/trials/trials-inspection/components/pull-image-list.vue
@@ -17,7 +17,7 @@
           <el-select
             v-model="searchData.PacsDicomAEId"
             style="width: 140px"
-            @change="getList"
+            @change="pacsDicomAEIdChange"
           >
             <el-option
               v-for="(item, index) of AElist"
@@ -36,6 +36,7 @@
           <el-input
             v-model="searchData.PatientID"
             clearable
+            style="width: 100px"
             :maxlength="400"
           ></el-input>
         </el-form-item>
@@ -47,11 +48,12 @@
           <el-input
             v-model="searchData.PatientName"
             clearable
+            style="width: 100px"
             :maxlength="400"
           ></el-input>
         </el-form-item>
         <!-- patientSex -->
-        <el-form-item
+        <!-- <el-form-item
           class="my_multiple"
           :label="$t('trials:inspection:pullImage:search:patientSex')"
         >
@@ -68,9 +70,9 @@
             >
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <!-- patientBirthDate -->
-        <el-form-item
+        <!-- <el-form-item
           :label="$t('trials:inspection:pullImage:search:patientBirthDate')"
         >
           <el-date-picker
@@ -82,7 +84,7 @@
             value-format="yyyyMMDD"
           >
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <!-- studyID -->
         <!-- <el-form-item
           class="my_multiple"
@@ -95,7 +97,7 @@
           ></el-input>
         </el-form-item> -->
         <!-- AccessionNumber -->
-        <el-form-item
+        <!-- <el-form-item
           class="my_multiple"
           :label="$t('trials:inspection:pullImage:search:AccessionNumber')"
         >
@@ -104,17 +106,25 @@
             clearable
             :maxlength="400"
           ></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <!-- modalitiesInStudy -->
         <el-form-item
-          class="my_multiple"
           :label="$t('trials:inspection:pullImage:search:modalitiesInStudy')"
         >
-          <el-input
+          <el-select
             v-model="searchData.ModalitiesInStudy"
+            placeholder=""
             clearable
-            :maxlength="400"
-          ></el-input>
+            multiple
+            collapse-tags
+          >
+            <el-option
+              v-for="item in ModalityList"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </el-select>
         </el-form-item>
         <!-- studyDate -->
         <el-form-item
@@ -127,11 +137,12 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             value-format="yyyyMMDD"
+            :picker-options="pickerOptions"
           >
           </el-date-picker>
         </el-form-item>
         <!-- studyTime -->
-        <el-form-item
+        <!-- <el-form-item
           :label="$t('trials:inspection:pullImage:search:studyTime')"
         >
           <el-time-picker
@@ -144,9 +155,9 @@
             placeholder="选择时间范围"
           >
           </el-time-picker>
-        </el-form-item>
+        </el-form-item> -->
         <!-- bodyPartExamined -->
-        <el-form-item
+        <!-- <el-form-item
           class="my_multiple"
           :label="$t('trials:inspection:pullImage:search:bodyPartExamined')"
         >
@@ -155,9 +166,9 @@
             clearable
             :maxlength="400"
           ></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <!-- studyDescription -->
-        <el-form-item
+        <!-- <el-form-item
           class="my_multiple"
           :label="$t('trials:inspection:pullImage:search:studyDescription')"
         >
@@ -166,9 +177,9 @@
             clearable
             :maxlength="400"
           ></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <!-- studyInstanceUID -->
-        <el-form-item
+        <!-- <el-form-item
           class="my_multiple"
           :label="$t('trials:inspection:pullImage:search:studyInstanceUID')"
         >
@@ -177,7 +188,7 @@
             clearable
             :maxlength="400"
           ></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -207,21 +218,21 @@
       ref="viewStudyList"
       v-loading="loading"
       v-adaptive="{ bottomOffset: 60 }"
-      :data="list"
+      :data="PageList"
       stripe
       height="100"
       @sort-change="handleSortByColumn"
-      :default-sort="{ prop: 'StartTime', order: 'descending' }"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" />
-      <!-- <el-table-column type="index" width="40" /> -->
+      <el-table-column type="index" width="40" />
       <!--patientID-->
       <el-table-column
         prop="PatientID"
         :label="$t('trials:inspection:pullImage:table:patientID')"
         show-overflow-tooltip
         min-width="120"
+        sortable="custom"
       />
       <!--patientName-->
       <el-table-column
@@ -229,6 +240,7 @@
         :label="$t('trials:inspection:pullImage:table:patientName')"
         show-overflow-tooltip
         min-width="120"
+        sortable="custom"
       />
       <!--patientSex-->
       <el-table-column
@@ -236,13 +248,19 @@
         :label="$t('trials:inspection:pullImage:table:patientSex')"
         show-overflow-tooltip
         min-width="120"
-      />
+        sortable="custom"
+      >
+        <template slot-scope="scope">
+          <span>{{ $fd('Sex', scope.row.PatientSex) }}</span>
+        </template>
+      </el-table-column>
       <!--patientBirthDate-->
       <el-table-column
         prop="PatientBirthDate"
         :label="$t('trials:inspection:pullImage:table:patientBirthDate')"
         show-overflow-tooltip
         min-width="120"
+        sortable="custom"
       />
       <!--studyID-->
       <!-- <el-table-column
@@ -257,6 +275,7 @@
         :label="$t('trials:inspection:pullImage:table:AccessionNumber')"
         show-overflow-tooltip
         min-width="120"
+        sortable="custom"
       />
       <!--modalitiesInStudy-->
       <el-table-column
@@ -264,6 +283,7 @@
         :label="$t('trials:inspection:pullImage:table:modalitiesInStudy')"
         show-overflow-tooltip
         min-width="120"
+        sortable="custom"
       />
       <!--studyDate-->
       <el-table-column
@@ -271,6 +291,7 @@
         :label="$t('trials:inspection:pullImage:table:studyDate')"
         show-overflow-tooltip
         min-width="120"
+        sortable="custom"
       />
       <!--studyTime-->
       <el-table-column
@@ -278,6 +299,7 @@
         :label="$t('trials:inspection:pullImage:table:studyTime')"
         show-overflow-tooltip
         min-width="120"
+        sortable="custom"
       />
       <!--bodyPartExamined-->
       <el-table-column
@@ -285,6 +307,7 @@
         :label="$t('trials:inspection:pullImage:table:bodyPartExamined')"
         show-overflow-tooltip
         min-width="120"
+        sortable="custom"
       />
       <!--studyDescription-->
       <el-table-column
@@ -292,6 +315,7 @@
         :label="$t('trials:inspection:pullImage:table:studyDescription')"
         show-overflow-tooltip
         min-width="120"
+        sortable="custom"
       />
       <!--studyInstanceUID-->
       <el-table-column
@@ -299,6 +323,7 @@
         :label="$t('trials:inspection:pullImage:table:studyInstanceUID')"
         show-overflow-tooltip
         min-width="120"
+        sortable="custom"
       />
 
       <!--操作-->
@@ -315,13 +340,13 @@
     </el-table>
 
     <!-- 分页组件 -->
-    <!-- <pagination
+    <pagination
       class="page"
       :total="total"
-      :page.sync="searchData.PageIndex"
-      :limit.sync="searchData.PageSize"
-      @pagination="getList"
-    /> -->
+      :page.sync="PageIndex"
+      :limit.sync="PageSize"
+      @pagination="paging"
+    />
   </el-dialog>
 </template>
   <script>
@@ -337,11 +362,12 @@ const defaultSearchData = () => {
     PacsDicomAEId: null,
     PatientID: null,
     PatientName: null,
+    ModalitiesInStudy: null,
+    StudyDate: null,
+
     PatientSex: null,
     PatientBirthDate: null,
     StudyID: null,
-    ModalitiesInStudy: null,
-    StudyDate: null,
     StudyTime: null,
     BodyPartExamined: null,
     StudyDescription: null,
@@ -374,25 +400,111 @@ export default {
     return {
       // 查询
       searchData: defaultSearchData(),
+      ModalityList: [],
+      timeFrame: null,
+      MaxStudyCount: null,
       PatientBirthDate: [],
-      StudyDate: [new Date(), new Date()],
+      StudyDate: [],
       //   StudyTime: [
       //     new Date(2016, 9, 10, 0, 0, 0),
       //     new Date(2016, 9, 10, 23, 59, 59),
       //   ],
-      StudyTime: [new Date(new Date().getTime() - 10800000), new Date()],
+      // StudyTime: [new Date(new Date().getTime() - 10800000), new Date()],
       // 可加入项目列表
       loading: false,
       list: [],
+      PageList: [],
       total: 0,
+      PageIndex: 1,
+      PageSize: 50,
       AElist: [],
       multipleSelection: [],
     }
   },
+  computed: {
+    pickerOptions() {
+      return {
+        shortcuts: [
+          {
+            text: this.$t('trials:inspection:pullImage:picker:today'),
+            onClick: (picker) => {
+              const end = new Date()
+              const start = new Date()
+              // picker.$emit('pick', [start, end])
+              this.StudyDate = [start, end]
+            },
+          },
+          {
+            text: this.$t('trials:inspection:pullImage:picker:week'),
+            onClick: (picker) => {
+              const end = new Date()
+              const start = new Date()
+              if (!this.timeFrame || this.timeFrame > 3) {
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 2)
+              } else {
+                start.setTime(
+                  start.getTime() - 3600 * 1000 * 24 * (this.timeFrame - 1)
+                )
+              }
+
+              // picker.$emit('pick', [start, end])
+              this.StudyDate = [start, end]
+            },
+          },
+          {
+            text: this.$t('trials:inspection:pullImage:picker:month'),
+            onClick: (picker) => {
+              const end = new Date()
+              const start = new Date()
+              if (!this.timeFrame || this.timeFrame > 30) {
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 29)
+              } else {
+                start.setTime(
+                  start.getTime() - 3600 * 1000 * 24 * (this.timeFrame - 1)
+                )
+              }
+              // picker.$emit('pick', [start, end])
+              this.StudyDate = [start, end]
+            },
+          },
+          {
+            text: this.$t('trials:inspection:pullImage:picker:trimester'),
+            onClick: (picker) => {
+              const end = new Date()
+              const start = new Date()
+              if (!this.timeFrame || this.timeFrame > 90) {
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 89)
+              } else {
+                start.setTime(
+                  start.getTime() - 3600 * 1000 * 24 * (this.timeFrame - 1)
+                )
+              }
+              // picker.$emit('pick', [start, end])
+              this.StudyDate = [start, end]
+            },
+          },
+        ],
+        disabledDate: (time) => {
+          if (!this.timeFrame) return false
+          let curDate = new Date().getTime()
+          let three = this.timeFrame * 24 * 3600 * 1000
+          let threeMonths = curDate - three
+          return time.getTime() >= Date.now() || time.getTime() <= threeMonths
+        },
+      }
+    },
+  },
   created() {
     this.getAEList()
   },
   methods: {
+    pacsDicomAEIdChange(val) {
+      let pacs = this.AElist.find((item) => item.Id === val)
+      this.ModalityList = pacs.ModalityList
+      this.timeFrame = pacs.PacsSearchMaxDays
+      this.MaxStudyCount = pacs.MaxStudyCount
+      this.handleReset()
+    },
     // 验证pacs
     async cMoveVerify(data) {
       try {
@@ -415,35 +527,44 @@ export default {
       Object.keys(this.searchData).forEach((key) => {
         data[key] = this.searchData[key]
       })
-      if (
-        this.PatientBirthDate &&
-        this.PatientBirthDate[0] &&
-        this.PatientBirthDate[1]
-      ) {
-        data.PatientBirthDate =
-          this.PatientBirthDate[0] + '-' + this.PatientBirthDate[1]
-      } else {
-        data.PatientBirthDate = null
-      }
+      // if (
+      //   this.PatientBirthDate &&
+      //   this.PatientBirthDate[0] &&
+      //   this.PatientBirthDate[1]
+      // ) {
+      //   data.PatientBirthDate =
+      //     this.PatientBirthDate[0] + '-' + this.PatientBirthDate[1]
+      // } else {
+      //   data.PatientBirthDate = null
+      // }
       if (this.StudyDate && this.StudyDate[0] && this.StudyDate[1]) {
         data.StudyDate = this.StudyDate[0] + '-' + this.StudyDate[1]
       } else {
         data.StudyDate = null
       }
-      if (this.StudyTime && this.StudyTime[0] && this.StudyTime[1]) {
-        data.StudyTime =
-          this.$moment(this.StudyTime[0]).format('HHmmss') +
-          '-' +
-          this.$moment(this.StudyTime[1]).format('HHmmss')
-      } else {
-        data.StudyTime = null
-      }
+      // if (this.StudyTime && this.StudyTime[0] && this.StudyTime[1]) {
+      //   data.StudyTime =
+      //     this.$moment(this.StudyTime[0]).format('HHmmss') +
+      //     '-' +
+      //     this.$moment(this.StudyTime[1]).format('HHmmss')
+      // } else {
+      //   data.StudyTime = null
+      // }
       try {
         this.loading = true
         let res = await getCFindStudyList(data)
         this.loading = false
         if (res.IsSuccess) {
           this.list = res.Result
+          this.total = res.Result.length
+          this.paging()
+          let MaxStudyCount = this.MaxStudyCount || 50
+          if (this.total >= MaxStudyCount) {
+            let message = this.$t(
+              'trials:inspection:pullImage:confirm:limit50'
+            ).replace('xx', MaxStudyCount)
+            this.$confirm(message)
+          }
         }
       } catch (err) {
         this.loading = false
@@ -456,7 +577,7 @@ export default {
         CalledAE: null,
         IP: null,
         Port: null,
-        PacsTypeEnum: 2,
+        // PacsTypeEnum: 2,
         PageIndex: 1,
         PageSize: 1000,
         SortField: 'CreateTime',
@@ -470,6 +591,9 @@ export default {
           this.AElist = res.Result.CurrentPageData
           if (this.AElist.length > 0) {
             this.searchData.PacsDicomAEId = this.AElist[0].Id
+            this.ModalityList = this.AElist[0].ModalityList
+            this.timeFrame = this.AElist[0].PacsSearchMaxDays
+            this.MaxStudyCount = this.AElist[0].MaxStudyCount
             this.getList()
           }
         }
@@ -477,6 +601,15 @@ export default {
         console.log(err)
       }
     },
+    // 分页
+    paging() {
+      this.PageList = []
+      if (!this.list || this.list.length <= 0) return false
+      this.PageList = this.list.slice(
+        (this.PageIndex - 1) * this.PageSize,
+        this.PageIndex * this.PageSize
+      )
+    },
     // 查询
     handleSearch() {
       //   this.searchData.PageIndex = 1
@@ -495,17 +628,19 @@ export default {
           this.searchData[key] = null
         }
       })
-      this.PatientBirthDate = []
-      this.StudyDate = [new Date(), new Date()]
-      this.StudyTime = [new Date(new Date().getTime() - 10800000), new Date()]
+      // this.PatientBirthDate = []
+      this.StudyDate = []
+      // this.StudyTime = [new Date(new Date().getTime() - 10800000), new Date()]
     },
     // 表格排序
     handleSortByColumn(sort) {
-      this.searchData.SortField = sort.prop
-      if (sort.order === 'ascending') this.searchData.Asc = true
-      if (sort.order === 'descending') this.searchData.Asc = false
-      if (!sort.order) this.searchData.SortField = null
-      this.getList()
+      if (sort.order === 'ascending') {
+        this.list.sort((a, b) => a[sort.prop] - b[sort.prop])
+      }
+      if (sort.order === 'descending') {
+        this.list.sort((a, b) => b[sort.prop] - a[sort.prop])
+      }
+      this.paging()
     },
     beforeCloseStudyDig() {
       this.$setOpenWindow()
diff --git a/src/views/trials/trials-inspection/components/research-trials-list.vue b/src/views/trials/trials-inspection/components/research-trials-list.vue
index 54ba4a5..506b3e8 100644
--- a/src/views/trials/trials-inspection/components/research-trials-list.vue
+++ b/src/views/trials/trials-inspection/components/research-trials-list.vue
@@ -6,22 +6,33 @@
     custom-class="upload-dialog"
     :before-close="beforeCloseStudyDig"
   >
-    <div class="top">
+    <span slot="title">
+      <span
+        >{{ $t('trials:uploadDicomList:table:patientInfo') }}（{{
+          Patient.PatientIdStr
+        }}，{{ Patient.PatientName }}）</span
+      >|<span>
+        {{
+          $t('trials:inspection:research-trials-list:table:joinTrialsNumber')
+        }}（{{ total }}）</span
+      ></span
+    >
+    <!-- <div class="top">
       <p>
         <span
-          >{{ $t("trials:uploadDicomList:table:patientInfo") }}（{{
+          >{{ $t('trials:uploadDicomList:table:patientInfo') }}（{{
             Patient.PatientIdStr
           }}，{{ Patient.PatientName }}）</span
         >|<span>
           {{
-            $t("trials:inspection:research-trials-list:table:joinTrialsNumber")
+            $t('trials:inspection:research-trials-list:table:joinTrialsNumber')
           }}（{{ total }}）</span
         >
       </p>
-      <!-- <el-button type="primary" @click="addTrials">
+      <el-button type="primary" @click="addTrials">
         {{ $t("trials:inspection:button:addTrials") }}
-      </el-button> -->
-    </div>
+      </el-button>
+    </div> -->
     <!--参与项目列表-->
     <el-table
       ref="researchTrialsList"
@@ -30,6 +41,7 @@
       :data="list"
       stripe
       height="100"
+      @sort-change="handleSortByColumn"
       :default-sort="{ prop: 'CreateTime', order: 'descending' }"
     >
       <el-table-column type="index" width="40" />
@@ -90,7 +102,7 @@
         sortable
       >
         <template slot-scope="scope">
-          <span>{{ $fd("Sex", scope.row.Sex) }}</span>
+          <span>{{ $fd('Sex', scope.row.Sex) }}</span>
         </template>
       </el-table-column>
       <!--状态-->
@@ -110,7 +122,7 @@
                 )
               ]
             "
-            >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag
+            >{{ $fd('TrialStatusEnum', scope.row.TrialStatusStr) }}</el-tag
           >
         </template></el-table-column
       >
@@ -145,23 +157,31 @@
     </el-table>
 
     <!-- 分页组件 -->
-    <!-- <pagination
+    <pagination
       class="page"
       :total="total"
       :page.sync="searchData.PageIndex"
       :limit.sync="searchData.PageSize"
       @pagination="getList"
-    /> -->
+    />
   </el-dialog>
 </template>
 <script>
-import Pagination from "@/components/Pagination";
+import Pagination from '@/components/Pagination'
 import {
   getPatientJoinedTrialList,
   deleteSubjectPatientBinding,
-} from "@/api/inspection.js";
+} from '@/api/inspection.js'
+const defaultSearchData = () => {
+  return {
+    PageIndex: 1,
+    PageSize: 20,
+    Asc: false,
+    SortField: 'CreateTime',
+  }
+}
 export default {
-  name: "researchTrialsList",
+  name: 'researchTrialsList',
   components: { Pagination },
   props: {
     visible: {
@@ -171,95 +191,105 @@ export default {
     Patient: {
       required: true,
       default: () => {
-        return {};
+        return {}
       },
     },
   },
   created() {
-    this.getList();
+    this.getList()
   },
   data() {
     return {
       // 参与项目列表
+      searchData: defaultSearchData(),
       total: 0,
       loading: false,
       list: [],
-    };
+    }
   },
   methods: {
     // 关闭弹框
     beforeCloseStudyDig() {
-      this.$emit("update:visible", false);
+      this.$emit('update:visible', false)
     },
     // 加入项目
     addTrials() {
-      this.$emit("update:visible", false);
-      this.$emit("handleOpenDialog", this.Patient, "add");
+      this.$emit('update:visible', false)
+      this.$emit('handleOpenDialog', this.Patient, 'add')
     },
     // 获取列表
     async getList() {
       let data = {
         PatientId: this.Patient.PatientId,
-      };
+        ...this.searchData,
+      }
       try {
-        this.loading = true;
-        let res = await getPatientJoinedTrialList(data);
-        this.loading = false;
+        this.loading = true
+        let res = await getPatientJoinedTrialList(data)
+        this.loading = false
         if (res.IsSuccess) {
-          this.list = res.Result;
-          this.total = this.list.length;
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
         }
       } catch (err) {
-        this.loading = false;
-        console.log(err);
+        this.loading = false
+        console.log(err)
       }
     },
     // 详情
     detail(item) {
-      this.$emit("update:visible", false);
+      this.$emit('update:visible', false)
       let query = {
         trialId: item.TrialId,
         trialCode: item.Code,
         researchProgramNo: item.ResearchProgramNo,
-      };
+      }
       this.$router.push({
-        path: "/trials/trials-panel/subject/subject-list",
+        path: '/trials/trials-panel/subject/subject-list',
         query,
-      });
+      })
+    },
+    // 表格排序
+    handleSortByColumn(sort) {
+      this.searchData.SortField = sort.prop
+      if (sort.order === 'ascending') this.searchData.Asc = true
+      if (sort.order === 'descending') this.searchData.Asc = false
+      if (!sort.order) this.searchData.SortField = null
+      this.getList()
     },
     // 移除项目
     async remove(item) {
       try {
         let confirm = await this.$confirm(
-          this.$t("trials:sitesList:message:removeSite"),
+          this.$t('trials:sitesList:message:removeSite'),
           {
-            type: "warning",
+            type: 'warning',
             distinguishCancelAndClose: true,
-            confirmButtonText: this.$t("common:button:confirm"),
-            cancelButtonText: this.$t("recompose:button:cancel"),
+            confirmButtonText: this.$t('common:button:confirm'),
+            cancelButtonText: this.$t('recompose:button:cancel'),
           }
-        );
-        if (confirm !== "confirm") return;
+        )
+        if (confirm !== 'confirm') return
         let params = {
           PatientId: this.Patient.PatientId,
           SubjectId: item.SubjectId,
           TrialId: item.TrialId,
-        };
-        this.loading = true;
-        let res = await deleteSubjectPatientBinding(params);
-        this.loading = false;
+        }
+        this.loading = true
+        let res = await deleteSubjectPatientBinding(params)
+        this.loading = false
         if (res.IsSuccess) {
-          this.getList();
-          this.$message.success(this.$t("common:message:removedSuccessfully"));
-          this.$emit("getList");
+          this.getList()
+          this.$message.success(this.$t('common:message:removedSuccessfully'))
+          this.$emit('getList')
         }
       } catch (err) {
-        this.loading = false;
-        console.log(err);
+        this.loading = false
+        console.log(err)
       }
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped>
 .top {
diff --git a/src/views/trials/trials-inspection/components/view-study-list.vue b/src/views/trials/trials-inspection/components/view-study-list.vue
index f3edccc..6df908e 100644
--- a/src/views/trials/trials-inspection/components/view-study-list.vue
+++ b/src/views/trials/trials-inspection/components/view-study-list.vue
@@ -7,8 +7,8 @@
     :before-close="beforeCloseStudyDig"
   >
     <span slot="title"
-      >{{ $t("trials:inspection:message:viewStudy") }}（{{
-        $t("trials:uploadDicomList:table:patientInfo")
+      >{{ $t('trials:inspection:message:viewStudy') }}（{{
+        $t('trials:uploadDicomList:table:patientInfo')
       }}：{{ Patient.PatientIdStr }}，{{ Patient.PatientName }}）</span
     >
     <div class="search">
@@ -44,7 +44,7 @@
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t("common:button:search") }}
+            {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
           <el-button
@@ -52,7 +52,7 @@
             icon="el-icon-refresh-left"
             @click="handleReset"
           >
-            {{ $t("common:button:reset") }}
+            {{ $t('common:button:reset') }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -161,19 +161,19 @@
     </el-table>
 
     <!-- 分页组件 -->
-    <!-- <pagination
+    <pagination
       class="page"
       :total="total"
       :page.sync="searchData.PageIndex"
       :limit.sync="searchData.PageSize"
       @pagination="getList"
-    /> -->
+    />
   </el-dialog>
 </template>
 <script>
-import Pagination from "@/components/Pagination";
-import { getPatientStudyList, deletePatientStudy } from "@/api/inspection.js";
-import { getToken } from "@/utils/auth";
+import Pagination from '@/components/Pagination'
+import { getPatientStudyList, deletePatientStudy } from '@/api/inspection.js'
+import { getToken } from '@/utils/auth'
 
 const defaultSearchData = () => {
   return {
@@ -182,11 +182,13 @@ const defaultSearchData = () => {
     LatestStudyTime: null,
     PatientId: null,
     Asc: false,
-    SortField: "StudyTime",
-  };
-};
+    SortField: 'StudyTime',
+    PageIndex: 1,
+    PageSize: 20,
+  }
+}
 export default {
-  name: "viewStudyList",
+  name: 'viewStudyList',
   components: { Pagination },
   props: {
     visible: {
@@ -196,7 +198,7 @@ export default {
     Patient: {
       required: true,
       default: () => {
-        return {};
+        return {}
       },
     },
   },
@@ -208,111 +210,113 @@ export default {
       // 可加入项目列表
       loading: false,
       list: [],
-    };
+      total: 0,
+    }
   },
   created() {
-    this.getList();
+    this.getList()
   },
   methods: {
     // 删除检查
     async deletePatientStudy(item) {
       try {
         let confirm = await this.$confirm(
-          this.$t("trials:inspection:message:remove"),
+          this.$t('trials:inspection:message:remove'),
           {
-            type: "warning",
+            type: 'warning',
             distinguishCancelAndClose: true,
-            confirmButtonText: this.$t("common:button:confirm"),
-            cancelButtonText: this.$t("common:button:cancel"),
+            confirmButtonText: this.$t('common:button:confirm'),
+            cancelButtonText: this.$t('common:button:cancel'),
           }
-        );
-        if (confirm !== "confirm") return;
+        )
+        if (confirm !== 'confirm') return
         let params = {
           PatiendId: item.PatientId,
           ScpStudyId: item.SCPStudyId,
-        };
-        let res = await deletePatientStudy(params);
+        }
+        let res = await deletePatientStudy(params)
         if (res.IsSuccess) {
-          this.getList();
-          this.$emit("getList");
-          this.$message.success(this.$t("common:message:deletedSuccessfully"));
+          this.getList()
+          this.$emit('getList')
+          this.$message.success(this.$t('common:message:deletedSuccessfully'))
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     // 关闭弹框
     beforeCloseStudyDig() {
-      this.$setOpenWindow();
-      this.$emit("update:visible", false);
+      this.$setOpenWindow()
+      this.$emit('update:visible', false)
     },
     // 获取列表
     async getList() {
-      let data = {};
+      let data = {}
       Object.keys(this.searchData).forEach((key) => {
-        data[key] = this.searchData[key];
-      });
-      data.PatientId = this.Patient.PatientId;
+        data[key] = this.searchData[key]
+      })
+      data.PatientId = this.Patient.PatientId
       if (this.dateValue && this.dateValue[0] && this.dateValue[1]) {
         data.EarliestStudyTime = this.$moment(this.dateValue[0]).format(
-          "YYYY-MM-DD HH:mm:ss"
-        );
+          'YYYY-MM-DD HH:mm:ss'
+        )
         data.LatestStudyTime = this.$moment(this.dateValue[1]).format(
-          "YYYY-MM-DD HH:mm:ss"
-        );
+          'YYYY-MM-DD HH:mm:ss'
+        )
       } else {
-        data.EarliestStudyTime = null;
-        data.LatestStudyTime = null;
+        data.EarliestStudyTime = null
+        data.LatestStudyTime = null
       }
 
       try {
-        this.loading = true;
-        let res = await getPatientStudyList(data);
-        this.loading = false;
+        this.loading = true
+        let res = await getPatientStudyList(data)
+        this.loading = false
         if (res.IsSuccess) {
-          this.list = res.Result;
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
         }
       } catch (err) {
-        this.loading = false;
-        console.log(err);
+        this.loading = false
+        console.log(err)
       }
     },
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     // 重置
     handleReset() {
-      this.reset();
-      this.getList();
+      this.reset()
+      this.getList()
     },
     // 初始化
     reset() {
-      this.searchData = defaultSearchData();
-      this.dateValue = [];
+      this.searchData = defaultSearchData()
+      this.dateValue = []
     },
     // 查看影像
     image(item) {
-      let token = getToken();
+      let token = getToken()
       const routeData = this.$router.resolve({
         path: `/showdicom?studyId=${item.SCPStudyId}&TokenKey=${token}&type=Patient`,
-      });
-      let newWindow = window.open(routeData.href, "_blank");
-      this.$setOpenWindow(newWindow);
+      })
+      let newWindow = window.open(routeData.href, '_blank')
+      this.$setOpenWindow(newWindow)
     },
     // 查看报告
     report() {},
     // 表格排序
     handleSortByColumn(sort) {
-      this.searchData.SortField = sort.prop;
-      if (sort.order === "ascending") this.searchData.Asc = true;
-      if (sort.order === "descending") this.searchData.Asc = false;
-      if (!sort.order) this.searchData.SortField = null;
-      this.getList();
+      this.searchData.SortField = sort.prop
+      if (sort.order === 'ascending') this.searchData.Asc = true
+      if (sort.order === 'descending') this.searchData.Asc = false
+      if (!sort.order) this.searchData.SortField = null
+      this.getList()
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped>
 </style>
\ No newline at end of file
diff --git a/src/views/trials/trials-inspection/index.vue b/src/views/trials/trials-inspection/index.vue
index 17614bd..1a78298 100644
--- a/src/views/trials/trials-inspection/index.vue
+++ b/src/views/trials/trials-inspection/index.vue
@@ -100,7 +100,11 @@
         </el-form-item>
         <el-form-item>
           <!-- pacs拉取 -->
-          <el-button type="primary" @click="handleOpenDialog({}, 'pull')">
+          <el-button
+            type="primary"
+            @click="handleOpenDialog({}, 'pull')"
+            v-hasPermi="['trials:trialsInspection:pullPACS']"
+          >
             {{ $t('common:button:pull') }}
           </el-button>
         </el-form-item>