Merge branch 'feature/zl' into 'release'

Feature/zl

See merge request !271

.env.development.local

@@ -17,4 +17,4 @@ VUE_APP_IS_LOCAL=true
 VUE_APP_APPID=wxf4e66242d31c81c2
 
 #本地token
-VUE_APP_TOKEN=080D305CDE1648C8A23B59AECE68C7A7
+VUE_APP_TOKEN=A696F7FD7DD5429B9CB693E91BD3A640

src/api/diagnosis.js

@@ -14,6 +14,13 @@ export const getDoctorList = async (data) => {
     method: 'get',
   });
 };
+export const getDoctorListNew = async (data) => {
+  return request({
+    url: '/diagnose/doctorService/doctorListNew',
+    params: data,
+    method: 'get',
+  });
+};
 
 export const getDiagnoseLog = async (data) => {
   return request({
@@ -29,6 +36,12 @@ export const diagnoseUpdate = async (data) => {
     method: 'post',
   });
 };
+export const reMatchDoctor = async (diagnoseLogId) => {
+  return request({
+    url: `/diagnose/admin/diagnose/outbound/intention/${diagnoseLogId}`,
+    method: 'post',
+  });
+};
 
 // diagnosis-im
 export const getQueryTemplate = async () => {

src/components/common/diagnosis-doctor.vue

+<!-- todo -->
 <template>
   <div>
     <el-dialog
@@ -23,6 +24,7 @@
             />
           </el-select>
           <el-date-picker
+            v-if="diagnoseType != 4"
             v-model="chooseTime"
             type="date"
             :clearable="false"
@@ -74,44 +76,49 @@
           <span>未选定医生</span>
         </div>
         <div class="work-info-Num">
-          <span
-            class="work-info-Num-span"
-          >可选排班时间（预约已满需要沟通确定时间）</span>
-          <div
-            v-if="timeChoosetList.length > 0"
-            class="time-list-show"
-          >
+          <div v-if="diagnoseType != 4">
+            <span
+              class="work-info-Num-span"
+            >可选排班时间（预约已满需要沟通确定时间）</span>
             <div
-              v-for="(itemChild, indexChild) in timeChoosetList"
-              :key="indexChild"
-              class="home_grid_item"
+              v-if="timeChoosetList.length > 0"
+              class="time-list-show"
             >
               <div
-                class="grid_text"
-                :class="chooseTimeIndex == indexChild && 'choose-time-choose'"
-                @click="getChooseTimeValue(itemChild, indexChild)"
+                v-for="(itemChild, indexChild) in timeChoosetList"
+                :key="indexChild"
+                class="home_grid_item"
               >
-                <span
-                  :class="
-                    itemChild.isFull == 1 ? 'show-meet-time' : 'no-meet-time'
-                  "
-                >{{ itemChild.time }}</span>
-                <p
-                  :class="
-                    itemChild.isFull == 1 ? 'can-meet-time' : 'canot-meet-time'
-                  "
+                <div
+                  class="grid_text"
+                  :class="chooseTimeIndex == indexChild && 'choose-time-choose'"
+                  @click="getChooseTimeValue(itemChild, indexChild)"
                 >
-                  {{ itemChild.isFull == 1 ? '可约' : '已满' }}
-                </p>
+                  <span
+                    :class="
+                      itemChild.isFull == 1 ? 'show-meet-time' : 'no-meet-time'
+                    "
+                  >{{ itemChild.time }}</span>
+                  <p
+                    :class="
+                      itemChild.isFull == 1
+                        ? 'can-meet-time'
+                        : 'canot-meet-time'
+                    "
+                  >
+                    {{ itemChild.isFull == 1 ? '可约' : '已满' }}
+                  </p>
+                </div>
               </div>
             </div>
+            <div
+              v-else
+              class="time-list-showNo"
+            >
+              <span> 无可选时间 </span>
+            </div>
           </div>
-          <div
-            v-else
-            class="time-list-showNo"
-          >
-            <span> 无可选时间 </span>
-          </div>
+
           <div class="work-info-botton">
             <span
               slot="footer"
@@ -141,7 +148,12 @@
 <script>
   import { manualQueue } from '../../utils/diagnosis';
   import dayjs from 'dayjs';
-  import { getDoctorList, getLeisureTime, acceptsCeiling } from '@/api/diagnosis';
+  import {
+    getDoctorList,
+    getDoctorListNew,
+    getLeisureTime,
+    acceptsCeiling,
+  } from '@/api/diagnosis';
 
   let vm = null;
   export default {
@@ -308,7 +320,7 @@
           });
           return false;
         }
