diff --git a/src/components/FormComponents/CustomForm/index.vue b/src/components/FormComponents/CustomForm/index.vue
index 6c707c2d6646b14ae54fd2b98985093acc101169..95ae8e536fc34aaededeed606a1d5ec38ef2e618 100644
--- a/src/components/FormComponents/CustomForm/index.vue
+++ b/src/components/FormComponents/CustomForm/index.vue
@@ -154,7 +154,7 @@ export default {
         }
         return vwForm
       },
-      formId: "",
+      // formId: "",
     }
   },
   data() {
diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue
index 621a4d16b430889b9b8cc81ddbcf72313fc689cb..bfa9cd37279b60848e95d032012b2af35d7ef6e9 100644
--- a/src/components/Upload/index.vue
+++ b/src/components/Upload/index.vue
@@ -1,9 +1,9 @@
 <template>
   <el-row class="el-upload-self">
     <el-upload
+      ref="upload"
       :multiple="multiple"
       class="avatar-uploader"
-      ref="upload"
       :action="action"
       :headers="headers"
       :list-type="listType"
@@ -20,6 +20,7 @@
       :drag="drag"
       :disabled="disabled"
     >
+      <!-- :http-request="handleUpload" -->
       <template v-if="drag">
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
@@ -37,10 +38,10 @@
     </el-upload>
 
     <el-image
+      ref="image"
       style="display: none"
       :src="imgUrl"
       :preview-src-list="previewList"
-      ref="image"
     >
     </el-image>
   </el-row>
@@ -50,7 +51,7 @@
 import { getAccessToken } from "@/utils/accessToken"
 import { delFile } from "@/api/file"
 export default {
-  name: "el-upload-self",
+  name: "ElUploadSelf",
   props: {
     accept: { type: String, default: "image/*" },
     disabled: {
@@ -97,20 +98,6 @@ export default {
       fileList: [],
     }
   },
-  watch: {
-    value: {
-      handler(newValue, oldValue) {
-        if (newValue === oldValue) return
-        this.fileList = newValue.map((_) => {
-          return {
-            name: _.file_name,
-            url: `https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucketName}/${_.uuidName}`,
-          }
-        })
-      },
-      immediate: true,
-    },
-  },
   computed: {
     headers() {
       return {
@@ -118,7 +105,10 @@ export default {
       }
     },
     action() {
-      return this.httpPrefix + `/cloud-upms/file/upload`
+      return (
+        this.httpPrefix +
+        `/disease-data/file/upload?formId=${this.uploadQuery.formId}&patientId=${this.uploadQuery.patientId}&prefix=${this.uploadQuery.prefix}`
+      )
     },
     // 预览list
     previewList() {
@@ -131,7 +121,35 @@ export default {
       })
     },
   },
+  watch: {
+    value: {
+      handler(newValue, oldValue) {
+        console.log(this.value)
+        if (newValue === oldValue) return
+        this.fileList = newValue.map((_) => {
+          return {
+            name: _.file_name,
+            url: `https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucketName}/${_.uuidName}`,
+          }
+        })
+      },
+      immediate: true,
+    },
+  },
   methods: {
+    // 自定义上传方法
+    // handleUpload(param) {
+    //   let formData = new FormData()
+    //   fd.append("file", param.file) //传文件
+    //   fd.append("formld", this.formld) //传formld
+    //   // ajax.axiosPost(
+    //   //   url, //接口地址
+    //   //   fd, //formdata对象参数
+    //   //   (res) => {
+    //   //     console.log(res)
+    //   //   }
+    //   // )
+    // },
     // 上传前回调
     beforeUpload(file) {
       return new Promise((resolve, reject) => {
@@ -162,13 +180,19 @@ export default {
 
     // 移除提醒
     beforeRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${file.file_name || file.name}？`)
+      // console.log(file, fileList)
+      return this.$confirm(
+        `确定移除 ${file.file_name || file.name || "该照片"}？`
+      )
     },
 
     // 移除
     handleRemove({ url }, fileList) {
-      const i = this.value.findIndex((_) => url.endsWith(_.uuid_name))
-      if (i > -1) this.value.splice(i, 1) // 静态移除
+      let arr = url.split("/")
+      let uuidName = arr[arr.length - 1]
+      const i = this.value.findIndex((_) => uuidName == _.uuidName)
+      if (i > -1) this.value.splice(i, 1)
+      console.log("删了", this.value)
     },
 
     // 查看
diff --git a/src/views/screening/components/ConfigForms.vue b/src/views/screening/components/ConfigForms.vue
index 075168dea6a61a3b81ca15ef95a3fbbd2fe1b5c6..72c1524880e1fe627d4dad853dc330be021bdc62 100644
--- a/src/views/screening/components/ConfigForms.vue
+++ b/src/views/screening/components/ConfigForms.vue
@@ -157,20 +157,23 @@ export default {
       if (val == "index1") {
         // 第二步问卷调查
         this.$nextTick(() => {
-          let { birthday } = JSON.parse(sessionStorage.getItem("index1Data"))
-          let date = new Date(String(birthday).replace(/-/g, "/"))
-          let d = new Date()
-          let age =
-            d.getFullYear() -
-            date.getFullYear() -
-            (d.getMonth() < date.getMonth() ||
-            (d.getMonth() == date.getMonth() && d.getDate() < date.getDate())
-              ? 1
-              : 0)
-          //!
-          this.formInitial = {
-            birthday,
-            age,
+          let index1Data = sessionStorage.getItem("index1Data")
+          if (index1Data) {
+            let { birthday } = JSON.parse(index1Data)
+            let date = new Date(String(birthday).replace(/-/g, "/"))
+            let d = new Date()
+            let age =
+              d.getFullYear() -
+              date.getFullYear() -
+              (d.getMonth() < date.getMonth() ||
+              (d.getMonth() == date.getMonth() && d.getDate() < date.getDate())
+                ? 1
+                : 0)
+            //!
+            this.formInitial = {
+              birthday,
+              age,
+            }
           }
         })
       } else {