diff --git a/src/api/study.js b/src/api/study.js
deleted file mode 100644
index 78f74c1..0000000
--- a/src/api/study.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// 项目管理->详情->检查
-import request from '@/utils/request'
-
-// 检查列表->未提交
-export function getPatientStudyBeforeConfirmList(data) {
-    return request({
-        url: '/Patient/getPatientStudyBeforeConfirmList',
-        method: 'post',
-        data
-    })
-}
-
-// 检查列表->已提交
-export function getTrialPatientStudyList(data) {
-    return request({
-        url: '/Patient/getTrialPatientStudyList',
-        method: 'post',
-        data
-    })
-}
\ No newline at end of file
diff --git a/src/api/trials/study.js b/src/api/trials/study.js
index e69de29..78f74c1 100644
--- a/src/api/trials/study.js
+++ b/src/api/trials/study.js
@@ -0,0 +1,20 @@
+// 项目管理->详情->检查
+import request from '@/utils/request'
+
+// 检查列表->未提交
+export function getPatientStudyBeforeConfirmList(data) {
+    return request({
+        url: '/Patient/getPatientStudyBeforeConfirmList',
+        method: 'post',
+        data
+    })
+}
+
+// 检查列表->已提交
+export function getTrialPatientStudyList(data) {
+    return request({
+        url: '/Patient/getTrialPatientStudyList',
+        method: 'post',
+        data
+    })
+}
\ No newline at end of file
diff --git a/src/api/trials/subject.js b/src/api/trials/subject.js
index d379743..d84e2fc 100644
--- a/src/api/trials/subject.js
+++ b/src/api/trials/subject.js
@@ -103,3 +103,20 @@ export function confirmBackCriteriaVisitTask(param) {
   })
 }
 
+// 受试者列表
+export function getPatientSubejctList(param) {
+  return request({
+    url: `/Patient/getPatientSubejctList`,
+    method: 'post',
+    data: param
+  })
+}
+
+// 新增受试者->患者列表
+export function getPatientInitList(param) {
+  return request({
+    url: `/Patient/getPatientInitList`,
+    method: 'post',
+    data: param
+  })
+}
diff --git a/src/api/trials/visit.js b/src/api/trials/visit.js
index c27c397..ee7e290 100644
--- a/src/api/trials/visit.js
+++ b/src/api/trials/visit.js
@@ -288,3 +288,19 @@ export function forwardSVDicomImage(param) {
   })
 }
 
+// 获取访视列表
+export function getPatientSubejctVisitList(param) {
+  return request({
+    url: `/Patient/getPatientSubejctVisitList`,
+    method: 'post',
+    data: param
+  })
+}
+
+// 下载影像
+export function getSubjectImageZipInfo(id) {
+  return request({
+    url: `/Patient/getSubjectImageZipInfo/${id}`,
+    method: 'get',
+  })
+}
\ No newline at end of file
diff --git a/src/views/reviewers/index.vue b/src/views/reviewers/index.vue
index 62d13bd..a3e138f 100644
--- a/src/views/reviewers/index.vue
+++ b/src/views/reviewers/index.vue
@@ -302,7 +302,7 @@
               clearable
               style="width:100%;"
             >
-              <el-option v-for="item of $d.AttendedReviewerType" :value="item.value" :label="item.label" />
+              <el-option v-for="item of $d.AttendedReviewerType" :value="item.value" :label="item.label" :key="item.id"/>
             </el-select>
           </el-form-item>
 
diff --git a/src/views/trials/trials-inspection/components/add-trials-list.vue b/src/views/trials/trials-inspection/components/add-trials-list.vue
index 5bd1dc8..a2c8132 100644
--- a/src/views/trials/trials-inspection/components/add-trials-list.vue
+++ b/src/views/trials/trials-inspection/components/add-trials-list.vue
@@ -80,7 +80,7 @@
         </div>
       </el-form>
     </div>
-    <confirmTrialsList
+    <confirmVisitList
       ref="confirmVisit"
       :Patient="Patient"
       :submitMessage="submitMessage"
@@ -91,7 +91,7 @@
 <script>
 import Pagination from "@/components/Pagination";
 import trialsSelect from "./trials-select.vue";
