修改

src/views/manage/preHospitalized/index.vue

@@ -60,6 +60,14 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="开证医生" prop="certificateIssuingDoctor" v-if="queryParams.hospitalAgencyId">
+        <el-select v-model="queryParams.certificateIssuingDoctorId" filterable placeholder="请选择主治医生" style="width:200px"
+          clearable>
+          <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </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"
           style="width:200px" placeholder="请选择出生日期">
@@ -75,10 +83,6 @@
         <el-input v-model="queryParams.appointmentTreatmentGroup" placeholder="请输入预约治疗组" clearable style="width:200px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="开证医生" prop="certificateIssuingDoctor">
-        <el-input v-model="queryParams.certificateIssuingDoctor" placeholder="请输入主治医生" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item label="登记号" prop="registrationNo">
         <el-input v-model="queryParams.registrationNo" placeholder="请输入登记号" clearable style="width:200px"
           @keyup.enter.native="handleQuery" />
@@ -150,7 +154,7 @@
       <el-table-column label="病区名称" align="center" prop="wardName" width='130' />
       <!-- <el-table-column label="住院号" align="center" prop="admissionNumber" width='130' /> -->
       <!-- <el-table-column label="门诊号" align="center" prop="outpatientNumber" width='130' /> -->
-      <el-table-column label="开证医生" align="center" prop="certificateIssuingDoctor" />
+      <el-table-column label="开证医生" align="center" prop="certificateIssuingDoctorName" />
       <el-table-column label="诊断" align="center" prop="mainDiagnosis" />
       <!-- <el-table-column label="就诊时间" align="center" prop="visitTime" width='130'>
         <template slot-scope="scope">
@@ -220,9 +224,6 @@
         <el-form-item label="主要诊断" prop="mainDiagnosis">
           <el-input v-model="form.mainDiagnosis" placeholder="请输入主要诊断" style="width:200px" />
         </el-form-item>
-        <el-form-item label="开证医生" prop="certificateIssuingDoctor">
-          <el-input v-model="form.certificateIssuingDoctor" placeholder="请输入开证医生" style="width:200px" />
-        </el-form-item>
         <el-form-item label="医院" prop="hospitalAgencyId">
           <el-select v-model="form.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
             @clear="clearhospitalAgency(1)" @change="changehospitalAgency($event, 1)">
@@ -250,6 +251,14 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="开证医生" prop="certificateIssuingDoctor" v-if="form.hospitalAgencyId">
+          <el-select v-model="form.certificateIssuingDoctorId" filterable placeholder="请选择主治医生" style="width:200px"
+            clearable>
+            <el-option v-for="item in form_attendingPhysicianlist" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="预约治疗组" prop="appointmentTreatmentGroup">
           <el-input v-model="form.appointmentTreatmentGroup" placeholder="请输入预约治疗组" style="width:200px" />
         </el-form-item>
@@ -368,6 +377,7 @@
 </template>
 
 <script>
+import { usergetList } from "@/api/unitconfig/patientConfiguration";
 import { listPatientInfo, getPatientInfo, delPatientInfo, addPatientInfo, updatePatientInfo } from "@/api/manage/preHospitalized";
 import { getAge } from "@/utils/age";
 import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
