Merge branch 'feature/jq119' into 'release'

Feature/jq119

See merge request !265

src/components/common/diagnosis-doctor.vue

@@ -162,6 +162,10 @@
         type: Number,
         default: 0,
       },
+      consultRoad: {
+        type: String,
+        default: '',
+      },
       doctorId: {
         type: [Number, String],
         default: 0,
@@ -272,11 +276,20 @@
         this.getLeisureTime(this.chooseTime);
       },
       getLeisureTime(chooseTime) {
-        console.log(this.doctorInfo);
+        let consultRoadType = '';
+        if (this.consultRoad == '向上问诊') {
+          consultRoadType = 0;
+        } else if (this.consultRoad == '中医实践') {
+          consultRoadType = 1;
+        } else if (this.consultRoad == '报告解读') {
+          consultRoadType = 2;
+        }
         const params = {
           doctorId: this.formData.receptionId,
           weekDay: chooseTime,
           diagnoseLogId: this.diagnoseLogId,
+          diagnoseType: this.diagnoseType,
+          consultRoad: consultRoadType,
         };
         getLeisureTime(params).then((res) => {
           if (res.code == '000000') {

src/components/common/diagnosis-time.vue

@@ -139,6 +139,14 @@
         type: String,
         default: '',
       },
+      diagnoseType: {
+        type: String,
+        default: '',
+      },
+      consultRoad: {
+        type: String,
+        default: '',
+      },
     },
     data() {
       return {
@@ -150,6 +158,7 @@
         model: {
           assistantRemark: '',
         },
+        consultRoadType: '',
         rangeTime: '',
         startDate: '',
         endDate: '',
@@ -178,11 +187,20 @@
     },
     methods: {
       getLeisureTime(time) {
-        console.log(this.doctorInfo);
+        let consultRoadType = '';
+        if (this.consultRoad == '向上问诊') {
+          consultRoadType = 0;
+        } else if (this.consultRoad == '中医实践') {
+          consultRoadType = 1;
+        } else if (this.consultRoad == '报告解读') {
+          consultRoadType = 2;
+        }
         const params = {
           departmentId: this.departmentId,
           weekDay: time ? time : this.chooseTime,
           diagnoseLogId: this.diagnoseLogId,
+          diagnoseType: this.diagnoseType,
+          consultRoad: consultRoadType,
         };
         getLeisureTime(params).then((res) => {
           if (res.code == '000000') {

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

@@ -292,6 +292,20 @@
                   </el-select>
                 </el-form-item>
               </div>
+              <div>
+                <el-form-item
+                  label="患者姓名"
+                  class="t-b"
+                >
+                  <el-input
+                    v-model.trim="searchParam.patientName"
+                    clearable
+                    placeholder="仅可查询报告解读患者"
+                    style="width: 220px"
+                    @change="patientNameChange"
+                  />
+                </el-form-item>
+              </div>
             </div>
             <div class="form-li">
               <div>
@@ -526,6 +540,7 @@
         :diagnose-type="diagnoseType"
         :doctor-id="doctorId"
         :range-time-data="rangeTimeData"
+        :consult-road="consultRoad"
         :doctor-info="doctorInfo"
         @search="search"
         @changeStartTime="changeStartTime"
@@ -545,6 +560,8 @@
         :user-name-phone="userNamePhone"
         :triage-department="triageDepartment"
         :patient-name="patientName"
+        :diagnose-type="diagnoseType"
+        :consult-road="consultRoad"
         :patient-mobile-phone="patientMobilePhone"
         :department-id="departmentId"
         @search="search"
@@ -680,6 +697,7 @@
           orderPlacer: '',
           matchingWay: null,
           consultRoad: null,
+          patientName: null,
         },
         noteList: [],
         alltabslist: [],
@@ -739,6 +757,7 @@
         dialogFormVisible: false,
         bizType: 0,
         diagnoseType: 0,
+        consultRoad: '',
         doctorId: 0,
         operateUserID: '',
         triageDepartmentId: 0,
@@ -1175,6 +1194,7 @@
           assistantEndTime: '',
           inNewTimeObj: {},
           consultRoad: null,
+          patientName: null,
         });
       },
       // 导出
@@ -1241,6 +1261,8 @@
         this.doctorData = row;
         this.diagnoseLogId = row.diagnoseLogId;
         this.userName = row.userName;
+        this.diagnoseType = row.diagnoseType;
+        this.consultRoad = row.consultRoad;
         this.userNamePhone = row.userMobile;
         this.triageDepartment = row.triageDepartment;
         this.departmentId = row.triageDepartmentId;
@@ -1331,6 +1353,7 @@
         this.diagnosisDoctorVisible = true;
         this.diagnoseLogId = row.diagnoseLogId;
         this.diagnoseType = row.diagnoseType;
+        this.consultRoad = row.consultRoad;
         if (row.doctorId == 0) {
           this.doctorId = '';
         } else {
@@ -1442,6 +1465,9 @@
         this.matchVisible = true;
         this.batchFlag = true;
       },
+      patientNameChange(value) {
+        this.searchParam.patientName = value ? value : null;
+      },
     },
   };
 </script>