Merge branch 'feature/qiao' into 'release'

feat 问诊服务

See merge request !305

.env.development.local

@@ -17,4 +17,4 @@ VUE_APP_IS_LOCAL=true
 VUE_APP_APPID=wxf4e66242d31c81c2
 
 #本地token
-VUE_APP_TOKEN=F5C0CE7C1278471CA133A7CDAE4AC4F5
+VUE_APP_TOKEN=0A78AF63DCA440A78A34CAC5B0971372

src/api/diagnosis.js

@@ -345,3 +345,11 @@ export const getUserIdByDiagnoseLogId = async (diagnoseLogId) => {
     method: 'get',
   });
 };
+
+export const projectList = async (data) => {
+  return request({
+    url: '/tis/project/list',
+    params: data,
+    method: 'get',
+  });
+};

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

@@ -17,6 +17,11 @@ export const DIAGNOS_LIST_NEW = [
     showtooltip: false,
     fixed: 'left',
   },
+  {
+    prop: 'dataFromStr',
+    label: '数据来源',
+    showtooltip: true,
+  },
   {
     prop: 'triageDepartment',
     label: '分诊科室',

src/utils/constants.js

@@ -65,6 +65,14 @@ export const SOURCE_LIST = [
     label: '话题讨论与回复',
     value: 5,
   },
+  {
+    label: '其它',
+    value: 6,
+  },
+  {
+    label: '保险',
+    value: 7,
+  },
 ];
 // 订单价格
 export const ORDER_PRICE = [

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

@@ -48,6 +48,26 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item
+          label="业务类型"
+          disabled
+        >
+          <el-input
+            class="set-width"
+            :value="formData.consultRoad"
+            disabled
+          />
+        </el-form-item>
+        <el-form-item
+          label="数据来源"
+          disabled
+        >
+          <el-input
+            class="set-width"
+            :value="formData.dataFromStr"
+            disabled
+          />
+        </el-form-item>
         <el-form-item label="创建时间">
           <el-date-picker
             v-model="formData.createdTime"

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

@@ -443,6 +443,29 @@
                   </el-select>
                 </el-form-item>
               </div>
+              <div>
+                <el-form-item
+                  label="数据来源"
+                  class="t-b"
+                >
+                  <el-select
+                    :value="insuranceCodes"
+                    placeholder="请选择数据来源"
+                    clearable
+                    multiple
+                    style="width: 220px"
+                    filterable
+                    @change="handleProjectSelect"
+                  >
+                    <el-option
+                      v-for="item of dataFromList"
+                      :key="item.insuranceProjectId"
+                      :label="item.projectName"
+                      :value="item.projectEquityCodes"
+                    />
+                  </el-select>
+                </el-form-item>
+              </div>
             </div>
             <div class="form-btn">
               <div class="form-btn-li">
@@ -672,6 +695,7 @@ import {
   reMatchDoctor,
   personnelList,
   getUserIdByDiagnoseLogId,
+  projectList,
 } from '@/api/diagnosis';
 import { DIAGNOS_LIST_NEW } from '@/utils/GeneralData/diagnosis-list-new';
 import {
@@ -738,6 +762,7 @@ export default {
       followDateTime: '',
       depList: [],
       tabrefresh: true,
+      insuranceCodes: [],
       searchParam: {
         id: '',
         typeList: [],
@@ -772,6 +797,7 @@ export default {
         patientName: null,
         followOperatorId: '', // 运营id
         followStatusList: [], // 跟进状态
+        dataSourceList: [], // 数据来源
       },
       noteList: [],
       alltabslist: [],
@@ -794,6 +820,18 @@ export default {
           label: '报告解读',
           value: 2,
         },
+        {
+          label: '用药咨询',
+          value: 3,
+        },
+        {
+          label: '中医问诊',
+          value: 4,
+        },
+        {
+          label: '在线问诊',
+          value: 5,
+        },
       ],
       newDiagnoseChannelList: DIAGNOSE_CHANNEL,
       nextPersonList: [
@@ -809,6 +847,7 @@ export default {
       tabpaneList: [],
       rematchingOptions: [], // 备注信息
       Raw_tabpaneList: [],
+      dataFromList: [],
       tableData: [],
       totalRows: 0,
       timeClickFlag: true,
@@ -897,11 +936,55 @@ export default {
     this.getOutboundNote();
     this.departmentAll();
     this.personnelList();
+    this.getProjectList();
   },
   destroyed() {
     clearInterval(this.timer);
   },
   methods: {
+    handleProjectSelect(item) {
+      const ids = this.insuranceCodes.join();
+      const selectIds = item.join();
+      const index = item.findIndex((i) => i === '0');
+      if (ids === '0' && selectIds === '0') return;
+      if (!selectIds) this.insuranceCodes = [];
+      else if (index > -1 && index === item.length - 1) {
+        this.insuranceCodes = ['0'];
+      } else if (index > -1) {
+        item.splice(index, 1);
+        this.insuranceCodes = item;
+      } else this.insuranceCodes = item;
+
+      let result = [];
+      if (this.insuranceCodes.join() === '0') {
+        result = this.dataFromList
+          .map((i) => i.projectEquityCodes)
+          .join()
+          .split(',');
+      } else {
+        result = this.insuranceCodes.length
+          ? this.insuranceCodes.join().split(',')
+          : [];
+      }
+      this.searchParam.dataSourceList = [...new Set(result)];
+    },
+    getProjectList() {
+      projectList().then((res) => {
+        if (res.code == '000000') {
+          const item = {
+            insuranceProjectId: 0,
+            projectName: '全部保险项目',
+            projectEquityCodes: [0],
+          };
+          this.dataFromList = [item].concat(res.data).map((row) => {
+            return {
+              ...row,
+              projectEquityCodes: row.projectEquityCodes.join(','),
+            };
+          });
+        }
+      });
+    },
     departmentAll() {
       departmentAll().then((res) => {
         if (res.code == '000000') {

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

@@ -29,7 +29,8 @@
       >
         <template slot-scope="scope">
           <div class="status_base">
-            <div :class="'status-circle status-' + scope.row.status" /><div>{{ getStatusDesc(scope.row.status) }}</div>
+            <div :class="'status-circle status-' + scope.row.status" />
+            <div>{{ getStatusDesc(scope.row.status) }}</div>
           </div>
         </template>
       </el-table-column>
@@ -41,6 +42,14 @@
       >
         <template slot-scope="scope">
           <div
+            v-if="scope.row.status === 1"
+            class="download-btn"
+            @click="reload"
+          >
+            刷新
+          </div>
+          <div
+            v-else-if="scope.row.status === 2"
             class="download-btn"
             @click="download(scope.row.path)"
           >
@@ -67,56 +76,57 @@
 </template>
 
 <script>
-  import {
-    exportList
-  } from '@/api/downList';
-  const STATUS_DESC_MAP = {
-    1: '处理中',
-    2: '完成',
-    3: '失败'
-  };
-  export default {
-    data() {
-      return {
-        pageSize: 15,
-        pageNo: 1,
-        totalCount: 0,
-        loading: false,
-        tableData: [],
-      };
+import { exportList } from '@/api/downList';
+const STATUS_DESC_MAP = {
+  1: '处理中',
+  2: '完成',
+  3: '失败',
+};
+export default {
+  data() {
+    return {
+      pageSize: 15,
+      pageNo: 1,
+      totalCount: 0,
+      loading: false,
+      tableData: [],
+    };
+  },
+  created() {
+    this.queryList();
+  },
+  methods: {
+    reload() {
+      this.queryList();
     },
-    created () {
+    queryList() {
+      exportList({
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+      }).then((res) => {
+        if (res && res.code === '000000') {
+          this.totalCount = res.data.allSize;
+          this.tableData = res.data.list;
+        }
+      });
+    },
+    getStatusDesc(status) {
+      return STATUS_DESC_MAP[status];
+    },
+    download(link) {
+      window.location.href = link;
+    },
+    handleSizeChange(value) {
+      this.pageNo = 1;
+      this.pageSize = value;
       this.queryList();
     },
-    methods: {
-      queryList () {
-        exportList({
-          pageSize: this.pageSize,
-          pageNo: this.pageNo
-        }).then(res => {
-          if (res && res.code === '000000') {
-            this.totalCount = res.data.allSize;
-            this.tableData = res.data.list;
-          }
-        });
-      },
-      getStatusDesc (status) {
-        return STATUS_DESC_MAP[status];
-      },
-      download(link) {
-        window.location.href = link;
-      },
-      handleSizeChange(value) {
-        this.pageNo = 1;
-        this.pageSize = value;
-        this.queryList();
-      },
-      handleCurrentChange(value) {
-        this.pageNo = value;
-        this.queryList();
-      },
+    handleCurrentChange(value) {
+      this.pageNo = value;
+      this.queryList();
     },
-  };
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -137,13 +147,13 @@
       margin-right: 5px;
     }
     .status-1 {
-      background-color: rgb(219, 223, 12);;
+      background-color: rgb(219, 223, 12);
     }
     .status-2 {
-      background-color: rgb(87, 238, 82);;
+      background-color: rgb(87, 238, 82);
     }
     .status-3 {
-      background-color: rgb(238, 68, 16);;
+      background-color: rgb(238, 68, 16);
     }
   }
   .download-btn {
@@ -154,4 +164,4 @@
     color: rgb(98, 233, 86);
   }
 }
-</style>
\ No newline at end of file
+</style>

vue.config.js

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