miaofuhao преди 1 година
родител
ревизия
7837d9dc9b

+ 2 - 2
CallCenterWeb.UI/RMYY/config/sit.env.js

4
   NODE_ENV: '"production"',
4
   NODE_ENV: '"production"',
5
   ENV_CONFIG: '"sit"',
5
   ENV_CONFIG: '"sit"',
6
   // BASE_API: '"http://192.168.8.10:8033/"', // API地址
6
   // BASE_API: '"http://192.168.8.10:8033/"', // API地址
7
-  BASE_API: '"http://39.164.159.226:8000/"', // 本地外网
8
-
7
+  // BASE_API: '"http://39.164.159.226:8000/"', // 本地外网
8
+  BASE_API: '"http://192.168.1.37:8000/"', // 本地外网
9
   // BASE_API: '"http://117.160.241.16:8000/"', // API地址
9
   // BASE_API: '"http://117.160.241.16:8000/"', // API地址
10
   SOCKET_IP: '"192.168.8.7"', // WebSocket通讯ip
10
   SOCKET_IP: '"192.168.8.7"', // WebSocket通讯ip
11
   SOCKET_PORT: '"8081"', // WebSocket通讯端口
11
   SOCKET_PORT: '"8081"', // WebSocket通讯端口

+ 118 - 11
CallCenterWeb.UI/RMYY/src/components/button/orderList.vue

268
     <!-- 门诊处理 -->
268
     <!-- 门诊处理 -->
269
     <el-dialog :visible.sync="dialogStatus.dialog_ywzx_menchuli" title="处理">
269
     <el-dialog :visible.sync="dialogStatus.dialog_ywzx_menchuli" title="处理">
270
       <el-form ref="appointmentMenForm" :model="appointmentMenForm" :rules="rules" label-width="100px">
270
       <el-form ref="appointmentMenForm" :model="appointmentMenForm" :rules="rules" label-width="100px">
271
-        <el-form-item label="沟通情况" prop="F_gtqk">
271
+        <el-form-item label="转归" required>
272
+          <el-radio-group v-model="menTurnover" @change="menTurnoverChange">
273
+            <el-radio label="0">接诊患者</el-radio>
274
+            <el-radio label="2">未见患者</el-radio>
275
+          </el-radio-group>
276
+        </el-form-item>
277
+        <el-form-item label="" v-if="menTurnover == '0'" required>
278
+          <el-radio-group v-model=" menTurnoverNext" @change="menTurnoverNextChange">
279
+            <el-radio label="1">诊后离院</el-radio>
280
+            <el-radio label="0">诊后住院</el-radio>
281
+          </el-radio-group>
282
+        </el-form-item>
283
+
284
+        <!-- <el-form-item label="沟通情况" prop="F_gtqk">
272
           <el-radio-group v-model="appointmentMenForm.F_gtqk" @change="gtqkChange">
285
           <el-radio-group v-model="appointmentMenForm.F_gtqk" @change="gtqkChange">
273
             <el-radio label="0">住院</el-radio>
286
             <el-radio label="0">住院</el-radio>
274
             <el-radio label="1">离院</el-radio>
287
             <el-radio label="1">离院</el-radio>
275
             <el-radio label="2">患者未来院</el-radio>
288
             <el-radio label="2">患者未来院</el-radio>
276
           </el-radio-group>
289
           </el-radio-group>
290
+        </el-form-item> -->
291
+        <el-form-item label="就诊科室" required v-if="appointmentMenForm.F_gtqk == '1'">
292
+          <select-dept-tree :tishiy="tishiyu" :is-check-strictly="isCheckStrictly" :deptparam="mendeptidArr2" v-model="appointmentMenForm.F_jiuzhenkeshi" @post-deptid="getmenDeptid2" />
293
+        </el-form-item>
294
+        <el-form-item label="就诊号" required v-if="appointmentMenForm.F_gtqk == '1'">
295
+          <el-input
296
+            v-model="appointmentMenForm.F_jiuzhenhao"
297
+            placeholder="请输入就诊号"
298
+            type="text" />
277
         </el-form-item>
