diff --git a/src/api/manage/blacklist.js b/src/api/manage/blacklist.js
new file mode 100644
index 0000000..799dc22
--- /dev/null
+++ b/src/api/manage/blacklist.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询患者-黑明单关系列表
+export function listBlacklist(query) {
+    return request({
+        url: '/manage/blacklist/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询患者-黑明单关系详细
+export function getBlacklist(id) {
+    return request({
+        url: '/manage/blacklist/' + id,
+        method: 'get'
+    })
+}
+
+// 新增患者-黑明单关系
+export function addBlacklist(data) {
+    return request({
+        url: '/manage/blacklist',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改患者-黑明单关系
+export function updateBlacklist(data) {
+    return request({
+        url: '/manage/blacklist',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除患者-黑明单关系
+export function delBlacklist(id) {
+    return request({
+        url: '/manage/blacklist/' + id,
+        method: 'delete'
+    })
+}
diff --git a/src/api/manage/healthEducation.js b/src/api/manage/healthEducation.js
new file mode 100644
index 0000000..afc5a67
--- /dev/null
+++ b/src/api/manage/healthEducation.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+
+// 查询患者宣教信息列表
+export function getList(query) {
+    return request({
+        url: '/manage/patientPropaganda/getList',
+        method: 'get',
+        params: query
+    })
+}
diff --git a/src/views/manage/blacklist/index.vue b/src/views/manage/blacklist/index.vue
new file mode 100644
index 0000000..514572a
--- /dev/null
+++ b/src/views/manage/blacklist/index.vue
@@ -0,0 +1,270 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
+      <el-form-item label="姓名" prop="patientName">
+        <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="电话" prop="patientPhone">
+        <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="医院" prop="hospitalAgencyName">
+        <el-input v-model="queryParams.hospitalAgencyName" placeholder="请输入医院" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="科室" prop="departmentName">
+        <el-input v-model="queryParams.departmentName" placeholder="请输入科室" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="异常原因" prop="abnormalCauseValue">
+        <el-input v-model="queryParams.abnormalCauseValue" placeholder="请输入异常原因" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <!-- (CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑,MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接) -->
+      <el-form-item label="来源" prop="blacklistSource">
+        <el-select v-model="queryParams.blacklistSource" placeholder="请选择来源" clearable>
+          <el-option v-for="dict in dict.type.blacklist_source" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['manage:blacklist:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['manage:blacklist:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['manage:blacklist:remove']">删除</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['manage:blacklist:export']">导出</el-button>
+      </el-col> -->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <el-table v-loading="loading" :data="blacklistList" @selection-change="handleSelectionChange">
+      <el-table-column label="序号" type="index" width="55" align="center" />
+      <el-table-column label="姓名" align="center" prop="patientName" />
+      <el-table-column label="电话" align="center" prop="patientPhone" width='120' />
+      <el-table-column label="医院" align="center" prop="hospitalAgencyName" width='130' />
+      <el-table-column label="科室名称" align="center" prop="departmentName" width='130' />
+      <el-table-column label="异常原因" align="center" prop="abnormalCauseValue" />
+      <el-table-column label="来源" align="center" prop="blacklistSource">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.blacklist_source" :value="scope.row.blacklistSource" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+            v-hasPermi="['manage:blacklist:edit']">修改</el-button>
+          <el-button size="mini" type="text" @click="handleDelete(scope.row)"
+            v-hasPermi="['manage:blacklist:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改患者-黑明单关系对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="姓名" prop="patientName">
+          <el-input v-model="form.patientName" placeholder="请输入姓名" />
+        </el-form-item>
+        <el-form-item label="身份证" prop="cardNo">
+          <el-input v-model="form.cardNo" placeholder="请输入身份证" />
+        </el-form-item>
+        <el-form-item label="电话" prop="patientPhone">
+          <el-input v-model="form.patientPhone" placeholder="请输入电话" />
+        </el-form-item>
+        <el-form-item label="医院名称" prop="hospitalAgencyName">
+          <el-input v-model="form.hospitalAgencyName" placeholder="请输入医院名称" />
+        </el-form-item>
+        <el-form-item label="科室名称" prop="departmentName">
+          <el-input v-model="form.departmentName" placeholder="请输入科室名称" />
+        </el-form-item>
+        <el-form-item label="异常原因" prop="abnormalCauseValue">
+          <el-input v-model="form.abnormalCauseValue" placeholder="请输入异常原因" />
+        </el-form-item>
+        <el-form-item label="补充说明" prop="supplementIllustrateValue">
+          <el-input v-model="form.supplementIllustrateValue" placeholder="请输入补充说明" />
+        </el-form-item>
+        <el-form-item label="功能限制" prop="functionLimitation">
+          <el-input v-model="form.functionLimitation" placeholder="请输入功能限制" />
+        </el-form-item>
+        <!-- <el-form-item label="来源" prop="blacklistSource">
+          <el-select v-model="form.blacklistSource" placeholder="请选择来源">
+            <el-option v-for="dict in dict.type.blacklist_source" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listBlacklist, getBlacklist, delBlacklist, addBlacklist, updateBlacklist } from "@/api/manage/blacklist";
+
+export default {
+  name: "Blacklist",
+  dicts: ['blacklist_source'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 患者-黑明单关系表格数据
+      blacklistList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        abnormalCauseId: null,
+        abnormalCauseValue: null,
+        blacklistSource: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询患者-黑明单关系列表 */
+    getList() {
+      this.loading = true;
+      listBlacklist(this.queryParams).then(response => {
+        this.blacklistList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        patientName: null,
+        abnormalCauseId: null,
+        abnormalCauseValue: null,
+        supplementIllustrateId: null,
+        supplementIllustrateValue: null,
+        functionLimitation: null,
+        blacklistSource: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加黑名单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getBlacklist(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改黑名单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateBlacklist(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBlacklist(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除？').then(function () {
+        return delBlacklist(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('manage/blacklist/export', {
+        ...this.queryParams
+      }, `blacklist_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/manage/components/healthEducation.vue b/src/views/manage/components/healthEducation.vue
index d5decf4..4994a19 100644
--- a/src/views/manage/components/healthEducation.vue
+++ b/src/views/manage/components/healthEducation.vue
@@ -4,7 +4,7 @@
             <div class="item" v-for="(item, index) in categorylist" :key="item.id" @click="clickcategory(item, index)"
                 :class="index == categoryindex ? 'selectitem' : ''">
                 <div class="name">
-                    {{ item.title }}
+                    {{ item.propagandaTitle }}
                 </div>
             </div>
         </div>
@@ -41,6 +41,9 @@
     </div>
 </template>
 <script>
+import {
+    getList
+} from '@/api/manage/healthEducation'
 export default {
     name: "visitRecords",
     data() {
@@ -60,23 +63,29 @@ export default {
             //左侧选中的item
             categoryItem: {},
             //左侧list
-            categorylist: [{
-                id: 1,
-                title: '冠状动脉粥样硬化性心脏病',
-            }, {
-                id: 2,
-                title: '冠状动脉粥样硬化性心脏病冠状动脉粥样硬化性心脏病',
-            }]
+            categorylist: [],
+            query: {
+                patientId: ''
+            }
         };
     },
-    created() {
-        this.categoryItem = this.categorylist[0]
+    mounted() {
+        this.info();
     },
     methods: {
         clickcategory(item, index) {
             this.categoryindex = index
             this.categoryItem = item
-        }
+        },
+        info() {
+            this.query.patientId = this.$route.query.patientId
+            getList(this.query).then(res => {
+                if (res.data.length > 0) {
+                    this.categorylist = res.data
+                    this.categoryItem = this.categorylist[0]
+                }
+            })
+        },
     }
 };
 </script>
diff --git a/src/views/manage/components/visitRecords.vue b/src/views/manage/components/visitRecords.vue
index 11d3915..3735e3e 100644
--- a/src/views/manage/components/visitRecords.vue
+++ b/src/views/manage/components/visitRecords.vue
@@ -30,21 +30,22 @@
             </div>
         </div>
         <div class="rightheader">
-            <div class="toptitle" v-if="categoryItem">
-                <div style="border-radius: 10px 0 0 10px"
-                    :class="categoryItem.visitType == 'BE_HOSPITALIZED' && recordindex == 0 ? 'zyclass' : categoryItem.visitType == 'OUTPATIENT_SERVICE' && recordindex == 0 ? 'mzclass' : ''"
+            <div class="toptitle" v-if="categoryItem && categoryItem.visitType == 'BE_HOSPITALIZED'">
+                <div style="border-radius: 10px 0 0 10px" :class="recordindex == 0 ? 'zyclass' : ''"
                     @click="clickrecord(0)">
                     入院记录
                 </div>
-                <div class="centerdiv"
-                    :class="categoryItem.visitType == 'BE_HOSPITALIZED' && recordindex == 1 ? 'zyclass' : categoryItem.visitType == 'OUTPATIENT_SERVICE' && recordindex == 1 ? 'mzclass' : ''"
-                    @click="clickrecord(1)">出院记录
+                <div class="centerdiv" :class="recordindex == 1 ? 'zyclass' : ''" @click="clickrecord(1)">出院记录
                 </div>
-                <div style="border-radius: 0 10px 10px 0"
-                    :class="categoryItem.visitType == 'BE_HOSPITALIZED' && recordindex == 2 ? 'zyclass' : categoryItem.visitType == 'OUTPATIENT_SERVICE' && recordindex == 2 ? 'mzclass' : ''"
+                <div style="border-radius: 0 10px 10px 0" :class="recordindex == 2 ? 'zyclass' : ''"
                     @click="clickrecord(2)">
                     手术记录</div>
             </div>
+            <div class="toptitle" v-if="categoryItem && categoryItem.visitType == 'OUTPATIENT_SERVICE'">
+                <div style="border-radius: 10px" :class="recordindex == 3 ? 'mzclass' : ''" @click="clickrecord(0)">
+                    门诊记录
+                </div>
+            </div>
             <div class="righttext" v-if="categoryItem">
                 <div v-if="recordindex == 0 && recordlist">
                     <p>婚姻史：{{ recordlist.maritalHistory }}</p>
@@ -72,6 +73,9 @@
                     <p>手术入路：{{ recordlist.operationApproach }}</p>
                     <p>手术方式：{{ recordlist.operationWay }}</p>
                 </div>
+                <div v-if="recordindex == 3">
+                    <p>{{ categoryItem.outpatientVisitInfo }}</p>
+                </div>
             </div>
         </div>
     </div>
@@ -135,14 +139,18 @@ export default {
                 this.OutRecordinfo();
             } else if (index == 2) {
                 this.OperationRecordinfo();
-            }
+            } 
         },
         //点击左侧item
         clickcategory(item, index) {
             this.categoryindex = index
             this.categoryItem = item
-            this.recordindex = 0
-            this.InRecordinfo();
+            if (item.visitType == 'BE_HOSPITALIZED') {
+                this.recordindex = 0
+                this.InRecordinfo();
+            } else if (item.visitType == 'OUTPATIENT_SERVICE') {
+                this.recordindex = 3
+            }
         },
         //左侧list
         getListinfo() {
@@ -171,6 +179,7 @@ export default {
                 this.recordlist = res.data
             })
         },
+        //门诊记录
         //info
         info() {
             var date = new Date();
diff --git a/src/views/manage/details/patientdetails.vue b/src/views/manage/details/patientdetails.vue
index d7bbcba..d6fa587 100644
--- a/src/views/manage/details/patientdetails.vue
+++ b/src/views/manage/details/patientdetails.vue
@@ -54,13 +54,13 @@
         </el-tab-pane>
         <el-tab-pane label="康复计划及记录" name="second">康复计划及记录</el-tab-pane>
         <el-tab-pane label="健康宣教" name="third">
-          <healthEducation></healthEducation>
+          <healthEducation v-if="activeName == 'third'"></healthEducation>
         </el-tab-pane>
         <el-tab-pane label="指标监测" name="fourth">
-          <indicatorMonitoring></indicatorMonitoring>
+          <indicatorMonitoring v-if="activeName == 'fourth'"></indicatorMonitoring>
         </el-tab-pane>
         <el-tab-pane label="签约记录" name="five">
-          <signingRecords></signingRecords>
+          <signingRecords v-if="activeName == 'five'"></signingRecords>
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -71,7 +71,7 @@
 import visitRecords from '../components/visitRecords.vue';
 import healthEducation from '../components/healthEducation.vue';
 import indicatorMonitoring from '../components/indicatorMonitoring.vue';
-import signingRecords from '../components/signingRecords.vue'
+import signingRecords from '../components/signingRecords.vue';
 export default {
   components: {
     //就诊记录
diff --git a/src/views/manage/patientInfo/index.vue b/src/views/manage/patientInfo/index.vue
index fbba5ca..3c0fa0e 100644
--- a/src/views/manage/patientInfo/index.vue
+++ b/src/views/manage/patientInfo/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
       <el-form-item label="患者姓名" prop="patientName">
         <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery"
           style="width:200px" />
@@ -9,22 +9,6 @@
         <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable @keyup.enter.native="handleQuery"
           style="width:200px" />
       </el-form-item>
-      <el-form-item label="就诊时间" prop="visitTimeStart">
-        <el-date-picker v-model="visitTime" type="daterange" range-separator="至" start-placeholder="开始日期"
-          style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="入院时间" prop="admissionDateStart">
-        <el-date-picker v-model="admissionDate" type="daterange" range-separator="至" start-placeholder="开始日期"
-          style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
-        </el-date-picker>
-      </el-form-item>
-      <!-- ，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL -->
-      <el-form-item label="就诊方式" prop="visitMethod">
-        <el-select v-model="queryParams.visitMethod" placeholder="请选择就诊方式" clearable style="width:200px">
-          <el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label" :value="dict.value" />
-        </el-select>
-      </el-form-item>
       <el-form-item label="诊断" prop="mainDiagnosis">
         <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width:200px"
           @keyup.enter.native="handleQuery" />
@@ -45,10 +29,10 @@
         <el-input v-model="queryParams.wardId" placeholder="请输入病区名称" clearable style="width:200px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="门诊号" prop="outpatientNumber">
+      <!-- <el-form-item label="门诊号" prop="outpatientNumber">
         <el-input v-model="queryParams.outpatientNumber" placeholder="请输入门诊号" clearable style="width:200px"
           @keyup.enter.native="handleQuery" />
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="出生日期" prop="birthDate">
         <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
           style="width:200px" placeholder="请选择出生日期">
@@ -74,36 +58,29 @@
           <el-option v-for="dict in dict.type.patient_source" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="出院方式" prop="dischargeMethod">
-        <el-input v-model="queryParams.dischargeMethod" placeholder="请输入出院方式" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
+      <el-form-item label="就诊方式" prop="visitMethod">
+        <el-select v-model="queryParams.visitMethod" placeholder="请选择就诊方式" clearable style="width:200px">
+          <el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
       </el-form-item>
+      <el-form-item label="就诊时间" prop="visitTimeStart">
+        <el-date-picker v-model="visitTime" type="daterange" range-separator="至" start-placeholder="开始日期"
+          style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="入院时间" prop="admissionDateStart">
+        <el-date-picker v-model="admissionDate" type="daterange" range-separator="至" start-placeholder="开始日期"
+          style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <!-- ，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <!-- <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['manage:patientInfo:add']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['manage:patientInfo:edit']">修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['manage:patientInfo:remove']">删除</el-button>
-      </el-col>
-     <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['manage:patientInfo:export']">导出</el-button>
-      </el-col> 
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>-->
-
-    <el-table v-loading="loading" :data="patientInfoList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="patientInfoList">
+      <el-table-column label="序号" type="index" width="55" align="center" />
       <el-table-column label="患者姓名" align="center" prop="patientName" />
       <el-table-column label="患者电话" align="center" prop="patientPhone" width='120' />
       <el-table-column label="性别" align="center" prop="sex">
@@ -112,9 +89,9 @@
           {{ scope.row.sex == 'FEMALE' ? '女' : '' }}
         </template>
       </el-table-column>
-      <el-table-column label="出生日期" align="center" prop="birthDate" width='130' />
       <el-table-column label="年龄" align="center" prop="age" />
-      <el-table-column label="签约状态" align="center" prop="signStatus">
+      <el-table-column label="出生日期" align="center" prop="birthDate" width='130' />
+      <!-- <el-table-column label="签约状态" align="center" prop="signStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sign_status" :value="scope.row.signStatus" />
         </template>
@@ -123,28 +100,29 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.signTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="开证医生" align="center" prop="certificateIssuingDoctor" />
-      <el-table-column label="诊断" align="center" prop="mainDiagnosis" />
+      </el-table-column> -->
+      <!-- <el-table-column label="开证医生" align="center" prop="certificateIssuingDoctor" /> -->
       <el-table-column label="就诊时间" align="center" prop="visitTime" width='130'>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.visitTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="就诊方式" align="center" prop="visitMethod">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.visit_method" :value="scope.row.visitMethod" />
-        </template>
-      </el-table-column>
-      <el-table-column label="入院时间" align="center" prop="admissionDate" width='130' />
-      <el-table-column label="医院名称" align="center" prop="hospitalAgencyName" width='130' />
-      <el-table-column label="院区名称" align="center" prop="campusAgencyName" width='130' />
+      <el-table-column label="诊断" align="center" prop="mainDiagnosis" />
+      <!-- <el-table-column label="入院时间" align="center" prop="admissionDate" width='130' /> -->
+      <el-table-column label="医院" align="center" prop="hospitalAgencyName" width='130' />
+      <el-table-column label="院区" align="center" prop="campusAgencyName" width='130' />
       <el-table-column label="科室名称" align="center" prop="departmentName" width='130' />
       <el-table-column label="病区名称" align="center" prop="wardName" width='130' />
       <el-table-column label="住院号" align="center" prop="admissionNumber" width='130' />
       <el-table-column label="门诊号" align="center" prop="outpatientNumber" width='130' />
       <el-table-column label="主治医生" align="center" prop="attendingPhysician" />
-      <el-table-column label="出院方式" align="center" prop="dischargeMethod" />
+      <el-table-column label="手术名称" align="center" prop="surgicalName" />
+      <el-table-column label="就诊方式" align="center" prop="visitMethod">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.visit_method" :value="scope.row.visitMethod" />
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="出院方式" align="center" prop="dischargeMethod" /> -->
       <el-table-column label="患者来源" align="center" prop="patientSource">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.patient_source" :value="scope.row.patientSource" />
@@ -157,151 +135,17 @@
             v-hasPermi="['manage:patientInfo:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['manage:patientInfo:remove']">删除</el-button> -->
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleAuthRole(scope.row)">详情</el-button>
+          <el-button size="mini" type="text" @click="handleAuthRole(scope.row)">详情</el-button>
         </template>
       </el-table-column>
     </el-table>
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
-    <!-- 添加或修改患者信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
-        <el-form-item label="患者姓名" prop="patientName">
-          <el-input v-model="form.patientName" placeholder="请输入患者姓名" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="患者电话" prop="patientPhone">
-          <el-input v-model="form.patientPhone" placeholder="请输入患者电话" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="家属电话" prop="familyMemberPhone">
-          <el-input v-model="form.familyMemberPhone" placeholder="请输入家属电话" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="出生日期" prop="birthDate">
-          <el-date-picker clearable v-model="form.birthDate" style="width:200px" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择出生日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="身份证号" prop="cardNo">
-          <el-input v-model="form.cardNo" placeholder="请输入身份证号" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="住址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入住址" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="患者类型" prop="patientType">
-          <el-select v-model="form.patientType" placeholder="请选择患者类型" style="width:200px">
-            <el-option v-for="dict in dict.type.patient_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="签约状态" prop="signStatus">
-          <el-select v-model="form.signStatus" placeholder="请选择签约状态" style="width:200px">
-            <el-option v-for="dict in dict.type.sign_status" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="签约时间" prop="signTime">
-          <el-date-picker clearable v-model="form.signTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择签约时间"
-            style="width:200px">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="开证医生" prop="certificateIssuingDoctor">
-          <el-input v-model="form.certificateIssuingDoctor" placeholder="请输入开证医生" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="就诊方式" prop="visitMethod">
-          <el-select v-model="form.visitMethod" placeholder="请选择就诊方式" style="width:200px">
-            <el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="主要诊断" prop="mainDiagnosis">
-          <el-input v-model="form.mainDiagnosis" placeholder="请输入主要诊断" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="主治医生" prop="attendingPhysician">
-          <el-input v-model="form.attendingPhysician" placeholder="请输入主治医生" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="所属医院名称" prop="hospitalAgencyName">
-          <el-input v-model="form.hospitalAgencyName" placeholder="请输入所属医院名称" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="所属院区名称" prop="campusAgencyName">
-          <el-input v-model="form.campusAgencyName" placeholder="请输入所属院区名称" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="所属科室名称" prop="departmentName">
-          <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="所属病区名称" prop="wardName">
-          <el-input v-model="form.wardName" placeholder="请输入所属病区名称" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="住院号" prop="admissionNumber">
-          <el-input v-model="form.admissionNumber" placeholder="请输入住院号" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="责任护士" prop="responsibleNurse">
-          <el-input v-model="form.responsibleNurse" placeholder="请输入责任护士" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="就诊流水号" prop="visitSerialNumber">
-          <el-input v-model="form.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="手术名称" prop="surgicalName">
-          <el-input v-model="form.surgicalName" placeholder="请输入手术名称" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="入院时间" prop="admissionDate">
-          <el-date-picker clearable v-model="form.admissionDate" type="date" value-format="yyyy-MM-dd" style="width:200px"
-            placeholder="请选择入院时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="出院时间" prop="dischargeDate">
-          <el-date-picker clearable v-model="form.dischargeDate" type="date" value-format="yyyy-MM-dd" style="width:200px"
-            placeholder="请选择出院时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="病历内容">
-          <editor v-model="form.medicalRecordContent" :min-height="192" />
-        </el-form-item>
-        <el-form-item label="预约资料组" prop="appointmentTreatmentGroup">
-          <el-input v-model="form.appointmentTreatmentGroup" placeholder="请输入预约资料组" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="登记号" prop="registrationNo">
-          <el-input v-model="form.registrationNo" placeholder="请输入登记号" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="登记日期" prop="registrationDate">
-          <el-date-picker clearable v-model="form.registrationDate" type="date" value-format="yyyy-MM-dd"
-            style="width:200px" placeholder="请选择登记日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="预约时间" prop="appointmentDate">
-          <el-date-picker clearable v-model="form.appointmentDate" type="date" value-format="yyyy-MM-dd"
-            style="width:200px" placeholder="请选择预约时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="门诊号" prop="outpatientNumber">
-          <el-input v-model="form.outpatientNumber" placeholder="请输入门诊号" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="就诊时间" prop="visitTime">
-          <el-date-picker clearable v-model="form.visitTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择就诊时间"
-            style="width:200px">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="出院方式" prop="dischargeMethod">
-          <el-input v-model="form.dischargeMethod" placeholder="请输入出院方式" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="微信openid" prop="openId">
-          <el-input v-model="form.openId" placeholder="请输入微信openid" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="患者来源" prop="patientSource">
-          <el-select v-model="form.patientSource" placeholder="请选择就诊方式" clearable style="width:200px">
-            <el-option v-for="dict in dict.type.patient_source" :key="dict.value" :label="dict.label"
-              :value="dict.value" />
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listPatientInfo, getPatientInfo, delPatientInfo, addPatientInfo, updatePatientInfo } from "@/api/manage/patientInfo";
+import { listPatientInfo } from "@/api/manage/patientInfo";
 import { getAge } from "@/utils/age";
 
 export default {
@@ -311,22 +155,11 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
       // 总条数
       total: 0,
       // 患者信息表格数据
       patientInfoList: [],
-      // 弹出层标题
-      title: "",
       // 是否显示弹出层
-      open: false,
       pickerOptions: {
         disabledDate: (time) => {
           if (this.queryParams.appointmentDateEnd != null) {
@@ -364,11 +197,6 @@ export default {
       },
       visitTime: [],
       admissionDate: [],
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
     };
   },
   created() {
@@ -390,7 +218,7 @@ export default {
           address: row.address,
           patientSource: row.patientSource,
           createTime: row.createTime,
-          age: getAge(row.birthDate)
+          age: row.birthDate ? getAge(row.birthDate) : ''
         },
       });
     },
@@ -400,60 +228,13 @@ export default {
       this.queryParams.params = {};
       listPatientInfo(this.queryParams).then(response => {
         response.rows.forEach(e => {
-          e.age = getAge(e.birthDate)
+          e.birthDate ? e.age = getAge(e.birthDate) : ''
         })
         this.patientInfoList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        patientName: null,
-        patientPhone: null,
-        familyMemberPhone: null,
-        birthDate: null,
-        cardNo: null,
-        sex: null,
-        address: null,
-        patientType: null,
-        signStatus: null,
-        signTime: null,
-        certificateIssuingDoctor: null,
-        visitMethod: null,
-        mainDiagnosis: null,
-        attendingPhysician: null,
-        hospitalAgencyId: null,
-        campusAgencyId: null,
-        departmentId: null,
-        wardId: null,
-        admissionNumber: null,
-        responsibleNurse: null,
-        visitSerialNumber: null,
-        surgicalName: null,
-        admissionDate: null,
-        dischargeDate: null,
-        medicalRecordContent: null,
-        appointmentTreatmentGroup: null,
-        registrationNo: null,
-        registrationDate: null,
-        appointmentDate: null,
-        outpatientNumber: null,
-        visitTime: null,
-        dischargeMethod: null,
-        openId: null,
-        unionId: null,
-        patientSource: null,
-        delFlag: null,
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       if (this.visitTime.length > 0) {
@@ -473,64 +254,6 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加患者信息";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getPatientInfo(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改患者信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updatePatientInfo(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addPatientInfo(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除患者信息编号为"' + ids + '"的数据项？').then(function () {
-        return delPatientInfo(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('manage/patientInfo/export', {
-        ...this.queryParams
-      }, `patientInfo_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>
diff --git a/src/views/manage/preHospitalized/index.vue b/src/views/manage/preHospitalized/index.vue
index 7d6be30..4d4d957 100644
--- a/src/views/manage/preHospitalized/index.vue
+++ b/src/views/manage/preHospitalized/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="患者姓名" prop="patientName">
         <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery"
           style="width:200px" />
@@ -60,10 +60,18 @@
           <el-option v-for="dict in dict.type.patient_type" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item> -->
+      <el-form-item label="预约治疗组" prop="appointmentTreatmentGroup">
+        <el-input v-model="queryParams.appointmentTreatmentGroup" placeholder="请输入预约治疗组" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item label="开证医生" prop="certificateIssuingDoctor">
         <el-input v-model="queryParams.certificateIssuingDoctor" placeholder="请输入主治医生" clearable style="width:200px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item label="登记号" prop="registrationNo">
+        <el-input v-model="queryParams.registrationNo" placeholder="请输入登记号" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <!-- <el-form-item label="手术名称" prop="surgicalName">
         <el-input v-model="queryParams.surgicalName" placeholder="请输入手术名称" clearable @keyup.enter.native="handleQuery"
           style="width:200px" />
@@ -97,12 +105,13 @@
           v-hasPermi="['manage:preHospitalized:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-upload2" size="mini" @click="handleExport">导入</el-button>
+        <el-button type="warning" plain icon="el-icon-upload2" size="mini" @click="handleUpload">导入</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-table v-loading="loading" :data="patientInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" />
+      <el-table-column label="序号" type="index" width="55" align="center" />
       <el-table-column label="患者姓名" align="center" prop="patientName" />
       <el-table-column label="患者电话" align="center" prop="patientPhone" width='120' />
       <el-table-column label="性别" align="center" prop="sex">
@@ -111,9 +120,10 @@
           {{ scope.row.sex == 'FEMALE' ? '女' : '' }}
         </template>
       </el-table-column>
-      <el-table-column label="出生日期" align="center" prop="birthDate" width='130' />
+      <!-- <el-table-column label="出生日期" align="center" prop="birthDate" width='130' /> -->
       <el-table-column label="年龄" align="center" prop="age" />
-      <el-table-column label="签约状态" align="center" prop="signStatus">
+      <el-table-column label="家属电话" align="center" prop="familyMemberPhone" width='130' />
+      <!-- <el-table-column label="签约状态" align="center" prop="signStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sign_status" :value="scope.row.signStatus" />
         </template>
@@ -122,7 +132,13 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.signTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
+      <el-table-column label="医院" align="center" prop="hospitalAgencyName" width='130' />
+      <el-table-column label="院区" align="center" prop="campusAgencyName" width='130' />
+      <el-table-column label="科室名称" align="center" prop="departmentName" width='130' />
+      <el-table-column label="病区名称" align="center" prop="wardName" width='130' />
+      <el-table-column label="住院号" align="center" prop="admissionNumber" width='130' />
+      <el-table-column label="门诊号" align="center" prop="outpatientNumber" width='130' />
       <el-table-column label="开证医生" align="center" prop="certificateIssuingDoctor" />
       <el-table-column label="诊断" align="center" prop="mainDiagnosis" />
       <el-table-column label="就诊时间" align="center" prop="visitTime" width='130'>
@@ -136,14 +152,8 @@
         </template>
       </el-table-column>
       <el-table-column label="入院时间" align="center" prop="admissionDate" width='130' />
-      <el-table-column label="医院名称" align="center" prop="hospitalAgencyName" width='130' />
-      <el-table-column label="院区名称" align="center" prop="campusAgencyName" width='130' />
-      <el-table-column label="科室名称" align="center" prop="departmentName" width='130' />
-      <el-table-column label="病区名称" align="center" prop="wardName" width='130' />
-      <el-table-column label="住院号" align="center" prop="admissionNumber" width='130' />
-      <el-table-column label="门诊号" align="center" prop="outpatientNumber" width='130' />
       <el-table-column label="主治医生" align="center" prop="attendingPhysician" />
-      <el-table-column label="出院方式" align="center" prop="dischargeMethod" />
+      <!-- <el-table-column label="出院方式" align="center" prop="dischargeMethod" /> -->
       <el-table-column label="患者来源" align="center" prop="patientSource">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.patient_source" :value="scope.row.patientSource" />
@@ -152,11 +162,11 @@
       <el-table-column label="住址" align="center" prop="address" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+          <el-button size="mini" type="text" @click="handleAuthRole(scope.row)">详情</el-button>
+          <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
             v-hasPermi="['manage:preHospitalized:edit']">编辑</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+          <el-button size="mini" type="text" @click="handleDelete(scope.row)"
             v-hasPermi="['manage:preHospitalized:remove']">删除</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleAuthRole(scope.row)">详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -165,6 +175,7 @@
     <!-- 添加或修改患者信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
+        <div class="title">基本信息</div>
         <el-form-item label="患者姓名" prop="patientName">
           <el-input v-model="form.patientName" placeholder="请输入患者姓名" style="width:200px" />
         </el-form-item>
@@ -182,8 +193,61 @@
         <el-form-item label="身份证号" prop="cardNo">
           <el-input v-model="form.cardNo" placeholder="请输入身份证号" style="width:200px" />
         </el-form-item>
+        <el-form-item label="性别" prop="sex">
+          <el-radio-group v-model="form.sex">
+            <el-radio label="MALE">男</el-radio>
+            <el-radio label="FEMALE">女</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- <el-form-item label="年龄" prop="age">
+          <el-input v-model="form.age" placeholder="请输入年龄" style="width:200px" />
+        </el-form-item> -->
         <el-form-item label="住址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入住址" style="width:200px" />
+          <el-input type="textarea" style="width:200px" :rows="2" placeholder="请输入住址" v-model="form.address" />
+        </el-form-item>
+        <div class="title" style="margin-top:20px">就诊信息</div>
+        <el-form-item label="主要诊断" prop="mainDiagnosis">
+          <el-input v-model="form.mainDiagnosis" placeholder="请输入主要诊断" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="开证医生" prop="certificateIssuingDoctor">
+          <el-input v-model="form.certificateIssuingDoctor" placeholder="请输入开证医生" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="医院" prop="hospitalAgencyName">
+          <el-input v-model="form.hospitalAgencyName" placeholder="请输入所属医院名称" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="院区" prop="campusAgencyName">
+          <el-input v-model="form.campusAgencyName" placeholder="请输入所属院区名称" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="科室名称" prop="departmentName">
+          <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="预约病区" prop="wardName">
+          <el-input v-model="form.wardName" placeholder="请输入所属病区名称" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="预约治疗组" prop="appointmentTreatmentGroup">
+          <el-input v-model="form.appointmentTreatmentGroup" placeholder="请输入预约治疗组" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="责任护士" prop="responsibleNurse">
+          <el-input v-model="form.responsibleNurse" placeholder="请输入责任护士" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="登记号" prop="registrationNo">
+          <el-input v-model="form.registrationNo" placeholder="请输入登记号" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="登记日期" prop="registrationDate">
+          <el-date-picker clearable v-model="form.registrationDate" type="date" value-format="yyyy-MM-dd"
+            style="width:200px" placeholder="请选择登记日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="预约时间" prop="appointmentDate">
+          <el-date-picker clearable v-model="form.appointmentDate" type="date" value-format="yyyy-MM-dd"
+            style="width:200px" placeholder="请选择预约时间">
+          </el-date-picker>
+        </el-form-item>
+        <!--  <el-form-item label="患者来源" prop="patientSource">
+          <el-select v-model="form.patientSource" placeholder="请选择患者来源" clearable style="width:200px">
+            <el-option v-for="dict in dict.type.patient_source" :key="dict.value" :label="dict.label"
+              :value="dict.value" />
+          </el-select>
         </el-form-item>
         <el-form-item label="患者类型" prop="patientType">
           <el-select v-model="form.patientType" placeholder="请选择患者类型" style="width:200px">
@@ -202,39 +266,18 @@
             style="width:200px">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="开证医生" prop="certificateIssuingDoctor">
-          <el-input v-model="form.certificateIssuingDoctor" placeholder="请输入开证医生" style="width:200px" />
-        </el-form-item>
         <el-form-item label="就诊方式" prop="visitMethod">
           <el-select v-model="form.visitMethod" placeholder="请选择就诊方式" style="width:200px">
             <el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label"
               :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="主要诊断" prop="mainDiagnosis">
-          <el-input v-model="form.mainDiagnosis" placeholder="请输入主要诊断" style="width:200px" />
-        </el-form-item>
         <el-form-item label="主治医生" prop="attendingPhysician">
           <el-input v-model="form.attendingPhysician" placeholder="请输入主治医生" style="width:200px" />
         </el-form-item>
-        <el-form-item label="所属医院名称" prop="hospitalAgencyName">
-          <el-input v-model="form.hospitalAgencyName" placeholder="请输入所属医院名称" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="所属院区名称" prop="campusAgencyName">
-          <el-input v-model="form.campusAgencyName" placeholder="请输入所属院区名称" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="所属科室名称" prop="departmentName">
-          <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="所属病区名称" prop="wardName">
-          <el-input v-model="form.wardName" placeholder="请输入所属病区名称" style="width:200px" />
-        </el-form-item>
         <el-form-item label="住院号" prop="admissionNumber">
           <el-input v-model="form.admissionNumber" placeholder="请输入住院号" style="width:200px" />
         </el-form-item>
-        <el-form-item label="责任护士" prop="responsibleNurse">
-          <el-input v-model="form.responsibleNurse" placeholder="请输入责任护士" style="width:200px" />
-        </el-form-item>
         <el-form-item label="就诊流水号" prop="visitSerialNumber">
           <el-input v-model="form.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
         </el-form-item>
@@ -254,22 +297,6 @@
         <el-form-item label="病历内容">
           <editor v-model="form.medicalRecordContent" :min-height="192" />
         </el-form-item>
-        <el-form-item label="预约资料组" prop="appointmentTreatmentGroup">
-          <el-input v-model="form.appointmentTreatmentGroup" placeholder="请输入预约资料组" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="登记号" prop="registrationNo">
-          <el-input v-model="form.registrationNo" placeholder="请输入登记号" style="width:200px" />
-        </el-form-item>
-        <el-form-item label="登记日期" prop="registrationDate">
-          <el-date-picker clearable v-model="form.registrationDate" type="date" value-format="yyyy-MM-dd"
-            style="width:200px" placeholder="请选择登记日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="预约时间" prop="appointmentDate">
-          <el-date-picker clearable v-model="form.appointmentDate" type="date" value-format="yyyy-MM-dd"
-            style="width:200px" placeholder="请选择预约时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="门诊号" prop="outpatientNumber">
           <el-input v-model="form.outpatientNumber" placeholder="请输入门诊号" style="width:200px" />
         </el-form-item>
@@ -284,18 +311,32 @@
         <el-form-item label="微信openid" prop="openId">
           <el-input v-model="form.openId" placeholder="请输入微信openid" style="width:200px" />
         </el-form-item>
-        <el-form-item label="患者来源" prop="patientSource">
-          <el-select v-model="form.patientSource" placeholder="请选择就诊方式" clearable style="width:200px">
-            <el-option v-for="dict in dict.type.patient_source" :key="dict.value" :label="dict.label"
-              :value="dict.value" />
-          </el-select>
-        </el-form-item>
+        -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- //导入 -->
+    <el-dialog title="导入患者信息" :visible.sync="uploadopen" width="400px" append-to-body>
+      <el-upload drag class="upload-demo" ref="upload" action="https://jsonplaceholder.typicode.com/posts/"
+        :on-preview="handlePreview" :on-remove="handleRemove" :file-list="fileList" :auto-upload="false">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip" slot="tip" style="line-height:25px">
+          <div>
+            1. <span style="color:#1890ff">下载导入模板</span>
+          </div>
+          <div>2.最大支持2MB的xls/xlsx文件</div>
+          <div>3.一次导入患者数量不能超过5000</div>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="uploadcancel">确 定</el-button>
+        <el-button @click="uploadcancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -308,6 +349,8 @@ export default {
   dicts: ['patient_type', 'visit_method', 'sign_status', 'patient_source'],
   data() {
     return {
+      //导入
+      fileList: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -326,6 +369,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      uploadopen: false,
       // 查询参数
       appointmentDate: [],
       queryParams: {
@@ -368,6 +412,7 @@ export default {
   methods: {
     /** 详情操作 */
     handleAuthRole(row) {
+      console.log(getAge(row.birthDate))
       this.$router.push({
         path: "/patient/patientdetails",
         query: {
@@ -381,7 +426,7 @@ export default {
           address: row.address,
           patientSource: row.patientSource,
           createTime: row.createTime,
-          age: getAge(row.birthDate)
+          age: row.birthDate ? getAge(row.birthDate) : ''
         },
       });
     },
@@ -389,10 +434,9 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.patientType = 'PRE_HOSPITALIZED_PATIENT'
-      console.log(this.queryParams)
       listPatientInfo(this.queryParams).then(response => {
         response.rows.forEach(e => {
-          e.age = getAge(e.birthDate)
+          e.birthDate ? e.age = getAge(e.birthDate) : ''
         })
         this.patientInfoList = response.rows;
         this.total = response.total;
@@ -411,38 +455,23 @@ export default {
         patientPhone: null,
         familyMemberPhone: null,
         birthDate: null,
+        age: null,
         cardNo: null,
         sex: null,
         address: null,
-        patientType: null,
-        signStatus: null,
-        signTime: null,
+        patientType: 'PRE_HOSPITALIZED_PATIENT',
         certificateIssuingDoctor: null,
-        visitMethod: null,
         mainDiagnosis: null,
-        attendingPhysician: null,
         hospitalAgencyId: null,
         campusAgencyId: null,
         departmentId: null,
         wardId: null,
-        admissionNumber: null,
         responsibleNurse: null,
-        visitSerialNumber: null,
-        surgicalName: null,
-        admissionDate: null,
-        dischargeDate: null,
-        medicalRecordContent: null,
         appointmentTreatmentGroup: null,
         registrationNo: null,
         registrationDate: null,
         appointmentDate: null,
-        outpatientNumber: null,
-        visitTime: null,
-        dischargeMethod: null,
-        openId: null,
-        unionId: null,
         patientSource: null,
-        delFlag: null,
       };
       this.resetForm("form");
     },
@@ -506,7 +535,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除患者信息编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除？').then(function () {
         return delPatientInfo(ids);
       }).then(() => {
         this.getList();
@@ -518,7 +547,33 @@ export default {
       this.download('manage/patientInfo/export', {
         ...this.queryParams
       }, `patientInfo_${new Date().getTime()}.xlsx`)
-    }
+    },
+    //导入相关的方法
+    submitUpload() {
+      this.$refs.upload.submit();
+    },
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    handlePreview(file) {
+      console.log(file);
+    },
+    //导入
+    handleUpload() {
+      this.uploadopen = true
+    },
+    //取消导入
+    uploadcancel() {
+      this.uploadopen = false
+    },
   }
 };
 </script>
+<style lang="scss" scoped>
+.title {
+  font-size: 16px;
+  font-weight: 600;
+  height: 60px;
+  margin-left: 20px;
+}
+</style>
diff --git a/src/views/manage/visitin/index.vue b/src/views/manage/visitin/index.vue
new file mode 100644
index 0000000..b0a0c79
--- /dev/null
+++ b/src/views/manage/visitin/index.vue
@@ -0,0 +1,598 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <el-form-item label="患者姓名" prop="patientName">
+        <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery"
+          style="width:200px" />
+      </el-form-item>
+      <el-form-item label="患者电话" prop="patientPhone">
+        <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable @keyup.enter.native="handleQuery"
+          style="width:200px" />
+      </el-form-item>
+      <!-- <el-form-item label="预约时间" prop="appointmentDateStart">
+        <el-date-picker v-model="appointmentDate" type="daterange" range-separator="至" start-placeholder="开始日期"
+          style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item> -->
+      <el-form-item label="入院时间" prop="admissionDateStart">
+        <el-date-picker v-model="admissionDate" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
+          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <!-- <el-form-item label="就诊时间" prop="visitTime">
+        <el-date-picker v-model="queryParams.visitTime" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
+          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>-->
+      <!-- ，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL -->
+      <!-- <el-form-item label="就诊方式" prop="visitMethod">
+        <el-select v-model="queryParams.visitMethod" placeholder="请选择就诊方式" clearable style="width:200px">
+          <el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item> -->
+      <el-form-item label="诊断" prop="mainDiagnosis">
+        <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="医院" prop="hospitalAgencyId">
+        <el-input v-model="queryParams.hospitalAgencyId" placeholder="请输入医院名称" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="院区" prop="campusAgencyId">
+        <el-input v-model="queryParams.campusAgencyId" placeholder="请输入院区名称" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="科室" prop="departmentId">
+        <el-input v-model="queryParams.departmentId" placeholder="请输入科室名称" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="病区" prop="wardId">
+        <el-input v-model="queryParams.wardId" placeholder="请输入病区名称" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="就诊流水号" prop="visitSerialNumber">
+        <el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
+      </el-form-item>
+      <!-- <el-form-item label="出生日期" prop="birthDate">
+        <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
+          style="width:200px" placeholder="请选择出生日期">
+        </el-date-picker>
+      </el-form-item> -->
+      <!-- 预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，签约患者：CONTRACTED_PATIENT -->
+      <!-- <el-form-item label="患者类型" prop="patientType">
+        <el-select v-model="queryParams.patientType" placeholder="请选择患者类型" clearable style="width:200px">
+          <el-option v-for="dict in dict.type.patient_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item> -->
+      <el-form-item label="主治医生" prop="attendingPhysician">
+        <el-input v-model="queryParams.attendingPhysician" placeholder="请输入主治医生" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="责任护士" prop="responsibleNurse">
+        <el-input v-model="queryParams.responsibleNurse" placeholder="请输入责任护士" style="width:200px" />
+      </el-form-item>
+      <el-form-item label="手术名称" prop="surgicalName">
+        <el-input v-model="queryParams.surgicalName" placeholder="请输入手术名称" clearable @keyup.enter.native="handleQuery"
+          style="width:200px" />
+      </el-form-item>
+      <el-form-item label="年龄" prop="age">
+        <el-input v-model="queryParams.age" placeholder="请输入手术名称" clearable @keyup.enter.native="handleQuery"
+          style="width:200px" />
+      </el-form-item>
+      <!-- ，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END -->
+      <!-- <el-form-item label="患者来源" prop="patientSource">
+        <el-select v-model="queryParams.patientSource" placeholder="请选择就诊方式" clearable style="width:200px">
+          <el-option v-for="dict in dict.type.patient_source" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item> -->
+      <!-- <el-form-item label="出院方式" prop="dischargeMethod">
+        <el-input v-model="queryParams.dischargeMethod" placeholder="请输入出院方式" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['manage:preHospitalized:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['manage:preHospitalized:edit']">编辑</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['manage:preHospitalized:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-upload2" size="mini" @click="handleUpload">导入</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <el-table v-loading="loading" :data="patientInfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <el-table-column label="住院号" align="center" prop="admissionNumber" />
+      <el-table-column label="姓名" align="center" prop="patientName" />
+      <el-table-column label="电话" align="center" prop="patientPhone" width='120' />
+      <el-table-column label="性别" align="center" prop="sex">
+        <template slot-scope="scope">
+          {{ scope.row.sex == 'MALE' ? '男' : '' }}
+          {{ scope.row.sex == 'FEMALE' ? '女' : '' }}
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="出生日期" align="center" prop="birthDate" width='130' /> -->
+      <el-table-column label="年龄" align="center" prop="age" />
+      <el-table-column label="就诊流水号" align="center" prop="visitSerialNumber" width="130" />
+      <el-table-column label="诊断" align="center" prop="mainDiagnosis" />
+      <!-- <el-table-column label="签约状态" align="center" prop="signStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sign_status" :value="scope.row.signStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="签约时间" align="center" prop="signTime" width='130'>
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.signTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> 
+      <el-table-column label="开证医生" align="center" prop="certificateIssuingDoctor" />
+      <el-table-column label="就诊时间" align="center" prop="visitTime" width='130'>
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.visitTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="就诊方式" align="center" prop="visitMethod">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.visit_method" :value="scope.row.visitMethod" />
+        </template>
+      </el-table-column>
+      <el-table-column label="入院时间" align="center" prop="admissionDate" width='130' />-->
+      <el-table-column label="医院" align="center" prop="hospitalAgencyName" width='130' />
+      <el-table-column label="院区" align="center" prop="campusAgencyName" width='130' />
+      <el-table-column label="科室名称" align="center" prop="departmentName" width='130' />
+      <el-table-column label="病区名称" align="center" prop="wardName" width='130' />
+      <!-- <el-table-column label="住院号" align="center" prop="admissionNumber" width='130' /> -->
+      <!-- <el-table-column label="门诊号" align="center" prop="outpatientNumber" width='130' /> -->
+      <el-table-column label="主治医生" align="center" prop="attendingPhysician" />
+      <el-table-column label="手术名称" align="center" prop="surgicalName" />
+      <!-- <el-table-column label="出院方式" align="center" prop="dischargeMethod" /> -->
+      <el-table-column label="患者来源" align="center" prop="patientSource">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.patient_source" :value="scope.row.patientSource" />
+        </template>
+      </el-table-column>
+      <el-table-column label="住址" align="center" prop="address" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="handleAuthRole(scope.row)">详情</el-button>
+          <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+            v-hasPermi="['manage:preHospitalized:edit']">编辑</el-button>
+          <el-button size="mini" type="text" @click="handleDelete(scope.row)"
+            v-hasPermi="['manage:preHospitalized:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+    <!-- 添加或修改患者信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
+        <div class="title">基本信息</div>
+        <el-form-item label="患者姓名" prop="patientName">
+          <el-input v-model="form.patientName" placeholder="请输入患者姓名" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="患者电话" prop="patientPhone">
+          <el-input v-model="form.patientPhone" placeholder="请输入患者电话" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="家属电话" prop="familyMemberPhone">
+          <el-input v-model="form.familyMemberPhone" placeholder="请输入家属电话" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="出生日期" prop="birthDate">
+          <el-date-picker clearable v-model="form.birthDate" style="width:200px" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择出生日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="身份证号" prop="cardNo">
+          <el-input v-model="form.cardNo" placeholder="请输入身份证号" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="性别" prop="sex">
+          <el-radio-group v-model="form.sex">
+            <el-radio label="MALE">男</el-radio>
+            <el-radio label="FEMALE">女</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- <el-form-item label="年龄" prop="age">
+          <el-input v-model="form.age" placeholder="请输入年龄" style="width:200px" />
+        </el-form-item> -->
+        <el-form-item label="住址" prop="address">
+          <el-input type="textarea" style="width:200px" :rows="2" placeholder="请输入住址" v-model="form.address" />
+        </el-form-item>
+        <div class="title" style="margin-top:20px">就诊信息</div>
+        <el-form-item label="就诊方式" prop="visitMethod">
+          <el-select v-model="form.visitMethod" placeholder="请选择就诊方式" style="width:200px" disabled>
+            <el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="主要诊断" prop="mainDiagnosis">
+          <el-input v-model="form.mainDiagnosis" placeholder="请输入主要诊断" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="主治医生" prop="attendingPhysician">
+          <el-input v-model="form.attendingPhysician" placeholder="请输入主治医生" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="医院" prop="hospitalAgencyName">
+          <el-input v-model="form.hospitalAgencyName" placeholder="请输入所属医院名称" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="院区" prop="campusAgencyName">
+          <el-input v-model="form.campusAgencyName" placeholder="请输入所属院区名称" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="科室" prop="departmentName">
+          <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="病区" prop="wardName">
+          <el-input v-model="form.wardName" placeholder="请输入所属病区名称" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="住院号" prop="admissionNumber">
+          <el-input v-model="form.admissionNumber" placeholder="请输入住院号" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="责任护士" prop="responsibleNurse">
+          <el-input v-model="form.responsibleNurse" placeholder="请输入责任护士" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="就诊流水号" prop="visitSerialNumber">
+          <el-input v-model="form.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="手术名称" prop="surgicalName">
+          <el-input v-model="form.surgicalName" placeholder="请输入手术名称" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="入院时间" prop="admissionDate">
+          <el-date-picker clearable v-model="form.admissionDate" type="date" value-format="yyyy-MM-dd" style="width:200px"
+            placeholder="请选择入院时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="病历内容">
+          <editor v-model="form.medicalRecordContent" :min-height="192" />
+        </el-form-item>
+        <!-- <el-form-item label="患者来源" prop="patientSource">
+          <el-select v-model="form.patientSource" placeholder="请选择患者来源" clearable style="width:200px">
+            <el-option v-for="dict in dict.type.patient_source" :key="dict.value" :label="dict.label"
+              :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="开证医生" prop="certificateIssuingDoctor">
+          <el-input v-model="form.certificateIssuingDoctor" placeholder="请输入开证医生" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="预约治疗组" prop="appointmentTreatmentGroup">
+          <el-input v-model="form.appointmentTreatmentGroup" placeholder="请输入预约治疗组" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="登记号" prop="registrationNo">
+          <el-input v-model="form.registrationNo" placeholder="请输入登记号" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="登记日期" prop="registrationDate">
+          <el-date-picker clearable v-model="form.registrationDate" type="date" value-format="yyyy-MM-dd"
+            style="width:200px" placeholder="请选择登记日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="预约时间" prop="appointmentDate">
+          <el-date-picker clearable v-model="form.appointmentDate" type="date" value-format="yyyy-MM-dd"
+            style="width:200px" placeholder="请选择预约时间">
+          </el-date-picker>
+        </el-form-item>
+         <el-form-item label="患者类型" prop="patientType">
+          <el-select v-model="form.patientType" placeholder="请选择患者类型" style="width:200px">
+            <el-option v-for="dict in dict.type.patient_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="签约状态" prop="signStatus">
+          <el-select v-model="form.signStatus" placeholder="请选择签约状态" style="width:200px">
+            <el-option v-for="dict in dict.type.sign_status" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="签约时间" prop="signTime">
+          <el-date-picker clearable v-model="form.signTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择签约时间"
+            style="width:200px">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="出院时间" prop="dischargeDate">
+          <el-date-picker clearable v-model="form.dischargeDate" type="date" value-format="yyyy-MM-dd" style="width:200px"
+            placeholder="请选择出院时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="门诊号" prop="outpatientNumber">
+          <el-input v-model="form.outpatientNumber" placeholder="请输入门诊号" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="就诊时间" prop="visitTime">
+          <el-date-picker clearable v-model="form.visitTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择就诊时间"
+            style="width:200px">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="出院方式" prop="dischargeMethod">
+          <el-input v-model="form.dischargeMethod" placeholder="请输入出院方式" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="微信openid" prop="openId">
+          <el-input v-model="form.openId" placeholder="请输入微信openid" style="width:200px" />
+        </el-form-item>
+        -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- //导入 -->
+    <el-dialog title="导入患者信息" :visible.sync="uploadopen" width="400px" append-to-body>
+      <el-upload drag class="upload-demo" ref="upload" action="https://jsonplaceholder.typicode.com/posts/"
+        :on-preview="handlePreview" :on-remove="handleRemove" :file-list="fileList" :auto-upload="false">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip" slot="tip" style="line-height:25px">
+          <div>
+            1. <span style="color:#1890ff">下载导入模板</span>
+          </div>
+          <div>2.最大支持2MB的xls/xlsx文件</div>
+          <div>3.一次导入患者数量不能超过5000</div>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="uploadcancel">确 定</el-button>
+        <el-button @click="uploadcancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPatientInfo, getPatientInfo, delPatientInfo, addPatientInfo, updatePatientInfo } from "@/api/manage/patientInfo";
+import { getAge } from "@/utils/age";
+
+export default {
+  name: "PatientInfo",
+  dicts: ['patient_type', 'visit_method', 'sign_status', 'patient_source'],
+  data() {
+    return {
+      //导入
+      fileList: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 患者信息表格数据
+      patientInfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      uploadopen: false,
+      // 查询参数
+      admissionDate: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        admissionDateStart: '',
+        admissionDateEnd: '',
+        patientName: null,
+        patientPhone: null,
+        birthDate: null,
+        patientType: null,
+        visitMethod: null,
+        mainDiagnosis: null,
+        certificateIssuingDoctor: null,
+        hospitalAgencyId: null,
+        hospitalAgencyName: null,
+        campusAgencyId: null,
+        campusAgencyName: null,
+        departmentId: null,
+        departmentName: null,
+        wardId: null,
+        wardName: null,
+        surgicalName: null,
+        admissionDate: null,
+        outpatientNumber: null,
+        visitTime: null,
+        dischargeMethod: null,
+        patientSource: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 详情操作 */
+    handleAuthRole(row) {
+      this.$router.push({
+        path: "/patient/patientdetails",
+        query: {
+          patientId: row.id,
+          cardNo: row.cardNo,
+          patientName: row.patientName,
+          patientPhone: row.patientPhone,
+          sex: row.sex,
+          birthDate: row.birthDate,
+          familyMemberPhone: row.familyMemberPhone,
+          address: row.address,
+          patientSource: row.patientSource,
+          createTime: row.createTime,
+          age: row.birthDate ? getAge(row.birthDate) : ''
+        },
+      });
+    },
+    /** 查询患者信息列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.patientType = 'IN_HOSPITAL_PATIENT'
+      console.log(this.queryParams)
+      listPatientInfo(this.queryParams).then(response => {
+        response.rows.forEach(e => {
+          e.birthDate ? e.age = getAge(e.birthDate) : ''
+        })
+        this.patientInfoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        patientType: 'IN_HOSPITAL_PATIENT',
+        patientName: null,
+        patientPhone: null,
+        familyMemberPhone: null,
+        birthDate: null,
+        cardNo: null,
+        sex: null,
+        address: null,
+        signStatus: null,
+        signTime: null,
+        certificateIssuingDoctor: null,
+        visitMethod: 'BE_IN_HOSPITAL',
+        mainDiagnosis: null,
+        attendingPhysician: null,
+        hospitalAgencyId: null,
+        campusAgencyId: null,
+        departmentId: null,
+        wardId: null,
+        admissionNumber: null,
+        responsibleNurse: null,
+        visitSerialNumber: null,
+        surgicalName: null,
+        admissionDate: null,
+        dischargeDate: null,
+        medicalRecordContent: null,
+        appointmentTreatmentGroup: null,
+        registrationNo: null,
+        registrationDate: null,
+        appointmentDate: null,
+        admissionDate: null,
+        outpatientNumber: null,
+        visitTime: null,
+        dischargeMethod: null,
+        openId: null,
+        unionId: null,
+        patientSource: null,
+        delFlag: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      if (this.admissionDate.length > 0) {
+        this.queryParams.admissionDateStart = this.admissionDate[0]
+        this.queryParams.admissionDateEnd = this.admissionDate[1]
+      }
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.admissionDateEnd = ''
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增在院患者";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getPatientInfo(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改患者信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updatePatientInfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPatientInfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除？').then(function () {
+        return delPatientInfo(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('manage/patientInfo/export', {
+        ...this.queryParams
+      }, `patientInfo_${new Date().getTime()}.xlsx`)
+    },
+    //导入相关的方法
+    submitUpload() {
+      this.$refs.upload.submit();
+    },
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    handlePreview(file) {
+      console.log(file);
+    },
+    //导入
+    handleUpload() {
+      this.uploadopen = true
+    },
+    //取消导入
+    uploadcancel() {
+      this.uploadopen = false
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+.title {
+  font-size: 16px;
+  font-weight: 600;
+  height: 60px;
+  margin-left: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue
new file mode 100644
index 0000000..b011978
--- /dev/null
+++ b/src/views/manage/visitout/index.vue
@@ -0,0 +1,609 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <el-form-item label="患者姓名" prop="patientName">
+        <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery"
+          style="width:200px" />
+      </el-form-item>
+      <el-form-item label="患者电话" prop="patientPhone">
+        <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable @keyup.enter.native="handleQuery"
+          style="width:200px" />
+      </el-form-item>
+      <el-form-item label="门诊/出院时间" prop="dischargeDateStart" label-width="120px">
+        <el-date-picker v-model="dischargeDate" type="daterange" range-separator="至" start-placeholder="开始日期"
+          style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <!-- <el-form-item label="就诊时间" prop="visitTime">
+        <el-date-picker v-model="queryParams.visitTime" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
+          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="入院时间" prop="admissionDate">
+        <el-date-picker v-model="queryParams.admissionDate" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
+          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item> -->
+      <!-- ，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL -->
+      <!-- <el-form-item label="就诊方式" prop="visitMethod">
+        <el-select v-model="queryParams.visitMethod" placeholder="请选择就诊方式" clearable style="width:200px">
+          <el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item> -->
+      <el-form-item label="诊断" prop="mainDiagnosis">
+        <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="医院" prop="hospitalAgencyId">
+        <el-input v-model="queryParams.hospitalAgencyId" placeholder="请输入医院名称" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="院区" prop="campusAgencyId">
+        <el-input v-model="queryParams.campusAgencyId" placeholder="请输入院区名称" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="科室" prop="departmentId">
+        <el-input v-model="queryParams.departmentId" placeholder="请输入科室名称" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="病区" prop="wardId">
+        <el-input v-model="queryParams.wardId" placeholder="请输入病区名称" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="就诊流水号" prop="visitSerialNumber">
+        <el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
+      </el-form-item>
+      <el-form-item label="就诊方式" prop="visitMethod">
+        <el-select v-model="queryParams.visitMethod" placeholder="请选择就诊方式" clearable style="width:200px">
+          <el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="主治医生" prop="attendingPhysician">
+        <el-input v-model="queryParams.attendingPhysician" placeholder="请输入主治医生" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="手术名称" prop="surgicalName">
+        <el-input v-model="queryParams.surgicalName" placeholder="请输入手术名称" clearable @keyup.enter.native="handleQuery"
+          style="width:200px" />
+      </el-form-item>
+      <!-- <el-form-item label="出生日期" prop="birthDate">
+        <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
+          style="width:200px" placeholder="请选择出生日期">
+        </el-date-picker>
+      </el-form-item> -->
+      <!-- 预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，签约患者：CONTRACTED_PATIENT -->
+      <!-- <el-form-item label="患者类型" prop="patientType">
+        <el-select v-model="queryParams.patientType" placeholder="请选择患者类型" clearable style="width:200px">
+          <el-option v-for="dict in dict.type.patient_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item> -->
+      <!-- ，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END -->
+      <!-- <el-form-item label="患者来源" prop="patientSource">
+        <el-select v-model="queryParams.patientSource" placeholder="请选择就诊方式" clearable style="width:200px">
+          <el-option v-for="dict in dict.type.patient_source" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item> -->
+      <!-- <el-form-item label="出院方式" prop="dischargeMethod">
+        <el-input v-model="queryParams.dischargeMethod" placeholder="请输入出院方式" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['manage:preHospitalized:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['manage:preHospitalized:edit']">编辑</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['manage:preHospitalized:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-upload2" size="mini" @click="handleUpload">导入</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <el-table v-loading="loading" :data="patientInfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <el-table-column label="序号" type="index" width="55" align="center" />
+      <el-table-column label="姓名" align="center" prop="patientName" />
+      <el-table-column label="电话" align="center" prop="patientPhone" width='120' />
+      <el-table-column label="性别" align="center" prop="sex">
+        <template slot-scope="scope">
+          {{ scope.row.sex == 'MALE' ? '男' : '' }}
+          {{ scope.row.sex == 'FEMALE' ? '女' : '' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="出生日期" align="center" prop="birthDate" width='130' />
+      <el-table-column label="年龄" align="center" prop="age" />
+      <el-table-column label="就诊流水号" align="center" prop="visitSerialNumber" width="130" />
+      <!-- <el-table-column label="签约状态" align="center" prop="signStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sign_status" :value="scope.row.signStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="签约时间" align="center" prop="signTime" width='130'>
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.signTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="开证医生" align="center" prop="certificateIssuingDoctor" /> -->
+      <el-table-column label="诊断" align="center" prop="mainDiagnosis" />
+      <!-- <el-table-column label="就诊时间" align="center" prop="visitTime" width='130'>
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.visitTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="入院时间" align="center" prop="admissionDate" width='130' /> -->
+      <el-table-column label="医院" align="center" prop="hospitalAgencyName" width='130' />
+      <el-table-column label="院区" align="center" prop="campusAgencyName" width='130' />
+      <el-table-column label="科室名称" align="center" prop="departmentName" width='130' />
+      <el-table-column label="病区名称" align="center" prop="wardName" width='130' />
+      <el-table-column label="住院号" align="center" prop="admissionNumber" width='130' />
+      <el-table-column label="门诊号" align="center" prop="outpatientNumber" width='130' />
+      <el-table-column label="主治医生" align="center" prop="attendingPhysician" />
+      <!-- <el-table-column label="出院方式" align="center" prop="dischargeMethod" /> -->
+      <el-table-column label="手术名称" align="center" prop="surgicalName" />
+      <el-table-column label="就诊方式" align="center" prop="visitMethod">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.visit_method" :value="scope.row.visitMethod" />
+        </template>
+      </el-table-column>
+      <el-table-column label="门诊/出院时间" align="center" prop="dischargeDate" width='130'>
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.dischargeDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="患者来源" align="center" prop="patientSource">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.patient_source" :value="scope.row.patientSource" />
+        </template>
+      </el-table-column>
+      <el-table-column label="住址" align="center" prop="address" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="handleAuthRole(scope.row)">详情</el-button>
+          <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+            v-hasPermi="['manage:preHospitalized:edit']">编辑</el-button>
+          <el-button size="mini" type="text" @click="handleDelete(scope.row)"
+            v-hasPermi="['manage:preHospitalized:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+    <!-- 添加或修改患者信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
+        <div class="title">基本信息</div>
+        <el-form-item label="患者姓名" prop="patientName">
+          <el-input v-model="form.patientName" placeholder="请输入患者姓名" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="患者电话" prop="patientPhone">
+          <el-input v-model="form.patientPhone" placeholder="请输入患者电话" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="家属电话" prop="familyMemberPhone">
+          <el-input v-model="form.familyMemberPhone" placeholder="请输入家属电话" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="出生日期" prop="birthDate">
+          <el-date-picker clearable v-model="form.birthDate" style="width:200px" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择出生日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="身份证号" prop="cardNo">
+          <el-input v-model="form.cardNo" placeholder="请输入身份证号" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="性别" prop="sex">
+          <el-radio-group v-model="form.sex">
+            <el-radio label="MALE">男</el-radio>
+            <el-radio label="FEMALE">女</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- <el-form-item label="年龄" prop="age">
+          <el-input v-model="form.age" placeholder="请输入年龄" style="width:200px" />
+        </el-form-item> -->
+        <el-form-item label="住址" prop="address">
+          <el-input type="textarea" style="width:200px" :rows="2" placeholder="请输入住址" v-model="form.address" />
+        </el-form-item>
+        <div class="title" style="margin-top:20px">就诊信息</div>
+        <el-form-item label="就诊方式" prop="visitMethod">
+          <el-select v-model="form.visitMethod" placeholder="请选择就诊方式" style="width:200px">
+            <el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="主要诊断" prop="mainDiagnosis">
+          <el-input v-model="form.mainDiagnosis" placeholder="请输入主要诊断" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="主治医生" prop="attendingPhysician">
+          <el-input v-model="form.attendingPhysician" placeholder="请输入主治医生" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="医院" prop="hospitalAgencyName">
+          <el-input v-model="form.hospitalAgencyName" placeholder="请输入所属医院名称" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="院区" prop="campusAgencyName">
+          <el-input v-model="form.campusAgencyName" placeholder="请输入所属院区名称" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="科室" prop="departmentName">
+          <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="病区" prop="wardName">
+          <el-input v-model="form.wardName" placeholder="请输入所属病区名称" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="门诊号" prop="outpatientNumber" v-if="form.visitMethod == 'OUTPATIENT_SERVICE'">
+          <el-input v-model="form.outpatientNumber" placeholder="请输入门诊号" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="住院号" prop="admissionNumber" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
+          <el-input v-model="form.admissionNumber" placeholder="请输入住院号" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="责任护士" prop="responsibleNurse" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
+          <el-input v-model="form.responsibleNurse" placeholder="请输入责任护士" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="就诊流水号" prop="visitSerialNumber">
+          <el-input v-model="form.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="手术名称" prop="surgicalName">
+          <el-input v-model="form.surgicalName" placeholder="请输入手术名称" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="就诊时间" prop="visitTime" v-if="form.visitMethod == 'OUTPATIENT_SERVICE'">
+          <el-date-picker clearable v-model="form.visitTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择就诊时间"
+            style="width:200px">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="入院时间" prop="admissionDate" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
+          <el-date-picker clearable v-model="form.admissionDate" type="date" value-format="yyyy-MM-dd" style="width:200px"
+            placeholder="请选择入院时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="病历内容">
+          <editor v-model="form.medicalRecordContent" :min-height="192" />
+        </el-form-item>
+        <!-- <el-form-item label="患者来源" prop="patientSource">
+          <el-select v-model="form.patientSource" placeholder="请选择患者来源" clearable style="width:200px">
+            <el-option v-for="dict in dict.type.patient_source" :key="dict.value" :label="dict.label"
+              :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="开证医生" prop="certificateIssuingDoctor">
+          <el-input v-model="form.certificateIssuingDoctor" placeholder="请输入开证医生" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="预约治疗组" prop="appointmentTreatmentGroup">
+          <el-input v-model="form.appointmentTreatmentGroup" placeholder="请输入预约治疗组" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="登记号" prop="registrationNo">
+          <el-input v-model="form.registrationNo" placeholder="请输入登记号" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="登记日期" prop="registrationDate">
+          <el-date-picker clearable v-model="form.registrationDate" type="date" value-format="yyyy-MM-dd"
+            style="width:200px" placeholder="请选择登记日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="预约时间" prop="appointmentDate">
+          <el-date-picker clearable v-model="form.appointmentDate" type="date" value-format="yyyy-MM-dd"
+            style="width:200px" placeholder="请选择预约时间">
+          </el-date-picker>
+        </el-form-item>
+         <el-form-item label="患者类型" prop="patientType">
+          <el-select v-model="form.patientType" placeholder="请选择患者类型" style="width:200px">
+            <el-option v-for="dict in dict.type.patient_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="签约状态" prop="signStatus">
+          <el-select v-model="form.signStatus" placeholder="请选择签约状态" style="width:200px">
+            <el-option v-for="dict in dict.type.sign_status" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="签约时间" prop="signTime">
+          <el-date-picker clearable v-model="form.signTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择签约时间"
+            style="width:200px">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="出院时间" prop="dischargeDate">
+          <el-date-picker clearable v-model="form.dischargeDate" type="date" value-format="yyyy-MM-dd" style="width:200px"
+            placeholder="请选择出院时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="门诊号" prop="outpatientNumber">
+          <el-input v-model="form.outpatientNumber" placeholder="请输入门诊号" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="出院方式" prop="dischargeMethod">
+          <el-input v-model="form.dischargeMethod" placeholder="请输入出院方式" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="微信openid" prop="openId">
+          <el-input v-model="form.openId" placeholder="请输入微信openid" style="width:200px" />
+        </el-form-item>
+        -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- //导入 -->
+    <el-dialog title="导入患者信息" :visible.sync="uploadopen" width="400px" append-to-body>
+      <el-upload drag class="upload-demo" ref="upload" action="https://jsonplaceholder.typicode.com/posts/"
+        :on-preview="handlePreview" :on-remove="handleRemove" :file-list="fileList" :auto-upload="false">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip" slot="tip" style="line-height:25px">
+          <div>
+            1. <span style="color:#1890ff">下载导入模板</span>
+          </div>
+          <div>2.最大支持2MB的xls/xlsx文件</div>
+          <div>3.一次导入患者数量不能超过5000</div>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="uploadcancel">确 定</el-button>
+        <el-button @click="uploadcancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPatientInfo, getPatientInfo, delPatientInfo, addPatientInfo, updatePatientInfo } from "@/api/manage/patientInfo";
+import { getAge } from "@/utils/age";
+
+export default {
+  name: "PatientInfo",
+  dicts: ['patient_type', 'visit_method', 'sign_status', 'patient_source'],
+  data() {
+    return {
+      //导入
+      fileList: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 患者信息表格数据
+      patientInfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      uploadopen: false,
+      // 查询参数
+      dischargeDate: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        dischargeDateStart: '',
+        dischargeDateEnd: '',
+        patientName: null,
+        patientPhone: null,
+        birthDate: null,
+        patientType: null,
+        visitMethod: null,
+        mainDiagnosis: null,
+        certificateIssuingDoctor: null,
+        hospitalAgencyId: null,
+        hospitalAgencyName: null,
+        campusAgencyId: null,
+        campusAgencyName: null,
+        departmentId: null,
+        departmentName: null,
+        wardId: null,
+        wardName: null,
+        surgicalName: null,
+        admissionDate: null,
+        outpatientNumber: null,
+        visitTime: null,
+        dischargeMethod: null,
+        patientSource: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 详情操作 */
+    handleAuthRole(row) {
+      this.$router.push({
+        path: "/patient/patientdetails",
+        query: {
+          patientId: row.id,
+          cardNo: row.cardNo,
+          patientName: row.patientName,
+          patientPhone: row.patientPhone,
+          sex: row.sex,
+          birthDate: row.birthDate,
+          familyMemberPhone: row.familyMemberPhone,
+          address: row.address,
+          patientSource: row.patientSource,
+          createTime: row.createTime,
+          age: row.birthDate ? getAge(row.birthDate) : ''
+        },
+      });
+    },
+    /** 查询患者信息列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.patientType = 'OUTPATIENT_DISCHARGE'
+      console.log(this.queryParams)
+      listPatientInfo(this.queryParams).then(response => {
+        response.rows.forEach(e => {
+          e.birthDate ? e.age = getAge(e.birthDate) : ''
+        })
+        this.patientInfoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        patientName: null,
+        patientPhone: null,
+        familyMemberPhone: null,
+        birthDate: null,
+        cardNo: null,
+        sex: null,
+        address: null,
+        patientType: null,
+        signStatus: null,
+        signTime: null,
+        certificateIssuingDoctor: null,
+        visitMethod: null,
+        mainDiagnosis: null,
+        attendingPhysician: null,
+        hospitalAgencyId: null,
+        campusAgencyId: null,
+        departmentId: null,
+        wardId: null,
+        admissionNumber: null,
+        responsibleNurse: null,
+        visitSerialNumber: null,
+        surgicalName: null,
+        admissionDate: null,
+        dischargeDate: null,
+        medicalRecordContent: null,
+        appointmentTreatmentGroup: null,
+        registrationNo: null,
+        registrationDate: null,
+        appointmentDate: null,
+        outpatientNumber: null,
+        visitTime: null,
+        dischargeMethod: null,
+        openId: null,
+        unionId: null,
+        patientSource: null,
+        delFlag: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      if (this.dischargeDate.length > 0) {
+        this.queryParams.dischargeDateStart = this.dischargeDate[0]
+        this.queryParams.dischargeDateEnd = this.dischargeDate[1]
+      }
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.dischargeDateEnd = ''
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增门诊/出院患者";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getPatientInfo(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改患者信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      if (this.form.visitMethod == 'BE_IN_HOSPITAL') {
+        this.form.patientType = 'DISCHARGED_PATIENT'
+      } else if (this.form.visitMethod == 'OUTPATIENT_SERVICE') {
+        this.form.patientType = 'OUTPATIENT'
+      }
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updatePatientInfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPatientInfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除？').then(function () {
+        return delPatientInfo(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('manage/patientInfo/export', {
+        ...this.queryParams
+      }, `patientInfo_${new Date().getTime()}.xlsx`)
+    },
+    //导入相关的方法
+    submitUpload() {
+      this.$refs.upload.submit();
+    },
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    handlePreview(file) {
+      console.log(file);
+    },
+    //导入
+    handleUpload() {
+      this.uploadopen = true
+    },
+    //取消导入
+    uploadcancel() {
+      this.uploadopen = false
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+.title {
+  font-size: 16px;
+  font-weight: 600;
+  height: 60px;
+  margin-left: 20px;
+}
+</style>
\ No newline at end of file