Merge branch 'feature/jq119' into 'release'

Feature/jq119

See merge request !264

src/api/serviceSchedule.js

@@ -26,6 +26,13 @@ export const switchOpen = async (data) => {
     method: 'post',
   });
 };
+export const readingReportOpen = async (data) => {
+  return request({
+    url: 'diagnose/doctor/work/readingReportOpen',
+    data: data,
+    method: 'post',
+  });
+};
 export const workInStep = async () => {
   return request({
     url: '/diagnose/doctor/work/inStep',

src/components/common/diagnosis-doctor.vue

@@ -276,6 +276,7 @@
         const params = {
           doctorId: this.formData.receptionId,
           weekDay: chooseTime,
+          diagnoseLogId: this.diagnoseLogId,
         };
         getLeisureTime(params).then((res) => {
           if (res.code == '000000') {

src/components/common/diagnosis-time.vue

@@ -30,6 +30,13 @@
             {{ userNamePhone }}
           </span>
         </div>
+        <div class="name-floor">
+          <span class="doctor-info-name">患者信息</span>
+          <span class="name-info-detail">{{ patientName }}</span>
+          <span class="info-phone">
+            {{ patientMobilePhone }}
+          </span>
+        </div>
         <div class="daignose-info">
           <span>分诊科室：{{ triageDepartment }}</span>
         </div>
@@ -116,6 +123,14 @@
         type: String,
         default: '',
       },
+      patientName: {
+        type: String,
+        default: '',
+      },
+      patientMobilePhone: {
+        type: String,
+        default: '',
+      },
       triageDepartment: {
         type: String,
         default: '',
@@ -167,6 +182,7 @@
         const params = {
           departmentId: this.departmentId,
           weekDay: time ? time : this.chooseTime,
+          diagnoseLogId: this.diagnoseLogId,
         };
         getLeisureTime(params).then((res) => {
           if (res.code == '000000') {
@@ -276,9 +292,10 @@
       border-radius: 8px;
       height: 68px;
       display: flex;
+      justify-content: space-between;
       padding: 20px 30px 20px 0;
       .name-floor {
-        width: 50%;
+        // width: 50%;
         padding: 10px 26px;
         display: flex;
         align-items: center;
@@ -312,7 +329,7 @@
         color: #666666;
         display: flex;
         align-items: center;
-        width: 50%;
+        // width: 50%;
         justify-content: flex-end;
       }
     }

src/components/list/table-serviceSchedule.vue

@@ -123,6 +123,20 @@
           />
         </template>
       </el-table-column>
+      <el-table-column
+        prop="isReadingReport"
+        align="center"
+        label="报告解读开关"
+        width="170"
+      >
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.isReadingReport"
+            active-color="#0D9078"
+            @change="changeSwitchReport(scope.$index, scope.row)"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         fixed="right"
@@ -246,6 +260,9 @@
       changeSwitch(value, val) {
         this.$emit('changeSwitch', value, val);
       },
+      changeSwitchReport(value, val) {
+        this.$emit('changeSwitchReport', value, val);
+      },
       getServiceOpen(value, row) {
         return row.serviceOpen === String(value);
       },

src/utils/GeneralData/diagnosis-list-new.js

@@ -14,9 +14,14 @@ export const DIAGNOS_LIST_NEW = [
     label: '订单金额',
     showtooltip: false,
   },
+  {
+    prop: 'orderPlacer',
+    label: '下单人',
+    showtooltip: false,
+  },
   {
     prop: 'consultRoad',
-    label: '订单业务类型',
+    label: '业务类型',
     showtooltip: false,
   },
   {

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

@@ -202,6 +202,26 @@
                   </el-select>
                 </el-form-item>
               </div>
+              <div>
+                <el-form-item
+                  label="下单人"
+                  class="t-b"
+                >
+                  <el-select
+                    v-model="searchParam.orderPlacer"
+                    placeholder="请选择下单人"
+                    clearable
+                    style="width: 220px"
+                  >
+                    <el-option
+                      v-for="item of nextPersonList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </div>
             </div>
             <div class="form-li">
               <div>
@@ -332,12 +352,12 @@
               </div>
               <div>
                 <el-form-item
-                  label="订单业务类型"
+                  label="业务类型"
                   class="t-b"
                 >
                   <el-select
                     v-model="searchParam.consultRoad"
-                    placeholder="请选择订单业务类型"
+                    placeholder="请选择业务类型"
                     clearable
                     style="width: 220px"
                   >
@@ -524,6 +544,8 @@
         :user-name="userName"
         :user-name-phone="userNamePhone"
         :triage-department="triageDepartment"
+        :patient-name="patientName"
+        :patient-mobile-phone="patientMobilePhone"
         :department-id="departmentId"
         @search="search"
       />
@@ -655,6 +677,7 @@
           status: '',
           price: '',
           refundRemark: '',
+          orderPlacer: '',
           matchingWay: null,
           consultRoad: null,
         },
@@ -674,6 +697,20 @@
             label: '向上问诊',
             value: 0,
           },
+          {
+            label: '报告解读',
+            value: 2,
+          },
+        ],
+        nextPersonList: [
+          {
+            label: '基层医生',
+            value: 0,
+          },
+          {
+            label: '患者',
+            value: 1,
+          },
         ],
         tabpaneList: [],
         rematchingOptions: [], // 备注信息
@@ -1122,6 +1159,7 @@
           triageDepartmentId: '',
           price: '',
           refundRemark: '',
+          orderPlacer: '',
           matchingWay: null,
           diagnoseType: '', // 预约问诊类型：1、音频 2、视频 3、图文
           createdTimeBegin: '',
@@ -1206,6 +1244,8 @@
         this.userNamePhone = row.userMobile;
         this.triageDepartment = row.triageDepartment;
         this.departmentId = row.triageDepartmentId;
+        this.patientName = row.patientName;
+        this.patientMobilePhone = row.patientMobilePhone;
         this.diagnosisTimeVisible = true;
         this.bizType = 5;
       // }

src/views/IM/diagnosis-admin/serviceSchedule.vue

@@ -143,6 +143,7 @@
             @getServiceOpen="getServiceOpen"
             @getWorkStatus="getWorkStatus"
             @changeSwitch="changeSwitch"
+            @changeSwitchReport="changeSwitchReport"
             @handleSizeChange="handleSizeChange"
             @handleCurrentChange="handleCurrentChange"
             @addSchedule="addSchedule"
@@ -196,6 +197,7 @@
     switchOpen,
     workInStep,
     getLevel,
+    readingReportOpen
   } from '@/api/serviceSchedule';
   import { departmentAll, savePCDayCount } from '@/api/diagnosis';
   import TableServiceSchedule from '@/components/list/table-serviceSchedule';
@@ -364,17 +366,11 @@
           this.loading = false;
           if (res.code === '000000') {
             this.tableData = (res.data.list || []).map((item) => {
-              if (item.switchStatus === '1') {
-                return {
-                  ...item,
-                  switchStatus: true,
-                };
-              } else {
-                return {
-                  ...item,
-                  switchStatus: false,
-                };
-              }
+              return {
+                ...item,
+                isReadingReport:item.isReadingReport == 1 ? true : false,
+                switchStatus:item.switchStatus == 1 ? true : false
+              };
             });
             this.searchParam.totalRows = res.data.count;
           }
@@ -396,6 +392,16 @@
           }
         });
       },
+      changeSwitchReport(value, val) {
+        readingReportOpen({
+          id: val.id,
+          readingReportOpen: val.isReadingReport ? '1' : '2',
+        }).then((res) => {
+          if (res.code === '000000') {
+          // this.search();
+          }
+        });
+      },
       searchInStep() {
         this.loading = true;
         workInStep().then((res) => {