299
         </el-form-item>
278
-        <el-form-item v-show="appointmentMenForm.F_gtqk == '0'" label="">
300
+        <el-form-item label="就诊医生" required v-if="appointmentMenForm.F_gtqk == '1'">
301
+          <el-input
302
+            v-model="appointmentMenForm.F_jiezhenyisheng"
303
+            placeholder="请输入就诊医生"
304
+            type="text" />
305
+        </el-form-item>
306
+
307
+        <el-form-item label="住院科室" required v-if="appointmentMenForm.F_gtqk == '0'">
279
           <select-dept-tree :tishiy="tishiyu" :is-check-strictly="isCheckStrictly" :deptparam="mendeptidArr" v-model="appointmentMenForm.F_zyks" @post-deptid="getmenDeptid" />
308
           <select-dept-tree :tishiy="tishiyu" :is-check-strictly="isCheckStrictly" :deptparam="mendeptidArr" v-model="appointmentMenForm.F_zyks" @post-deptid="getmenDeptid" />
280
         </el-form-item>
309
         </el-form-item>
310
+        <el-form-item label="住院号" required v-if="appointmentMenForm.F_gtqk == '0'">
311
+          <el-input
312
+            v-model="appointmentMenForm.F_InpatientNum"
313
+            placeholder="请输入住院号"
314
+            type="text" />
315
+        </el-form-item>
316
+       
317
+
281
         <el-form-item label="处理结果" prop="cont">
318
         <el-form-item label="处理结果" prop="cont">
282
           <el-input
319
           <el-input
283
             :autosize="{ minRows: 4, maxRows: 8 }"
320
             :autosize="{ minRows: 4, maxRows: 8 }"
1300
         cont: ''
1337
         cont: ''
1301
       },
1338
       },
1302
       mendeptidArr: [],
1339
       mendeptidArr: [],
1340
+      mendeptidArr2:[],
1303
       tishiyu: '请选择住院科室',
1341
       tishiyu: '请选择住院科室',
1304
       isCheckStrictly: false,
1342
       isCheckStrictly: false,
1343
+      menTurnover:'',
1344
+      menTurnoverNext:'',
1305
       appointmentMenForm: {
1345
       appointmentMenForm: {
1306
         isover: 1,
1346
         isover: 1,
1307
-        F_gtqk: '0',
1347
+        F_jiuzhenkeshi:'',// 就诊科室 
1348
+        F_jiezhenyisheng:'',// 就诊医生
1349
+        F_jiuzhenhao:'',// 就诊号 
1350
+         
1351
+        F_gtqk: '',
1352
+        F_InpatientNum:'',// 住院号 
1308
         F_zyks: '',
1353
         F_zyks: '',
1309
         cont: ''
1354
         cont: ''
1310
       },
1355
       },
2074
           })
2119
           })
2075
         })
2120
         })
2076
     },
2121
     },
2077
-    gtqkChange(val) {
2078
-      if (val == '1' || val == '2') {
2079
-        this.mendeptidArr = []
2080
-        this.appointmentMenForm.F_zyks = ''
2081
-      }
2122
+    // gtqkChange(val) {
2123
+    //   if (val == '1' || val == '2') {
2124
+    //     this.mendeptidArr = []
2125
+    //     this.appointmentMenForm.F_zyks = '' F_InpatientNum
2126
+    //   }
2127
+    // },
2128
+    menTurnoverChange(val) {
2129
+     if (val== '2') {
2130
+      this.appointmentMenForm.F_gtqk = val
2131
+     }
2132
+    },
2133
+    menTurnoverNextChange(val) {
2134
+      // if (val =='0') {
2135
+      //   this.mendeptidArr2 = []
2136
+      //   this.appointmentMenForm.F_jiuzhenkeshi = ''
2137
+      // } else if(val =='1'){
2138
+      //   this.mendeptidArr = []
2139
+      //   this.appointmentMenForm.F_zyks = ''
2140
+      // }
2141
+      this.appointmentMenForm.F_gtqk = val
2142
+    },
2143
+    getmenDeptid2(data) {
2144
+      this.mendeptidArr2 = data
2145
+      this.appointmentMenForm.F_jiuzhenkeshi = data[data.length - 1]
2082
     },
2146
     },
