Merge branch 'feature/diagnose-0425' into 'release'

Feature/diagnose 0425

See merge request !303

.env.development.local

@@ -17,4 +17,4 @@ VUE_APP_IS_LOCAL=true
 VUE_APP_APPID=wxf4e66242d31c81c2
 
 #本地token
-VUE_APP_TOKEN=E214A2D6B40345F98DE538DA793CF918
+VUE_APP_TOKEN=609ED00303E54EEF9AEE2F8BB9A34CD8

src/utils/constants.js

@@ -91,6 +91,10 @@ export const MATCHING_LIST = [
     label: '人工匹配',
     value: 2,
   },
+  {
+    label: '自营转诊',
+    value: 3,
+  },
 ];
 // 订单状态
 export const STATUS_LIST = [
@@ -763,4 +767,4 @@ export const CHECK_FOLLOW_RESULT = [
     label: '线下自己做',
     value: 3,
   },
-];
+];
\ No newline at end of file

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

@@ -602,8 +602,29 @@
           />
         </el-form-item>
         <!-- -->
-
         <br>
+
+        <template
+          v-if="referralDetail.newDoctorName && referralDetail.referralDate"
+        >
+          <h1>转诊信息</h1>
+          <el-form-item label="接诊医生">
+            <span>{{ referralDetail.originalDoctorName }}</span>
+          </el-form-item>
+          <el-form-item label="转诊医生">
+            <span>{{ referralDetail.newDoctorName }}</span>
+          </el-form-item>
+          <el-form-item label="转诊科室">
+            {{ referralDetail.newDoctorDepartment }}
+          </el-form-item>
+          <el-form-item label="转诊建议">
+            <span>{{ referralDetail.referralAdvice }}</span>
+          </el-form-item>
+          <el-form-item label="转诊时间">
+            <span> {{ referralDetail.referralDate }}</span>
+          </el-form-item>
+        </template>
+
         <h1>结算信息</h1>
         <el-form-item
           label="接诊服务费"
@@ -1073,7 +1094,7 @@
               v-model="formData.drugFollowResultContent"
               placeholder=""
               class="set-width flex-1"
-              style="margin-left:30px"
+              style="margin-left: 30px"
               :disabled="editorType == 2"
               maxlength="1000"
               show-word-limit
@@ -1120,9 +1141,9 @@
                 :value="item.value"
               />
             </el-select>
-            <span 
+            <span
               class="flex flex-1"
-              style="margin-left:30px"
+              style="margin-left: 30px"
             >
               检查结果
               <el-input
@@ -1131,7 +1152,7 @@
                 show-word-limit
                 maxlength="1000"
                 class="set-width flex-1"
-                style="margin-left:12px"
+                style="margin-left: 12px"
                 :disabled="editorType == 2"
               />
             </span>
@@ -1263,7 +1284,7 @@ import {
   MEDICINE_FOLLOW_STATUS_LIST,
   HEALING_EFFECT_FOLLOW_STATUS,
   HEALING_EFFECT_FOLLOW_RESULT,
-  CHECK_FOLLOW_RESULT
+  CHECK_FOLLOW_RESULT,
 } from '@/utils/constants';
 import { getBirth } from '@/utils/index';
 
@@ -1275,10 +1296,17 @@ export default {
   components: {
     uploadImg,
     uploadMusic,
-    uploadVideo
+    uploadVideo,
   },
   data() {
     return {
+      referralDetail: {
+        originalDoctorName: '',
+        newDoctorName: '',
+        newDoctorDepartment: '',
+        referralAdvice: '',
+        referralDate: '',
+      },
       asd: 123,
       diagnoseLogId: '',
       birthDisable: false,
@@ -1344,7 +1372,7 @@ export default {
         diagnoseStage: '',
         determineFlag: '',
         diagnoseDisease: '',
-        diseaseName:'',
+        diseaseName: '',
         illnessDetail: '',
         illnessImageUrls: [],
         diagnoseAdvice: '',
@@ -1354,14 +1382,14 @@ export default {
         checkFollowStatus: '',
         otherFollowStatus: '',
         otherFollow: '',
-        followStatus:'', // 跟进状态
-        followDate:'', // 计划跟进时间
-        drugFollow:'', // 药品跟进点
-        drugFollowResult:'', // 药品跟进结果
-        drugFollowResultContent:'', // 药品跟进结果描述
-        treatmentFollow:'', // 治疗效果跟进点
-        treatmentFollowStatus:'', // 治疗效果跟进状态
-        treatmentFollowResult:'', // 治疗效果跟进结果
+        followStatus: '', // 跟进状态
+        followDate: '', // 计划跟进时间
+        drugFollow: '', // 药品跟进点
+        drugFollowResult: '', // 药品跟进结果
+        drugFollowResultContent: '', // 药品跟进结果描述
+        treatmentFollow: '', // 治疗效果跟进点
+        treatmentFollowStatus: '', // 治疗效果跟进状态
+        treatmentFollowResult: '', // 治疗效果跟进结果
         checkFollow: '', // 检查跟进点
         checkFollowResult: '', // 检查跟进结果
         checkResult: '', // 检测结果
@@ -1386,11 +1414,11 @@ export default {
         vodList: {
           name: '',
           url: '',
-          text: ''
+          text: '',
         },
         additionPrice: null, // 诊疗费
         orderTotalPrice: null,
-        diagnoseChannel: null
+        diagnoseChannel: null,
       },
       tyleList: TYPE_LIST,
       payList: PAY_LIST,
@@ -1561,10 +1589,22 @@ export default {
         .then((res) => {
           this.loading = false;
           if (res.code == '000000') {
+            this.referralDetail.originalDoctorName =
+              res.data.originalDoctorName;
+            this.referralDetail.newDoctorName = res.data.newDoctorName;
+            this.referralDetail.newDoctorDepartment =
+              res.data.newDoctorDepartment;
+            this.referralDetail.referralAdvice = res.data.referralAdvice;
+            this.referralDetail.referralDate = res.data.referralDate;
+            console.log('referralDetail', this.referralDetail);
+
             this.formData = res.data;
             this.formData.price = this.priceFilter(this.formData.price);
-            this.formData.additionPrice = this.priceFilter(this.formData.additionPrice);
-            this.formData.orderTotalPrice = this.formData.price + this.formData.additionPrice;
+            this.formData.additionPrice = this.priceFilter(
+              this.formData.additionPrice
+            );
+            this.formData.orderTotalPrice =
+              this.formData.price + this.formData.additionPrice;
             this.formData.serviceFee = this.priceFilter(
               this.formData.serviceFee
             );
@@ -1790,6 +1830,13 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.referral-container {
+  color: #8d9196;
+  line-height: 30px;
+  font-size: 20px;
+  width: 45%;
+  margin-left: 28px;
+}
 .diagnosis-list-content {
   .component-content {
     padding: 10px;

vue.config.js

@@ -67,10 +67,10 @@ module.exports = {
     config.plugins.delete('preload');
   },
   devServer: {
-    port: 8080,
+    port: 8082,
     proxy: {
       '/proxy': {
-        target: 'https://uat-sc.yunqueyi.com/',
+        target: 'https://dev-sso.yunqueyi.com/',
         ws: false,
         changeOrigin: true,
         secure: true,