Merge remote-tracking branch 'origin/dev' into dev

src/api/manage/blacklist.js

@@ -42,3 +42,15 @@ export function delBlacklist(id) {
         method: 'delete'
     })
 }
+
+
+//查异常原因的时候，abnormalCauseLevel传ABNORMAL_CAUSE，
+// 补充说明查询的时候，parentId传上面选中的异常原因的id
+
+export function causegetlist(query) {
+    return request({
+        url: '/manage/cause/getList',
+        method: 'get',
+        params: query
+    })
+}

src/api/manage/selectAgencyList.js

@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+// 医院：HOSPITAL，院区：CAMPUS
+export function selectAgencyList(query) {
+    return request({
+        url: '/system/agency/selectAgencyList',
+        method: 'get',
+        params: query
+    })
+}
+
+//院区
+export function subordinateAgencyList(query) {
+    return request({
+        url: '/system/agency/subordinateAgencyList',
+        method: 'get',
+        params: query
+    })
+}
+
+// 科室及病区的
+export function getDepartmentList(query) {
+    return request({
+        url: '/system/department/getDepartmentList',
+        method: 'get',
+        params: query
+    })
+}

src/api/manage/signRecord.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询签约记录列表
+export function listSignRecord(query) {
+    return request({
+        url: '/manage/signRecord/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询签约记录详细
+export function getSignRecord(id) {
+    return request({
+        url: '/manage/signRecord/' + id,
+        method: 'get'
+    })
+}
+
+// 新增签约记录
+export function addSignRecord(data) {
+    return request({
+        url: '/manage/signRecord',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改签约记录
+export function updateSignRecord(data) {
+    return request({
+        url: '/manage/signRecord',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除签约记录
+export function delSignRecord(id) {
+    return request({
+        url: '/manage/signRecord/' + id,
+        method: 'delete'
+    })
+}

src/api/manage/signingRecords.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+
+// 根据患者主键查询签约记录
+export function getByPatient(patientId) {
+    return request({
+        url: `/manage/signRecord/getByPatient/${patientId}`,
+        method: 'get',
+    })
+}
+
+// 根据签约记录表主键查询签约详情
+export function getByRecordId(patientSignRecordId) {
+    return request({
+        url: `/manage/signRecord/getByRecordId/${patientSignRecordId}`,
+        method: 'get',
+    })
+}

src/api/system/user.js

@@ -10,6 +10,22 @@ export function listUser(query) {
   })
 }
 
+export function selectUserAgencyleft(query) {
+  return request({
+    url: '/system/user/selectUserAgency',
+    method: 'get',
+    params: query
+  
+  })
+}
+export function selectUserAgency(userName) {
+  return request({
+    url: `/system/user/selectUserBelongAgency?userName=${userName}`,
+    method: 'get',
+  
+  })
+}
+// /system/user/selectUserAgency 这个是右边的接口，传值不变
 // 查询用户详细
 export function getUser(userId) {
   return request({

src/views/manage/blacklist/index.vue

@@ -7,12 +7,25 @@
       <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-form-item label="医院" prop="hospitalAgencyId">
-        <el-input v-model="queryParams.hospitalAgencyName" placeholder="请输入医院" clearable
+        <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
-          @keyup.enter.native="handleQuery" />
+          @clear="clearhospitalAgency" @change="changehospitalAgency">
+          <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="科室" prop="departmentName">
+      <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
-        <el-input v-model="queryParams.departmentName" placeholder="请输入科室" clearable @keyup.enter.native="handleQuery" />
+        <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+          @clear="clearcampusAgency" @change="changecampusAgency">
+          <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="科室" prop="departmentId" v-if="queryParams.campusAgencyId">
+        <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable>
+          <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="异常原因" prop="abnormalCauseValue">
         <el-input v-model="queryParams.abnormalCauseValue" placeholder="请输入异常原因" clearable
@@ -50,6 +63,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-table v-loading="loading" :data="blacklistList" @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' />
@@ -75,33 +89,55 @@
         </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-input v-model="form.patientName" placeholder="请输入姓名" :disabled="title == '修改黑名单'" />
         </el-form-item>
         <el-form-item label="身份证" prop="cardNo">
-          <el-input v-model="form.cardNo" placeholder="请输入身份证" />
+          <el-input v-model="form.cardNo" placeholder="请输入身份证" :disabled="title == '修改黑名单'" />
         </el-form-item>
         <el-form-item label="电话" prop="patientPhone">
-          <el-input v-model="form.patientPhone" placeholder="请输入电话" />
+          <el-input v-model="form.patientPhone" placeholder="请输入电话" :disabled="title == '修改黑名单'" />
         </el-form-item>
-        <el-form-item label="医院名称" prop="hospitalAgencyName">
+        <el-form-item label="医院" prop="hospitalAgencyId">
-          <el-input v-model="form.hospitalAgencyName" placeholder="请输入医院名称" />
+          <el-select v-model="form.hospitalAgencyId" filterable placeholder="请选择医院" style="width:380px" clearable
+            :disabled="title == '修改黑名单'" @clear="clearhospitalAgency(1)" @change="changehospitalAgency($event, 1)">
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="科室名称" prop="departmentName">
+        <el-form-item label="院区" prop="campusAgencyId" v-if="form.hospitalAgencyId">
-          <el-input v-model="form.departmentName" placeholder="请输入科室名称" />
+          <el-select v-model="form.campusAgencyId" filterable placeholder="请选择院区" style="width:380px" clearable
+            :disabled="title == '修改黑名单'" @clear="clearcampusAgency(1)" @change="changecampusAgency($event, 1)">
+            <el-option v-for="item in form_campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="科室名称" prop="departmentId" v-if="form.campusAgencyId">
+          <el-select v-model="form.departmentId" filterable placeholder="请选择科室" style="width:380px" clearable
+            :disabled="title == '修改黑名单'">
+            <el-option v-for="item in form_departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="异常原因" prop="abnormalCauseValue">
-          <el-input v-model="form.abnormalCauseValue" placeholder="请输入异常原因" />
+          <el-select v-model="form.abnormalCauseValue" filterable placeholder="请输入异常原因" style="width:380px" clearable
+            @clear="clearabnormalCauseValue" @change="changeabnormalCauseValue">
+            <el-option v-for="item in abnormalCauselist" :key="item.id" :label="item.abnormalCauseValue" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="补充说明" prop="supplementIllustrateValue">
-          <el-input v-model="form.supplementIllustrateValue" placeholder="请输入补充说明" />
+          <el-select v-model="form.supplementIllustrateValue" filterable placeholder="请输入异常原因" style="width:380px"
+            clearable>
+            <el-option v-for="item in supplementIllustratelist" :key="item.id" :label="item.abnormalCauseValue"
+              :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="功能限制" prop="functionLimitation">
           <el-input v-model="form.functionLimitation" placeholder="请输入功能限制" />
@@ -122,13 +158,34 @@
 </template>
 
 <script>
-import { listBlacklist, getBlacklist, delBlacklist, addBlacklist, updateBlacklist } from "@/api/manage/blacklist";
+import { listBlacklist, getBlacklist, delBlacklist, addBlacklist, updateBlacklist, causegetlist } from "@/api/manage/blacklist";
+import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
 
 export default {
   name: "Blacklist",
   dicts: ['blacklist_source'],
   data() {
     return {
+      //医院list
+      hospitalAgencylist: [],
+      // 院区list
+      campusAgencylist: [],
+      //科室list
+      departmentlist: [],
+      //病区list
+      wardlist: [],
+      //form-医院list
+      form_hospitalAgencylist: [],
+      // form-院区list
+      form_campusAgencylist: [],
+      //form-科室list
+      form_departmentlist: [],
+      //form-病区list
+      form_wardlist: [],
+      //异常原因
+      abnormalCauselist: [],
+      //补充说明
+      supplementIllustratelist: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -151,19 +208,48 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        hospitalAgencyId: null,
         abnormalCauseId: null,
         abnormalCauseValue: null,
+        departmentId: null,
+        campusAgencyId: null,
         blacklistSource: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
+        patientName: [
+          { required: true, message: '请输入患者姓名', trigger: 'change' }
+        ],
+        cardNo: [
+          { required: true, message: '请输入患者身份证号', trigger: 'change' }
+        ],
+        hospitalAgencyId: [
+          { required: true, message: '请选择医院', trigger: 'change' }
+        ],
+        campusAgencyId: [
+          { required: true, message: '请选择院区', trigger: 'change' }
+        ],
+        departmentId: [
+          { required: true, message: '请选择科室', trigger: 'change' }
+        ],
+        abnormalCauseValue: [
+          { required: true, message: '请输入异常原因', trigger: 'change' }
+        ],
+        supplementIllustrateValue: [
+          { required: true, message: '请输入补充说明', trigger: 'change' }
+        ],
+        patientPhone: [
+          { required: true, message: '请输入患者手机号', trigger: 'change' }
+        ],
       }
     };
   },
   created() {
+    this.selectAgencyinfo();
     this.getList();
+    this.causegetinfo();
   },
   methods: {
     /** 查询患者-黑明单关系列表 */
@@ -183,6 +269,9 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        campusAgencyId: null,
+        departmentId: null,
+        wardId: null,
         patientName: null,
         abnormalCauseId: null,
         abnormalCauseValue: null,
@@ -225,6 +314,18 @@ export default {
       const id = row.id || this.ids
       getBlacklist(id).then(response => {
         this.form = response.data;
+        if (this.form.hospitalAgencyId) {
+          this.changehospitalAgency(this.form.hospitalAgencyId, 1, 2)
+        }
+        if (this.form.campusAgencyId) {
+          this.changecampusAgency(this.form.campusAgencyId, 1, 2)
+        }
+        if (this.form.departmentId) {
+          this.changedepartment(this.form.departmentId, 1, 2)
+        }
+        if (this.form.abnormalCauseValue) {
+          this.changeabnormalCauseValue(this.form.abnormalCauseValue, 1)
+        }
         this.open = true;
         this.title = "修改黑名单";
       });
@@ -264,7 +365,134 @@ export default {
       this.download('manage/blacklist/export', {
         ...this.queryParams
       }, `blacklist_${new Date().getTime()}.xlsx`)
-    }
+    },
+    //获取医院list
+    selectAgencyinfo() {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'HOSPITAL',
+      }
+      selectAgencyList(query).then(res => {
+        this.hospitalAgencylist = res.data
+      })
+    },
+    //选中医院获取院区
+    changehospitalAgency(id, type, typetwo) {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'CAMPUS',
+        parentId: id,
+      }
+      selectAgencyList(query).then(res => {
+        if (type) {
+          this.form_campusAgencylist = res.data
+          if (!typetwo) {
+            this.form.campusAgencyId = null
+            this.form.departmentId = null
+            this.form.wardId = null
+          }
+        } else {
+          this.campusAgencylist = res.data
+          this.queryParams.campusAgencyId = null
+          this.queryParams.departmentId = null
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //选中院区获取科室
+    changecampusAgency(id, type, typetwo) {
+      let query = {
+        nodeType: 'DEPARTMENT',
+        agencyId: id,
+      }
+      getDepartmentList(query).then(res => {
+        if (type) {
+          this.form_departmentlist = res.data
+          if (!typetwo) {
+            this.form.departmentId = null
+            this.form.wardId = null
+          }
+        } else {
+          this.departmentlist = res.data
+          this.queryParams.departmentId = null
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //选中科室获取病区
+    changedepartment(id, type, typetwo) {
+      let query = {
+        nodeType: 'WARD',
+        parentDepartmentId: id,
+      }
+      getDepartmentList(query).then(res => {
+        if (type) {
+          this.form_wardlist = res.data
+          if (!typetwo) {
+            this.form.wardId = null
+          }
+        } else {
+          this.wardlist = res.data
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //清空医院
+    clearhospitalAgency(type) {
+      if (type) {
+        this.form.campusAgencyId = null
+        this.form.departmentId = null
+        this.form.wardId = null
+      } else {
+        this.queryParams.campusAgencyId = null
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      }
+    },
+    //清空院区
+    clearcampusAgency(type) {
+      if (type) {
+        this.form.departmentId = null
+        this.form.wardId = null
+      } else {
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      }
+    },
+    //清空科室
+    cleardepartment(type) {
+      if (type) {
+        this.form.wardId = null
+      } else {
+        this.queryParams.wardId = null
+      }
+    },
+    //获取异常原因
+    causegetinfo() {
+      let query = {
+        abnormalCauseLevel: 'ABNORMAL_CAUSE'
+      }
+      causegetlist(query).then(res => {
+        this.abnormalCauselist = res.data
+        this.form.supplementIllustrateValue = null
+      })
+    },
+    //清空异常原因
+    clearabnormalCauseValue() {
+      this.form.supplementIllustrateValue = null
+    },
+    //选中异常原因
+    changeabnormalCauseValue(id, type) {
+      let query = {
+        parentId: id,
+      }
+      causegetlist(query).then(res => {
+        this.supplementIllustratelist = res.data
+        if (!type) {
+          this.form.supplementIllustrateValue = null
+        }
+      })
+    },
   }
 };
 </script>

src/views/manage/components/healthEducation.vue

@@ -48,16 +48,6 @@ export default {
     name: "healthEducation",
     data() {
         return {
-            pickerOptions: {
-                disabledDate(time) {
-                    return time.getTime() > Date.now(); //禁止选择今天以后的时间
-                },
-            },
-            //选择时间区间
-            datePickerStart: "",
-            datePickerEnd: "",
-            //右侧标题选中
-            recordindex: 0,
             //左侧类型选中
             categoryindex: 0,
             //左侧选中的item

src/views/manage/components/indicatorMonitoring.vue

@@ -20,16 +20,6 @@ export default {
     name: "indicatorMonitoring",
     data() {
         return {
-            pickerOptions: {
-                disabledDate(time) {
-                    return time.getTime() > Date.now(); //禁止选择今天以后的时间
-                },
-            },
-            //选择时间区间
-            datePickerStart: "",
-            datePickerEnd: "",
-            //右侧标题选中
-            recordindex: 0,
             //左侧类型选中
             categoryindex: 0,
             //左侧选中的item

src/views/manage/components/signingRecords.vue

@@ -3,13 +3,9 @@
         <div class="leftheader">
             <div class="item" v-for="(item, index) in categorylist" :key="item.id" @click="clickcategory(item, index)"
                 :class="index == categoryindex ? 'selectitem' : ''">
-                <div class="time">{{ item.time }}
+                <div class="time">{{ item.signTime }}
                 </div>
-                <div class="name">
+                <div class="name"> {{ item.packageName }}
-                    {{ item.name }}
-                </div>
-                <div class="text">
-                    {{ item.text }}
                 </div>
                 <el-tag class="type" size="mini">服务中</el-tag>
                 <!-- <el-tag class="type" size="mini" type="success">门诊</el-tag> -->
@@ -18,66 +14,91 @@
         <div class="rightheader">
             <div class="richtext">
                 <el-descriptions title="基本信息" style="margin-top: 20px;">
-                    <el-descriptions-item label="医院">kooriookami</el-descriptions-item>
+                    <el-descriptions-item label="医院">{{ ByRecord.hospitalAgencyName }}</el-descriptions-item>
-                    <el-descriptions-item label="科室">18100000000</el-descriptions-item>
+                    <el-descriptions-item label="科室">{{ ByRecord.departmentName }}</el-descriptions-item>
-                    <el-descriptions-item label="签约时诊断">苏州市</el-descriptions-item>
+                    <el-descriptions-item label="签约时诊断">{{ ByRecord.signDiagnosis }}</el-descriptions-item>
-                    <el-descriptions-item label="院区">苏州市</el-descriptions-item>
+                    <el-descriptions-item label="院区">{{ ByRecord.campusAgencyName }}</el-descriptions-item>
-                    <el-descriptions-item label="病区">苏州市</el-descriptions-item>
+                    <el-descriptions-item label="病区">{{ ByRecord.wardName }}</el-descriptions-item>
-                    <el-descriptions-item label="审核后诊断">苏州市</el-descriptions-item>
+                    <el-descriptions-item label="审核后诊断">{{ ByRecord.reviewDiagnosis }}</el-descriptions-item>
                 </el-descriptions>
                 <el-descriptions title="签约信息" style="margin-top: 40px;">
-                    <el-descriptions-item label="服务包">kooriookami</el-descriptions-item>
+                    <el-descriptions-item label="服务包">{{ ByRecord.packageName }}</el-descriptions-item>
-                    <el-descriptions-item label="服务包缴费状态">18100000000</el-descriptions-item>
+                    <el-descriptions-item label="服务包缴费状态">{{
-                    <el-descriptions-item label="到期时间">苏州市</el-descriptions-item>
+                        ByRecord.packagePaymentStatus == 'PAID' ? '已缴费' : ByRecord.packagePaymentStatus == 'UNPAID_FEES' ?
-                    <el-descriptions-item label="服务包价格">￥1188</el-descriptions-item>
+                        '未缴费' : ''
-                    <el-descriptions-item label="服务时间">2024-02-19 00:00:00至2024-03-1823:59:59</el-descriptions-item>
+                    }}</el-descriptions-item>
-                    <el-descriptions-item label="服务周期">苏州市 1188 号</el-descriptions-item>
+                    <el-descriptions-item label="到期时间">{{ ByRecord.serviceEndTime }}</el-descriptions-item>
-                    <el-descriptions-item label="签约时间">2024-02-19 15:43:40</el-descriptions-item>
+                    <el-descriptions-item label="服务包价格">{{ ByRecord.packagePrice }}</el-descriptions-item>
+                    <el-descriptions-item label="服务时间">{{ ByRecord.serviceStartTime }}</el-descriptions-item>
+                    <el-descriptions-item label="服务周期">{{ ByRecord.serviceCycle }}月</el-descriptions-item>
+                    <el-descriptions-item label="签约时间">{{ ByRecord.signTime }}</el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions title="硬件信息" style="margin-top: 20px;" class="descriptions">
+                    <el-descriptions-item>
+                        <el-table :data="ByRecord.signDevices" style="width: 100%">
+                            <el-table-column label="序号" type="index" width="55" align="center" />
+                            <el-table-column prop="hardwareType" label="硬件类型" width="180" align="center">
+                                <template slot-scope="scope">
+                                    {{ scope.row.hardwareType == 'BLOOD_PRESSURE' ? '血压仪' : '' }}
+                                    {{ scope.row.hardwareType == 'GLUCOSE_METER' ? '血糖仪' : '' }}
+                                    {{ scope.row.hardwareType == 'ELECTROCARDIOGRA' ? '心电仪' : '' }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="snCode" label="SN码" width="180" align="center" />
+                            <el-table-column prop="hardwarePrice" label="硬件金额(元)" align="center" />
+                            <el-table-column prop="hardwareStatus" label="硬件状态" align="center" />
+                        </el-table>
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions title="其他材料" style="margin-top: 20px;" class="descriptions">
+                    <el-descriptions-item>
+
+                    </el-descriptions-item>
                 </el-descriptions>
             </div>
         </div>
     </div>
 </template>
 <script>
+import {
+    getByPatient,
+    getByRecordId
+} from '@/api/manage/signingRecords'
 export default {
     name: "signingRecords",
     data() {
         return {
-            pickerOptions: {
-                disabledDate(time) {
-                    return time.getTime() > Date.now(); //禁止选择今天以后的时间
-                },
-            },
-            //选择时间区间
-            datePickerStart: "",
-            datePickerEnd: "",
-            //右侧标题选中
-            recordindex: 0,
             //左侧类型选中
             categoryindex: 0,
             //左侧选中的item
             categoryItem: {},
             //左侧list
-            categorylist: [{
+            categorylist: [],
-                id: 1,
+            ByRecord: { signDevices: [], },
-                name: '冠状动脉粥样硬化性心脏病',
-                text: '冠状动脉粥样硬化性心脏病',
-                time: '2022-02-02 10:33:00'
-            }, {
-                id: 2,
-                name: '冠状动脉粥样硬化性心脏病',
-                text: '冠状动脉粥样硬化性心脏病',
-                time: '2022-02-02 10:33:00'
-            }]
         };
     },
     created() {
-        this.categoryItem = this.categorylist[0]
+        this.info();
     },
     methods: {
+        info() {
+            getByPatient(this.$route.query.patientId).then(res => {
+                if (res.data.length > 0) {
+                    this.categorylist = res.data
+                    this.categoryItem = this.categorylist[0]
+                    this.getByRecordIdinfo();
+                }
+            })
+        },
+        getByRecordIdinfo() {
+            getByRecordId(this.categoryItem.id).then(res => {
+                this.ByRecord = res.data
+            })
+        },
         clickcategory(item, index) {
             this.categoryindex = index
             this.categoryItem = item
+            this.getByRecordIdinfo();
         }
     }
 };
@@ -88,6 +109,12 @@ export default {
     padding: 0 !important;
     display: flex;
 
+    .descriptions {
+        ::v-deep .el-descriptions-item__label.has-colon::after {
+            display: none;
+        }
+    }
+
     .rightheader {
         width: 75%;
         padding-top: 20px;
@@ -97,6 +124,9 @@ export default {
             width: 90%;
             margin: 0 auto;
             height: 450px;
+            overflow: scroll;
+            // 隐藏表头的滚动条
+            overflow-x: hidden !important;
         }
     }
 
@@ -115,7 +145,7 @@ export default {
         }
 
         .item {
-            height: 120px;
+            height: 100px;
             padding: 25px 10px;
             position: relative;
             border-left: 2px solid #fff;
@@ -128,13 +158,6 @@ export default {
                 font-size: 12px;
             }
 
-            .text {
-                height: 20px;
-                line-height: 20px;
-                font-size: 12px;
-                color: #999999;
-            }
-
             .name {
                 overflow: hidden;
                 text-overflow: ellipsis;

src/views/manage/details/patientdetails.vue

@@ -14,19 +14,21 @@
           {{ $route.query.age }}
         </div>
         <div class="source">
-          <div class="item" v-if="$route.query.patientSource == 'WE_CHAT_OFFICIAL_ACCOUNT'">
+          <div class="item" style="color:#00E06E;border-color:#00E06E"
-            <img src="../../../assets/manage/gzh.png" alt="">
+            v-if="$route.query.patientSource == 'WE_CHAT_OFFICIAL_ACCOUNT'">
+            <img src="../../../assets/manage/gzh.png" alt="" style="width:24px">
             <div>
               公众号
             </div>
           </div>
-          <div class="item" v-if="$route.query.patientSource == 'WE_CHAT_APPLET'">
+          <div class="item" style="color:#339DE5;border-color:#339DE5"
+            v-if="$route.query.patientSource == 'WE_CHAT_APPLET'">
             <img src="../../../assets/manage/xcx.png" alt="">
             <div>
               小程序
             </div>
           </div>
-          <div class="item" v-if="$route.query.patientSource == 'MANAGE_END'">
+          <div class="item" style="color:#F4881F;border-color:#F4881F" v-if="$route.query.patientSource == 'MANAGE_END'">
             <img src="../../../assets/manage/gld.png" alt="">
             <div>
               管理端
@@ -150,7 +152,6 @@ export default {
         display: flex;
 
         .item {
-          color: #787878;
           line-height: 30px;
           font-size: 14px;
           margin-left: 20px;
@@ -161,7 +162,6 @@ export default {
           height: 30px;
           display: flex;
           align-items: center;
-          background-color: #F5F5F5;
 
           img {
             margin-right: 10px;

src/views/manage/newSigning/index.vue

@@ -0,0 +1,66 @@
+<template>
+    <div class="app-container">
+        <div class="header">
+            <el-descriptions title="签约详情" class="descriptions">
+            </el-descriptions>
+            <el-descriptions title="患者信息" style="padding:0 30px">
+                <el-descriptions-item label="患者姓名">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="性别">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="年龄">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="电话">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="就诊方式">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="诊断">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="住院/门诊号">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="医院">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="科室">kooriookami</el-descriptions-item>
+                <el-descriptions-item label="服务包缴费状态">18100000000</el-descriptions-item>
+                <el-descriptions-item label="出院/门诊时间">苏州市</el-descriptions-item>
+                <el-descriptions-item label="注册时间"></el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions title="服务包信息" style="padding:0 30px">
+                <el-descriptions-item label="选择服务包"></el-descriptions-item>
+            </el-descriptions>
+        </div>
+    </div>
+</template>
+    
+<script>
+
+export default {
+    name: "newSigning",
+    data() {
+        return {
+        };
+    },
+    created() {
+    },
+    methods: {
+
+    }
+};
+</script>
+<style lang="scss" scoped>
+.app-container {
+    padding: 14px 0 0;
+    background-color: #F2F3F5 !important;
+    width: 100%;
+
+    .descriptions {
+        padding: 20px 20px 10px;
+    }
+
+    .descriptions {
+        ::v-deep .el-descriptions-item__label.has-colon::after {
+            display: none;
+        }
+    }
+
+    .header {
+        background-color: #fff;
+        width: 98%;
+        margin: 0 auto;
+        border-radius: 8px;
+    }
+}
+</style>
+    

src/views/manage/patientInfo/index.vue

@@ -9,25 +9,41 @@
         <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="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"
+        <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
-          @keyup.enter.native="handleQuery" />
+          @clear="clearhospitalAgency" @change="changehospitalAgency">
+          <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="院区" prop="campusAgencyId">
+      <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
-        <el-input v-model="queryParams.campusAgencyId" placeholder="请输入院区名称" clearable style="width:200px"
+        <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
-          @keyup.enter.native="handleQuery" />
+          @clear="clearcampusAgency" @change="changecampusAgency">
+          <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="科室" prop="departmentId">
+      <el-form-item label="科室" prop="departmentId" v-if="queryParams.campusAgencyId">
-        <el-input v-model="queryParams.departmentId" placeholder="请输入科室名称" clearable style="width:200px"
+        <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
-          @keyup.enter.native="handleQuery" />
+          @clear="cleardepartment" @change="changedepartment">
+          <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="病区" prop="wardId">
+      <el-form-item label="病区" prop="wardId" v-if="queryParams.departmentId">
-        <el-input v-model="queryParams.wardId" placeholder="请输入病区名称" clearable style="width:200px"
+        <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
-          @keyup.enter.native="handleQuery" />
+          <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
       <!-- <el-form-item label="门诊号" prop="outpatientNumber">
         <el-input v-model="queryParams.outpatientNumber" placeholder="请输入门诊号" clearable style="width:200px"
@@ -63,16 +79,11 @@
           <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-form-item label="入院时间" prop="admissionDateStart">
-        <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>
+      </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>
@@ -147,6 +158,7 @@
 <script>
 import { listPatientInfo } from "@/api/manage/patientInfo";
 import { getAge } from "@/utils/age";
+import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
 
 export default {
   name: "PatientInfo",
@@ -159,14 +171,6 @@ export default {
       total: 0,
       // 患者信息表格数据
       patientInfoList: [],
-      // 是否显示弹出层
-      pickerOptions: {
-        disabledDate: (time) => {
-          if (this.queryParams.appointmentDateEnd != null) {
-            return time.getTime() < new Date(this.queryParams.appointmentDateStart).getTime();
-          }
-        },
-      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -197,10 +201,19 @@ export default {
       },
       visitTime: [],
       admissionDate: [],
+      //医院list
+      hospitalAgencylist: [],
+      // 院区list
+      campusAgencylist: [],
+      //科室list
+      departmentlist: [],
+      //病区list
+      wardlist: [],
     };
   },
   created() {
     this.getList();
+    this.selectAgencyinfo();
   },
   methods: {
     /** 详情操作 */
@@ -250,10 +263,70 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.admissionDate = [];
+      this.admissionDate = [];
+      this.queryParams.admissionDateStart = null
+      this.queryParams.admissionDateEnd = null
+      this.visitTime = []
+      this.queryParams.visitTimeStart = null
+      this.queryParams.visitTimeEnd = null
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    selectAgencyinfo() {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'HOSPITAL',
+      }
+      selectAgencyList(query).then(res => {
+        this.hospitalAgencylist = res.data
+      })
+    },
+    //选中医院获取院区
+    changehospitalAgency(id) {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'CAMPUS',
+        parentId: id,
+      }
+      selectAgencyList(query).then(res => {
+        this.campusAgencylist = res.data
+      })
+    },
+    //选中院区获取科室
+    changecampusAgency(id) {
+      let query = {
+        nodeType: 'DEPARTMENT',
+        agencyId: id,
+      }
+      getDepartmentList(query).then(res => {
+        this.departmentlist = res.data
+      })
+    },
+    //选中科室获取病区
+    changedepartment(id) {
+      let query = {
+        nodeType: 'WARD',
+        parentDepartmentId: id,
+      }
+      getDepartmentList(query).then(res => {
+        this.wardlist = res.data
+      })
+    },
+    //清空医院
+    clearhospitalAgency() {
+      this.queryParams.campusAgencyId = null
+      this.queryParams.departmentId = null
+      this.queryParams.wardId = null
+    },
+    //清空院区
+    clearcampusAgency() {
+      this.queryParams.departmentId = null
+      this.queryParams.wardId = null
+    },
+    //清空科室
+    cleardepartment() {
+      this.queryParams.wardId = null
+    },
   }
 };
 </script>

src/views/manage/preHospitalized/index.vue

@@ -34,20 +34,31 @@
           @keyup.enter.native="handleQuery" />
       </el-form-item> -->
       <el-form-item label="医院" prop="hospitalAgencyId">
-        <el-input v-model="queryParams.hospitalAgencyId" placeholder="请输入医院名称" clearable style="width:200px"
+        <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
-          @keyup.enter.native="handleQuery" />
+          @clear="clearhospitalAgency" @change="changehospitalAgency">
+          <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="院区" prop="campusAgencyId">
+      <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
-        <el-input v-model="queryParams.campusAgencyId" placeholder="请输入院区名称" clearable style="width:200px"
+        <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
-          @keyup.enter.native="handleQuery" />
+          @clear="clearcampusAgency" @change="changecampusAgency">
+          <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="科室" prop="departmentId">
+      <el-form-item label="科室" prop="departmentId" v-if="queryParams.campusAgencyId">
-        <el-input v-model="queryParams.departmentId" placeholder="请输入科室名称" clearable style="width:200px"
+        <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
-          @keyup.enter.native="handleQuery" />
+          @clear="cleardepartment" @change="changedepartment">
+          <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="病区" prop="wardId">
+      <el-form-item label="病区" prop="wardId" v-if="queryParams.departmentId">
-        <el-input v-model="queryParams.wardId" placeholder="请输入病区名称" clearable style="width:200px"
+        <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
-          @keyup.enter.native="handleQuery" />
+          <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
       <!-- <el-form-item label="出生日期" prop="birthDate">
         <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
@@ -212,17 +223,32 @@
         <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-form-item label="医院" prop="hospitalAgencyId">
-          <el-input v-model="form.hospitalAgencyName" placeholder="请输入所属医院名称" style="width:200px" />
+          <el-select v-model="form.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
+            @clear="clearhospitalAgency(1)" @change="changehospitalAgency($event, 1)">
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyName">
+        <el-form-item label="院区" prop="campusAgencyId" v-if="form.hospitalAgencyId">
-          <el-input v-model="form.campusAgencyName" placeholder="请输入所属院区名称" style="width:200px" />
+          <el-select v-model="form.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+            @clear="clearcampusAgency(1)" @change="changecampusAgency($event, 1)">
+            <el-option v-for="item in form_campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="科室名称" prop="departmentName">
+        <el-form-item label="科室名称" prop="departmentId" v-if="form.campusAgencyId">
-          <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" style="width:200px" />
+          <el-select v-model="form.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
+            @clear="cleardepartment(1)" @change="changedepartment($event, 1)">
+            <el-option v-for="item in form_departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="预约病区" prop="wardName">
+        <el-form-item label="预约病区" prop="wardId" v-if="form.departmentId">
-          <el-input v-model="form.wardName" placeholder="请输入所属病区名称" style="width:200px" />
+          <el-select v-model="form.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
+            <el-option v-for="item in form_wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="预约治疗组" prop="appointmentTreatmentGroup">
           <el-input v-model="form.appointmentTreatmentGroup" placeholder="请输入预约治疗组" style="width:200px" />
@@ -343,12 +369,29 @@
 <script>
 import { listPatientInfo, getPatientInfo, delPatientInfo, addPatientInfo, updatePatientInfo } from "@/api/manage/patientInfo";
 import { getAge } from "@/utils/age";
+import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
 
 export default {
   name: "preHospitalized",
   dicts: ['patient_type', 'visit_method', 'sign_status', 'patient_source'],
   data() {
     return {
+      //医院list
+      hospitalAgencylist: [],
+      // 院区list
+      campusAgencylist: [],
+      //科室list
+      departmentlist: [],
+      //病区list
+      wardlist: [],
+      //form-医院list
+      form_hospitalAgencylist: [],
+      // form-院区list
+      form_campusAgencylist: [],
+      //form-科室list
+      form_departmentlist: [],
+      //form-病区list
+      form_wardlist: [],
       //导入
       fileList: [],
       // 遮罩层
@@ -403,11 +446,21 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        patientName: [
+          { required: true, message: '请输入患者姓名', trigger: 'change' }
+        ],
+        patientPhone: [
+          { required: true, message: '请输入患者手机号', trigger: 'change' }
+        ],
+        appointmentDate: [
+          { required: true, message: '请选择患者预约时间', trigger: 'change' }
+        ],
       }
     };
   },
   created() {
     this.getList();
+    this.selectAgencyinfo();
   },
   methods: {
     /** 详情操作 */
@@ -486,6 +539,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.appointmentDate = []
+      this.queryParams.appointmentDateStart = ''
       this.queryParams.appointmentDateEnd = ''
       this.resetForm("queryForm");
       this.handleQuery();
@@ -508,12 +563,22 @@ export default {
       const id = row.id || this.ids
       getPatientInfo(id).then(response => {
         this.form = response.data;
+        if (this.form.hospitalAgencyId) {
+          this.changehospitalAgency(this.form.hospitalAgencyId, 1, 2)
+        }
+        if (this.form.campusAgencyId) {
+          this.changecampusAgency(this.form.campusAgencyId, 1, 2)
+        }
+        if (this.form.departmentId) {
+          this.changedepartment(this.form.departmentId, 1, 2)
+        }
         this.open = true;
         this.title = "修改患者信息";
       });
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form)
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -566,6 +631,107 @@ export default {
     uploadcancel() {
       this.uploadopen = false
     },
+    //获取医院list
+    selectAgencyinfo() {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'HOSPITAL',
+      }
+      selectAgencyList(query).then(res => {
+        this.hospitalAgencylist = res.data
+      })
+    },
+    //选中医院获取院区
+    changehospitalAgency(id, type, typetwo) {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'CAMPUS',
+        parentId: id,
+      }
+      selectAgencyList(query).then(res => {
+        if (type) {
+          this.form_campusAgencylist = res.data
+          if (!typetwo) {
+            this.form.campusAgencyId = null
+            this.form.departmentId = null
+            this.form.wardId = null
+          }
+        } else {
+          this.campusAgencylist = res.data
+          this.queryParams.campusAgencyId = null
+          this.queryParams.departmentId = null
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //选中院区获取科室
+    changecampusAgency(id, type, typetwo) {
+      let query = {
+        nodeType: 'DEPARTMENT',
+        agencyId: id,
+      }
+      getDepartmentList(query).then(res => {
+        if (type) {
+          this.form_departmentlist = res.data
+          if (!typetwo) {
+            this.form.departmentId = null
+            this.form.wardId = null
+          }
+        } else {
+          this.departmentlist = res.data
+          this.queryParams.departmentId = null
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //选中科室获取病区
+    changedepartment(id, type, typetwo) {
+      let query = {
+        nodeType: 'WARD',
+        parentDepartmentId: id,
+      }
+      getDepartmentList(query).then(res => {
+        if (type) {
+          this.form_wardlist = res.data
+          if (!typetwo) {
+            this.form.wardId = null
+          }
+        } else {
+          this.wardlist = res.data
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //清空医院
+    clearhospitalAgency(type) {
+      if (type) {
+        this.form.campusAgencyId = null
+        this.form.departmentId = null
+        this.form.wardId = null
+      } else {
+        this.queryParams.campusAgencyId = null
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      }
+    },
+    //清空院区
+    clearcampusAgency(type) {
+      if (type) {
+        this.form.departmentId = null
+        this.form.wardId = null
+      } else {
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      }
+    },
+    //清空科室
+    cleardepartment(type) {
+      if (type) {
+        this.form.wardId = null
+      } else {
+        this.queryParams.wardId = null
+      }
+    },
   }
 };
 </script>

src/views/manage/signRecord/index.vue

@@ -0,0 +1,485 @@
+<template>
+  <div class="app-container">
+    <el-tabs v-model="queryParams.serviceStatus" @tab-click="handleClick">
+      <el-tab-pane label="意向签约" name="INTENTIONAL_SIGNING"></el-tab-pane>
+      <el-tab-pane label="服务中" name="SERVICE_CENTER"></el-tab-pane>
+      <el-tab-pane label="服务结束" name="SERVICE_END"></el-tab-pane>
+      <el-tab-pane label="待续签" name="WAIT_CONTINUOUS_SIGN"></el-tab-pane>
+    </el-tabs>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
+      <el-form-item label="加入意向时间" prop="intentionalTimeStart" label-width="110px"
+        v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">
+        <el-date-picker v-model="intentionalTime" 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="signTimeStart" v-if="queryParams.serviceStatus == 'SERVICE_CENTER'">
+        <el-date-picker v-model="signTime" 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="serviceEndTimeStart" v-if="queryParams.serviceStatus == 'SERVICE_END'">
+        <el-date-picker v-model="serviceEndTime" 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="submissionTimeStart" v-if="queryParams.serviceStatus == 'WAIT_CONTINUOUS_SIGN'">
+        <el-date-picker v-model="submissionTime" 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="hospitalAgencyId">
+        <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
+          @clear="clearhospitalAgency" @change="changehospitalAgency">
+          <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
+        <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+          @clear="clearcampusAgency" @change="changecampusAgency">
+          <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="科室" prop="departmentId" v-if="queryParams.campusAgencyId">
+        <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
+          @clear="cleardepartment" @change="changedepartment">
+          <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="病区" prop="wardId" v-if="queryParams.departmentId">
+        <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
+          <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
+      </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="signDiagnosis">
+        <el-input v-model="queryParams.signDiagnosis" placeholder="请输入签约时诊断" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+      <el-form-item label="意向来源" prop="intentionalSource">
+        <el-input v-model="queryParams.intentionalSource" placeholder="请输入意向来源" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="开单医生" prop="billingDoctorName">
+        <el-input v-model="queryParams.billingDoctorName" placeholder="请输入开单医生姓名" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <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="cardNo">
+        <el-input v-model="queryParams.cardNo" placeholder="请输入身份证号" clearable @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:signRecord: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:signRecord: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:signRecord: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:signRecord:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row> -->
+    <el-table v-loading="loading" :data="signRecordList" @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="130" />
+      <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="hospitalAgencyName" width="130" />
+      <el-table-column label="院区" align="center" prop="campusAgencyName" />
+      <el-table-column label="科室" align="center" prop="departmentName" />
+      <el-table-column label="病区" align="center" prop="wardName" />
+      <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="intentionalSource"
+        v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'" />
+      <el-table-column label="患者来源" align="center" prop="intentionalSource" v-else />
+      <el-table-column label="签约时间" align="center" prop="signTime" width="180"
+        v-if="queryParams.serviceStatus == 'SERVICE_CENTER'">
+        <template slot-scope="scope">
+          <span>{{ formatDate(scope.row.signTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="加入意向时间" align="center" prop="intentionalTime" width="180"
+        v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">
+        <template slot-scope="scope">
+          <span>{{ formatDate(scope.row.intentionalTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="服务包名称" align="center" prop="packageName" width="130"
+        v-if="queryParams.serviceStatus != 'INTENTIONAL_SIGNING'" />
+      <div v-else>
+        <el-table-column label="开单医生" align="center" prop="billingDoctorName" />
+        <el-table-column label="金额" align="center" prop="price" />
+        <el-table-column label="缴费状态" align="center" prop="paymentStatus">
+          <template slot-scope="scope">
+            <span>{{ scope.row.paymentStatus == 'PAID' ? '已缴费' : '' }}
+              {{ scope.row.paymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }}
+            </span>
+          </template>
+        </el-table-column>
+      </div>
+      <el-table-column label="签约时长" align="center" prop="serviceCycle">
+        <template slot-scope="scope">
+          <span>{{ scope.row.serviceCycle }}月</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="服务状态" align="center"
+        prop="serviceStatus" >
+      ，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END
+        </el-table-column> -->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="handlenewsign(scope.row)"
+            v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">签约</el-button>
+          <el-button size="mini" type="text" @click="handleDelete(scope.row)"
+            v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">忽略</el-button>
+          <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+            v-if="queryParams.serviceStatus == 'SERVICE_CENTER' || queryParams.serviceStatus == 'SERVICE_END'">详情</el-button>
+          <el-button size="mini" type="text" @click="handleDelete(scope.row)"
+            v-if="queryParams.serviceStatus == 'SERVICE_CENTER'">取消签约</el-button>
+          <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+            v-if="queryParams.serviceStatus == 'SERVICE_CENTER' || queryParams.serviceStatus == 'SERVICE_END'">续约</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" />
+  </div>
+</template>
+
+<script>
+import { getAge } from "@/utils/age";
+import { listSignRecord, getSignRecord, delSignRecord, addSignRecord, updateSignRecord } from "@/api/manage/signRecord";
+import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
+
+export default {
+  dicts: ['visit_method'],
+  name: "SignRecord",
+  data() {
+    return {
+      //医院list
+      hospitalAgencylist: [],
+      // 院区list
+      campusAgencylist: [],
+      //科室list
+      departmentlist: [],
+      //病区list
+      wardlist: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 签约记录表格数据
+      signRecordList: [],
+      intentionalTime: [],
+      signTime: [],
+      serviceEndTime: [],
+      submissionTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        patientName: null,
+        patientPhone: null,
+        cardNo: null,
+        signTimeStart: null,
+        signTimeEnd: null,
+        hospitalAgencyId: null,
+        campusAgencyId: null,
+        departmentId: null,
+        wardId: null,
+        wardName: null,
+        visitMethod: null,
+        signDiagnosis: null,
+        serviceStatus: 'INTENTIONAL_SIGNING',
+        intentionalSource: null,
+        intentionalTimeStart: null,
+        intentionalTimeEnd: null,
+        billingDoctorName: null,
+        paymentStatus: null,
+        serviceEndTimeStart: null,
+        serviceEndTimeEnd: null,
+        submissionTimeStart: null,
+        submissionTimeEnd: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        patientId: [
+          { required: true, message: "患者信息表id不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.selectAgencyinfo();
+    this.getList();
+  },
+  methods: {
+    /** 查询签约记录列表 */
+    getList() {
+      this.loading = true;
+      listSignRecord(this.queryParams).then(response => {
+        this.signRecordList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        patientId: null,
+        patientName: null,
+        patientPhone: null,
+        cardNo: null,
+        signTime: null,
+        hospitalAgencyId: null,
+        hospitalAgencyName: null,
+        campusAgencyId: null,
+        campusAgencyName: null,
+        departmentId: null,
+        departmentName: null,
+        wardId: null,
+        wardName: null,
+        visitSerialNumber: null,
+        visitMethod: null,
+        signDiagnosis: null,
+        reviewDiagnosis: null,
+        serviceStatus: "0",
+        signStatus: "0",
+        intentionalSource: null,
+        intentionalTime: null,
+        billingDoctorId: null,
+        billingDoctorName: null,
+        price: null,
+        paymentStatus: "0",
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      if (this.intentionalTime.length > 0) {
+        this.queryParams.intentionalTimeStart = this.intentionalTime[0]
+        this.queryParams.intentionalTimeEnd = this.intentionalTime[1]
+      }
+      if (this.signTime.length > 0) {
+        this.queryParams.signTimeStart = this.signTime[0]
+        this.queryParams.signTimeEnd = this.signTime[1]
+      }
+      if (this.serviceEndTime.length > 0) {
+        this.queryParams.serviceEndTimeStart = this.serviceEndTime[0]
+        this.queryParams.serviceEndTimeEnd = this.serviceEndTime[1]
+      }
+      if (this.submissionTime.length > 0) {
+        this.queryParams.submissionTimeStart = this.submissionTime[0]
+        this.queryParams.submissionTimeEnd = this.submissionTime[1]
+      }
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.intentionalTime = []
+      this.signTime = []
+      this.queryParams.signTimeStart = null
+      this.queryParams.signTimeEnd = null
+      this.queryParams.intentionalTimeStart = null
+      this.queryParams.intentionalTimeEnd = null
+      this.serviceEndTime = []
+      this.submissionTime = []
+      this.queryParams.serviceEndTimeStart = null
+      this.queryParams.serviceEndTimeEnd = null
+      this.queryParams.submissionTimeStart = null
+      this.queryParams.submissionTimeEnd = null
+      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();
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getSignRecord(id).then(response => {
+        this.form = response.data;
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除签约记录编号为"' + ids + '"的数据项？').then(function () {
+        return delSignRecord(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('manage/signRecord/export', {
+        ...this.queryParams
+      }, `signRecord_${new Date().getTime()}.xlsx`)
+    },
+    handleClick(tab, event) {
+      this.intentionalTime = []
+      this.queryParams.intentionalTimeStart = null
+      this.queryParams.intentionalTimeEnd = null
+      this.signTime = []
+      this.queryParams.signTimeStart = null
+      this.queryParams.signTimeEnd = null
+      this.getList();
+    },
+    // 格式化日期格式如：2017-9-19 18:04:33
+    formatDate(value) {
+      if (!value) {
+        return
+      }
+      // 计算日期相关值
+      let time = new Date(value)
+      let Y = time.getFullYear();
+      let M = time.getMonth() + 1;
+      let D = time.getDate();
+      let h = time.getHours();
+      let m = time.getMinutes();
+      let s = time.getSeconds();
+      // 如果传递了type的话
+      return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s);
+    },
+    handlenewsign(row) {
+      this.$router.push({
+        path: "/patient/newSigning",
+        query: {
+          patientName: row.patientName,
+          patientPhone: row.patientPhone,
+          visitMethod: row.visitMethod,
+          mainDiagnosis: row.mainDiagnosis,
+          visitSerialNumber: row.visitSerialNumber,
+          hospitalAgencyName: row.hospitalAgencyName,
+          departmentName: row.departmentName,
+          paymentStatus: row.paymentStatus,
+          sex: row.sex,
+          age: row.birthDate ? getAge(row.birthDate) : '',
+          patientId: row.id,
+          createTime: row.createTime,
+        },
+      });
+    },
+    selectAgencyinfo() {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'HOSPITAL',
+      }
+      selectAgencyList(query).then(res => {
+        this.hospitalAgencylist = res.data
+      })
+    },
+    //选中医院获取院区
+    changehospitalAgency(id) {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'CAMPUS',
+        parentId: id,
+      }
+      selectAgencyList(query).then(res => {
+        this.campusAgencylist = res.data
+      })
+    },
+    //选中院区获取科室
+    changecampusAgency(id) {
+      let query = {
+        nodeType: 'DEPARTMENT',
+        agencyId: id,
+      }
+      getDepartmentList(query).then(res => {
+        this.departmentlist = res.data
+      })
+    },
+    //选中科室获取病区
+    changedepartment(id) {
+      let query = {
+        nodeType: 'WARD',
+        parentDepartmentId: id,
+      }
+      getDepartmentList(query).then(res => {
+        this.wardlist = res.data
+      })
+    },
+    //清空医院
+    clearhospitalAgency() {
+      this.queryParams.campusAgencyId = null
+      this.queryParams.departmentId = null
+      this.queryParams.wardId = null
+    },
+    //清空院区
+    clearcampusAgency() {
+      this.queryParams.departmentId = null
+      this.queryParams.wardId = null
+    },
+    //清空科室
+    cleardepartment() {
+      this.queryParams.wardId = null
+    },
+  }
+};
+</script>

src/views/manage/visitin/index.vue

@@ -34,20 +34,31 @@
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="医院" prop="hospitalAgencyId">
-        <el-input v-model="queryParams.hospitalAgencyId" placeholder="请输入医院名称" clearable style="width:200px"
+        <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
-          @keyup.enter.native="handleQuery" />
+          @clear="clearhospitalAgency" @change="changehospitalAgency">
+          <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="院区" prop="campusAgencyId">
+      <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
-        <el-input v-model="queryParams.campusAgencyId" placeholder="请输入院区名称" clearable style="width:200px"
+        <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
-          @keyup.enter.native="handleQuery" />
+          @clear="clearcampusAgency" @change="changecampusAgency">
+          <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="科室" prop="departmentId">
+      <el-form-item label="科室" prop="departmentId" v-if="queryParams.campusAgencyId">
-        <el-input v-model="queryParams.departmentId" placeholder="请输入科室名称" clearable style="width:200px"
+        <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
-          @keyup.enter.native="handleQuery" />
+          @clear="cleardepartment" @change="changedepartment">
+          <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="病区" prop="wardId">
+      <el-form-item label="病区" prop="wardId" v-if="queryParams.departmentId">
-        <el-input v-model="queryParams.wardId" placeholder="请输入病区名称" clearable style="width:200px"
+        <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
-          @keyup.enter.native="handleQuery" />
+          <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="就诊流水号" prop="visitSerialNumber">
         <el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
@@ -221,17 +232,32 @@
         <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-form-item label="医院" prop="hospitalAgencyId">
-          <el-input v-model="form.hospitalAgencyName" placeholder="请输入所属医院名称" style="width:200px" />
+          <el-select v-model="form.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
+            @clear="clearhospitalAgency(1)" @change="changehospitalAgency($event, 1)">
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyName">
+        <el-form-item label="院区" prop="campusAgencyId" v-if="form.hospitalAgencyId">
-          <el-input v-model="form.campusAgencyName" placeholder="请输入所属院区名称" style="width:200px" />
+          <el-select v-model="form.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+            @clear="clearcampusAgency(1)" @change="changecampusAgency($event, 1)">
+            <el-option v-for="item in form_campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="科室" prop="departmentName">
+        <el-form-item label="科室名称" prop="departmentId" v-if="form.campusAgencyId">
-          <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" style="width:200px" />
+          <el-select v-model="form.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
+            @clear="cleardepartment(1)" @change="changedepartment($event, 1)">
+            <el-option v-for="item in form_departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="病区" prop="wardName">
+        <el-form-item label="预约病区" prop="wardId" v-if="form.departmentId">
-          <el-input v-model="form.wardName" placeholder="请输入所属病区名称" style="width:200px" />
+          <el-select v-model="form.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
+            <el-option v-for="item in form_wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="住院号" prop="admissionNumber">
           <el-input v-model="form.admissionNumber" placeholder="请输入住院号" style="width:200px" />
@@ -342,16 +368,32 @@
     </el-dialog>
   </div>
 </template>
-
 <script>
 import { listPatientInfo, getPatientInfo, delPatientInfo, addPatientInfo, updatePatientInfo } from "@/api/manage/patientInfo";
 import { getAge } from "@/utils/age";
+import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
 
 export default {
   name: "visitin",
   dicts: ['patient_type', 'visit_method', 'sign_status', 'patient_source'],
   data() {
     return {
+      //医院list
+      hospitalAgencylist: [],
+      // 院区list
+      campusAgencylist: [],
+      //科室list
+      departmentlist: [],
+      //病区list
+      wardlist: [],
+      //form-医院list
+      form_hospitalAgencylist: [],
+      // form-院区list
+      form_campusAgencylist: [],
+      //form-科室list
+      form_departmentlist: [],
+      //form-病区list
+      form_wardlist: [],
       //导入
       fileList: [],
       // 遮罩层
@@ -406,11 +448,24 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        patientName: [
+          { required: true, message: '请输入患者姓名', trigger: 'change' }
+        ],
+        patientPhone: [
+          { required: true, message: '请输入患者手机号', trigger: 'change' }
+        ],
+        visitMethod: [
+          { required: true, message: '请输入就诊方式', trigger: 'change' }
+        ],
+        admissionDate: [
+          { required: true, message: '请选择患者入院时间', trigger: 'change' }
+        ],
       }
     };
   },
   created() {
     this.getList();
+    this.selectAgencyinfo();
   },
   methods: {
     /** 详情操作 */
@@ -505,6 +560,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.admissionDate = []
+      this.queryParams.admissionDateStart = ''
       this.queryParams.admissionDateEnd = ''
       this.resetForm("queryForm");
       this.handleQuery();
@@ -527,6 +584,15 @@ export default {
       const id = row.id || this.ids
       getPatientInfo(id).then(response => {
         this.form = response.data;
+        if (this.form.hospitalAgencyId) {
+          this.changehospitalAgency(this.form.hospitalAgencyId, 1, 2)
+        }
+        if (this.form.campusAgencyId) {
+          this.changecampusAgency(this.form.campusAgencyId, 1, 2)
+        }
+        if (this.form.departmentId) {
+          this.changedepartment(this.form.departmentId, 1, 2)
+        }
         this.open = true;
         this.title = "修改患者信息";
       });
@@ -585,6 +651,107 @@ export default {
     uploadcancel() {
       this.uploadopen = false
     },
+    //获取医院list
+    selectAgencyinfo() {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'HOSPITAL',
+      }
+      selectAgencyList(query).then(res => {
+        this.hospitalAgencylist = res.data
+      })
+    },
+    //选中医院获取院区
+    changehospitalAgency(id, type, typetwo) {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'CAMPUS',
+        parentId: id,
+      }
+      selectAgencyList(query).then(res => {
+        if (type) {
+          this.form_campusAgencylist = res.data
+          if (!typetwo) {
+            this.form.campusAgencyId = null
+            this.form.departmentId = null
+            this.form.wardId = null
+          }
+        } else {
+          this.campusAgencylist = res.data
+          this.queryParams.campusAgencyId = null
+          this.queryParams.departmentId = null
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //选中院区获取科室
+    changecampusAgency(id, type, typetwo) {
+      let query = {
+        nodeType: 'DEPARTMENT',
+        agencyId: id,
+      }
+      getDepartmentList(query).then(res => {
+        if (type) {
+          this.form_departmentlist = res.data
+          if (!typetwo) {
+            this.form.departmentId = null
+            this.form.wardId = null
+          }
+        } else {
+          this.departmentlist = res.data
+          this.queryParams.departmentId = null
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //选中科室获取病区
+    changedepartment(id, type, typetwo) {
+      let query = {
+        nodeType: 'WARD',
+        parentDepartmentId: id,
+      }
+      getDepartmentList(query).then(res => {
+        if (type) {
+          this.form_wardlist = res.data
+          if (!typetwo) {
+            this.form.wardId = null
+          }
+        } else {
+          this.wardlist = res.data
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //清空医院
+    clearhospitalAgency(type) {
+      if (type) {
+        this.form.campusAgencyId = null
+        this.form.departmentId = null
+        this.form.wardId = null
+      } else {
+        this.queryParams.campusAgencyId = null
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      }
+    },
+    //清空院区
+    clearcampusAgency(type) {
+      if (type) {
+        this.form.departmentId = null
+        this.form.wardId = null
+      } else {
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      }
+    },
+    //清空科室
+    cleardepartment(type) {
+      if (type) {
+        this.form.wardId = null
+      } else {
+        this.queryParams.wardId = null
+      }
+    },
   }
 };
 </script>

src/views/manage/visitout/index.vue

@@ -34,20 +34,31 @@
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="医院" prop="hospitalAgencyId">
-        <el-input v-model="queryParams.hospitalAgencyId" placeholder="请输入医院名称" clearable style="width:200px"
+        <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
-          @keyup.enter.native="handleQuery" />
+          @clear="clearhospitalAgency" @change="changehospitalAgency">
+          <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="院区" prop="campusAgencyId">
+      <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
-        <el-input v-model="queryParams.campusAgencyId" placeholder="请输入院区名称" clearable style="width:200px"
+        <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
-          @keyup.enter.native="handleQuery" />
+          @clear="clearcampusAgency" @change="changecampusAgency">
+          <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="科室" prop="departmentId">
+      <el-form-item label="科室" prop="departmentId" v-if="queryParams.campusAgencyId">
-        <el-input v-model="queryParams.departmentId" placeholder="请输入科室名称" clearable style="width:200px"
+        <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
-          @keyup.enter.native="handleQuery" />
+          @clear="cleardepartment" @change="changedepartment">
+          <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="病区" prop="wardId">
+      <el-form-item label="病区" prop="wardId" v-if="queryParams.departmentId">
-        <el-input v-model="queryParams.wardId" placeholder="请输入病区名称" clearable style="width:200px"
+        <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
-          @keyup.enter.native="handleQuery" />
+          <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="就诊流水号" prop="visitSerialNumber">
         <el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
@@ -224,17 +235,32 @@
         <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-form-item label="医院" prop="hospitalAgencyId">
-          <el-input v-model="form.hospitalAgencyName" placeholder="请输入所属医院名称" style="width:200px" />
+          <el-select v-model="form.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
+            @clear="clearhospitalAgency(1)" @change="changehospitalAgency($event, 1)">
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyName">
+        <el-form-item label="院区" prop="campusAgencyId" v-if="form.hospitalAgencyId">
-          <el-input v-model="form.campusAgencyName" placeholder="请输入所属院区名称" style="width:200px" />
+          <el-select v-model="form.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+            @clear="clearcampusAgency(1)" @change="changecampusAgency($event, 1)">
+            <el-option v-for="item in form_campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="科室" prop="departmentName">
+        <el-form-item label="科室名称" prop="departmentId" v-if="form.campusAgencyId">
-          <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" style="width:200px" />
+          <el-select v-model="form.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
+            @clear="cleardepartment(1)" @change="changedepartment($event, 1)">
+            <el-option v-for="item in form_departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="病区" prop="wardName">
+        <el-form-item label="预约病区" prop="wardId" v-if="form.departmentId">
-          <el-input v-model="form.wardName" placeholder="请输入所属病区名称" style="width:200px" />
+          <el-select v-model="form.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
+            <el-option v-for="item in form_wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
         </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" />
@@ -353,12 +379,29 @@
 <script>
 import { listPatientInfo, getPatientInfo, delPatientInfo, addPatientInfo, updatePatientInfo } from "@/api/manage/patientInfo";
 import { getAge } from "@/utils/age";
+import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
 
 export default {
   name: "visitout",
   dicts: ['patient_type', 'visit_method', 'sign_status', 'patient_source'],
   data() {
     return {
+      //医院list
+      hospitalAgencylist: [],
+      // 院区list
+      campusAgencylist: [],
+      //科室list
+      departmentlist: [],
+      //病区list
+      wardlist: [],
+      //form-医院list
+      form_hospitalAgencylist: [],
+      // form-院区list
+      form_campusAgencylist: [],
+      //form-科室list
+      form_departmentlist: [],
+      //form-病区list
+      form_wardlist: [],
       //导入
       fileList: [],
       // 遮罩层
@@ -413,11 +456,27 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        patientName: [
+          { required: true, message: '请输入患者姓名', trigger: 'change' }
+        ],
+        patientPhone: [
+          { required: true, message: '请输入患者手机号', trigger: 'change' }
+        ],
+        visitMethod: [
+          { required: true, message: '请输入就诊方式', trigger: 'change' }
+        ],
+        admissionDate: [
+          { required: true, message: '请选择患者入院时间', trigger: 'change' }
+        ],
+        visitTime: [
+          { required: true, message: '请选择患者就诊时间', trigger: 'change' }
+        ],
       }
     };
   },
   created() {
     this.getList();
+    this.selectAgencyinfo();
   },
   methods: {
     /** 详情操作 */
@@ -511,6 +570,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dischargeDate = []
+      this.queryParams.dischargeDateStart = ''
       this.queryParams.dischargeDateEnd = ''
       this.resetForm("queryForm");
       this.handleQuery();
@@ -533,6 +594,16 @@ export default {
       const id = row.id || this.ids
       getPatientInfo(id).then(response => {
         this.form = response.data;
+        this.form = response.data;
+        if (this.form.hospitalAgencyId) {
+          this.changehospitalAgency(this.form.hospitalAgencyId, 1, 2)
+        }
+        if (this.form.campusAgencyId) {
+          this.changecampusAgency(this.form.campusAgencyId, 1, 2)
+        }
+        if (this.form.departmentId) {
+          this.changedepartment(this.form.departmentId, 1, 2)
+        }
         this.open = true;
         this.title = "修改患者信息";
       });
@@ -596,6 +667,107 @@ export default {
     uploadcancel() {
       this.uploadopen = false
     },
+    //获取医院list
+    selectAgencyinfo() {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'HOSPITAL',
+      }
+      selectAgencyList(query).then(res => {
+        this.hospitalAgencylist = res.data
+      })
+    },
+    //选中医院获取院区
+    changehospitalAgency(id, type, typetwo) {
+      let query = {
+        agencyStatus: 'ON',
+        nodeType: 'CAMPUS',
+        parentId: id,
+      }
+      selectAgencyList(query).then(res => {
+        if (type) {
+          this.form_campusAgencylist = res.data
+          if (!typetwo) {
+            this.form.campusAgencyId = null
+            this.form.departmentId = null
+            this.form.wardId = null
+          }
+        } else {
+          this.campusAgencylist = res.data
+          this.queryParams.campusAgencyId = null
+          this.queryParams.departmentId = null
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //选中院区获取科室
+    changecampusAgency(id, type, typetwo) {
+      let query = {
+        nodeType: 'DEPARTMENT',
+        agencyId: id,
+      }
+      getDepartmentList(query).then(res => {
+        if (type) {
+          this.form_departmentlist = res.data
+          if (!typetwo) {
+            this.form.departmentId = null
+            this.form.wardId = null
+          }
+        } else {
+          this.departmentlist = res.data
+          this.queryParams.departmentId = null
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //选中科室获取病区
+    changedepartment(id, type, typetwo) {
+      let query = {
+        nodeType: 'WARD',
+        parentDepartmentId: id,
+      }
+      getDepartmentList(query).then(res => {
+        if (type) {
+          this.form_wardlist = res.data
+          if (!typetwo) {
+            this.form.wardId = null
+          }
+        } else {
+          this.wardlist = res.data
+          this.queryParams.wardId = null
+        }
+      })
+    },
+    //清空医院
+    clearhospitalAgency(type) {
+      if (type) {
+        this.form.campusAgencyId = null
+        this.form.departmentId = null
+        this.form.wardId = null
+      } else {
+        this.queryParams.campusAgencyId = null
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      }
+    },
+    //清空院区
+    clearcampusAgency(type) {
+      if (type) {
+        this.form.departmentId = null
+        this.form.wardId = null
+      } else {
+        this.queryParams.departmentId = null
+        this.queryParams.wardId = null
+      }
+    },
+    //清空科室
+    cleardepartment(type) {
+      if (type) {
+        this.form.wardId = null
+      } else {
+        this.queryParams.wardId = null
+      }
+    },
   }
 };
 </script>

src/views/system/agency/index.vue

@@ -224,7 +224,7 @@
             ></el-option>
           </el-select>
           <el-select
-            v-model="form.areaName"
+            v-model="form.regionName"
             clearable
             placeholder="请选择区"
             style="width: 129px; margin-left: 10px"