diff --git a/.env.production b/.env.production
index b4a32b32..fe6051c9 100644
--- a/.env.production
+++ b/.env.production
@@ -41,12 +41,12 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/'
 
 # 三明大田医院
-# VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/'
 
 
 # VUE_APP_BASE_API = 'http://192.168.0.207:9150/UDI_WMS_MC/'
 
-VUE_APP_BASE_API = 'http://192.168.0.191:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.0.191:9150/UDI_WMS_MC/'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'
diff --git a/src/api/basic/sicker/skPersonApi.js b/src/api/basic/sicker/skPersonApi.js
index 61933626..6a34a88c 100644
--- a/src/api/basic/sicker/skPersonApi.js
+++ b/src/api/basic/sicker/skPersonApi.js
@@ -47,7 +47,6 @@ export function skPrescribeCheck(query) {
 }
 
 
-
 /**
  * 下载并查询处方信息
  */
@@ -60,6 +59,24 @@ export function dlOrFilter(query) {
   });
 }
 
+/**
+ * 在线实时获取患者信息
+ * @param query
+ * @returns {AxiosPromise}
+ */
+export function dlSickerOnline(query) {
+  return axios({
+    url: "/udiwms/basic/sk/sicker/filter/onLine",
+    method: "get",
+    params: query
+  });
+}
+
+
+
+
+
+
 
 
 
diff --git a/src/views/basic/sicker/skPerson.js b/src/views/basic/sicker/skPerson.js
index 082faf50..3c08af3b 100644
--- a/src/views/basic/sicker/skPerson.js
+++ b/src/views/basic/sicker/skPerson.js
@@ -2,6 +2,7 @@ import {downloadSick, page} from "@/api/basic/sicker/skPersonApi";
 import {detail, downloadPrescribe, page as prescribePage} from "@/api/basic/sicker/prescribeApi";
 
 import skPrescribeDi from "./skPrescribeDi.vue";