@@ -378,6 +388,10 @@ export default {
   dicts: ['patient_type', 'visit_method', 'sign_status', 'patient_source'],
   data() {
     return {
+      // 医生
+      attendingPhysicianlist: [],
+      //form-医生
+      form_attendingPhysicianlist: [],
       //医院list
       hospitalAgencylist: [],
       // 院区list
@@ -586,19 +600,21 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      if (this.form.hospitalAgencyId) {
+      if (this.form.hospitalAgencyId && this.hospitalAgencylist.length > 0) {
         this.form.hospitalAgencyName = this.hospitalAgencylist.find(e => e.id == this.form.hospitalAgencyId).agencyName
       }
-      if (this.form.campusAgencyId) {
+      if (this.form.campusAgencyId && this.form_campusAgencylist.length > 0) {
         this.form.campusAgencyName = this.form_campusAgencylist.find(e => e.id == this.form.campusAgencyId).agencyName
       }
-      if (this.form.departmentId) {
+      if (this.form.departmentId && this.form_departmentlist.length > 0) {
         this.form.departmentName = this.form_departmentlist.find(e => e.id == this.form.departmentId).departmentName
       }
-      if (this.form.hospitalAgencyId) {
+      if (this.form.hospitalAgencyId && this.form_wardlist.length > 0) {
         this.form.wardName = this.form_wardlist.find(e => e.id == this.form.wardId).departmentName
       }
-      console.log(this.form)
+      if (this.form.certificateIssuingDoctorId && this.form_attendingPhysicianlist.length > 0) {
+        this.form.certificateIssuingDoctorName = this.form_attendingPhysicianlist.find(e => e.userId == this.form.certificateIssuingDoctorId).nickName
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -665,6 +681,19 @@ export default {
         this.hospitalAgencylist = res.data
       })
     },
+    //主治医生
+    usergetListinfo(id, type) {
+      usergetList({
+        agencyId: id,
+        postName: 'DOCTOR'
+      }).then(res => {
+        if (type) {
+          this.form_attendingPhysicianlist = res.data
+        } else {
+          this.attendingPhysicianlist = res.data
+        }
+      })
+    },
     //选中医院获取院区
     changehospitalAgency(id, type, typetwo) {
       let query = {
@@ -679,14 +708,17 @@ export default {
             this.form.campusAgencyId = null
             this.form.departmentId = null
             this.form.wardId = null
+            this.form.certificateIssuingDoctorId = null
           }
         } else {
           this.campusAgencylist = res.data
           this.queryParams.campusAgencyId = null
           this.queryParams.departmentId = null
           this.queryParams.wardId = null
+          this.queryParams.certificateIssuingDoctorId = null
         }
       })
+      this.usergetListinfo(id, type)
       this.changecampusAgency(id, type, typetwo)
     },
     //选中院区获取科室

src/views/manage/visitin/index.vue

@@ -60,6 +60,14 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="主治医生" prop="attendingPhysician" v-if="queryParams.hospitalAgencyId">
+        <el-select v-model="queryParams.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width:200px"
+          clearable>
+          <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="就诊流水号" prop="visitSerialNumber">
         <el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
       </el-form-item>
@@ -74,10 +82,6 @@
           <el-option v-for="dict in dict.type.patient_type" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item> -->
-      <el-form-item label="主治医生" prop="attendingPhysician">
-        <el-input v-model="queryParams.attendingPhysician" placeholder="请输入主治医生" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item label="责任护士" prop="responsibleNurse">
         <el-input v-model="queryParams.responsibleNurse" placeholder="请输入责任护士" style="width:200px" />
       </el-form-item>
@@ -166,7 +170,7 @@
       <el-table-column label="病区名称" align="center" prop="wardName" width='130' />
       <!-- <el-table-column label="住院号" align="center" prop="admissionNumber" width='130' /> -->
       <!-- <el-table-column label="门诊号" align="center" prop="outpatientNumber" width='130' /> -->
-      <el-table-column label="主治医生" align="center" prop="attendingPhysician" />
+      <el-table-column label="主治医生" align="center" prop="attendingPhysicianName" />
       <el-table-column label="手术名称" align="center" prop="surgicalName" />
       <!-- <el-table-column label="出院方式" align="center" prop="dischargeMethod" /> -->
       <el-table-column label="患者来源" align="center" prop="patientSource">
@@ -232,9 +236,6 @@
         <el-form-item label="主要诊断" prop="mainDiagnosis">
           <el-input v-model="form.mainDiagnosis" placeholder="请输入主要诊断" style="width:200px" />
         </el-form-item>
-        <el-form-item label="主治医生" prop="attendingPhysician">
-          <el-input v-model="form.attendingPhysician" placeholder="请输入主治医生" style="width:200px" />
-        </el-form-item>
         <el-form-item label="医院" prop="hospitalAgencyId">
           <el-select v-model="form.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
             @clear="clearhospitalAgency(1)" @change="changehospitalAgency($event, 1)">
@@ -262,6 +263,13 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="主治医生" prop="attendingPhysicianId" v-if="form.hospitalAgencyId">
+          <el-select v-model="form.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width:200px" clearable>
+            <el-option v-for="item in form_attendingPhysicianlist" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="住院号" prop="admissionNumber">
           <el-input v-model="form.admissionNumber" placeholder="请输入住院号" style="width:200px" />
         </el-form-item>
@@ -374,6 +382,7 @@
 </template>
 
 <script>
+import { usergetList } from "@/api/unitconfig/patientConfiguration";
 import { listPatientInfo, getPatientInfo, delPatientInfo, addPatientInfo, updatePatientInfo } from "@/api/manage/patientInfo";
 import { getAge } from "@/utils/age";
 import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
@@ -384,6 +393,10 @@ export default {
   dicts: ['patient_type', 'visit_method', 'sign_status', 'patient_source'],
   data() {
     return {
+      //医生
+      attendingPhysicianlist: [],
+      //form-医生
+      form_attendingPhysicianlist: [],
       //医院list
       hospitalAgencylist: [],
       // 院区list
@@ -424,6 +437,7 @@ export default {
       // 查询参数
       admissionDate: [],
       queryParams: {
+        attendingPhysicianId: '',
         pageNum: 1,
         pageSize: 10,
         admissionDateStart: '',
@@ -537,7 +551,7 @@ export default {
         certificateIssuingDoctor: null,
         visitMethod: 'BE_IN_HOSPITAL',
         mainDiagnosis: null,
-        attendingPhysician: null,
+        attendingPhysicianId: null,
         hospitalAgencyId: null,
         campusAgencyId: null,
         departmentId: null,
@@ -614,18 +628,21 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      if (this.form.hospitalAgencyId) {
+      if (this.form.hospitalAgencyId && this.hospitalAgencylist.length > 0) {
         this.form.hospitalAgencyName = this.hospitalAgencylist.find(e => e.id == this.form.hospitalAgencyId).agencyName
       }
-      if (this.form.campusAgencyId) {
+      if (this.form.campusAgencyId && this.form_campusAgencylist.length > 0) {
         this.form.campusAgencyName = this.form_campusAgencylist.find(e => e.id == this.form.campusAgencyId).agencyName
       }
-      if (this.form.departmentId) {
+      if (this.form.departmentId && this.form_departmentlist.length > 0) {
         this.form.departmentName = this.form_departmentlist.find(e => e.id == this.form.departmentId).departmentName
       }
-      if (this.form.hospitalAgencyId) {
+      if (this.form.hospitalAgencyId && this.form_wardlist.length > 0) {
         this.form.wardName = this.form_wardlist.find(e => e.id == this.form.wardId).departmentName
       }
+      if (this.form.attendingPhysicianId && this.form_attendingPhysicianlist.length > 0) {
+        this.form.attendingPhysicianName = this.form_attendingPhysicianlist.find(e => e.userId == this.form.attendingPhysicianId).nickName
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -706,14 +723,17 @@ export default {
             this.form.campusAgencyId = null
             this.form.departmentId = null
             this.form.wardId = null
+            this.form.attendingPhysicianId = null
           }
         } else {
           this.campusAgencylist = res.data
           this.queryParams.campusAgencyId = null
           this.queryParams.departmentId = null
           this.queryParams.wardId = null
+          this.queryParams.attendingPhysicianId = null
         }
       })
+      this.usergetListinfo(id, type)
       this.changecampusAgency(id, type, typetwo)
     },
     //选中院区获取科室
@@ -792,6 +812,19 @@ export default {
         `在院患者导入模板.xlsx`
       );
     },
+    //主治医生
+    usergetListinfo(id, type) {
+      usergetList({
+        agencyId: id,
+        postName: 'DOCTOR'
+      }).then(res => {
+        if (type) {
+          this.form_attendingPhysicianlist = res.data
+        } else {
+          this.attendingPhysicianlist = res.data
+        }
+      })
+    },
   }
 };
 </script>

src/views/manage/visitout/index.vue

@@ -60,6 +60,14 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="主治医生" prop="attendingPhysician" v-if="queryParams.hospitalAgencyId">
+        <el-select v-model="queryParams.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width:200px"
+          clearable>
+          <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="就诊流水号" prop="visitSerialNumber">
         <el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
       </el-form-item>
@@ -68,10 +76,6 @@
           <el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="主治医生" prop="attendingPhysician">
-        <el-input v-model="queryParams.attendingPhysician" placeholder="请输入主治医生" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item label="手术名称" prop="surgicalName">
         <el-input v-model="queryParams.surgicalName" placeholder="请输入手术名称" clearable @keyup.enter.native="handleQuery"
           style="width:200px" />
@@ -161,7 +165,7 @@
       <el-table-column label="病区名称" align="center" prop="wardName" width='130' />
       <el-table-column label="住院号" align="center" prop="admissionNumber" width='130' />
       <el-table-column label="门诊号" align="center" prop="outpatientNumber" width='130' />
-      <el-table-column label="主治医生" align="center" prop="attendingPhysician" />
+      <el-table-column label="主治医生" align="center" prop="attendingPhysicianName" />
       <!-- <el-table-column label="出院方式" align="center" prop="dischargeMethod" /> -->
       <el-table-column label="手术名称" align="center" prop="surgicalName" />
       <el-table-column label="就诊方式" align="center" prop="visitMethod">
@@ -235,9 +239,6 @@
         <el-form-item label="主要诊断" prop="mainDiagnosis">
           <el-input v-model="form.mainDiagnosis" placeholder="请输入主要诊断" style="width:200px" />
         </el-form-item>
-        <el-form-item label="主治医生" prop="attendingPhysician">
-          <el-input v-model="form.attendingPhysician" placeholder="请输入主治医生" style="width:200px" />
-        </el-form-item>
         <el-form-item label="医院" prop="hospitalAgencyId">
           <el-select v-model="form.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
             @clear="clearhospitalAgency(1)" @change="changehospitalAgency($event, 1)">
@@ -265,6 +266,13 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="主治医生" prop="attendingPhysician" v-if="form.hospitalAgencyId">
+          <el-select v-model="form.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width:200px" clearable>
+            <el-option v-for="item in form_attendingPhysicianlist" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </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" />
         </el-form-item>
@@ -404,12 +412,17 @@ import { listPatientInfo, getPatientInfo, delPatientInfo, addPatientInfo, update
 import { getAge } from "@/utils/age";
 import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
 import { getToken } from '@/utils/auth'
+import { usergetList } from "@/api/unitconfig/patientConfiguration";
 
 export default {
   name: "visitout",
   dicts: ['patient_type', 'visit_method', 'sign_status', 'patient_source'],
   data() {
     return {
+      //医生
+      attendingPhysicianlist: [],
+      //form-医生
+      form_attendingPhysicianlist: [],
       //医院list
       hospitalAgencylist: [],
       // 院区list
@@ -652,18 +665,21 @@ export default {
       } else if (this.form.visitMethod == 'OUTPATIENT_SERVICE') {
         this.form.patientType = 'OUTPATIENT'
       }
-      if (this.form.hospitalAgencyId) {
+      if (this.form.hospitalAgencyId && this.hospitalAgencylist.length > 0) {
         this.form.hospitalAgencyName = this.hospitalAgencylist.find(e => e.id == this.form.hospitalAgencyId).agencyName
       }
-      if (this.form.campusAgencyId) {
+      if (this.form.campusAgencyId && this.form_campusAgencylist.length > 0) {
         this.form.campusAgencyName = this.form_campusAgencylist.find(e => e.id == this.form.campusAgencyId).agencyName
       }
-      if (this.form.departmentId) {
+      if (this.form.departmentId && this.form_departmentlist.length > 0) {
         this.form.departmentName = this.form_departmentlist.find(e => e.id == this.form.departmentId).departmentName
       }
-      if (this.form.hospitalAgencyId) {
+      if (this.form.hospitalAgencyId && this.form_wardlist.length > 0) {
         this.form.wardName = this.form_wardlist.find(e => e.id == this.form.wardId).departmentName
       }
+      if (this.form.attendingPhysicianId && this.form_attendingPhysicianlist.length > 0) {
+        this.form.attendingPhysicianName = this.form_attendingPhysicianlist.find(e => e.userId == this.form.attendingPhysicianId).nickName
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -748,16 +764,32 @@ export default {
             this.form.campusAgencyId = null
             this.form.departmentId = null
             this.form.wardId = null
+            this.form.attendingPhysicianId = null
           }
         } else {
           this.campusAgencylist = res.data
           this.queryParams.campusAgencyId = null
           this.queryParams.departmentId = null
           this.queryParams.wardId = null
+          this.queryParams.attendingPhysicianId = null
         }
       })
+      this.usergetListinfo(id, type)
       this.changecampusAgency(id, type, typetwo)
     },
+    //主治医生
+    usergetListinfo(id, type) {
+      usergetList({
+        agencyId: id,
+        postName: 'DOCTOR'
+      }).then(res => {
+        if (type) {
+          this.form_attendingPhysicianlist = res.data
+        } else {
+          this.attendingPhysicianlist = res.data
+        }
+      })
+    },
     //选中院区获取科室
     changecampusAgency(id, type, typetwo) {
       let query = {

src/views/system/editorialSpecialization/index.vue

@@ -9,7 +9,7 @@
             </el-form-item>
         </el-form>
         <el-form ref="form" :inline="true" :model="form" label-width="80px">
-            <el-form-item label="活动名称">
+            <el-form-item label="服务名称">
                 <el-input v-model="form.name" style="width:160px"></el-input>
             </el-form-item>
             <el-form-item label="病种名称" required>