fix

CallCenterWeb.UI/RMYY/config/sit.env.js

@@ -4,8 +4,8 @@ module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"sit"',
   // BASE_API: '"http://192.168.8.10:8033/"', // API地址
-  BASE_API: '"http://39.164.159.226:8000/"', // 本地外网
-
+  // BASE_API: '"http://39.164.159.226:8000/"', // 本地外网
+  BASE_API: '"http://192.168.1.37:8000/"', // 本地外网
   // BASE_API: '"http://117.160.241.16:8000/"', // API地址
   SOCKET_IP: '"192.168.8.7"', // WebSocket通讯ip
   SOCKET_PORT: '"8081"', // WebSocket通讯端口

CallCenterWeb.UI/RMYY/src/components/button/orderList.vue

@@ -268,16 +268,53 @@
     <!-- 门诊处理 -->
     <el-dialog :visible.sync="dialogStatus.dialog_ywzx_menchuli" title="处理">
       <el-form ref="appointmentMenForm" :model="appointmentMenForm" :rules="rules" label-width="100px">
-        <el-form-item label="沟通情况" prop="F_gtqk">
+        <el-form-item label="转归" required>
+          <el-radio-group v-model="menTurnover" @change="menTurnoverChange">
+            <el-radio label="0">接诊患者</el-radio>
+            <el-radio label="2">未见患者</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="" v-if="menTurnover == '0'" required>
+          <el-radio-group v-model=" menTurnoverNext" @change="menTurnoverNextChange">
+            <el-radio label="1">诊后离院</el-radio>
+            <el-radio label="0">诊后住院</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <!-- <el-form-item label="沟通情况" prop="F_gtqk">
           <el-radio-group v-model="appointmentMenForm.F_gtqk" @change="gtqkChange">
             <el-radio label="0">住院</el-radio>
             <el-radio label="1">离院</el-radio>
             <el-radio label="2">患者未来院</el-radio>
           </el-radio-group>
+        </el-form-item> -->
+        <el-form-item label="就诊科室" required v-if="appointmentMenForm.F_gtqk == '1'">
+          <select-dept-tree :tishiy="tishiyu" :is-check-strictly="isCheckStrictly" :deptparam="mendeptidArr2" v-model="appointmentMenForm.F_jiuzhenkeshi" @post-deptid="getmenDeptid2" />
+        </el-form-item>
+        <el-form-item label="就诊号" required v-if="appointmentMenForm.F_gtqk == '1'">
+          <el-input
+            v-model="appointmentMenForm.F_jiuzhenhao"
+            placeholder="请输入就诊号"
+            type="text" />
         </el-form-item>
-        <el-form-item v-show="appointmentMenForm.F_gtqk == '0'" label="">
+        <el-form-item label="就诊医生" required v-if="appointmentMenForm.F_gtqk == '1'">
+          <el-input
+            v-model="appointmentMenForm.F_jiezhenyisheng"
+            placeholder="请输入就诊医生"
+            type="text" />
+        </el-form-item>
+
+        <el-form-item label="住院科室" required v-if="appointmentMenForm.F_gtqk == '0'">
           <select-dept-tree :tishiy="tishiyu" :is-check-strictly="isCheckStrictly" :deptparam="mendeptidArr" v-model="appointmentMenForm.F_zyks" @post-deptid="getmenDeptid" />
         </el-form-item>
+        <el-form-item label="住院号" required v-if="appointmentMenForm.F_gtqk == '0'">
+          <el-input
+            v-model="appointmentMenForm.F_InpatientNum"
+            placeholder="请输入住院号"
+            type="text" />
+        </el-form-item>
+       
+
         <el-form-item label="处理结果" prop="cont">
           <el-input
             :autosize="{ minRows: 4, maxRows: 8 }"
@@ -1300,11 +1337,19 @@ export default {
         cont: ''
       },
       mendeptidArr: [],
+      mendeptidArr2:[],
       tishiyu: '请选择住院科室',
       isCheckStrictly: false,
+      menTurnover:'',
+      menTurnoverNext:'',
       appointmentMenForm: {
         isover: 1,
-        F_gtqk: '0',
+        F_jiuzhenkeshi:'',// 就诊科室 
+        F_jiezhenyisheng:'',// 就诊医生
+        F_jiuzhenhao:'',// 就诊号 
+         
+        F_gtqk: '',
+        F_InpatientNum:'',// 住院号 
         F_zyks: '',
         cont: ''
       },
@@ -2074,11 +2119,30 @@ export default {
           })
         })
     },
