diff --git a/src/api/system/nurseItem.js b/src/api/system/nurseItem.js
index 384f02e..49ad1da 100644
--- a/src/api/system/nurseItem.js
+++ b/src/api/system/nurseItem.js
@@ -59,4 +59,12 @@ export function delNurseItem(id) {
         url: '/system/stationItem/' + id,
         method: 'delete'
     })
-}
\ No newline at end of file
+}
+// 删除图片
+export function updatePicture(data) {
+    return request({
+        url: '/system/patientArchives/updatePicture',
+        method: 'post',
+        data: data
+    })
+}
diff --git a/src/views/system/OperateGoodsInfo/index.vue b/src/views/system/OperateGoodsInfo/index.vue
index 81399f1..1a90f4c 100644
--- a/src/views/system/OperateGoodsInfo/index.vue
+++ b/src/views/system/OperateGoodsInfo/index.vue
@@ -513,7 +513,7 @@
         :total="nursetotal"
         :page.sync="nurseStationqueryParams.pageNum"
         :limit.sync="nurseStationqueryParams.pageSize"
-        @pagination="handleQuery2"
+        @pagination="getList2"
       />
     </el-dialog>
     <!-- 查看商品详情 -->
diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue
index 091c381..e64b794 100644
--- a/src/views/system/person/index.vue
+++ b/src/views/system/person/index.vue
@@ -254,8 +254,8 @@
           <el-form-item
             label="所属科室"
             label-width="120px"
-            :rules="rules.nurseStationPersonList.departmentName"
-            :prop="`nurseStationPersonList.${index}.departmentName`"
+            :rules="rules.nurseStationPersonList.departmentCode"
+            :prop="`nurseStationPersonList.${index}.departmentCode`"
           >
             <el-button
               type=""
@@ -396,7 +396,7 @@
     >
       <el-form
         ref="queryForm"
-        :model="nurseStationqueryParams"
+        :model="StationqueryParams"
         :rules="rules"
         label-width="80px"
         :inline="true"
@@ -407,7 +407,7 @@
           label-width="120"
         >
           <el-input
-            v-model="nurseStationqueryParams.nurseStationCode"
+            v-model="StationqueryParams.nurseStationCode"
             placeholder="请输入护理站编码"
             clearable
           />
@@ -418,7 +418,7 @@
           label-width="120"
         >
           <el-input
-            v-model="nurseStationqueryParams.nurseStationName"
+            v-model="StationqueryParams.nurseStationName"
             placeholder="请输入护理站名称"
             clearable
           />
@@ -481,9 +481,9 @@
       <pagination
         v-show="nursetotal > 0"
         :total="nursetotal"
-        :page.sync="nurseStationqueryParams.pageNum"
-        :limit.sync="nurseStationqueryParams.pageSize"
-        @pagination="handleQuery2"
+        :page.sync="StationqueryParams.pageNum"
+        :limit.sync="StationqueryParams.pageSize"
+        @pagination="getList2"
       />
     </el-dialog>
     <!-- 修改护理站名称弹框 -->
@@ -496,7 +496,7 @@
     >
       <el-form
         ref="queryForm"
-       :model="nurseStationqueryParams"
+       :model="StationqueryParams"
         :rules="rules"
         label-width="80px"
         :inline="true"
@@ -507,7 +507,7 @@
           label-width="120"
         >
           <el-input
-            v-model="nurseStationqueryParams.nurseStationCode"
+            v-model="StationqueryParams.nurseStationCode"
             placeholder="请输入护理站编码"
             clearable
           />
@@ -518,7 +518,7 @@
           label-width="120"
         >
           <el-input
-            v-model="nurseStationqueryParams.nurseStationName"
+            v-model="StationqueryParams.nurseStationName"
             placeholder="请输入护理站名称"
             clearable
           />
@@ -574,9 +574,9 @@
       <pagination
         v-show="nursetotal > 0"
         :total="nursetotal"
-        :page.sync="nurseStationqueryParams.pageNum"
-        :limit.sync="nurseStationqueryParams.pageSize"
-        @pagination="handleQuery2"
+        :page.sync="StationqueryParams.pageNum"
+        :limit.sync="StationqueryParams.pageSize"
+        @pagination="getList2"
       />
     </el-dialog>
     <!-- 所属科室弹框 -->
@@ -669,7 +669,7 @@
         :total="departtotal"
         :page.sync="queryParams3.pageNum"
         :limit.sync="queryParams3.pageSize"
-        @pagination="handleQuery3"
+        @pagination="getList3"
       />
     </el-dialog>
     <!-- 修改所属科室弹框 -->
@@ -764,7 +764,7 @@
         :total="departtotal"
         :page.sync="queryParams3.pageNum"
         :limit.sync="queryParams3.pageSize"
-        @pagination="handleQuery3"
+        @pagination="getList3"
       />
     </el-dialog>
     <!-- 修改 -->
@@ -1076,12 +1076,19 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
+      StationqueryParams:{
+         pageNum: 1,
+        pageSize: 10,
+      },
 
       // 表单参数
       form: {},
       index: "",
       // 表单校验
       rules: {
+          nurseStationId: [
+            { required: true, message: "请选择所属护理站", trigger: "blur" },
+          ],
         departmentName: [
           { required: true, message: "所属科室不能为空", trigger: "blur" },
         ],
@@ -1112,7 +1119,7 @@ export default {
               trigger: "blur",
             },
           ],