2083
     getmenDeptid(data) {
2147
     getmenDeptid(data) {
2084
       this.mendeptidArr = data
2148
       this.mendeptidArr = data
2181
     },
2245
     },
2182
     submitForm(formName) {
2246
     submitForm(formName) {
2183
       // this.loading = true //打开loading
2247
       // this.loading = true //打开loading
2184
-      if (formName === 'appointmentMenForm' && this.worktypeInfo == 'menzhen') {
2185
-        if (this.appointmentMenForm.F_gtqk == '0' && !this.appointmentMenForm.F_zyks) {
2186
-          this.$message.error('请选择住院科室')
2248
+      if (formName === 'appointmentMenForm') {
2249
+        if (!this.appointmentMenForm.F_gtqk) {
2250
+          this.$message.error('请选择转归方式')
2187
           return
2251
           return
2188
         }
2252
         }
2253
+        if (this.appointmentMenForm.F_gtqk == '0') {
2254
+          if( !this.appointmentMenForm.F_zyks){
2255
+            this.$message.error('请选择住院科室')
2256
+            return
2257
+          } 
2258
+          if( !this.appointmentMenForm.F_InpatientNum){
2259
+            this.$message.error('请输入住院号')
2260
+            return
2261
+          }
2262
+          // delete  
2263
+          this.appointmentMenForm.F_jiuzhenkeshi && delete this.appointmentMenForm.F_jiuzhenkeshi
2264
+          this.appointmentMenForm.F_jiuzhenhao && delete this.appointmentMenForm.F_jiuzhenhao
2265
+          this.appointmentMenForm.F_jiezhenyisheng && delete this.appointmentMenForm.F_jiezhenyisheng
2266
+        }
2267
+
2268
+        if (this.appointmentMenForm.F_gtqk == '1') {
2269
+          if(!this.appointmentMenForm.F_jiuzhenkeshi){
2270
+            this.$message.error('请选择就诊科室')
2271
+            return
2272
+          } 
2273
+          if(!this.appointmentMenForm.F_jiuzhenhao){
2274
+            this.$message.error('请输入就诊号')
2275
+            return
2276
+          } 
2277
+          if(!this.appointmentMenForm.F_jiezhenyisheng){
2278
+            this.$message.error('请输入就诊医生')
2279
+            return
2280
+          } 
2281
+          this.appointmentMenForm.F_zyks && delete this.appointmentMenForm.F_zyks
2282
+          this.appointmentMenForm.F_InpatientNum && delete this.appointmentMenForm.F_InpatientNum
2283
+
2284
+        }
2285
+        if(this.appointmentMenForm.F_gtqk == '2'){
2286
+          this.appointmentMenForm.F_zyks && delete this.appointmentMenForm.F_zyks
2287
+          this.appointmentMenForm.F_InpatientNum && delete this.appointmentMenForm.F_InpatientNum
2288
+          this.appointmentMenForm.F_jiuzhenkeshi && delete this.appointmentMenForm.F_jiuzhenkeshi
2289
+          this.appointmentMenForm.F_jiuzhenhao && delete this.appointmentMenForm.F_jiuzhenhao
2290
+          this.appointmentMenForm.F_jiezhenyisheng && delete this.appointmentMenForm.F_jiezhenyisheng
2291
+        }
2189
       }
2292
       }
2293
+
2294
+
2190
       if (formName === 'transferForm') {
2295
       if (formName === 'transferForm') {
2191
         this.transferForm.datetime = this.getNowDate()
2296
         this.transferForm.datetime = this.getNowDate()
2192
       }
2297
       }
2530
                   if (this.optionName == 'ywzx_chuli' && this.worktypeInfo == 'menzhen') {
2635
                   if (this.optionName == 'ywzx_chuli' && this.worktypeInfo == 'menzhen') {
2531
                     this.dialogStatus.dialog_ywzx_menchuli = false
2636
                     this.dialogStatus.dialog_ywzx_menchuli = false
2532
                     this.mendeptidArr = []
2637
                     this.mendeptidArr = []
2638
+                    this.mendeptidArr2 = []
2533
                     this.appointmentMenForm.F_gtqk = '0'
2639
                     this.appointmentMenForm.F_gtqk = '0'
2534
                     this.appointmentMenForm.F_zyks = ''
2640
                     this.appointmentMenForm.F_zyks = ''
2641
+                    this.appointmentMenForm.F_jiuzhenkeshi = ''
2535
                     this.appointmentMenForm.cont = ''
2642
                     this.appointmentMenForm.cont = ''
2536
                   }
2643
                   }
2537
                   if (this.optionName == 'ywzx_chuli' && this.worktypeInfo == 'huizhen') {
2644
                   if (this.optionName == 'ywzx_chuli' && this.worktypeInfo == 'huizhen') {

Файловите разлики са ограничени, защото са твърде много
+ 1411 - 1493
CallCenterWeb.UI/RMYY/src/components/workOrder/information/addOrEditInfOrder.vue


+ 12 - 6
CallCenterWeb.UI/RMYY/src/views/orderManage/MydoubleList/index.vue

90
         </template>
90
         </template>
91
       </el-table-column> -->
91
       </el-table-column> -->
92
       <el-table-column prop="F_WorkOrderContents" label="就诊需求" align="center" min-width />
92
       <el-table-column prop="F_WorkOrderContents" label="就诊需求" align="center" min-width />
93
-      <el-table-column prop="F_Customer" label="姓名" align="center" min-width />
94
-      <el-table-column prop="F_Phon" label="联系电话" align="center" min-width />
93
+      <el-table-column prop="F_guanchuangyisheng" label="管床医生" align="center" min-width />
94
+      <el-table-column prop="F_guanchuangtel" label="医生电话" align="center" min-width />
95
       <el-table-column prop="F_ssyy" label="医联体单位" align="center" min-width />
95
       <el-table-column prop="F_ssyy" label="医联体单位" align="center" min-width />
96
       <el-table-column prop="F_FullName" label="患者姓名" align="center" min-width />
96
       <el-table-column prop="F_FullName" label="患者姓名" align="center" min-width />
97
       <el-table-column prop="F_hzdh" label="患者电话" align="center" min-width />
97
       <el-table-column prop="F_hzdh" label="患者电话" align="center" min-width />
161
           }}</span>
161
           }}</span>