-import confirmTrialsList from "./confirm-visit-list.vue";
+import confirmVisitList from "./confirm-visit-list.vue";
 import {
   getPatientJoinTrialInitSelectList,
   getTrialSubejctSelectList,
@@ -100,7 +100,7 @@ import {
 } from "@/api/inspection.js";
 export default {
   name: "addTrialsList",
-  components: { Pagination, trialsSelect, confirmTrialsList },
+  components: { Pagination, trialsSelect, confirmVisitList },
   props: {
     visible: {
       required: true,
diff --git a/src/views/trials/trials-inspection/components/confirm-visit-list.vue b/src/views/trials/trials-inspection/components/confirm-visit-list.vue
index f6eab96..e26df7c 100644
--- a/src/views/trials/trials-inspection/components/confirm-visit-list.vue
+++ b/src/views/trials/trials-inspection/components/confirm-visit-list.vue
@@ -71,6 +71,22 @@
     >
       <el-table-column type="selection" align="center" width="45" />
       <el-table-column type="index" width="40" />
+      <!--患者编号-->
+      <el-table-column
+        align="center"
+        prop="PatientIdStr"
+        :label="$t('trials:uploadDicomList:table:pId')"
+        show-overflow-tooltip
+        min-width="140"
+      ></el-table-column>
+      <!--患者姓名-->
+      <el-table-column
+        align="center"
+        prop="PatientName"
+        :label="$t('trials:uploadDicomList:table:patientName')"
+        show-overflow-tooltip
+        min-width="140"
+      ></el-table-column>
       <!--检查描述-->
       <el-table-column
         align="center"
@@ -270,7 +286,11 @@ export default {
       Object.keys(this.searchData).forEach((key) => {
         data[key] = this.searchData[key];
       });
-      data.PatientId = this.Patient.PatientId;
+      data.patientIdList = this.Patient.PatientId;
+      if (!Array.isArray(this.Patient.PatientId)) {
+        data.patientIdList = [this.Patient.PatientId];
+      }
+
       if (this.dateValue[0] && this.dateValue[1]) {
         data.earliestStudyTime = this.dateValue[0].toISOString();
         data.latestStudyTime = this.dateValue[1].toISOString();
diff --git a/src/views/trials/trials-inspection/index.vue b/src/views/trials/trials-inspection/index.vue
index efc4c23..c5b69b3 100644
--- a/src/views/trials/trials-inspection/index.vue
+++ b/src/views/trials/trials-inspection/index.vue
@@ -116,7 +116,7 @@
               v-for="(item, index) in scope.row.CalledAEList"
               :key="`CalledAEList${index}`"
               >{{
-                index === scope.row.CalledAEList.length - 1 ? item : `${item}，`
+                index === scope.row.CalledAEList.length - 1 ? item : `${item}, `
               }}</span
             >
           </template>
diff --git a/src/views/trials/trials-panel/study/components/list.vue b/src/views/trials/trials-panel/study/components/list.vue
index d555706..7cccd25 100644
--- a/src/views/trials/trials-panel/study/components/list.vue
+++ b/src/views/trials/trials-panel/study/components/list.vue
@@ -116,7 +116,6 @@
           prop="PatientList.PatientIdStr"
           :label="$t('trials:uploadDicomList:table:pId')"
           show-overflow-tooltip
-          sortable="custom"
           min-width="100"
         >
           <template slot-scope="scope">
@@ -132,10 +131,10 @@
             </span>
           </template>
         </el-table-column>
-        <!-- 患者姓名 -->
+        <!-- 姓名 -->
         <el-table-column
           prop="SubjectShortName"
-          :label="$t('trials:uploadDicomList:table:patientName')"
+          :label="$t('trials:researchStaff:table:Name')"
           show-overflow-tooltip
           sortable="custom"
           min-width="100"
@@ -241,7 +240,7 @@ import editVisit from "./edit-visit";
 import {
   getPatientStudyBeforeConfirmList,
   getTrialPatientStudyList,
-} from "@/api/study.js";
+} from "@/api/trials/study.js";
 let defaultSearchData = () => {
   return {
     SubjectCode: null,
diff --git a/src/views/trials/trials-panel/subject/subject-list/components/SubjectStatusForm.vue b/src/views/trials/trials-panel/subject/subject-list/components/SubjectStatusForm.vue
index 06b1952..0067779 100644
--- a/src/views/trials/trials-panel/subject/subject-list/components/SubjectStatusForm.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/components/SubjectStatusForm.vue
@@ -11,11 +11,20 @@
       <!-- Status -->
       <el-form-item :label="$t('trials:subject:table:status')" prop="Status">
         <el-radio-group v-model="form.Status" :disabled="originalStatus === 2">
-          <el-radio v-for="item of $d.Subject_Visit_Status" :label="item.value">{{item.label}}</el-radio>
+          <el-radio
+            v-for="item of $d.Subject_Visit_Status"
+            :label="item.value"
+            :key="item.id"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
       <!-- Out Visit Date -->
-      <el-form-item v-if="form.Status== 2" :label="$t('trials:subject:table:outVisitDate')" prop="VisitOverTime">
+      <el-form-item
+        v-if="form.Status == 2"
+        :label="$t('trials:subject:table:outVisitDate')"
+        prop="VisitOverTime"
+      >
         <el-date-picker
           v-model="form.VisitOverTime"
           type="date"
@@ -25,12 +34,16 @@
         />
       </el-form-item>
       <!-- 末次访视 -->
-      <el-form-item v-if="form.Status===2" :label="$t('trials:subject:table:finalSubjectVisit')" prop="FinalSubjectVisitId">
+      <el-form-item
+        v-if="form.Status === 2"
+        :label="$t('trials:subject:table:finalSubjectVisit')"
+        prop="FinalSubjectVisitId"
+      >
         <el-select
           v-model="form.FinalSubjectVisitId"
           clearable
           filterable
-          style="width:100%"
+          style="width: 100%"
           :disabled="originalStatus === 2"
         >
           <el-option
@@ -42,12 +55,16 @@
         </el-select>
       </el-form-item>
       <!-- 结束访视的原因 -->
-      <el-form-item v-if="form.Status===2" :label="$t('trials:subject:table:outVisitReason')" prop="Reason">
+      <el-form-item
+        v-if="form.Status === 2"
+        :label="$t('trials:subject:table:outVisitReason')"
+        prop="Reason"
+      >
         <el-input v-model="form.Reason" type="textarea" autosize />
       </el-form-item>
     </div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
-      <el-form-item style="text-align:right;">
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
+      <el-form-item style="text-align: right">
         <!-- 取消 -->
         <el-button
           :disabled="btnLoading"
@@ -55,96 +72,131 @@
           type="primary"
           @click="handleCancel"
         >
-          {{ $t('common:button:cancel') }}
+          {{ $t("common:button:cancel") }}
         </el-button>
-        <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
-          {{ $t('common:button:save') }}
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="handleSave"
+        >
+          {{ $t("common:button:save") }}
         </el-button>
       </el-form-item>
     </div>
   </el-form>
 </template>
 <script>
-import { getSubjectVisitSelectOptions, updateSubjectStatus } from '@/api/trials'
+import {
+  getSubjectVisitSelectOptions,
+  updateSubjectStatus,
+} from "@/api/trials";
 export default {
-  name: 'SubjectStatusForm',
+  name: "SubjectStatusForm",
   props: {
     data: {
       type: Object,
-      default() { return {} }
-    }
+      default() {
+        return {};
+      },
+    },
   },
 
   data() {
     return {
       form: {
-        SubjectId: '',
+        SubjectId: "",
         Status: 1,
-        OutEnrollmentTime: '',
-        Reason: '',
-        VisitOverTime: '',
-        FinalSubjectVisitId: ''
+        OutEnrollmentTime: "",
+        Reason: "",
+        VisitOverTime: "",
+        FinalSubjectVisitId: "",
       },
       rules: {
-        OutEnrollmentTime: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
-        FinalSubjectVisitId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
-        Reason: [{ max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500` }],
-        VisitOverTime: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }]
+        OutEnrollmentTime: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: ["blur"],
+          },
+        ],
+        FinalSubjectVisitId: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: ["blur"],
+          },
+        ],
+        Reason: [
+          {
+            max: 500,
+            message: `${this.$t("common:ruleMessage:maxLength")} 500`,
+          },
+        ],
+        VisitOverTime: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: ["blur"],
+          },
+        ],
       },
       pickerOption: {
-        disabledDate: time => {
-          return time.getTime() > Date.now()
-        }
+        disabledDate: (time) => {
+          return time.getTime() > Date.now();
+        },
       },
       subjectVisitOptions: [],
       btnLoading: false,
       loading: false,
       originalStatus: null,
-      trialId: ''
-    }
+      trialId: "",
+    };
   },
   mounted() {
-    this.trialId = this.$route.query.trialId
-    this.initForm()
+    this.trialId = this.$route.query.trialId;
+    this.initForm();
   },
   methods: {
     async initForm() {
-      this.loading = true
-      const { Result } = await getSubjectVisitSelectOptions(this.data.Id)
-      this.subjectVisitOptions = Result
+      this.loading = true;
+      const { Result } = await getSubjectVisitSelectOptions(this.data.Id);
+      this.subjectVisitOptions = Result;
       if (Object.keys(this.data).length > 0) {
         for (const k in this.form) {
           if (this.data.hasOwnProperty(k)) {
-            this.form[k] = this.data[k]
+            this.form[k] = this.data[k];
           }
         }
-        this.form.SubjectId = this.data.Id
-        this.originalStatus = this.data.Status
+        this.form.SubjectId = this.data.Id;
+        this.originalStatus = this.data.Status;
       }
-      this.form.TrialId = this.trialId
-      this.loading = false
+      this.form.TrialId = this.trialId;
+      this.loading = false;
     },
     handleSave() {
-      this.$refs.subjectStatusForm.validate(valid => {
-        if (!valid) return
-        this.btnLoading = true
+      this.$refs.subjectStatusForm.validate((valid) => {
+        if (!valid) return;
+        this.btnLoading = true;
 
-        this.form.TrialId = this.trialId
-        this.form.SiteId = this.data.SiteId
-        updateSubjectStatus(this.form).then(res => {
-          this.btnLoading = false
-          this.$emit('getList')
-          // this.$message.success('Saved successfully!')
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.$emit('closeDialog')
-        }).catch(() => {
-          this.btnLoading = false
-        })
-      })
+        this.form.TrialId = this.trialId;
+        this.form.SiteId = this.data.SiteId;
+        updateSubjectStatus(this.form)
+          .then((res) => {
+            this.btnLoading = false;
+            this.$emit("getList");
+            // this.$message.success('Saved successfully!')
+            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            this.$emit("closeDialog");
+          })
+          .catch(() => {
+            this.btnLoading = false;
+          });
+      });
     },
     handleCancel() {
-      this.$emit('closeDialog')
-    }
-  }
-}
+      this.$emit("closeDialog");
+    },
+  },
+};
 </script>
diff --git a/src/views/trials/trials-panel/subject/subject-list/components/add-subject.vue b/src/views/trials/trials-panel/subject/subject-list/components/add-subject.vue
index e4f8ec3..157cf9a 100644
--- a/src/views/trials/trials-panel/subject/subject-list/components/add-subject.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/components/add-subject.vue
@@ -8,177 +8,116 @@
   >
     <span slot="title"
       >{{ $t("trials:subject:title:addSubject") }}（{{
-        $t("trials:uploadDicomList:table:patientInfo")
-      }}：T0001132，ZhangSan）</span
+        $t("trials:trials-list:table:researchNumber")
+      }}：{{ researchProgramNo }}）</span
     >
     <div class="top">
+      <p class="line">{{ $t("trials:inspection:subject:checkAddPatient") }}</p>
       <el-form
         :inline="true"
         :model="submitMessage"
         class="demo-form-inline topForm"
         :rules="rules"
+        ref="addSubjectForm"
       >
-        <!--受试者编号-->
-        <el-form-item
-          :label="$t('trials:crcQuestion:table:subjectId')"
-          prop="subjectId"
-        >
-          <el-input v-model="submitMessage.subjectId"></el-input>
-        </el-form-item>
-        <el-button type="primary" @click="addTrials">
-          {{ $t("trials:addRP:button:confirmAddPR") }}
-        </el-button>
-      </el-form>
-    </div>
-    <div class="search">
-      <p>{{ $t("trials:subject:messge:selectPatient") }}</p>
-      <div class="form">
-        <el-form :inline="true" class="base-search-form">
-          <!-- 患者编号 -->
-          <el-form-item :label="$t('trials:uploadDicomList:table:pId')">
-            <el-input v-model="searchData.SubjectInfo" style="width: 100px" />
-          </el-form-item>
-          <!-- 患者姓名 -->
-          <el-form-item :label="$t('trials:uploadDicomList:table:patientName')">
-            <el-input v-model="searchData.SubjectInfo" style="width: 100px" />
-          </el-form-item>
-          <!-- DICOM AE -->
+        <div class="selectAndBtn">
+          <!--受试者编号-->
           <el-form-item
-            class="my_multiple"
-            :label="$t('trials:inspection:table:DICOMAE')"
+            :label="$t('trials:crcQuestion:table:subjectId')"
+            prop="SubjectId"
           >
             <el-select
-              v-model="searchData.VisitPlanArray"
+              v-model="submitMessage.SubjectId"
+              filterable
+              allow-create
+              default-first-option
               clearable
-              multiple
-              style="width: 140px"
+              :disabled="status === 'visit'"
             >
               <el-option
-                v-for="(item, index) of sponsorList"
-                :key="index"
-                :label="item.VisitName"
-                :value="item.VisitNum"
+                v-for="item in subjectIdList"
+                :key="item.SubejctId"
+                :label="item.SubjectCode"
+                :value="item.SubejctId"
               >
               </el-option>
             </el-select>
           </el-form-item>
-          <!-- 检查日期 -->
-          <el-form-item :label="$t('trials:uploadedDicoms:table:studyDate')">
-            <el-date-picker
-              v-model="searchData.date"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <!-- 查询 -->
+          <el-button
+            type="primary"
+            @click="save"
+            :loading="btnLoading"
+            v-if="status === 'trial'"
+          >
+            {{ $t("trials:addRP:button:confirmAddPR") }}
+          </el-button>
+        </div>
+        <!--患者-->
+        <el-form-item :label="$t('trials:subject:messge:patient')">
+          <div class="patientBox">
+            <p style="margin-right: 10px">
+              <span v-for="(item, index) in selectPatient" :key="item.PatientId"
+                >{{ item.PatientIdStr }}
+                <i
+                  class="el-icon-delete-solid"
+                  style="cursor: pointer"
+                  @click.stop="delPatient(index)"
+                  v-if="status === 'trial'"
+                ></i>
+              </span>
+            </p>
             <el-button
               type="primary"
-              icon="el-icon-search"
-              @click="handleSearch"
+              @click="patient_model.visible = true"
+              v-if="status === 'trial'"
             >
-              {{ $t("common:button:search") }}
+              {{ $t("common:button:add") }}
             </el-button>
-            <!-- 重置 -->
-            <el-button
-              type="primary"
-              icon="el-icon-refresh-left"
-              @click="handleReset"
-            >
-              {{ $t("common:button:reset") }}
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
+          </div>
+        </el-form-item>
+      </el-form>
     </div>
-    <!--可加入项目列表-->
-    <!--:header-cell-style="{ background: '#f9f9f9' }"-->
-    <el-table
-      ref="addTrialsList"
-      v-loading="loading"
-      v-adaptive="{ bottomOffset: 60 }"
-      :data="list"
-      stripe
-      height="100"
-      @selection-change="handleSelectChange"
-    >
-      <el-table-column type="selection" align="center" width="45" />
-      <!--患者编号-->
-      <el-table-column
-        align="center"
-        prop="IsUrgent"
-        :label="$t('trials:uploadDicomList:table:pId')"
-        show-overflow-tooltip
-      ></el-table-column>
-      <!--患者姓名-->
-      <el-table-column
-        align="center"
-        prop="IsUrgent"
-        :label="$t('trials:uploadDicomList:table:patientName')"
-        show-overflow-tooltip
-      ></el-table-column>
-      <!--出生日期-->
-      <el-table-column
-        align="center"
-        prop="IsUrgent"
-        :label="$t('trials:inspection:table:birthdate')"
-        show-overflow-tooltip
-      ></el-table-column>
-      <!--性别-->
-      <el-table-column
-        align="center"
-        prop="IsUrgent"
-        :label="$t('trials:subject:table:gender')"
-        show-overflow-tooltip
-      ></el-table-column>
-      <!--检查时间-->
-      <el-table-column
-        align="center"
-        prop="IsUrgent"
-        :label="$t('trials:audit:table:studyDate')"
-        show-overflow-tooltip
-      ></el-table-column>
-      <!--DiCOM AE-->
-      <el-table-column
-        align="center"
-        prop="IsUrgent"
-        :label="$t('trials:inspection:table:DICOMAE')"
-        show-overflow-tooltip
-      ></el-table-column>
-      <!--检查数-->
-      <el-table-column
-        align="center"
-        prop="IsUrgent"
-        :label="$t('trials:studyList:table:count')"
-        show-overflow-tooltip
-      ></el-table-column>
-      <!--最新接收时间-->
-      <el-table-column
-        align="center"
-        prop="IsUrgent"
-        :label="$t('trials:inspection:table:latestReceiveTime')"
-        show-overflow-tooltip
-      ></el-table-column>
-    </el-table>
-
-    <!-- 分页组件 -->
-    <pagination
-      class="page"
-      :total="total"
-      :page.sync="searchData.PageIndex"
-      :limit.sync="searchData.PageSize"
-      @pagination="getList"
+    <confirmVistList
+      ref="confirmVisit"
+      :Patient="Patient"
+      :submitMessage="submitMessage"
+      :status="status"
     />
+    <base-model v-if="patient_model.visible" :config="patient_model">
+      <template slot="dialog-body">
+        <SubjectPatientList
+          @addPatient="addPatient"
+          :visible.sync="patient_model.visible"
+        />
+      </template>
+    </base-model>
   </el-dialog>
 </template>
 <script>
+import confirmVistList from "@/views/trials/trials-inspection/components/confirm-visit-list.vue";
+import SubjectPatientList from "./patient-list.vue";
+import BaseModel from "@/components/BaseModel";
 import Pagination from "@/components/Pagination";
+import {
+  getTrialSubejctSelectList,
+  addSubjectPatientBinding,
+} from "@/api/inspection.js";
+const defaultSearchData = () => {
+  return {
+    PatientIdStr: null,
+    PatientName: null,
+    CalledAEList: [],
+    EarliestStudyTime: null,
+    LatestStudyTime: null,
+    Asc: false,
+    SortField: "LatestPushTime",
+    PageIndex: 1,
+    PageSize: 20,
+  };
+};
 export default {
   name: "addSubject",
-  components: { Pagination },
+  components: { Pagination, confirmVistList, SubjectPatientList, BaseModel },
   props: {
     visible: {
       require: true,
@@ -187,44 +126,163 @@ export default {
   },
   data() {
     return {
+      researchProgramNo: null,
       // 查询
-      searchData: {},
-      sponsorList: [],
+      searchData: defaultSearchData(),
       // 可加入项目列表
       total: 0,
       loading: false,
-      list: [{ key: 1, IsUrgent: "123" }],
+      list: [],
       // 提交数据
+      Patient: {},
+      status: "trial", // 页面当前状态  trial 绑定患者  visit 确认访视
+      patient_model: {
+        visible: false,
+        title: this.$t("trials:subject:messge:selectPatient"),
+        width: "1200px",
+        appendToBody: true,
+      },
+      btnLoading: false,
       submitMessage: {},
+      selectPatient: [],
+      tableSelectData: [],
+      subjectIdList: [],
       rules: {
-        subjectId: [
+        SubjectId: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t("trials:inscept:rules:selectOrInputSubject"),
+            trigger: "change",
           },
         ],
       },
     };
   },
+  created() {
+    this.researchProgramNo = this.$route.query.researchProgramNo;
+    this.getTrialSubejctSelectList(this.$route.query.trialId);
+  },
   methods: {
+    // 删除选中患者
+    delPatient(index) {
+      this.selectPatient.splice(index, 1);
+    },
+    addPatient(item) {
+      this.selectPatient = item;
+    },
     // 关闭弹框
     beforeCloseStudyDig() {
       this.$emit("update:visible", false);
     },
     // 确认添加
-    addTrials() {
-      this.$emit("update:visible", false);
-      this.$emit("handleOpenDialog", {}, "confirm");
+    async save() {
+      try {
+        if (this.btnLoading) return;
+        let validate = await this.$refs.addSubjectForm.validate();
+        if (!validate) return;
+        if (this.selectPatient.length <= 0)
+          return this.$message.warning(
+            this.$t("trials:subject:formatData:notCheckPantient")
+          );
+        let data = {
+          TrialId: this.$route.query.trialId,
+          PatientIdList: this.selectPatient.map((item) => item.PatientId),
+        };
+        if (this.submitMessage.SubjectId.length === 36) {
+          data.SubjectId = this.submitMessage.SubjectId;
+        } else {
+          data.SubjectCode = this.submitMessage.SubjectId;
+        }
+        this.btnLoading = true;
+        let res = await addSubjectPatientBinding(data);
+        this.btnLoading = false;
+        if (res.IsSuccess) {
+          this.submitMessage.SubjectId = res.Result;
+          this.submitMessage.TrialId = data.TrialId;
+          this.Patient.PatientId = data.PatientIdList;
+          this.$message.success(this.$t("common:message:addedSuccessfully"));
+          this.$emit("getList");
+          this.status = "visit";
+          this.$nextTick(() => {
+            this.$refs.confirmVisit.getList();
+            this.$refs.confirmVisit.getSubjectVisitSelectList();
+          });
+          // this.$emit("update:visible", false);
+        }
+      } catch (err) {
+        this.btnLoading = false;
+        console.log(err);
+      }
+      // this.$emit("update:visible", false);
+      // this.$emit("handleOpenDialog", {}, "confirm");
+    },
+    // 获取受试者列表
+    async getTrialSubejctSelectList(id) {
+      let data = {
+        TrialId: id,
+      };
+      try {
+        let res = await getTrialSubejctSelectList(data);
+        if (res.IsSuccess) {
+          this.subjectIdList = res.Result;
+        }
+      } catch (err) {
+        console.log(err);
+      }
     },
     // 获取列表
-    getList() {},
+    async getList() {
+      let data = {};
+      Object.keys(this.searchData).forEach((key) => {
+        data[key] = this.searchData[key];
+      });
+      if (this.dateValue[0] && this.dateValue[1]) {
+        data.EarliestStudyTime = this.dateValue[0].toISOString();
+        data.LatestStudyTime = this.dateValue[1].toISOString();
+      } else {
+        data.EarliestStudyTime = null;
+        data.LatestStudyTime = null;
+      }
+      try {
+        this.loading = true;
+        let res = await getPatientInitList(data);
+        this.loading = false;
+        if (res.IsSuccess) {
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        }
+      } catch (err) {
+        this.loading = false;
+        console.log(err);
+      }
+    },
     // 查询
-    handleSearch() {},
+    handleSearch() {
+      this.getList();
+    },
     // 重置
-    handleReset() {},
+    handleReset() {
+      this.reset();
+      this.getList();
+    },
+    // 初始化
+    reset() {
+      this.searchData = defaultSearchData();
+      this.dateValue = [];
+      this.$refs.addSubjectList.clearSort();
+    },
     // 表格选择
-    handleSelectChange() {},
+    handleSelectChange(selection) {
+      this.tableSelectData = selection;
+    },
+    // 排序
+    handleSortByColumn() {
+      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>
@@ -234,10 +292,8 @@ export default {
   display: flex;
   align-items: center;
   justify-content: space-between;
+  flex-wrap: wrap;
   .topForm {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
     width: 100%;
   }
 }
@@ -265,4 +321,33 @@ export default {
     justify-content: space-between;
   }
 }
+.line {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  &::after {
+    display: block;
+    content: "";
+    flex: 1;
+    height: 1px;
+    border-top: 1px solid #ddd;
+  }
+}
+.selectAndBtn {
+  width: 100%;
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+}
+.patientBox {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  p {
+    flex: 1;
+    padding: 0;
+    margin: 0;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/subject/subject-list/components/patient-list.vue b/src/views/trials/trials-panel/subject/subject-list/components/patient-list.vue
new file mode 100644
index 0000000..6912040
--- /dev/null
+++ b/src/views/trials/trials-panel/subject/subject-list/components/patient-list.vue
@@ -0,0 +1,285 @@
+<template>
+  <el-container class="participant-container">
+    <el-header style="height: 50px">
+      <div class="filter-container">
+        <!-- 患者ID/患者姓名 -->
+        <span>{{ $t("trials:uploadDicomList:table:pId") }}:</span>
+        <el-input
+          v-model="searchData.PatientIdStr"
+          size="mini"
+          class="mr"
+          clearable
+        />
+        <span>{{ $t("trials:uploadDicomList:table:patientName") }}:</span>
+        <el-input
+          v-model="searchData.PatientName"
+          size="mini"
+          class="mr"
+          clearable
+        />
+        <!-- DICOM AE -->
+        <span>{{ $t("trials:inspection:table:DICOMAE") }}:</span>
+        <el-select
+          v-model="searchData.CalledAEList"
+          clearable
+          multiple
+          class="mr"
+        >
+          <el-option
+            v-for="(item, index) of dicomAeList"
+            :key="index"
+            :label="item"
+            :value="item"
+          >
+          </el-option>
+        </el-select>
+        <!-- 查询 -->
+        <el-button
+          type="primary"
+          size="mini"
+          icon="el-icon-search"
+          @click="handleSearch"
+        >
+          {{ $t("common:button:search") }}
+        </el-button>
+        <!-- 重置 -->
+        <el-button
+          size="mini"
+          type="primary"
+          icon="el-icon-refresh-left"
+          @click="handleReset"
+        >
+          {{ $t("common:button:reset") }}
+        </el-button>
+
+        <el-button
+          type="primary"
+          size="mini"
+          style="margin-left: auto"
+          :disabled="tableSelectData.length === 0"
+          :loading="btnLoading"
+          icon="el-icon-plus"
+          @click="handleAssign"
+        >
+          {{ $t("common:button:add") }}
+        </el-button>
+      </div>
+    </el-header>
+    <el-main>
+      <div class="data-table">
+        <el-table
+          ref="subjectPatientList"
+          v-loading="loading"
+          :data="list"
+          stripe
+          height="400"
+          @selection-change="handleSelectChange"
+          @sort-change="handleSortByColumn"
+          :default-sort="{ prop: 'LatestPushTime', order: 'descending' }"
+        >
+          <el-table-column type="selection" align="center" width="45" />
+          <el-table-column type="index" width="40" />
+          <!--患者ID-->
+          <el-table-column
+            prop="PatientIdStr"
+            :label="$t('trials:uploadDicomList:table:pId')"
+            show-overflow-tooltip
+            min-width="140"
+          ></el-table-column>
+          <!--患者姓名-->
+          <el-table-column
+            prop="PatientName"
+            :label="$t('trials:uploadDicomList:table:patientName')"
+            show-overflow-tooltip
+            min-width="140"
+          ></el-table-column>
+          <!--出生日期-->
+          <el-table-column
+            prop="PatientBirthDate"
+            :label="$t('trials:inspection:table:birthdate')"
+            show-overflow-tooltip
+            min-width="140"
+          ></el-table-column>
+          <!--性别-->
+          <el-table-column
+            prop="PatientSex"
+            :label="$t('trials:trials-myinfo:form:gender')"
+            show-overflow-tooltip
+            min-width="140"
+          ></el-table-column>
+          <!--DICOM AE-->
+          <el-table-column
+            prop="CalledAEList"
+            :label="$t('trials:inspection:table:DICOMAE')"
+            show-overflow-tooltip
+            min-width="140"
+          >
+            <template slot-scope="scope">
+              <span
+                v-for="(item, index) in scope.row.CalledAEList"
+                :key="`CalledAEList${index}`"
+                >{{
+                  index === scope.row.CalledAEList.length - 1
+                    ? item
+                    : `${item}, `
+                }}</span
+              >
+            </template>
+          </el-table-column>
+          <!--最新接收时间-->
+          <el-table-column
+            prop="LatestPushTime"
+            :label="$t('trials:inspection:table:latestReceiveTime')"
+            show-overflow-tooltip
+            min-width="140"
+            sortable="custom"
+          ></el-table-column>
+        </el-table>
+      </div>
+    </el-main>
+    <div class="pagination" style="text-align: right; margin-top: 5px">
+      <pagination
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
+    </div>
+  </el-container>
+</template>
+<script>
+import Pagination from "@/components/Pagination";
+import { getPatientInitList } from "@/api/trials/subject.js";
+import { getDicomCalledAEList } from "@/api/dicomAE.js";
+const defaultSearchData = () => {
+  return {
+    PatientIdStr: null,
+    PatientName: null,
+    CalledAEList: [],
+    ExperimentName: null,
+    Asc: false,
+    SortField: "LatestPushTime",
+    PageIndex: 1,
+    PageSize: 10,
+  };
+};
+export default {
+  name: "subjectPatientList",
+  components: { Pagination },
+  props: {
+    visible: {
+      required: true,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      // 查询
+      searchData: defaultSearchData(),
+      dicomAeList: [],
+      // 列表
+      list: [],
+      total: 0,
+      loading: false,
+      // 提交数据
+      tableSelectData: [],
+      btnLoading: false,
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicomCalledAEList();
+  },
+  methods: {
+    // 确定添加
+    handleAssign() {
+      this.$emit("addPatient", this.tableSelectData);
+      this.beforeCloseStudyDig();
+    },
+    // 获取列表
+    async getList() {
+      let data = {};
+      Object.keys(this.searchData).forEach((key) => {
+        data[key] = this.searchData[key];
+      });
+      data.TrialId = this.$route.query.trialId;
+      try {
+        this.loading = true;
+        let res = await getPatientInitList(data);
+        this.loading = false;
+        if (res.IsSuccess) {
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        }
+      } catch (err) {
+        this.loading = false;
+        console.log(err);
+      }
+    },
+    // 关闭弹框
+    beforeCloseStudyDig() {
+      this.$emit("update:visible", false);
+    },
+    // 表格选择
+    handleSelectChange(selection) {
+      // console.log(selection);
+      this.tableSelectData = selection;
+    },
+    // 表格排序
+    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();
+    },
+    // 查询
+    handleSearch() {
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+    // 重置
+    handleReset() {
+      this.searchData = defaultSearchData();
+      this.$refs.subjectPatientList.clearSort();
+      this.getList();
+    },
+    // 获取dicomAE列表
+    async getDicomCalledAEList() {
+      try {
+        let res = await getDicomCalledAEList();
+        if (res.IsSuccess) {
+          this.dicomAeList = res.Result;
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.participant-container {
+  height: 100%;
+  .el-header {
+    .filter-container {
+      display: flex;
+      align-items: center;
+      span {
+        font-size: 13px;
+        margin-right: 5px;
+      }
+      .mr {
+        margin-right: 5px;
+        width: 120px;
+      }
+    }
+  }
+  .el-main {
+    padding: 0px;
+  }
+  .el-footer {
+    padding: 0 20px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/subject/subject-list/index.vue b/src/views/trials/trials-panel/subject/subject-list/index.vue
index c498813..52dd6ae 100644
--- a/src/views/trials/trials-panel/subject/subject-list/index.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/index.vue
@@ -5,20 +5,24 @@
       <el-form :inline="true">
         <!-- 受试者编号 -->
         <el-form-item :label="$t('trials:crcQuestion:table:subjectId')">
-          <el-input v-model="searchData.Code" style="width: 130px" />
+          <el-input v-model="searchData.Code" style="width: 130px" clearable />
         </el-form-item>
         <!-- 患者编号 -->
-        <el-form-item :label="$t('trials:uploadDicomList:table:pId')">
-          <el-input v-model="searchData.Code" style="width: 130px" />
-        </el-form-item>
-        <!-- 患者姓名 -->
-        <el-form-item :label="$t('trials:uploadDicomList:table:patientName')">
+        <!-- <el-form-item :label="$t('trials:uploadDicomList:table:pId')">
           <el-input v-model="searchData.Code" style="width: 130px" />
+        </el-form-item> -->
+        <!-- 姓名 -->
+        <el-form-item :label="$t('trials:researchStaff:table:Name')">
+          <el-input
+            v-model="searchData.ShortName"
+            style="width: 130px"
+            clearable
+          />
         </el-form-item>
         <!-- 性别 -->
         <el-form-item :label="$t('trials:trials-myinfo:form:gender')">
           <el-select
-            v-model="searchData.SiteId"
+            v-model="searchData.Sex"
             clearable
             filterable
             style="width: 130px"
@@ -87,7 +91,9 @@
         stripe
         height="100"
         @sort-change="handleSortByColumn"
+        :default-sort="{ prop: 'CreateTime', order: 'descending' }"
       >
+        <el-table-column type="index" width="40" />
         <!-- 受试者编号 -->
         <el-table-column
           prop="Code"
@@ -97,49 +103,61 @@
         />
         <!-- 患者编号 -->
         <el-table-column
-          prop="Code"
+          prop="PatientList.PatientIdStr"
           :label="$t('trials:uploadDicomList:table:pId')"
           show-overflow-tooltip
-          sortable="custom"
-        />
-        <!-- 患者姓名 -->
+        >
+          <template slot-scope="scope">
+            <span
+              v-for="(item, index) in scope.row.PatientList"
+              :key="`${item.PatientId}${index}`"
+            >
+              {{
+                index === scope.row.PatientList.length - 1
+                  ? item.PatientIdStr
+                  : `${item.PatientIdStr}, `
+              }}
+            </span>
+          </template>
+        </el-table-column>
+        <!-- 姓名 -->
         <el-table-column
-          prop="Code"
-          :label="$t('trials:uploadDicomList:table:patientName')"
+          prop="ShortName"
+          :label="$t('trials:researchStaff:table:Name')"
           show-overflow-tooltip
           sortable="custom"
         />
         <!-- 性别 -->
         <el-table-column
-          prop="Code"
+          prop="Sex"
           :label="$t('trials:trials-myinfo:form:gender')"
           show-overflow-tooltip
           sortable="custom"
         />
         <!-- 出生日期 -->
         <el-table-column
-          prop="Code"
+          prop="BirthDate"
           :label="$t('trials:inspection:table:birthdate')"
           show-overflow-tooltip
           sortable="custom"
         />
         <!-- 年龄 -->
         <el-table-column
-          prop="Code"
+          prop="Age"
           :label="$t('trials:subject:table:age')"
           show-overflow-tooltip
           sortable="custom"
         />
         <!-- 总访视量 -->
         <el-table-column
-          prop="Code"
+          prop="VisitCount"
           :label="$t('trials:subject:table:totalVisitCount')"
           show-overflow-tooltip
           sortable="custom"
         />
         <!-- 最新检查访视 -->
         <el-table-column
-          prop="Code"
+          prop="LatestVisitName"
           :label="$t('trials:subject:table:latestStudiesVisitName')"
           show-overflow-tooltip
           sortable="custom"
@@ -162,7 +180,7 @@
         </el-table-column>
         <!-- 创建日期 -->
         <el-table-column
-          prop="Code"
+          prop="CreateTime"
           :label="$t('trials:trials-list:table:createDate')"
           show-overflow-tooltip
           sortable="custom"
@@ -202,7 +220,7 @@
               circle
               :title="$t('trials:subject:action:delete')"
               icon="el-icon-delete"
-              :disabled="scope.row.StudyCount > 0"
+              :disabled="scope.row.PatientList.length <= 0"
               @click="handleDelete(scope.row)"
             />
           </template>
@@ -251,55 +269,35 @@
         @getList="getList"
       />
     </el-dialog>
-    <!-- 修改受试者状态 -->
-    <el-dialog
-      v-if="MessageVisible"
-      :visible.sync="MessageVisible"
-      :close-on-click-modal="false"
-      :title="
-        $t('trials:subject:title:sendReport').replace('xxx', rowData.Code)
-      "
-      width="720px"
-      custom-class="base-dialog-wrapper"
-    >
-      <MessageTable
-        :data="rowData"
-        @closeDialog="closeStatusDialog"
-        @getList="getList"
-      />
-    </el-dialog>
     <!--添加受试者-->
     <addSubject
+      v-if="addSubjectTrialsVisible"
       :visible.sync="addSubjectTrialsVisible"
       @handleOpenDialog="handleOpenDialog"
+      @getList="getList"
     />
-    <!--确认访视-->
-    <!-- <confirmVisitList :visible.sync="confirmTrialsVisible" /> -->
   </BaseContainer>
 </template>
 <script>
-import {
-  getTrialSiteSelect,
-  getSubjectList,
-  deleteSubject,
-} from "@/api/trials";
+import { getTrialSiteSelect, deleteSubject } from "@/api/trials";
+import { getPatientSubejctList } from "@/api/trials/subject";
 import { getSubjectList_Export } from "@/api/export";
 import BaseContainer from "@/components/BaseContainer";
 import Pagination from "@/components/Pagination";
 import SubjectsForm from "./components/SubjectsForm";
 import SubjectStatusForm from "./components/SubjectStatusForm";
-import MessageTable from "./components/MessageTable";
-import moment from "moment";
 import addSubject from "./components/add-subject.vue";
 // import confirmVisitList from "../../../trials-inspection/components/confirm-visit-list.vue";
 const searchDataDefault = () => {
   return {
     Code: "",
     Status: "",
-    SiteId: "",
+    Sex: "",
     ShortName: "",
     PageIndex: 1,
     PageSize: 20,
+    Asc: false,
+    SortField: "CreateTime",
   };
 };
 export default {
@@ -309,29 +307,19 @@ export default {
     Pagination,
     SubjectsForm,
     SubjectStatusForm,
-    MessageTable,
     addSubject,
-    confirmVisitList,
   },
   data() {
     return {
-      moment,
-      MessageVisible: false,
-      model_cfg: { visible: false, showClose: true, width: "700px", title: "" },
       searchData: searchDataDefault(),
       loading: false,
       list: [],
       total: 0,
-      siteOptions: [],
-      visitPlanConfirmed: false,
       rowData: {},
-      userTypeEnumInt: zzSessionStorage.getItem("userTypeEnumInt") * 1,
       otherInfo: {},
       editDialog: { title: "", visible: false },
       statusVisible: false,
       trialId: "",
-      hasCrcRoute: false,
-      hasQCRoute: false,
       // 添加受试者
       addSubjectTrialsVisible: false,
       // 确认访视
@@ -346,23 +334,10 @@ export default {
     },
   },
   mounted() {
-    const trialsRouter = this.$store.getters.routes.find((r) => {
-      return r.name === "Trials";
-    });
-    const trialsPanelRouter = trialsRouter.children.find((r) => {
-      return r.name === "TrialsPanel";
-    }).children;
-    this.hasCrcRoute = this.hasRoute("crc-upload", trialsPanelRouter);
-    this.hasQCRoute = this.hasRoute("qc-check", trialsPanelRouter);
     this.trialId = this.$route.query.trialId;
-    this.getSite();
     this.getList();
   },
   methods: {
-    handleMessage(row) {
-      this.rowData = { ...row };
-      this.MessageVisible = true;
-    },
     handleExport() {
       getSubjectList_Export(this.searchData)
         .then((res) => {})
@@ -371,20 +346,25 @@ export default {
         });
     },
     // 获取受试者列表
-    getList() {
-      this.loading = true;
-      this.searchData.TrialId = this.$route.query.trialId;
-      getSubjectList(this.searchData)
-        .then((res) => {
-          this.loading = false;
+    async getList() {
+      let data = {};
+      Object.keys(this.searchData).forEach((key) => {
+        data[key] = this.searchData[key];
+      });
+      data.TrialId = this.$route.query.trialId;
+      try {
+        this.loading = true;
+        let res = await getPatientSubejctList(data);
+        this.loading = false;
+        if (res.IsSuccess) {
           this.list = res.Result.CurrentPageData;
           this.total = res.Result.TotalCount;
           this.otherInfo = res.OtherInfo;
-          this.visitPlanConfirmed = res.OtherInfo.VisitPlanConfirmed;
-        })
-        .catch(() => {
-          this.loading = false;
-        });
+        }
+      } catch (err) {
+        this.loading = false;
+        console.log(err);
+      }
     },
     // 新增
     // 打开弹框
@@ -424,20 +404,6 @@ export default {
           });
       });
     },
-    // 审计
-    handleAudit(row) {
-      const routeData = this.$router.resolve({
-        path: "/audit",
-        query: {
-          Id: row.TrialId,
-          Code: this.$route.query.trialCode,
-          SubName: row.Name,
-          SubId: row.Id,
-          Type: 2,
-        },
-      });
-      window.open(routeData.href, "_blank");
-    },
     // 查询
     handleSearch() {
       this.searchData.PageIndex = 1;
@@ -456,15 +422,9 @@ export default {
         this.searchData.Asc = false;
       }
       this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1;
+      // this.searchData.PageIndex = 1;
       this.getList();
     },
-    // 获取site下拉框数据
-    getSite() {
-      getTrialSiteSelect(this.trialId).then((res) => {
-        this.siteOptions = res.Result;
-      });
-    },
     // 打开编辑状态框
     handleEditStatus(row) {
       this.rowData = { ...row };
@@ -474,31 +434,6 @@ export default {
     closeStatusDialog() {
       this.statusVisible = false;
     },
-    handleTotalVisitCount(subjectCode) {
-      if (this.hasCrcRoute) {
-        this.$router.push({
-          path: `/trials/trials-panel/visit/crc-upload?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&subjectCode=${subjectCode}`,
-        });
-      } else if (this.hasQCRoute) {
-        this.$router.push({
-          path: `/trials/trials-panel/visit/qc-check?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&subjectCode=${subjectCode}`,
-        });
-      }
-    },
-    hasRoute(name, routeList) {
-      for (let i = 0; i < routeList.length; i++) {
-        if (routeList[i].name === name) {
-          return true;
-        }
-        if (routeList[i].children) {
-          const flag = this.hasRoute(name, routeList[i].children);
-          if (flag) {
-            return flag;
-          }
-        }
-      }
-      return false;
-    },
   },
 };
 </script>
diff --git a/src/views/trials/trials-panel/visit/forward-list/index.vue b/src/views/trials/trials-panel/visit/forward-list/index.vue
index f69a9d9..c111a13 100644
--- a/src/views/trials/trials-panel/visit/forward-list/index.vue
+++ b/src/views/trials/trials-panel/visit/forward-list/index.vue
@@ -5,9 +5,14 @@
       <el-form :inline="true">
         <!-- 中心编号 -->
         <el-form-item :label="$t('trials:dicomForward:table:siteId')">
-          <el-select v-model="searchData.SiteId" clearable filterable style="width:120px;">
+          <el-select
+            v-model="searchData.SiteId"
+            clearable
+            filterable
+            style="width: 120px"
+          >
             <el-option
-              v-for="(item,index) of siteOptions"
+              v-for="(item, index) of siteOptions"
               :key="index"
               :label="item.TrialSiteCode"
               :value="item.SiteId"
@@ -16,13 +21,16 @@
         </el-form-item>
         <!-- 受试者信息 -->
         <el-form-item :label="$t('trials:dicomForward:table:subjectId')">
-          <el-input v-model="searchData.SubjectInfo" style="width:100px;" />
+          <el-input v-model="searchData.SubjectInfo" style="width: 100px" />
         </el-form-item>
         <!-- 访视名称 -->
-        <el-form-item class="my_multiple" :label="$t('trials:dicomForward:tableon:visitName')">
+        <el-form-item
+          class="my_multiple"
+          :label="$t('trials:dicomForward:tableon:visitName')"
+        >
           <el-select
             v-model="searchData.VisitPlanArray"
-            style="width:140px"
+            style="width: 140px"
             clearable
             multiple
           >
@@ -34,31 +42,47 @@
             >
               <span style="float: left">{{ item.VisitName }}</span>
             </el-option>
-            <el-option
-              key="Other"
-              label="Out of Plan"
-              value="1.11"
-            />
+            <el-option key="Other" label="Out of Plan" value="1.11" />
           </el-select>
         </el-form-item>
         <!-- 转发状态 -->
         <el-form-item :label="$t('trials:dicomForward:table:forwardStatus')">
-          <el-select v-model="searchData.ForwardState" clearable style="width:120px">
-            <el-option v-for="item of $d.ForwardStateEnum" v-if="item.value !== 0" :value="item.value" :label="item.label" />
+          <el-select
+            v-model="searchData.ForwardState"
+            clearable
+            style="width: 120px"
+          >
+            <template v-for="item of $d.ForwardStateEnum">
+              <el-option
+                v-if="item.value !== 0"
+                :value="item.value"
+                :label="item.label"
+                :key="item.id"
+              />
+            </template>
           </el-select>
         </el-form-item>
         <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 type="primary" icon="el-icon-refresh-left" @click="handleReset">
-            {{ $t('common:button:reset') }}
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t("common:button:reset") }}
           </el-button>
           <!-- 批量转发 -->
-          <el-button :disabled="loading || selectArr.length === 0" type="primary" icon="el-icon-document-copy" @click="handleBulkForward">
-            {{ $t('trials:dicomForward:action:forward') }}
+          <el-button
+            :disabled="loading || selectArr.length === 0"
+            type="primary"
+            icon="el-icon-document-copy"
+            @click="handleBulkForward"
+          >
+            {{ $t("trials:dicomForward:action:forward") }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -69,14 +93,19 @@
       <el-table
         ref="forwardList"
         v-loading="loading"
-        v-adaptive="{bottomOffset:60}"
+        v-adaptive="{ bottomOffset: 60 }"
         :data="list"
         stripe
         height="100"
         @sort-change="handleSortByColumn"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" align="left" width="45" :selectable="handleSelectTable" />
+        <el-table-column
+          type="selection"
+          align="left"
+          width="45"
+          :selectable="handleSelectTable"
+        />
         <!-- 中心编号 -->
         <el-table-column
           prop="TrialSiteCode"
@@ -110,10 +139,20 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.ForwardState*1 === 0">--</span>
-            <el-tag v-else-if="scope.row.ForwardState*1 === 14" type="warning">{{ $fd('ForwardStateEnum', scope.row.ForwardState*1) }}</el-tag>
-            <el-tag v-else-if="scope.row.ForwardState*1 === 15">{{ $fd('ForwardStateEnum', scope.row.ForwardState*1) }}</el-tag>
-            <el-tag v-else-if="scope.row.ForwardState*1 === 16" type="danger">{{ $fd('ForwardStateEnum', scope.row.ForwardState*1) }}</el-tag>
+            <span v-if="scope.row.ForwardState * 1 === 0">--</span>
+            <el-tag
+              v-else-if="scope.row.ForwardState * 1 === 14"
+              type="warning"
+              >{{ $fd("ForwardStateEnum", scope.row.ForwardState * 1) }}</el-tag
+            >
+            <el-tag v-else-if="scope.row.ForwardState * 1 === 15">{{
+              $fd("ForwardStateEnum", scope.row.ForwardState * 1)
+            }}</el-tag>
+            <el-tag
+              v-else-if="scope.row.ForwardState * 1 === 16"
+              type="danger"
+              >{{ $fd("ForwardStateEnum", scope.row.ForwardState * 1) }}</el-tag
+            >
           </template>
         </el-table-column>
         <!-- 转发人 -->
@@ -148,32 +187,42 @@
               :disabled="scope.row.ForwardState === 15"
               @click="handleForward(scope.row)"
             />
-
           </template>
         </el-table-column>
       </el-table>
 
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
     </template>
   </BaseContainer>
 </template>
 <script>
-import { getTrialSiteSelect, getTrialVisitStageSelect, getForwardList, forwardSVDicomImage } from '@/api/trials'
-import BaseContainer from '@/components/BaseContainer'
-import Pagination from '@/components/Pagination'
+import {
+  getTrialSiteSelect,
+  getTrialVisitStageSelect,
+  getForwardList,
+  forwardSVDicomImage,
+} from "@/api/trials";
+import BaseContainer from "@/components/BaseContainer";
+import Pagination from "@/components/Pagination";
 const searchDataDefault = () => {
   return {
-    SiteId: '',
-    SubjectInfo: '',
+    SiteId: "",
+    SubjectInfo: "",
     VisitPlanArray: [],
     ForwardState: null,
     PageIndex: 1,
-    PageSize: 20
-  }
-}
+    PageSize: 20,
+  };
+};
 export default {
-  name: 'ForwardList',
+  name: "ForwardList",
   components: { BaseContainer, Pagination },
   data() {
     return {
@@ -181,109 +230,120 @@ export default {
       total: 0,
       list: [],
       loading: false,
-      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
-      userId: zzSessionStorage.getItem('userId'),
+      userTypeEnumInt: zzSessionStorage.getItem("userTypeEnumInt") * 1,
+      userId: zzSessionStorage.getItem("userId"),
       siteOptions: [],
       visitPlanOptions: [],
       trialId: this.$route.query.trialId,
-      selectArr: []
-    }
+      selectArr: [],
+    };
   },
   mounted() {
-    this.getList()
-    this.getSite()
-    this.getVisitPlanOptions()
+    this.getList();
+    this.getSite();
+    this.getVisitPlanOptions();
   },
   methods: {
     // 获取qc审核列表
     getList() {
-      this.loading = true
-      this.searchData.TrialId = this.trialId
-      getForwardList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { this.loading = false })
+      this.loading = true;
+      this.searchData.TrialId = this.trialId;
+      getForwardList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 单个转发
     handleForward(row) {
-      this.$confirm(this.$t('trials:dicomForward:message:sureToForward'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
+      this.$confirm(this.$t("trials:dicomForward:message:sureToForward"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.forward([row.Id])
-        }).catch(() => {})
+          this.forward([row.Id]);
+        })
+        .catch(() => {});
     },
 
     // 批量转发
     handleBulkForward() {
-      this.$confirm(this.$t('trials:dicomForward:message:sureToForward'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
+      this.$confirm(this.$t("trials:dicomForward:message:sureToForward"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.forward(this.selectArr)
-        }).catch(() => {})
+          this.forward(this.selectArr);
+        })
+        .catch(() => {});
     },
     // 影像转发
     forward(arr) {
-      this.loading = true
-      forwardSVDicomImage(this.trialId, arr).then(res => {
-        this.loading = false
-        this.$message.success(this.$t('trials:dicomForward:message:forwardSuccessfully'))
-        this.getList()
-      }).catch(() => { this.loading = false })
+      this.loading = true;
+      forwardSVDicomImage(this.trialId, arr)
+        .then((res) => {
+          this.loading = false;
+          this.$message.success(
+            this.$t("trials:dicomForward:message:forwardSuccessfully")
+          );
+          this.getList();
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 当选择项发生变化时会触发该事件
     handleSelectionChange(val) {
-      const arr = []
+      const arr = [];
       for (let index = 0; index < val.length; index++) {
-        arr.push(val[index].Id)
+        arr.push(val[index].Id);
       }
-      this.selectArr = arr
+      this.selectArr = arr;
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
+      this.searchData = searchDataDefault();
+      this.getList();
       this.$nextTick(() => {
-        this.$refs.forwardList.clearSort()
-      })
+        this.$refs.forwardList.clearSort();
+      });
     },
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1
-      this.getList()
+      this.searchData.PageIndex = 1;
+      this.getList();
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
+      this.searchData.SortField = column.prop;
+      this.searchData.PageIndex = 1;
+      this.getList();
     },
     // 通过提交状态决定该行的 CheckBox 是否可以勾选
     handleSelectTable(row) {
-      return row.ForwardState * 1 !== 15
+      return row.ForwardState * 1 !== 15;
     },
     // 获取site下拉框数据
     getSite() {
-      getTrialSiteSelect(this.trialId).then(res => {
-        this.siteOptions = res.Result
-      })
+      getTrialSiteSelect(this.trialId).then((res) => {
+        this.siteOptions = res.Result;
+      });
     },
     // 获取访视下拉框数据
     getVisitPlanOptions() {
-      getTrialVisitStageSelect(this.trialId)
-        .then((res) => {
-          this.visitPlanOptions = res.Result
-        })
-    }
-  }
-}
+      getTrialVisitStageSelect(this.trialId).then((res) => {
+        this.visitPlanOptions = res.Result;
+      });
+    },
+  },
+};
 </script>