-          departmentName: [
+          departmentCode: [
             { required: true, message: "所属科室不能为空", trigger: "blur" },
           ],
           nurseStationId: [
@@ -1142,13 +1149,12 @@ export default {
   },
   created() {
     this.getList();
-    // this.getList2();
-    // this.nurselist();
     this.info();
   },
   methods: {
     // // 新增所属科室按钮
     departclick(item, index) {
+      this.getList3();
       console.log(item);
       this.departid = item.departmentCode;
       this.innerVisible2 = true;
@@ -1156,17 +1162,19 @@ export default {
     },
     // // 修改所属科室按钮
     departclick2() {
-      StationDepartmentList(this.queryParams3).then((res) => {
-        this.StationDepartmentLists = res.rows;
-        this.departtotal = res.total;
-        this.loading = false;
-      });
+      this.getList3();
+      // StationDepartmentList(this.queryParams3).then((res) => {
+      //   this.StationDepartmentLists = res.rows;
+      //   this.departtotal = res.total;
+      //   this.loading = false;
+      // });
       this.departid2 = this.form.departmentCode;
       this.innerVisiblexg2 = true;
       // this.index = index;
     },
     // 新增护理站按钮
     clickinnerVisible(item, index) {
+      this.getList2();
       this.stationid = item.nurseStationId;
       this.innerVisible = true;
       this.index = index;
@@ -1257,13 +1265,16 @@ export default {
       });
     },
     getList2() {
-      // 护理站名称
       this.loading = true;
-        getListByUser(this.nurseStationqueryParams).then((res) => {
+        getListByUser(this.StationqueryParams).then((res) => {
         this.nursetotal = res.total;
         this.nurseStationlist = res.rows;
+         this.loading = false;
       });
-      StationDepartmentList(this.queryParams3).then((res) => {
+    },
+    getList3(){
+       this.loading = true;
+        StationDepartmentList(this.queryParams3).then((res) => {
         this.StationDepartmentLists = res.rows;
         this.departtotal = res.total;
         this.loading = false;
@@ -1321,8 +1332,7 @@ export default {
     },
     handleQuery3() {
       this.queryParams3.pageNum = 1;
-      this.getList2()
-      // this.getList();
+      this.getList3()
     },
     handleQuery() {
       this.queryParams.pageNum = 1;
diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue
index 30b8e68..89ee433 100644
--- a/src/views/system/stationItem/index.vue
+++ b/src/views/system/stationItem/index.vue
@@ -291,22 +291,6 @@
             maxlength="50"
           />
         </el-form-item>
-        <!-- <el-form-item label="护理类型" prop="nurseTypeId">
-          <el-select
-            v-model="form.nurseTypeId"
-            clearable
-            placeholder="请选择护理类型"
-            style="width: 208px"
-          >
-            <el-option
-              v-for="item in typelist"
-              :key="item.id"
-              :label="item.nurseTypeName"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item
           label="提前预约时长"
           prop="nurseStationItem.advanceAppointDuration"
@@ -491,14 +475,13 @@
         label-width="110px"
         :inline="true"
       >
-       
         <el-form-item label="护理站编码" prop="nurseStationCode">
           <el-input
             v-model="getListByUserquery.nurseStationCode"
             placeholder="请输入护理站编码"
           />
         </el-form-item>
-         <el-form-item label="护理站名称" prop="nurseStationName">
+        <el-form-item label="护理站名称" prop="nurseStationName">
           <el-input
             v-model="getListByUserquery.nurseStationName"
             placeholder="请输入护理站名称"
@@ -734,6 +717,7 @@ import {
   updateNurseItem,
   getInfoList,
   liststation,
+  updatePicture,
 } from "@/api/system/nurseItem";
 import { getToken } from "@/utils/auth";
 import { getListByUser } from "@/api/system/userlist.js";
@@ -744,6 +728,7 @@ export default {
   data() {
     return {
       imageUrl: "",
+      img1:"",
       // 用户导入参数
       upload: {
         // 是否显示弹出层（用户导入）
@@ -791,6 +776,11 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
+      pictureList: {
+        pictureUrlList: [
+
+        ],
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -889,8 +879,8 @@ export default {
       this.$refs.upload.clearFiles();
       this.$alert(
         "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-          response.msg +
-          "</div>",
+        response.msg +
+        "</div>",
         "导入结果",
         { dangerouslyUseHTMLString: true }
       );
@@ -1018,7 +1008,15 @@ export default {
     },
     // 取消按钮
     cancel() {
-      // this.$refs["form"].clearValidate();
+      console.log(this.form.nurseStationItem);
+      var obj = { pictureUrlList: [] };
+      if (this.img1 != this.form.nurseStationItem.itemPictureUrl) {
+        obj.pictureUrlList.push(this.form.nurseStationItem.itemPictureUrl);
+      }
+      updatePicture(obj).then((res) => {
+        console.log(res);
+      });
+
       this.open = false;
       this.reset();
     },
@@ -1203,7 +1201,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导入按钮操作 */
     handleExport() {