162
         </template>
162
         </template>
163
       </el-table-column>
163
       </el-table-column>
164
-      <el-table-column label="沟通情况" align="center" min-width>
164
+      <el-table-column label="转归" align="center" min-width>
165
         <template slot-scope="scope">
165
         <template slot-scope="scope">
166
-          <span v-if="scope.row.F_gtqk == 0">住院</span>
167
-          <span v-if="scope.row.F_gtqk == 1">离院</span>
168
-          <span v-if="scope.row.F_gtqk == 2">患者未来院</span>
166
+          
167
+          <span v-if="scope.row.F_gtqk == 0">接诊患者-诊后住院</span>
168
+          <span v-if="scope.row.F_gtqk == 1">接诊患者-诊后离院</span>
169
+          <span v-if="scope.row.F_gtqk == 2">未见患者</span>
170
+          <!-- <span v-if="scope.row.F_gtqk == 10">接诊患者</span>
171
+          <span v-if="scope.row.F_gtqk == 11">诊后离院</span>
172
+          <span v-if="scope.row.F_gtqk == 12">诊后住院</span>
173
+          <span v-if="scope.row.F_gtqk == 20">未见患者</span> -->
174
+ 
169
           <span v-if="scope.row.F_gtqk == -1 || scope.row.F_gtqk == null"/>
175
           <span v-if="scope.row.F_gtqk == -1 || scope.row.F_gtqk == null"/>
170
         </template>
176
         </template>
171
       </el-table-column>
177
       </el-table-column>