-        if (this.startTime == '') {
+        if (this.startTime == '' && this.diagnoseType != 4) {
           this.$message({
             message: '请选择排班时间',
             type: 'warning',
@@ -322,8 +334,8 @@
           innerFlag: this.formData.innerFlag,
           receptionId: this.formData.receptionId,
           receptionName: this.formData.receptionName,
-          receptionBeginTime: this.startTime,
-          receptionEndTime: this.endTime,
+          receptionBeginTime: this.startTime || '',
+          receptionEndTime: this.endTime || '',
           diagnoseChannel: this.formData.diagnoseChannel,
         };
         manualQueue(req)
@@ -418,7 +430,13 @@
           this.doctorList = this.sessionDoctorList;
           this.doctorChanged(this.formData.receptionId);
         } else {
-          getDoctorList({
+          let doctorMethod = getDoctorList;
+          if (this.diagnoseType == '4') {
+            // diagnoseType = 4实时类型 换了一个接口
+            doctorMethod = getDoctorListNew;
+          }
+
+          doctorMethod({
             diagnoseType: this.diagnoseType,
           })
             .then((res) => {

src/components/common/rematching-doctor.vue

@@ -123,7 +123,8 @@
           if (valid) {
             const req = {
               id: this.diagnoseLogId,
-              bizType: this.bizType,
+              bizType:
+                this.model.statusRemark === '助诊医生爽约' ? 16 : this.bizType,
               statusRemark: this.model.statusRemark,
             };
             updateDiagnosis(req)

src/components/list/table-set-component.vue

@@ -116,7 +116,7 @@
             class="btn"
             @click="waitMatchDot(scope.row)"
           >
-            设为待匹配医生
+            重新匹配
           </el-button>
           <el-button
             v-if="showBtn(scope.row, 22, 21)"
@@ -136,8 +136,9 @@
           >
             发送消息
           </el-button>
+
           <el-button
-            v-if="showBtn(scope.row, 3, 26)"
+            v-if="scope.row.diagnoseType !== 4 && showBtn(scope.row, 3, 26)"
             type="primary"
             size="small"
             class="btn"
@@ -179,7 +180,7 @@
             class="btn"
             @click="waitMatchTime(scope.row)"
           >
-            设为待确认时间
+            修改指定医生
           </el-button>
           <el-button
             v-if="showBtn(scope.row, 3, 25, 26)"
@@ -188,9 +189,9 @@
             class="btn"
             @click="reMatchDot(scope.row, 10)"
           >
-            重新匹配医生
+            手动打回
           </el-button>
-          <el-button
+          <!-- <el-button
             v-if="showBtn(scope.row, 3, 25, 26)"
             type="primary"
             size="small"
@@ -198,9 +199,9 @@
             @click="reMatchDot(scope.row, 16)"
           >
             重新联系助诊医生
-          </el-button>
+          </el-button> -->
           <el-button
-            v-if="showBtn(scope.row, 3, 26)"
+            v-if="scope.row.diagnoseType !== 4 && showBtn(scope.row, 3, 26)"
             type="primary"
             size="small"
             class="btn"

src/main.js

 import { router, store } from '@pica-cli/vue-cli-plugin-pica-cli-plugin/auto';
 import '@/router';
 console.log('router ', router);
-console.log('store ', store);
+console.log('store ', store);
\ No newline at end of file
+
+// 本地调试增加token和systemType
+if (process.env.VUE_APP_ENV === 'development') {
+  window.localStorage.setItem('token', process.env.VUE_APP_TOKEN);
+  window.localStorage.setItem('systemType', process.env.VUE_APP_SYSTEM_TYPE);
+}

src/utils/constants.js

@@ -21,6 +21,10 @@ export const TYPE_LIST = [
     label: '图文问诊',
     value: 3,
   },
+  {
+    label: '电话问诊',
+    value: 4,
+  },
 ];
 
 // 支付方式

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

@@ -623,6 +623,7 @@
     diagnoseExport,
     diagnoseList,
     departmentAll,
+    reMatchDoctor,
   } from '@/api/diagnosis';
 
   import MatchComponent from '@/components/common/match';
@@ -1268,8 +1269,28 @@
         this.departmentId = row.triageDepartmentId;
         this.patientName = row.patientName;
         this.patientMobilePhone = row.patientMobilePhone;
-        this.diagnosisTimeVisible = true;
+
         this.bizType = 5;
+        if (this.diagnoseType == '4') {
+          this.$confirm('是否重新匹配医生', '提示', {
+            confirmButtonText: '是',
+            cancelButtonText: '否',
+            type: 'warning',
+          }).then(() => {
+            this.loading = true;
+            reMatchDoctor(this.diagnoseLogId)
+              .then(() => {
+                this.loading = false;
+                this.search(false);
+              })
+              .catch(() => {
+                this.loading = false;
+              });
+          });
+        } else {
+          this.diagnosisTimeVisible = true;
+        }
+
       // }
       },
       // 修改科室
@@ -1366,15 +1387,12 @@
       },
       // 重新匹配医生
       reMatchDot(row, type) {
-        if (type == 10) {
-          this.rematchingOptions = [
-            '接诊医生爽约',
-            '上级医生日程改变，提前取消',
-            '操作失误，重新匹配医生',
-          ];
-        } else {
-          this.rematchingOptions = ['助诊医生爽约'];
-        }
+        this.rematchingOptions = [
+          '接诊医生爽约',
+          '上级医生日程改变，提前取消',
+          '操作失误，重新匹配医生',
+          '助诊医生爽约',
+        ];
         // this.rematchingOptions=
         // this.options=
         this.rematchingVisible = true;

vue.config.js

@@ -71,7 +71,7 @@ module.exports = {
     port: 8080,
     proxy: {
       '/proxy': {
-        target: 'https://test1-sc.yunqueyi.com/',
+        target: 'https://uat-sc.yunqueyi.com/',
         ws: false,
         changeOrigin: true,
         secure: true,