+import skPersonDownload from "./skPersonDownload.vue";
 
 let query = {
   name: "",
@@ -36,6 +37,7 @@ export default {
       showSickerDialog: false,
       sicker: null,
       sickDiDialog: false,
+      sickDlDialog: false,
 
       // =============患者end================
       // ============处方=============
@@ -56,7 +58,7 @@ export default {
     this.getList()
   },
   components: {
-    skPrescribeDi
+    skPrescribeDi, skPersonDownload
 
   },
   methods: {
@@ -130,23 +132,29 @@ export default {
       })
     },
     onDownload() {
-      this.dlSickLoading = true;
-      downloadSick({thidSys: "thirdId"}).then(res => {
-        this.dlSickLoading = false
-        if (res.code != 20000) {
-          this.$message.error(res.message)
-          return
-        }
-      }).catch(() => {
-        this.dlSickLoading = false
-        this.$message.error("数据加载失败")
-      })
+
+      this.sickDlDialog = true;
+
+
+      // this.dlSickLoading = true;
+      // downloadSick({thidSys: "thirdId"}).then(res => {
+      //   this.dlSickLoading = false
+      //   if (res.code != 20000) {
+      //     this.$message.error(res.message)
+      //     return
+      //   } else {
+      //     this.$message.success("后台正在下载更新，请稍后刷新重试！");
+      //   }
+      // }).catch(() => {
+      //   this.dlSickLoading = false
+      //   this.$message.error("数据加载失败")
+      // })
     },
 
 
     updatePrecribe() {
       this.updatePrecribeLoading = true;
-      downloadPrescribe({sickCode: this.sickerInfo.code,adNum:this.sickerInfo.adNum}).then(res => {
+      downloadPrescribe({sickCode: this.sickerInfo.code, adNum: this.sickerInfo.adNum}).then(res => {
         this.updatePrecribeLoading = false
         if (res.code != 20000) {
           this.$message.error(res.message)
diff --git a/src/views/basic/sicker/skPerson.vue b/src/views/basic/sicker/skPerson.vue
index c9b6c683..a651b60c 100644
--- a/src/views/basic/sicker/skPerson.vue
+++ b/src/views/basic/sicker/skPerson.vue
@@ -190,6 +190,17 @@
       ></skPrescribeDi>
     </el-dialog>
 
+    <el-dialog
+      title="患者信息下载"
+      :visible.sync="sickDlDialog"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="sickDlDialog"
+    >
+      <skPersonDownload
+      ></skPersonDownload>
+    </el-dialog>
 
   </div>
 </template>
diff --git a/src/views/basic/sicker/skPersonDownload.vue b/src/views/basic/sicker/skPersonDownload.vue
new file mode 100644
index 00000000..857f3e7b
--- /dev/null
+++ b/src/views/basic/sicker/skPersonDownload.vue
@@ -0,0 +1,186 @@
+<template>
+  <div>
+    <el-card class="el-card">
+
+      <el-form :model="filterQuery" label-width="auto" v-if="showSearch" size="mini">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="患者编号:" class="query-form-item">
+              <el-input v-model="filterQuery.code" placeholder="请输入患者编号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="患者姓名:" class="query-form-item">
+              <el-input v-model="filterQuery.name" placeholder="请输入患者姓名"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="住院号:" class="query-form-item">
+              <el-input v-model="filterQuery.adNum" placeholder="请输入住院号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="外部系统:">
+              <el-select v-model="filterQuery.thirdSys" style="width: 90%" placeholder="请选择第三方系统">
+                <el-option
+                  v-for="item in thirdSys"
+                  :key="item.value"
+                  :label="item.thirdName"
+                  :value="item.thirdId">
+                  <span style="float: left">{{ item.thirdName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <el-button-group class="top-right-btn">
+        <el-button type="primary" icon="el-icon-refresh" @click="showSearch = !showSearch">显示/隐藏搜索栏</el-button>
+        <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+        <el-button type="primary" icon="el-icon-download" @click="downloadErp">选中下载</el-button>
+        <el-button type="primary" icon="el-icon-download" @click="downloadAllErp">结果全部下载
+        </el-button>
+
+      </el-button-group>
+      <el-divider></el-divider>
+
+
+      <el-table v-loading="loading" :data="list"
+                @selection-change="handleSelectionChange"
+                border highlight-current-row
+                style="width: 100%">
+        <el-table-column label="序号" type="index" width="80"></el-table-column>
+        <el-table-column label="患者编号" prop="code" width="160"></el-table-column>
+        <el-table-column label="患者姓名" prop="name" width="160"></el-table-column>
+        <el-table-column label="性别" prop="createByName" width="160"></el-table-column>
+        <el-table-column label="住院号" prop="adNum" width="160"></el-table-column>
+        <el-table-column label="职业" prop="gender" width="160"></el-table-column>
+        <el-table-column label="最后更新时间" prop="createTime" width="180"></el-table-column>
+      </el-table>
+
+    </el-card>
+  </div>
+</template>
+
+<script>
+
+import {dlSickerOnline, downloadSick} from "@/api/basic/sicker/skPersonApi";
+import {getBasicThirdSys} from "@/api/thrsys/basicThirdSys";
+
+let query = {
+  name: "",
+  code: "",
+  adNum: "",
+  thirdSys: "thirdId",
+  selectSickers: [],
+  page: 1,
+  limit: 10
+}
+export default {
+  name: "skPersonDownload",
+  props: {
+    selectType: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      filterQuery: {...query},
+      showSearch: true,
+      multipleSelection: [],
+      loading: false,
+      list: [],
+      thirdSys: [],
+    }
+
+  },
+  methods: {
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+
+    onReset() {
+      this.filterQuery = {...query}
+      this.getList()
+    },
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList()
+    },
+
+    getList() {
+      this.loading = true;
+      dlSickerOnline(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+
+
+    downloadErp() {
+      if (this.multipleSelection == null || this.multipleSelection.length < 1) {
+        this.$message.warning("请选择需要下载患者信息！");
+        return
+      }
+      let selectData = this.multipleSelection;
+      selectData.forEach((obj) => {
+        this.filterQuery.selectSickers.push(obj);
+      });
+      this.downloadAllErp();
+    },
+
+    downloadAllErp() {
+      this.dlSickLoading = true;
+      downloadSick({thidSys: "thirdId"}).then(res => {
+        this.dlSickLoading = false
+        if (res.code != 20000) {
+          this.$message.error(res.message)
+          return
+        } else {
+          this.$message.success("后台正在下载更新，请稍后刷新重试！");
+        }
+      }).catch(() => {
+        this.dlSickLoading = false
+        this.$message.error("数据加载失败")
+      })
+    },
+
+
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
+  },
+  created() {
+    this.getBasicThirdSys();
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dev/deviceInfo.vue b/src/views/dev/deviceInfo.vue
index 9fab712c..14a57fea 100644
--- a/src/views/dev/deviceInfo.vue
+++ b/src/views/dev/deviceInfo.vue
@@ -115,34 +115,34 @@
       </el-form>
       <el-table :data="detailList" v-loading="detailLoading">
         <el-table-column label="序号" width="50" type="index"/>
-        <el-table-column label="科室" width="150" prop="deptName"/>
+        <el-table-column label="科室" width="120" prop="deptName"/>
         <el-table-column label="设备编码" width="150" prop="deviceCode"/>
         <el-table-column label="最小销售标识" width="150" prop="nameCode"/>
         <el-table-column label="名称" width="150" prop="productName"/>
         <el-table-column label="规格型号" width="160" prop="ggxh"/>
-        <el-table-column label="状态" width="120" prop="statusName">
+        <el-table-column label="状态" width="80" prop="statusName">
           <template scope="scope">
             <el-tag :type="deviceStatus[scope.row.status].tagType">{{ scope.row.statusName }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="巡检锁定" width="120">
+        <el-table-column label="巡检锁定" width="80">
           <template scope="scope">
             <el-tag :type="scope.row.checkLock?'primark':'info'">{{ scope.row.checkLock ? '是' : '否' }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="变更次数" width="100" prop="changeCount"/>
-        <el-table-column label="维修次数" width="100" prop="repairCount"/>
-        <el-table-column label="巡检次数" width="100" prop="checkCount"/>
-        <el-table-column label="计量单位" width="100" prop="measname"/>
+        <el-table-column label="变更次数" width="80" prop="changeCount"/>
+        <el-table-column label="维修次数" width="80" prop="repairCount"/>
+        <el-table-column label="巡检次数" width="80" prop="checkCount"/>
+        <el-table-column label="计量单位" width="80" prop="measname"/>
         <el-table-column label="生产企业" width="180" prop="manufactory"/>
         <el-table-column label="批次号" width="100" prop="batchNo"/>
         <el-table-column label="序列号" width="100" prop="serialNo"/>
-        <el-table-column label="生产日期" width="140" prop="productionDate"/>
-        <el-table-column label="过期时间" width="140" prop="expireDate"/>
-        <el-table-column label="供应商" width="100" prop="supName"/>
+        <el-table-column label="生产日期" width="120" prop="productionDate"/>
+        <el-table-column label="过期时间" width="120" prop="expireDate"/>
+        <el-table-column label="供应商" width="160" prop="supName"/>
         <el-table-column label="udi码" width="150" prop="udi"/>
         <el-table-column label="注册/备案号" width="150" prop="zczbhhzbapzbh"/>
-        <el-table-column label="操作" :width="180" fixed="right">
+        <el-table-column label="操作" :width="200" fixed="right">
           <template scope="scope">
             <el-button type="text" class="mr5" @click="getDeviceLogs(scope.row)"
             >变更日志