Merge branch 'openIm' of http://1.14.104.71:10880/root/ylrz_his_scrm_doctorUI into openIm

# Conflicts:
#	src/components/user/login.vue
#	src/utils/im.js
#	src/views/im/index.vue

package.json

@@ -13,7 +13,8 @@
     "build:prod-jzzx": "vue-cli-service build --mode prod-jzzx",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
-    "lint": "eslint --ext .js,.vue src"
+    "lint": "eslint --ext .js,.vue src",
+    "postinstall": "patch-package"
   },
   "husky": {
     "hooks": {
@@ -55,6 +56,7 @@
     "livekit-client": "^2.15.4",
     "mta-h5-analysis": "^2.0.15",
     "nprogress": "0.2.0",
+    "patch-package": "^8.0.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",

src/api/diagnosis.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+
+//查询初诊单列表
+export function getDiagnosisList(query) {
+  return request({
+    url: '/app/diagnosis/getDiagnosisList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询初诊单详情
+export function detail(id) {
+  return request({
+    url: '/app/diagnosis/' + id,
+    method: 'get'
+  })
+}
+
+export function fill(data) {
+  return request({
+    url: '/app/diagnosis/fill',
+    method: 'put',
+    data: data
+  })
+}

src/router/index.js

@@ -154,6 +154,19 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/diagnosis',
+    component: Layout,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'Index',
+        component: (resolve) => require(['@/views/diagnosis/index'], resolve),
+        name: '初诊单',
+        meta: { title: '初诊单', icon: 'form', affix: false }
+      }
+    ]
+  },
   {
     path: '/follow',
     component: Layout,

src/utils/im.js

@@ -6,9 +6,10 @@ const config = {
   SECRET: 'openIM123',
 
   // 服务器地址配置
-  API_ADDRESS: 'https://web.im.fbylive.com/api', // OpenIM API地址
-  WS_ADDRESS: 'wss://web.im.fbylive.com/msg_gateway', // WebSocket地址
-
+  // API_ADDRESS: 'https://web.im.ysya.top/api', // OpenIM API地址
+  // WS_ADDRESS: 'wss://web.im.ysya.top/msg_gateway', // WebSocket地址
+  API_ADDRESS: 'https://web.im.cdwjyyh.com/api', // OpenIM API地址
+  WS_ADDRESS: 'wss://web.im.cdwjyyh.com/msg_gateway', // WebSocket地址
   // 平台配置
   PLATFORM_ID: 5, // 平台ID (5=Web)
 

src/views/diagnosis/index.vue

@@ -0,0 +1,214 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form-item label="患者姓名" prop="patientName">
+                <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable size="small"
+                    @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-tabs type="card" v-model="queryParams.type" @tab-click="handleClickX">
+            <el-tab-pane label="全部" name="0"></el-tab-pane>
+            <el-tab-pane label="我的" name="1"></el-tab-pane>
+        </el-tabs>
+        <el-table v-loading="loading" border :data="list" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="患者姓名" align="center" prop="patientName" width="120px" />
+            <el-table-column label="性别" align="center" prop="gender" width="120px">
+                <template slot-scope="scope">
+                    <el-tag v-if="scope.row.gender == 0">未知</el-tag>
+                    <el-tag v-if="scope.row.gender == 1">男</el-tag>
+                    <el-tag v-if="scope.row.gender == 2">女</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="患者年龄" align="center" prop="age" width="120px" />
+            <el-table-column label="患者电话" align="center" prop="phone" width="120px" />
+            <el-table-column label="日期" align="center" prop="dateTime" width="120px" />
+            <el-table-column label="身体状况" align="center" prop="physicalCondition" :show-overflow-tooltip="true" />
+            <el-table-column label="患者是否答复" align="center" prop="userStatus" width="120px">
+                <template slot-scope="scope">
+                    <el-tag v-if="scope.row.userStatus == 0">未答复</el-tag>
+                    <el-tag type="success" v-if="scope.row.userStatus == 1">已答复</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px">
+                <template slot-scope="scope">
+                    <el-button :disabled="scope.row.userStatus == 1" size="mini" type="text"
+                        @click="handleFill(scope.row)">填写初诊单</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+        <el-dialog title="填写初诊单" :visible.sync="open" width="1000px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="患者姓名" prop="patientName">
+                            <el-input disabled v-model="form.patientName" placeholder="请输入患者姓名" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="年龄" prop="age">
+                            <el-input disabled v-model="form.age" label="年龄"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="患者电话" prop="phone">
+                            <el-input disabled v-model="form.phone" placeholder="请输入电话" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="性别" prop="gender">
+                            <el-select disabled v-model="form.gender">
+                                <el-option label="未知" :value="0"></el-option>
+                                <el-option label="男性" :value="1"></el-option>
+                                <el-option label="女性" :value="2"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-form-item label="身体状况" prop="physicalCondition">
+                    <el-input v-model="form.physicalCondition" type="textarea" placeholder="请输入内容" />
+                </el-form-item>
+
+                <el-form-item label="初步诊断" prop="firstDiagnosis">
+                    <el-input v-model="form.firstDiagnosis" type="textarea" placeholder="请输入内容" />
+                </el-form-item>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="日期" prop="dateTime">
+                            <el-date-picker clearable size="small" v-model="form.dateTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { getDiagnosisList, fill, detail } from "@/api/diagnosis.js";
+export default {
+    name: "diagnosis",
+    data() {
+        return {
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+            },
+            // 遮罩层
+            loading: true,
+            // 导出遮罩层
+            exportLoading: false,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            list: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                type: "0",
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+
+
+            }
+        }
+    },
+    created() {
+        this.getList();
+    },
+
+    methods: {
+        submitForm() {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    fill(this.form).then(res => {
+                        this.msgSuccess("填写成功");
+                        this.open = false;
+                        this.getList();
+                    })
+                }
+            });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+        },
+        handleFill(row) {
+            detail(row.id).then(res => {
+                this.form = res.data
+            })
+            this.open = true;
+        },
+        getList() {
+            this.loading = true;
+            getDiagnosisList(this.queryParams).then(response => {
+                this.list = response.data.list;
+                this.total = response.data.total;
+                this.loading = false;
+            });
+        },
+        //切换
+        handleClickX(tab, event) {
+            this.queryParams.type = tab.name;
+            this.handleQuery();
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+            };
+            this.resetForm("form");
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.patientId)
+            this.single = selection.length !== 1
+            this.multiple = !selection.length
+        }
+    }
+
+};
+</script>

src/views/im/index.vue

@@ -112,7 +112,7 @@ export default {
           wsAddr: process.env.VUE_APP_WS_ADDR,
           dataDir: '/imdata' // 添加数据存储目录
         }
-        console.log("config",config)
+
         this.OpenIM.login(config).then(() => {
           this.$nextTick(() => {
             this.checkSDKReadyState();
@@ -187,12 +187,7 @@ export default {
           this.$store.commit('updateConversationList', data)
         })
         .catch(({ errCode, errMsg }) => {
-          if (errCode === 1004) {
-            console.log("暂无会话数据")
-            this.$store.commit('updateConversationList', [])
-          } else {
-            console.error("获取会话列表失败", errCode, errMsg)
-          }
+          // 调用失败
         })
       //查询好友列表
       this.OpenIM.getFriendListPage({ offset:0, count:100 })
@@ -203,12 +198,7 @@ export default {
           this.$store.commit('updateFriendList', data)
         })
         .catch(({ errCode, errMsg }) => {
-          if (errCode === 1004) {
-            console.log("暂无好友数据")
-            this.$store.commit('updateFriendList', [])
-          } else {
-            console.error("获取好友列表失败", errCode, errMsg)
-          }
+          // 调用失败
         })
     },