-    gtqkChange(val) {
-      if (val == '1' || val == '2') {
-        this.mendeptidArr = []
-        this.appointmentMenForm.F_zyks = ''
-      }
+    // gtqkChange(val) {
+    //   if (val == '1' || val == '2') {
+    //     this.mendeptidArr = []
+    //     this.appointmentMenForm.F_zyks = '' F_InpatientNum
+    //   }
+    // },
+    menTurnoverChange(val) {
+     if (val== '2') {
+      this.appointmentMenForm.F_gtqk = val
+     }
+    },
+    menTurnoverNextChange(val) {
+      // if (val =='0') {
+      //   this.mendeptidArr2 = []
+      //   this.appointmentMenForm.F_jiuzhenkeshi = ''
+      // } else if(val =='1'){
+      //   this.mendeptidArr = []
+      //   this.appointmentMenForm.F_zyks = ''
+      // }
+      this.appointmentMenForm.F_gtqk = val
+    },
+    getmenDeptid2(data) {
+      this.mendeptidArr2 = data
+      this.appointmentMenForm.F_jiuzhenkeshi = data[data.length - 1]
     },
     getmenDeptid(data) {
       this.mendeptidArr = data
@@ -2181,12 +2245,53 @@ export default {
     },
     submitForm(formName) {
       // this.loading = true //打开loading
-      if (formName === 'appointmentMenForm' && this.worktypeInfo == 'menzhen') {
-        if (this.appointmentMenForm.F_gtqk == '0' && !this.appointmentMenForm.F_zyks) {
-          this.$message.error('请选择住院科室')
+      if (formName === 'appointmentMenForm') {
+        if (!this.appointmentMenForm.F_gtqk) {
+          this.$message.error('请选择转归方式')
           return
         }
+        if (this.appointmentMenForm.F_gtqk == '0') {
+          if( !this.appointmentMenForm.F_zyks){
+            this.$message.error('请选择住院科室')
+            return
+          } 
+          if( !this.appointmentMenForm.F_InpatientNum){
+            this.$message.error('请输入住院号')
+            return
+          }
+          // delete  
+          this.appointmentMenForm.F_jiuzhenkeshi && delete this.appointmentMenForm.F_jiuzhenkeshi
+          this.appointmentMenForm.F_jiuzhenhao && delete this.appointmentMenForm.F_jiuzhenhao
+          this.appointmentMenForm.F_jiezhenyisheng && delete this.appointmentMenForm.F_jiezhenyisheng
+        }
+
+        if (this.appointmentMenForm.F_gtqk == '1') {
+          if(!this.appointmentMenForm.F_jiuzhenkeshi){
+            this.$message.error('请选择就诊科室')
+            return
+          } 
+          if(!this.appointmentMenForm.F_jiuzhenhao){
+            this.$message.error('请输入就诊号')
+            return
+          } 
+          if(!this.appointmentMenForm.F_jiezhenyisheng){
+            this.$message.error('请输入就诊医生')
+            return
+          } 
+          this.appointmentMenForm.F_zyks && delete this.appointmentMenForm.F_zyks
+          this.appointmentMenForm.F_InpatientNum && delete this.appointmentMenForm.F_InpatientNum
+
+        }
+        if(this.appointmentMenForm.F_gtqk == '2'){
+          this.appointmentMenForm.F_zyks && delete this.appointmentMenForm.F_zyks
+          this.appointmentMenForm.F_InpatientNum && delete this.appointmentMenForm.F_InpatientNum
+          this.appointmentMenForm.F_jiuzhenkeshi && delete this.appointmentMenForm.F_jiuzhenkeshi
+          this.appointmentMenForm.F_jiuzhenhao && delete this.appointmentMenForm.F_jiuzhenhao
+          this.appointmentMenForm.F_jiezhenyisheng && delete this.appointmentMenForm.F_jiezhenyisheng
+        }
       }
+
+
       if (formName === 'transferForm') {
         this.transferForm.datetime = this.getNowDate()
       }
@@ -2530,8 +2635,10 @@ export default {
                   if (this.optionName == 'ywzx_chuli' && this.worktypeInfo == 'menzhen') {
                     this.dialogStatus.dialog_ywzx_menchuli = false
                     this.mendeptidArr = []
+                    this.mendeptidArr2 = []
                     this.appointmentMenForm.F_gtqk = '0'
                     this.appointmentMenForm.F_zyks = ''
+                    this.appointmentMenForm.F_jiuzhenkeshi = ''
                     this.appointmentMenForm.cont = ''
                   }
                   if (this.optionName == 'ywzx_chuli' && this.worktypeInfo == 'huizhen') {

CallCenterWeb.UI/RMYY/src/views/orderManage/MydoubleList/index.vue

@@ -90,8 +90,8 @@
         </template>
       </el-table-column> -->
       <el-table-column prop="F_WorkOrderContents" label="就诊需求" align="center" min-width />
-      <el-table-column prop="F_Customer" label="姓名" align="center" min-width />
-      <el-table-column prop="F_Phon" label="联系电话" align="center" min-width />
+      <el-table-column prop="F_guanchuangyisheng" label="管床医生" align="center" min-width />
+      <el-table-column prop="F_guanchuangtel" label="医生电话" align="center" min-width />
       <el-table-column prop="F_ssyy" label="医联体单位" align="center" min-width />
       <el-table-column prop="F_FullName" label="患者姓名" align="center" min-width />
       <el-table-column prop="F_hzdh" label="患者电话" align="center" min-width />
@@ -161,11 +161,17 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="沟通情况" align="center" min-width>
+      <el-table-column label="转归" align="center" min-width>
         <template slot-scope="scope">
-          <span v-if="scope.row.F_gtqk == 0">住院</span>
-          <span v-if="scope.row.F_gtqk == 1">离院</span>
-          <span v-if="scope.row.F_gtqk == 2">患者未来院</span>
+          
+          <span v-if="scope.row.F_gtqk == 0">接诊患者-诊后住院</span>
+          <span v-if="scope.row.F_gtqk == 1">接诊患者-诊后离院</span>
+          <span v-if="scope.row.F_gtqk == 2">未见患者</span>
+          <!-- <span v-if="scope.row.F_gtqk == 10">接诊患者</span>
+          <span v-if="scope.row.F_gtqk == 11">诊后离院</span>
+          <span v-if="scope.row.F_gtqk == 12">诊后住院</span>
+          <span v-if="scope.row.F_gtqk == 20">未见患者</span> -->
+ 
           <span v-if="scope.row.F_gtqk == -1 || scope.row.F_gtqk == null"/>
         </template>
       </el-table-column>