问诊优化

src/components/common/coordinating-doctor.vue

@@ -68,12 +68,12 @@ export default {
     vm = this;
   },
   mounted() {
-    if(this.bizType == 8){
-      this.title = "设置待协调医生";
-    }
-    else if(this.bizType == 10){
-      this.title = "重新匹配医生";
-    }
+    // if(this.bizType == 8){
+    //   this.title = "设置待协调医生";
+    // }
+    // else if(this.bizType == 10){
+    //   this.title = "重新匹配医生";
+    // }
   },
   methods: {
     confirm() {

src/components/common/diagnosis-doctor.vue

@@ -13,7 +13,7 @@
                size="mini"
                style="width: 100%;">
 
-        <el-form-item label="接诊医生" prop="receptionName">
+        <el-form-item label="接诊医生" class="required-label" prop="receptionId">
           <!--                    <el-input v-model="formData.doctorName" placeholder="请选择接诊医生" class="set-width" disabled></el-input>-->
           <el-select @change="doctorChanged($event)" filterable v-model="formData.receptionId" placeholder="请选择接诊医生" class="set-width">
             <el-option v-for="item of doctorList" :key="item.doctorId" :label="item.doctorName" :value="item.doctorId"></el-option>
@@ -40,11 +40,9 @@
         <el-form-item label="接诊医生电话">
           <el-input v-model="formData.doctorMobile" placeholder="请输入接诊医生手机号" disabled class="set-width"></el-input>
         </el-form-item>
-<!--        <el-form-item label="接诊医生来源" >-->
-<!--          <el-select v-model="formData.doctorSource" placeholder="请选择医生来源" class="set-width" disabled>-->
-<!--            <el-option v-for="item of doctorSourceList" :key="item.value" :label="item.label" :value="item.value" ></el-option>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
+        <el-form-item v-if="formData.receptionName == '站外医生' || formData.receptionName == '云鹊医助'" label="外部医生姓名" class="required-label"  prop="outsideDoctor">
+          <el-input v-model="formData.outsideDoctor" placeholder="请输入外部医生姓名" class="set-width"></el-input>
+        </el-form-item>
         <el-form-item label="接诊意向时间" class="required-label"  prop="rangeTime">
           <el-date-picker
             v-model="rangeTime"
@@ -85,8 +83,8 @@ export default {
       default: 0
     },
     doctorId: {
-      type: Number,
-      default: 0
+      type: String,
+      default: ""
     },
   },
   data() {
@@ -104,14 +102,18 @@ export default {
         doctorDepartment:"",
         doctorMobile:"",
         outsideDoctor:"",
+        innerFlag:1,
         receptionBeginTime:"",
         receptionEndTime:'',
       },
       doctorList:[],
       rangeTime:'',
       addRules:{
-        receptionName: [
-          {required: true, message: "请选择接诊医生", trigger: 'blur'}
+        receptionId: [
+          {required: true, message: "请选择接诊医生", trigger: 'change'}
+        ],
+        outsideDoctor: [
+          {required: true, message: "请输入外部医生姓名", trigger: 'blur'}
         ],
         rangeTime: [
           // {type: 'array',required: true, validator: checkDate, trigger: 'blur,change'}
@@ -139,15 +141,35 @@ export default {
   },
   created() {
     vm = this;
-    this.getDoctorList()
+    this.getDoctorList();
+  },
+  watch:{
+    doctorId:function (){
+      if(this.doctorId == 0){
+        this.formData.receptionId = "";
+      }
+      else {
+        this.formData.receptionId = this.doctorId;
+        this.doctorChanged(this.doctorId);
+      }
+    }
   },
   methods: {
     confirm() {
+      console.log("doctorId:" + this.doctorId);
       this.$refs.setForm.validate((valid) => {
         if (valid) {
+          if(!(this.rangeTime != null && this.rangeTime.length > 0)){
+            vm.$message.warning("请选择接诊意向时间");
+            return;
+          }
+          if(this.formData.receptionName == "站外医生" || this.formData.receptionName == "云鹊医助"){
+            this.formData.innerFlag = 2;// 外部
+          }
           let req = {
             id:this.diagnoseLogId,
             bizType:9,
+            innerFlag:this.formData.innerFlag,
             receptionId:this.formData.receptionId,
             receptionName:this.formData.receptionName,
             receptionBeginTime:this.rangeTime[0],
@@ -178,7 +200,7 @@ export default {
         this.formData.doctorHospital   = selected.doctorHospital
         this.formData.doctorDepartment = selected.doctorDepartment
         this.formData.doctorMobile     = selected.doctorMobile
-        this.formData.serviceFee       = this.priceFilter(selected.serviceFee)
+        // this.formData.serviceFee       = this.priceFilter(selected.serviceFee)
       }
     },
     getDoctorList() {

src/components/common/rematching-doctor.vue

+<template>
+  <div>
+    <el-dialog
+      :title="title"
+      :visible.sync="rematchingVisible">
+      <!--            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
+      <el-form ref="setForm"
+               :rules="addRules"
+               :model="model"
+               label-width="250px"
+               label-suffix=":"
+               label-position="right"
+               size="mini"
+               style="width: 100%;">
+
+        <el-form-item label="备注"  class="required-label"  prop="repatternRemark">
+          <el-col :span="15">
+            <el-input type="textarea" v-model="model.repatternRemark" style="width: 90%;" size="small" minlength="2" maxlength="500" placeholder="请输入备注信息"></el-input>
+          </el-col>
+        </el-form-item>
+
+      </el-form>
+      <!--            </el-row>-->
+      <span slot="footer" class="dialog-footer" style="text-align: center;">
+                <el-button @click="cancel">取 消</el-button>
+                <el-button type="primary" @click="confirm">确定</el-button>
+            </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {updateDiagnosis} from "../../utils/diagnosis";
+let vm = null;
+export default {
+  props: {
+    rematchingVisible: {
+      type: Boolean,
+      default: false
+    },
+    diagnoseLogId: {
+      type: Number,
+      default: 0
+    },
+    bizType: {
+      type: Number,
+      default: 0
+    },
+  },
+  data() {
+    return {
+      show: false,
+      title: '重新匹配医生',
+      confirmTxt: '确定',
+      cancleTxt: '',
+      _promise: null,
+      model:{
+        repatternRemark:""
+      },
+      addRules:{
+        repatternRemark: [
+          {required: true, message: "请输入备注信息", trigger: 'blur'}
+        ]
+      }
+    }
+  },
+  created() {
+    vm = this;
+  },
+  methods: {
+    confirm() {
+      this.$refs.setForm.validate((valid) => {
+        if (valid) {
+          let req = {
+            id:this.diagnoseLogId,
+            bizType:10,
+            repatternRemark:this.model.repatternRemark
+          }
+          updateDiagnosis(req).then(function (res) {
+            if(res.code == "000000") {
+              vm.cancel();
+              vm.$emit('search');
+            } else {
+              vm.$message.error(res.message);
+            }
+          }).catch(function (error) {
+            vm.$message.error(res.message);
+          });
+        }
+      })
+
+    },
+    cancel(){
+      this.$emit('update:rematchingVisible', false);
+    }
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+
+</style>

src/views/IM/diagnosis-admin/diagnosis-list-new.vue

@@ -229,6 +229,7 @@
       <diagnosis-doctor @search="search" :diagnosisDoctorVisible.sync="diagnosisDoctorVisible" :diagnoseLogId="diagnoseLogId" :diagnoseType="diagnoseType" :doctorId="doctorId"></diagnosis-doctor>
       <appointment-time @search="search" :appointmentTimeVisible.sync="appointmentTimeVisible" :diagnoseLogId="diagnoseLogId" :bizType="bizType"></appointment-time>
       <diagnosis-time @search="search" :diagnosisTimeVisible.sync="diagnosisTimeVisible" :diagnoseLogId="diagnoseLogId" :bizType="bizType"></diagnosis-time>
+      <rematching-doctor @search="search" :rematchingVisible.sync="rematchingVisible" :diagnoseLogId="diagnoseLogId" :bizType="bizType"></rematching-doctor>
     </div>
     <a class="target" href="" target="_blank" ref="target"></a>
   </div>
@@ -258,6 +259,7 @@ import CoordinatingDoctor from "../../../components/common/coordinating-doctor"
 import DiagnosisDoctor from "../../../components/common/diagnosis-doctor"
 import AppointmentTime from "../../../components/common/appointment-time"
 import DiagnosisTime from "../../../components/common/diagnosis-time"
+import RematchingDoctor from "../../../components/common/rematching-doctor"
 export default {
   components: {
     TableComponent,
@@ -269,7 +271,8 @@ export default {
     CoordinatingDoctor,
     DiagnosisDoctor,
     AppointmentTime,
-    DiagnosisTime
+    DiagnosisTime,
+    RematchingDoctor
   },
   data() {
     return {
@@ -320,6 +323,7 @@ export default {
       diagnosisDoctorVisible:false,
       appointmentTimeVisible:false,
       diagnosisTimeVisible:false,
+      rematchingVisible:false,
       multipleSelection:[],
       batchFlag:false,
       bizType:0,
@@ -612,11 +616,17 @@ export default {
       this.diagnosisDoctorVisible = true;
       this.diagnoseLogId = row.diagnoseLogId;
       this.diagnoseType = row.diagnoseType;
-      this.doctorId = row.doctorId;
+      if(row.doctorId == 0){
+        this.doctorId = "";
+      }
+      else {
+        this.doctorId = row.doctorId;
+      }
+
     },
     //重新匹配医生
     reMatchDot(row) {
-      this.coordinatingVisible = true;
+      this.rematchingVisible = true;
       this.diagnoseLogId = row.diagnoseLogId;
       this.bizType = 10;
     },