添加组织查询条件

acupuncture-后台/src/layout/components/Sidebar/Logo.vue

@@ -104,7 +104,7 @@ export default {
       width: 32px;
       height: 32px;
       vertical-align: middle;
-      margin-right: 12px;
+      margin-right: 2px;
     }
 
     & .sidebar-title {

acupuncture-后台/src/views/followFile/index.vue

@@ -16,6 +16,21 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="组织" prop="tenantId">
+        <el-select
+          v-model="queryParams.param.tenantId"
+          placeholder="请选择"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="(item, index) in tenantsListData"
+            :label="item.name"
+            :value="item.id"
+            :key="index"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -127,7 +142,7 @@
       />
       <el-table-column
         fixed="right"
-        label="类型"
+        label="组织"
         align="center"
         show-overflow-tooltip
         min-width="130"
@@ -282,11 +297,13 @@ import {
   followupDel,
   commonQueue,
 } from "@/api/followupFile";
+import { tenantsList } from "@/api/member";
 export default {
   name: "Notice",
   components: { Crontab },
   data() {
     return {
+      tenantsListData: [], // 组织列表
       // 是否显示Cron表达式弹出层
       openCron: false,
       // 传入的表达式
@@ -335,6 +352,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         param: {
+          tenantId: "", // 组织id
           name: "", //关键字
         },
       },
@@ -374,8 +392,18 @@ export default {
   },
   created() {
     this.getList();
+    this.getTenantsList(); // 组织列表
   },
   methods: {
+    // 组织列表
+    getTenantsList() {
+      tenantsList({
+        pageNum: -1,
+        param: {},
+      }).then((res) => {
+        this.tenantsListData = res.data.list;
+      });
+    },
     /** cron表达式按钮操作 */
     handleShowCron() {
       this.expression = this.form.cronExpression;
@@ -424,6 +452,7 @@ export default {
         pageSize: 10,
         param: {
           name: "",
+          tenantId: "",
         },
       };
       this.handleQuery();

acupuncture-后台/src/views/followFile/subjects.vue

@@ -1,63 +1,175 @@
 <template>
   <div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+    <el-form
-			label-width="68px">
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="随访队列" prop="queueId">
-				<el-select v-model="queryParams.param.queueId" clearable placeholder="请选择">
+        <el-select
-					<el-option v-for="item in followupList" :key="item.id" :label="item.name" :value="item.id">
+          v-model="queryParams.param.queueId"
+          clearable
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in followupList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          >
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="组织" prop="tenantId">
+        <el-select
+          v-model="queryParams.param.tenantId"
+          placeholder="请选择"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="(item, index) in tenantsListData"
+            :label="item.name"
+            :value="item.id"
+            :key="index"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="" prop="queueId">
         <el-checkbox-group v-model="haveQueue">
-				   <el-checkbox >未参加队列人员</el-checkbox>
+          <el-checkbox>未参加队列人员</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <el-form-item>
-				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <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">
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-		<el-table v-loading="loading" :data="listDat" @selection-change="handleSelectionChange" max-height="600">
+    <el-table
+      v-loading="loading"
+      :data="listDat"
+      @selection-change="handleSelectionChange"
+      max-height="600"
+    >
       <el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="姓名" align="center" prop="name" width="100" fixed />
+      <el-table-column
-			<el-table-column fixed label="性别" align="center" prop="gender" show-overflow-tooltip min-width="100">
+        label="姓名"
+        align="center"
+        prop="name"
+        width="100"
+        fixed
+      />
+      <el-table-column
+        fixed
+        label="性别"
+        align="center"
+        prop="gender"
+        show-overflow-tooltip
+        min-width="100"
+      >
         <template slot-scope="scope">
           <span v-if="scope.row.gender == 0">男</span>
           <span v-if="scope.row.gender == 1">女</span>
         </template>
       </el-table-column>
 
-			<el-table-column fixed label="出生日期" align="center" prop="birthDate" show-overflow-tooltip min-width="150">
+      <el-table-column
+        fixed
+        label="出生日期"
+        align="center"
+        prop="birthDate"
+        show-overflow-tooltip
+        min-width="150"
+      >
         <template slot-scope="scope">
           {{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}
         </template>
       </el-table-column>
-			<el-table-column label="民族" align="center" prop="ethnicity" show-overflow-tooltip min-width="100" />
+      <el-table-column
-			<el-table-column label="受教育年限" align="center" prop="educationYears" show-overflow-tooltip min-width="100" />
+        label="民族"
-			<el-table-column label="手机号码" align="center" prop="phone" show-overflow-tooltip min-width="150" />
+        align="center"
-			<el-table-column label="证件类型" align="center" prop="idCardType" show-overflow-tooltip min-width="200">
+        prop="ethnicity"
+        show-overflow-tooltip
+        min-width="100"
+      />
+      <el-table-column
+        label="受教育年限"
+        align="center"
+        prop="educationYears"
+        show-overflow-tooltip
+        min-width="100"
+      />
+      <el-table-column
+        label="手机号码"
+        align="center"
+        prop="phone"
+        show-overflow-tooltip
+        min-width="150"
+      />
+      <el-table-column
+        label="证件类型"
+        align="center"
+        prop="idCardType"
+        show-overflow-tooltip
+        min-width="200"
+      >
         <template slot-scope="scope">
           {{ idCardTypeValue[scope.row.idCardType] }}
         </template>
       </el-table-column>
-			<el-table-column label="证件号码" align="center" prop="idCard" show-overflow-tooltip min-width="180" />
+      <el-table-column
-			<el-table-column fixed="right" label="随访队列" align="center" prop="queueList" show-overflow-tooltip
+        label="证件号码"
-				min-width="180">
+        align="center"
+        prop="idCard"
+        show-overflow-tooltip
+        min-width="180"
+      />
+      <el-table-column
+        fixed="right"
+        label="随访队列"
+        align="center"
+        prop="queueList"
+        show-overflow-tooltip
+        min-width="180"
+      >
         <template slot-scope="scope">
           <div v-if="scope.row.queueList && scope.row.queueList.length">
             {{ scope.row.queueList.map((i) => i.queueName).join(",") }}
           </div>
         </template>
       </el-table-column>
-			<el-table-column label="创建人/创建时间" align="center" width="140" fixed="right">
+      <el-table-column
+        fixed="right"
+        prop="tenantName"
+        label="组织"
+        align="center"
+        show-overflow-tooltip
+        min-width="150"
+      />
+      <el-table-column
+        label="创建人/创建时间"
+        align="center"
+        width="140"
+        fixed="right"
+      >
         <template slot-scope="scope">
           <div>{{ scope.row.createBy }}</div>
           <span>{{
@@ -69,23 +181,55 @@
         <template slot-scope="scope">
           <!-- <el-button size="mini" type="text" icon="el-icon-edit"
 						@click="handleUpdate(scope.row)">队列管理</el-button> -->
-					<el-button size="mini" type="text" icon="el-icon-tickets"
+          <el-button
-						@click="handlePatient(scope.row)">患者档案</el-button>
+            size="mini"
-					<el-button size="mini" type="text" icon="el-icon-notebook-2"
+            type="text"
-						@click="handleMedical(scope.row)">诊疗档案</el-button>
+            icon="el-icon-tickets"
+            @click="handlePatient(scope.row)"
+            >患者档案</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-notebook-2"
+            @click="handleMedical(scope.row)"
+            >诊疗档案</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
-		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+    <pagination
-			:limit.sync="queryParams.pageSize" @pagination="getList" />
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改公告对话框 -->
-		<el-dialog class="popup" :title="title" :visible.sync="open" width="780px" append-to-body>
+    <el-dialog
-			<el-form class="formStep" ref="form" :model="form" :rules="rules" label-width="90px">
+      class="popup"
+      :title="title"
+      :visible.sync="open"
+      width="780px"
+      append-to-body
+    >
+      <el-form
+        class="formStep"
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="90px"
+      >
         <el-form-item label="随访队列" prop="queueIdList">
           <el-select v-model="form.queueIdList" multiple placeholder="请选择">
-						<el-option v-for="item in followupList" :key="item.id" :label="item.name" :value="item.id">
+            <el-option
+              v-for="item in followupList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -99,17 +243,15 @@
 </template>
 
 <script>
-	import {
+import { queryPatient, followupQuery, updPatient } from "@/api/followupFile";
-		queryPatient,
+import { tenantsList } from "@/api/member";
-		followupQuery,
+export default {
-		updPatient
-	} from "@/api/followupFile";
-	export default {
   name: "Notice",
   data() {
     return {
       fileList: [],
-				idCardType: [{
+      idCardType: [
+        {
           label: "身份证",
           value: 0,
         },
@@ -147,26 +289,30 @@
       title: "", // 弹出层标题
       open: false, // 是否显示弹出层
       importOpen: false, // 导入弹窗
+      tenantsListData: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         param: {
-						queueId: ''
+          tenantId: "",
+          queueId: "",
         },
       },
-				haveQueue:'',
+      haveQueue: "",
       formDisabled: false,
       importform: {},
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-					queueIdList: [{
+        queueIdList: [
+          {
             required: true,
             message: "随访队列不能为空",
-						trigger: "change"
+            trigger: "change",
-					}, ],
+          },
+        ],
       },
       followupList: [], // 随访队列
     };
@@ -174,21 +320,31 @@
   created() {
     this.getList();
     this.getFollowupQuery();
+    this.getTenantsList(); // 组织列表
   },
   methods: {
+    // 组织列表
+    getTenantsList() {
+      tenantsList({
+        pageNum: -1,
+        param: {},
+      }).then((res) => {
+        this.tenantsListData = res.data.list;
+      });
+    },
     // 获取随访队列信息
     getFollowupQuery() {
       followupQuery({
         pageNum: -1,
         param: {
-						status: 1
+          status: 1,
         },
       }).then((res) => {
         this.followupList = res.data.list;
-					let commonQueue = JSON.parse(localStorage.getItem('commonQueue'))
+        let commonQueue = JSON.parse(localStorage.getItem("commonQueue"));
-					commonQueue?.forEach(i => {
+        commonQueue?.forEach((i) => {
-						this.followupList.unshift(i)
+          this.followupList.unshift(i);
-					})
+        });
       });
     },
 
@@ -213,9 +369,9 @@
     },
     /** 搜索按钮操作 */
     handleQuery() {
-				this.queryParams.param.haveQueue = ''
+      this.queryParams.param.haveQueue = "";
-				if(this.haveQueue){
+      if (this.haveQueue) {
-					this.queryParams.param.haveQueue = 0
+        this.queryParams.param.haveQueue = 0;
       }
       this.queryParams.pageNum = 1;
       this.getList();
@@ -224,10 +380,11 @@
     resetQuery() {
       this.queryParams = {
         param: {
-							queueId: ''
+          tenantId: "",
-						},
+          queueId: "",
         },
-					this.haveQueue = ''
+      };
+      this.haveQueue = "";
       this.handleQuery();
     },
     // 多选框选中数据
@@ -252,17 +409,17 @@
     /** 跳转患者档案 */
     handlePatient(row) {
       this.$router.push({
-					path: `/patientFile/index?idCard=${row.idCard}`
+        path: `/patientFile/index?idCard=${row.idCard}`,
-				})
+      });
     },
     /** 诊疗档案 */
     handleMedical(row) {
       this.$router.push({
-					path: `/medicalFile/index?idCard=${row.idCard}`
+        path: `/medicalFile/index?idCard=${row.idCard}`,
-				})
+      });
     },
     /** 提交按钮 */
-			submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           updPatient(this.form).then((response) => {
@@ -279,9 +436,9 @@
       const idList = row.id ? [row.id] : this.ids;
       this.$modal
         .confirm("是否确认删除当前选择的数据？")
-					.then(function() {
+        .then(function () {
           return patientDel({
-							idList: idList
+            idList: idList,
           });
         })
         .then(() => {
@@ -293,7 +450,8 @@
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-					"system/user/export", {
+        "system/user/export",
+        {
           ...this.queryParams.params,
         },
         `患者档案.xlsx`
@@ -305,22 +463,22 @@
       this.upload.open = true;
     },
   },
-	};
+};
 </script>
 <style scoped src="@/assets/styles/common.css"></style>
 <style scoped>
-	.form-item-age {
+.form-item-age {
   display: flex;
   align-items: center;
-	}
+}
 
-	.form-item-age span {
+.form-item-age span {
   margin: 0 10px;
-	}
+}
 
-	.form-item-age>>>.el-input {
+.form-item-age >>> .el-input {
   width: 100px;
-	}
+}
 </style>
 <!-- >>> .el-input__inner {
   padding: 0 15px !important;

acupuncture-后台/src/views/followFile/work.vue

@@ -33,6 +33,21 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="组织" prop="tenantId">
+          <el-select
+            v-model="queryParams.param.tenantId"
+            placeholder="请选择"
+            clearable
+            filterable
+          >
+            <el-option
+              v-for="(item, index) in tenantsListData"
+              :label="item.name"
+              :value="item.id"
+              :key="index"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
@@ -167,6 +182,14 @@
           }}</span>
         </template>
       </el-table-column>
+      <el-table-column
+        fixed="right"
+        prop="tenantName"
+        label="组织"
+        align="center"
+        show-overflow-tooltip
+        min-width="150"
+      />
       <el-table-column
         v-if="queryParams.param.status == 2"
         label="失访原因"
@@ -312,6 +335,7 @@ import {
   followPatient,
   followStatus,
 } from "@/api/followupFile";
+import { tenantsList } from "@/api/member";
 export default {
   name: "Notice",
   data() {
@@ -447,8 +471,10 @@ export default {
           status: "0",
           childStatus: "",
           keywords: "",
+          tenantId: "",
         },
       },
+      tenantsListData: [], // 组织列表
       formDisabled: false,
       importform: {},
       // 表单参数
@@ -498,8 +524,18 @@ export default {
     let idCard = this.$route.query.idCard;
     this.queryParams.param.keywords = idCard || "";
     this.getList();
+    this.getTenantsList(); // 组织列表
   },
   methods: {
+    // 组织列表
+    getTenantsList() {
+      tenantsList({
+        pageNum: -1,
+        param: {},
+      }).then((res) => {
+        this.tenantsListData = res.data.list;
+      });
+    },
     handleClick(tab, event) {
       this.queryParams.param.childStatus = "";
       this.getList();
@@ -532,6 +568,7 @@ export default {
     resetQuery() {
       this.queryParams.param.keywords = "";
       this.queryParams.param.childStatus = "";
+      this.queryParams.param.tenantId = "";
       this.handleQuery();
     },
     // 多选框选中数据

acupuncture-后台/src/views/medicalFile/index.vue

@@ -86,6 +86,21 @@
           <el-option label="驳回" :value="3" />
         </el-select>
       </el-form-item>
+      <el-form-item label="建档组织" prop="tenantId">
+        <el-select
+          v-model="queryParams.param.tenantId"
+          placeholder="请选择"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="(item, index) in tenantsListData"
+            :label="item.name"
+            :value="item.id"
+            :key="index"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -296,6 +311,13 @@
         show-overflow-tooltip
         min-width="100"
       />
+      <el-table-column
+        prop="tenantName"
+        label="建档组织"
+        align="center"
+        show-overflow-tooltip
+        min-width="150"
+      />
       <el-table-column label="建档时间" align="center" min-width="140">
         <template slot-scope="scope">
           <span>
@@ -572,6 +594,7 @@ import {
   saveAidRecord,
   queueAdd,
 } from "@/api/medicalFile";
+import { tenantsList } from "@/api/member";
 import { getToken } from "@/utils/auth";
 import { followupQuery } from "@/api/followupFile";
 export default {
@@ -579,6 +602,7 @@ export default {
   dicts: ["sys_normal_disable", "sys_user_sex"],
   data() {
     return {
+      tenantsListData: [], // 组织列表
       visitType: {
         0: "门诊",
         1: "住院",
@@ -1050,6 +1074,7 @@ export default {
           endAge: "",
           doctor: "",
           status: "",
+          tenantId: "",
         },
       },
       formDisabled: false,
@@ -1207,9 +1232,19 @@ export default {
     let idCard = this.$route.query.idCard;
     this.queryParams.param.keywords = idCard || "";
     this.getList();
-    this.getFollowupQuery();
+    this.getFollowupQuery(); // 随访队列
+    this.getTenantsList(); // 组织列表
   },
   methods: {
+    // 组织列表
+    getTenantsList() {
+      tenantsList({
+        pageNum: -1,
+        param: {},
+      }).then((res) => {
+        this.tenantsListData = res.data.list;
+      });
+    },
     // 获取随访队列信息
     getFollowupQuery() {
       followupQuery({
@@ -1291,6 +1326,7 @@ export default {
         doctor: "",
         status: 0,
         queueIdList: [],
+        tenantId: "",
       };
       this.resetForm("form");
     },

acupuncture-后台/src/views/patientFile/index.vue

@@ -45,6 +45,21 @@
           <el-option label="HIS" :value="2" />
         </el-select>
       </el-form-item>
+      <el-form-item label="建档组织" prop="tenantId">
+        <el-select
+          v-model="queryParams.param.tenantId"
+          placeholder="请选择"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="(item, index) in tenantsListData"
+            :label="item.name"
+            :value="item.id"
+            :key="index"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -375,11 +390,13 @@ import {
   patientUpd,
   patientDel,
 } from "@/api/patientFile";
+import { tenantsList } from "@/api/member";
 export default {
   name: "Notice",
   dicts: ["sys_notice_status", "sys_notice_type"],
   data() {
     return {
+      tenantsListData: [], // 组织列表
       headers: {
         Authorization: "Bearer " + getToken(),
         deptId: localStorage.getItem("hospitalId"),
@@ -540,9 +557,19 @@ export default {
   created() {
     let idCard = this.$route.query.idCard;
     this.queryParams.param.keywords = idCard || "";
-    this.getList();
+    this.getList(); // 列表
+    this.getTenantsList(); // 组织列表
   },
   methods: {
+    // 组织列表
+    getTenantsList() {
+      tenantsList({
+        pageNum: -1,
+        param: {},
+      }).then((res) => {
+        this.tenantsListData = res.data.list;
+      });
+    },
     // 上传成功回 - pdg
     handleUploadPdfAdd1(res) {
       if (res.code == 200) {