Merge remote-tracking branch 'origin/dev-20210702' into dev-20210702

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

@@ -243,9 +243,9 @@
                         <el-option v-for="item of relationList" :key="item.value" :label="item.label" :value="item.value" ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="招募人" v-if="true" prop="userName">
-                    {{'张兰'}}
-                </el-form-item>
+                <!-- <el-form-item label="招募人" v-if="formData.crrsName" prop="crrsName">
+                    {{ formData.crrsName }}
+                </el-form-item> -->
 
                 <br/>
                 <h1>接诊信息</h1>
@@ -494,6 +494,16 @@ export default {
                 operateUserName: '',
                 appointBeginTime: '',
                 appointEndTime: '',
+                triageOperatorName: '', // 分诊人员姓名
+                receptionOperatorName: '', // 接诊人员姓名
+                assistantBeginTime: '', // 助诊意向开始时间
+                assistantEndTime: '', //助诊意向结束时间
+                assistantRemark: '', // 助诊备注
+                triageDepartmentId: '', // 分诊科室id,
+                triageDepartment: '', // 分诊科室名
+                triageRemark: '', // 分诊备注
+                receptionBeginTime: '', // 接诊意向开始时间
+                receptionEndTime: '', // 接诊意向结束时间
                 // 患者信息
                 patientName: '',
                 idCardType: 1,
@@ -509,7 +519,8 @@ export default {
                 userDepartment: '',
                 userMobile: '',
                 patientRelation: '',
-                //医生信息
+                // crrsName: '', // 招募人
+                // 医生信息
                 doctorName: '',
                 doctorTitle: '',
                 doctorHospital: '',
@@ -517,6 +528,7 @@ export default {
                 doctorMobile: '',
                 doctorSource: '',
                 serviceFee: '',
+                outsideDoctor: '', // 站外医生姓名
                 // 问诊信息
                 diagnoseStage: '',
                 determineFlag: '',
@@ -535,6 +547,20 @@ export default {
                 remark: '',
                 maritalStatus: 2,
                 createType: 1 , ////创建方式1.系统创建 2.手动创建
+                // 备注信息
+                patInFlag: '', // 患者是否在场 1是 2否
+                valueFlag: '', // 是否有价值 1是 2否
+                worthlessReason: '', // 无价值原因
+                otherRemark: '', // 其他备注
+                // 结算信息
+                receptionServiceFee: 0, // 接诊医生服务费单位分
+                receptionServiceFeeStr: '', // 接诊医生服务费展示字段
+                receptionPayType: '', // 接诊医生付款方式1自动打款2手动打款
+                receptionSettleTime: '', // 接诊医生结算时间
+                assistantServiceFee: 0, // 助诊医生服务费单位分
+                assistantServiceFeeStr: '', // 助诊医生服务费展示字段
+                assistantPayType: '', // 助诊医生付款方式1自动打款2手动打款
+                assistantSettleTime: '', // 助诊医生结算时间
                 // 录像信息
                 vodList: {
                   name: '',
@@ -627,42 +653,17 @@ export default {
                     );
                 }
             },
-            logData: [{
-                operateTime: '2016-05-02',
-                operateUserName: '赵丽颖',
-                to: '问诊状态由已完成变成已结算',
-                from: '助诊医生时间不匹配'
-            }, {
-                operateTime: '2016-05-02',
-                operateUserName: '赵丽颖',
-                to: '问诊状态由已完成变成已结算',
-                from: '助诊医生时间不匹配'
-            }, {
-                operateTime: '2016-05-02',
-                operateUserName: '赵丽颖',
-                to: '问诊状态由已完成变成已结算',
-                from: '助诊医生时间不匹配'
-            }, {
+            // 操作日志数据
+            /* 元素结构
+             {
                 operateTime: '2016-05-02',
                 operateUserName: '赵丽颖',
                 to: '问诊状态由已完成变成已结算',
                 from: '助诊医生时间不匹配'
-            }, {
-                operateTime: '2016-05-02',
-                operateUserName: '赵丽颖',
-                to: '问诊状态由已完成变成已结算',
-                from: '助诊医生时间不匹配'
-            }, {
-                operateTime: '2016-05-02',
-                operateUserName: '赵丽颖',
-                to: '问诊状态由已完成变成已结算',
-                from: '助诊医生时间不匹配'
-            }, {
-                operateTime: '2016-05-02',
-                operateUserName: '赵丽颖',
-                to: '问诊状态由已完成变成已结算',
-                from: '助诊医生时间不匹配'
-            }],
+            }
+            */
+            logData: [],
+            // 分页功能与产品沟通不做
             // logCurrentPage: 1,
             // logTotalCount: 0
         }

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

@@ -59,12 +59,13 @@
                 v-model="searchParam.triageDepartmentId"
                 placeholder="请选择科室"
                 style="width: 220px"
+                filterable
               >
                 <el-option
-                  v-for="item of tyleList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                  v-for="item of depList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -234,6 +235,7 @@
 <script>
 const DOWN_URL= '/diagnose/admin/diagnose/export';
 const LIST_URL= '/diagnose/admin/diagnose/list';
+const DEP_URL= '/hospital/departments/0'
 import TableComponent from "@/components/list/table-c";
 import {
   TYPE_LIST,
@@ -274,6 +276,7 @@ export default {
       cancelRangeTime: "",
       orderRangeTime: "",
       completeRangeTime: "",
+      depList: [],
       searchParam: {
         id: "",
         operateName: "",
@@ -327,6 +330,7 @@ export default {
   created() {
     this.fromType = +(this.$route.query.fromType || 1);
     this.setTable();
+    this.getDep()
   },
   mounted() {
     this.setTableHeight();
@@ -409,6 +413,14 @@ export default {
         }
       });
     },
+    getDep() {
+      let url = DEP_URL;
+      this.GET(url).then((res) => {
+        if (res.code === '000000') {
+          this.depList = res.data
+        }
+      });
+    },
     // 重置
     reset() {
       this.createRangeTime = "";