liuzhihui 3 年 前
コミット
ee612fa771

+ 3 - 0
CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

468
     },
468
     },
469
     methods: {
469
     methods: {
470
       getUserData() {
470
       getUserData() {
471
+        if(!this.usercodeSearch){
472
+          return;
473
+        }
471
         const params = {
474
         const params = {
472
           usercode: this.usercodeSearch
475
           usercode: this.usercodeSearch
473
         }
476
         }

+ 3 - 0
CallCenterWeb.UI/RMYY/src/components/workOrder/repairbase/addRepairbase.vue

300
     },
300
     },
301
     methods: {
301
     methods: {
302
       getUserData() {
302
       getUserData() {
303
+        if(!this.usercodeSearch){
304
+          return;
305
+        }
303
         const params = {
306
         const params = {
304
           usercode: this.usercodeSearch
307
           usercode: this.usercodeSearch
305
         }
308
         }

+ 3 - 0
CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue

310
     },
310
     },
311
     methods: {
311
     methods: {
312
       getUserData() {
312
       getUserData() {
313
+        if(!this.usercodeSearch){
314
+          return;
315
+        }
313
         const params = {
316
         const params = {
314
           usercode: this.usercodeSearch
317
           usercode: this.usercodeSearch
315
         }
318
         }

+ 2 - 2
CallCenterWeb.UI/RMYY/src/views/callScreen/components/callScreen.vue

29
               <visit-list :callin-num="callinNum" :callid="callinCallid" />
29
               <visit-list :callin-num="callinNum" :callid="callinCallid" />
30
             </div>
30
             </div>
31
           </el-tab-pane>
31
           </el-tab-pane>
32
-          <el-tab-pane label="药品信息" name="drugInfo">
32
+          <!-- <el-tab-pane label="药品信息" name="drugInfo">
33
             <div class="tab_body">
33
             <div class="tab_body">
34
               <drug-list :callin-num="callinNum" :callid="callinCallid" />
34
               <drug-list :callin-num="callinNum" :callid="callinCallid" />
35
             </div>
35
             </div>
36
-          </el-tab-pane>
36
+          </el-tab-pane> -->
37
           <el-tab-pane label="知识库" name="second">
37
           <el-tab-pane label="知识库" name="second">
38
             <div class="tab_body">
38
             <div class="tab_body">
39
               <knowledge-List ref="knowledgeListEl" :callin-num="callinNum" :callid="callinCallid" />
39
               <knowledge-List ref="knowledgeListEl" :callin-num="callinNum" :callid="callinCallid" />

+ 64 - 30
CallCenterWeb.UI/RMYY/src/views/callScreen/components/hisList.vue

33
       <el-table-column :show-overflow-tooltip="true" prop="DischargeDateTime" label="出院时间" align="center" />
33
       <el-table-column :show-overflow-tooltip="true" prop="DischargeDateTime" label="出院时间" align="center" />
34
       <el-table-column :show-overflow-tooltip="true" prop="" label="出院科室" align="center">
34
       <el-table-column :show-overflow-tooltip="true" prop="" label="出院科室" align="center">
35
         <template slot-scope="scope">
35
         <template slot-scope="scope">
36
-          <span>{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
36
+          <span v-if="scope.row.AssignedPatientLocation">{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
37
         </template>
37
         </template>
38
       </el-table-column>
38
       </el-table-column>
39
       <el-table-column :show-overflow-tooltip="true" label="出院诊断" align="center">
39
       <el-table-column :show-overflow-tooltip="true" label="出院诊断" align="center">
40
         <template slot-scope="scope">
40
         <template slot-scope="scope">
41
-          <span>{{scope.row.Diagnosis.Name}}</span>
41
+          <span v-if="scope.row.Diagnosis">{{scope.row.Diagnosis.Name}}</span>
42
         </template>
42
         </template>
43
       </el-table-column>
43
       </el-table-column>
44
       <el-table-column :show-overflow-tooltip="true" prop="" label="主管医生" align="center">
44
       <el-table-column :show-overflow-tooltip="true" prop="" label="主管医生" align="center">
45
         <template slot-scope="scope">
45
         <template slot-scope="scope">
46
-          <span>{{scope.row.AttendingDoctor.FamilyName}}</span>
46
+          <span v-if="scope.row.AttendingDoctor">{{scope.row.AttendingDoctor.FamilyName}}</span>
47
         </template>
47
         </template>
48
       </el-table-column>
48
       </el-table-column>
49
       <el-table-column :show-overflow-tooltip="true" prop="" label="住院号" align="center">
49
       <el-table-column :show-overflow-tooltip="true" prop="" label="住院号" align="center">
50
         <template slot-scope="scope">
50
         <template slot-scope="scope">
51
-          <span>{{scope.row.VisitNumber.CardID}}</span>
51
+          <span v-if="scope.row.VisitNumber">{{scope.row.VisitNumber.CardID}}</span>
52
         </template>
52
         </template>
53
       </el-table-column>
53
       </el-table-column>
54
     </el-table>
54
     </el-table>
57
       <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="就诊时间" align="center" />
57
       <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="就诊时间" align="center" />
58
       <el-table-column :show-overflow-tooltip="true" label="就诊科室" align="center">
58
       <el-table-column :show-overflow-tooltip="true" label="就诊科室" align="center">
59
         <template slot-scope="scope">
59
         <template slot-scope="scope">
60
-          <span>{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
60
+          <span v-if="scope.row.AssignedPatientLocation">{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
61
         </template>
61
         </template>
62
       </el-table-column>
62
       </el-table-column>
63
       <el-table-column :show-overflow-tooltip="true" label="就诊病区" align="center">
63
       <el-table-column :show-overflow-tooltip="true" label="就诊病区" align="center">
64
         <template slot-scope="scope">
64
         <template slot-scope="scope">
65
-          <span>{{scope.row.AssignedPatientLocation.Areaname}}</span>
65
+          <span v-if="scope.row.AssignedPatientLocation">{{scope.row.AssignedPatientLocation.Areaname}}</span>
66
         </template>
66
         </template>
67
       </el-table-column>
67
       </el-table-column>
68
       <el-table-column :show-overflow-tooltip="true" label="接诊医生" align="center">
68
       <el-table-column :show-overflow-tooltip="true" label="接诊医生" align="center">
69
         <template slot-scope="scope">
69
         <template slot-scope="scope">
70
-          <span>{{scope.row.AttendingDoctor.FamilyName}}</span>
70
+          <span v-if="scope.row.AttendingDoctor">{{scope.row.AttendingDoctor.FamilyName}}</span>
71
         </template>
71
         </template>
72
       </el-table-column>
72
       </el-table-column>
73
     </el-table>
73
     </el-table>
76
       <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="就诊时间" align="center" />
76
       <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="就诊时间" align="center" />
77
       <el-table-column :show-overflow-tooltip="true" label="就诊科室" align="center">
77
       <el-table-column :show-overflow-tooltip="true" label="就诊科室" align="center">
78
         <template slot-scope="scope">
78
         <template slot-scope="scope">
79
-          <span>{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
79
+          <span v-if="scope.row.AssignedPatientLocation">{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
80
         </template>
80
         </template>
81
       </el-table-column>
81
       </el-table-column>
82
       <el-table-column :show-overflow-tooltip="true" label="接诊医生" align="center">
82
       <el-table-column :show-overflow-tooltip="true" label="接诊医生" align="center">
83
         <template slot-scope="scope">
83
         <template slot-scope="scope">
84
-          <span>{{scope.row.AttendingDoctor.FamilyName}}</span>
84
+          <span v-if="scope.row.AttendingDoctor">{{scope.row.AttendingDoctor.FamilyName}}</span>
85
         </template>
85
         </template>
86
       </el-table-column>
86
       </el-table-column>
87
     </el-table>
87
     </el-table>
90
       <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="体检时间" align="center" />
90
       <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="体检时间" align="center" />
91
       <el-table-column :show-overflow-tooltip="true" prop="" label="体检科室" align="center">
91
       <el-table-column :show-overflow-tooltip="true" prop="" label="体检科室" align="center">
92
         <template slot-scope="scope">
92
         <template slot-scope="scope">
93
-          <span>{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
93
+          <span v-if="scope.row.AssignedPatientLocation">{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
94
         </template>
94
         </template>
95
       </el-table-column>
95
       </el-table-column>
96
       <el-table-column :show-overflow-tooltip="true" prop="" label="接诊医生" align="center">
96
       <el-table-column :show-overflow-tooltip="true" prop="" label="接诊医生" align="center">
97
         <template slot-scope="scope">
97
         <template slot-scope="scope">
98
-          <span>{{scope.row.AttendingDoctor.FamilyName}}</span>
98
+          <span v-if="scope.row.AttendingDoctor">{{scope.row.AttendingDoctor.FamilyName}}</span>
99
         </template>
99
         </template>
100
       </el-table-column>
100
       </el-table-column>
101
     </el-table>
101
     </el-table>
102
-    <el-dialog title="请选择系统" :visible.sync="dialogVisible" width="30%">
102
+    <el-dialog title="请选择" :visible.sync="dialogVisible" width="30%">
103
       <div style="height: 300px;">
103
       <div style="height: 300px;">
104
-        <el-select v-model="tourlid" placeholder="请选择系统">
104
+        <!-- <el-select v-model="tourlid" placeholder="请选择系统">
105
           <el-option v-for="(item,index) in urls" :key="index" :label="item.F_Name" :value="item.F_DictionaryValueId">
105
           <el-option v-for="(item,index) in urls" :key="index" :label="item.F_Name" :value="item.F_DictionaryValueId">
106
           </el-option>
106
           </el-option>
107
-        </el-select>
108
-        <el-select v-model="jzlb" placeholder="请选择就诊类别">
107
+        </el-select> -->
108
+        <el-select v-model="jzlb" clearable placeholder="请选择就诊类别">
109
           <el-option value="1" label="门诊"></el-option>
109
           <el-option value="1" label="门诊"></el-option>
110
           <el-option value="2" label="住院"></el-option>
110
           <el-option value="2" label="住院"></el-option>
111
           <el-option value="3" label="体检"></el-option>
111
           <el-option value="3" label="体检"></el-option>
112
         </el-select>
112
         </el-select>
113
+        <el-input v-model="jzlsh" placeholder="请输入就诊流水号" style="width: 200px;" clearable></el-input>
114
+        <el-input v-model="zjh" placeholder="请输入身份证号" style="width: 200px;margin-top: 5px;" clearable></el-input>
113
       </div>
115
       </div>
114
       <span slot="footer" class="dialog-footer">
116
       <span slot="footer" class="dialog-footer">
115
-        <!-- <el-button @click="dialogVisible = false">取 消</el-button> -->
116
         <el-button type="primary" @click="goToView">确 定</el-button>
117
         <el-button type="primary" @click="goToView">确 定</el-button>
117
       </span>
118
       </span>
118
     </el-dialog>
119
     </el-dialog>
158
           pagesize: 5, // 每页几条数据
159
           pagesize: 5, // 每页几条数据
159
           total: 0 // 总共多少数据
160
           total: 0 // 总共多少数据
160
         },
161
         },
161
-        selectedUrl:'',
162
+        selectedUrl: '',
162
         urls: [],
163
         urls: [],
163
-        jzlb:'',
164
+        jzlb: '1',
165
+        jzlsh: '',
166
+        zjh:'',
164
         tourlid: '',
167
         tourlid: '',
165
         tourl: '',
168
         tourl: '',
166
         dialogVisible: false,
169
         dialogVisible: false,
197
           GetModelList(params).then(response => {
200
           GetModelList(params).then(response => {
198
             this.loading = false
201
             this.loading = false
199
             this.hismsg = response.rows[0]
202
             this.hismsg = response.rows[0]
203
+            this.zjh = this.hismsg.zjhm
200
             this.getRecord('I', response.rows[0].zsyh)
204
             this.getRecord('I', response.rows[0].zsyh)
201
             this.getRecord('O', response.rows[0].zsyh)
205
             this.getRecord('O', response.rows[0].zsyh)
202
             this.getRecord('E', response.rows[0].zsyh)
206
             this.getRecord('E', response.rows[0].zsyh)
219
         })
223
         })
220
       },
224
       },
221
       goView() {
225
       goView() {
226
+        if (this.zhuyuanArr.length == 0 && this.menzhenArr.length == 0 && this.jizhenArr.length == 0 && this.tijianArr
227
+          .length == 0) {
228
+          this.$message.error('当前患者暂无就诊记录')
229
+          return;
230
+        }
222
         this.dialogVisible = true
231
         this.dialogVisible = true
223
         this.getUrls()
232
         this.getUrls()
224
       },
233
       },
236
       //   this.tourl = data.split(',')[1]
245
       //   this.tourl = data.split(',')[1]
237
       //   console.log(this.tourlid,this.tourl)
246
       //   console.log(this.tourlid,this.tourl)
238
       // },
247
       // },
239
-      goToView(){
248
+      goToView() {
249
+        if (!this.jzlb) {
250
+          this.$message.error('请选择就诊类别')
251
+          return;
252
+        }
253
+        var zhuyuanid = ''
254
+        var menzhenid = ''
255
+        var jizhenid = ''
256
+        var tijianid = ''
257
+        if (this.zhuyuanArr.length > 0) {
258
+          zhuyuanid = this.zhuyuanArr[0].AttendingDoctor.CardID
259
+        }
260
+        if (this.menzhenArr.length > 0) {
261
+          menzhenid = this.menzhenArr[0].AttendingDoctor.CardID
262
+        }
263
+        if (this.jizhenArr.length > 0) {
264
+          jizhenid = this.jizhenArr[0].AttendingDoctor.CardID
265
+        }
266
+        if (this.tijianArr.length > 0) {
267
+          tijianid = this.tijianArr[0].AttendingDoctor.CardID
268
+        }
240
         const params = {
269
         const params = {
241
-          id:this.tourlid,
242
-          userid:this.zhuyuanArr[0].AttendingDoctor.CardID || '',
243
-          zjh:this.hismsg.zjhm,
244
-          jzlb:this.jzlb,
270
+          userid: zhuyuanid || menzhenid || jizhenid || tijianid,
271
+          zjh: this.hismsg.zjhm || this.zjh,
272
+          jzlb: this.jzlb,
273
+          jzlsh: this.jzlsh
245
         }
274
         }
246
-        GetUrl(params).then(res=>{
247
-          if(res.state == 'success'){
275
+        GetUrl(params).then(res => {
276
+          if (res.state == 'success') {
248
             this.dialogVisible = false
277
             this.dialogVisible = false
249
-            this.tourlid = ''
278
+            this.jzlb = ''
279
+            this.jzlsh = ''
280
+            this.zjh = ''
250
             window.open(res.data)
281
             window.open(res.data)
251
           }
282
           }
252
         })
283
         })
269
           GlobalPID: zsyh
300
           GlobalPID: zsyh
270
         }
301
         }
271
         GetRcord(params).then(res => {
302
         GetRcord(params).then(res => {
303
+          if (res.QueryPatientVisitByIDResponse.patientVisits == "") {
304
+            return;
305
+          }
272
           const Obj = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
306
           const Obj = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
273
           if (recordtype === 'I') {
307
           if (recordtype === 'I') {
274
-            if (Obj instanceof Array == 'true') {
308
+            if (Obj instanceof Array === true) {
275
               this.zhuyuanArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
309
               this.zhuyuanArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
276
             } else {
310
             } else {
277
               this.zhuyuanArr = []
311
               this.zhuyuanArr = []
279
             }
313
             }
280
           }
314
           }
281
           if (recordtype === 'O') {
315
           if (recordtype === 'O') {
282
-            if (Obj instanceof Array == 'true') {
316
+            if (Obj instanceof Array === true) {
283
               this.menzhenArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
317
               this.menzhenArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
284
             } else {
318
             } else {
285
               this.menzhenArr = []
319
               this.menzhenArr = []
287
             }
321
             }
288
           }
322
           }
289
           if (recordtype === 'E') {
323
           if (recordtype === 'E') {
290
-            if (Obj instanceof Array == 'true') {
324
+            if (Obj instanceof Array === true) {
291
               this.jizhenArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
325
               this.jizhenArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
292
             } else {
326
             } else {
293
               this.jizhenArr = []
327
               this.jizhenArr = []
295
             }
329
             }
296
           }
330
           }
297
           if (recordtype === 'P') {
331
           if (recordtype === 'P') {
298
-            if (Obj instanceof Array == 'true') {
332
+            if (Obj instanceof Array === true) {
299
               this.tijianArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
333
               this.tijianArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
300
             } else {
334
             } else {
301
               this.tijianArr = []
335
               this.tijianArr = []

+ 1 - 0
CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/repairList/index.vue

41
           <span v-if="scope.row.StateName=='待完成'" style="color: #ff5507;">{{scope.row.StateName}}</span>
41
           <span v-if="scope.row.StateName=='待完成'" style="color: #ff5507;">{{scope.row.StateName}}</span>
42
           <span v-if="scope.row.StateName=='待接单'" style="color: #ff0000;">{{scope.row.StateName}}</span>
42
           <span v-if="scope.row.StateName=='待接单'" style="color: #ff0000;">{{scope.row.StateName}}</span>
43
           <span v-if="scope.row.StateName=='待提交'" style="color: #ff007f;">{{scope.row.StateName}}</span>
43
           <span v-if="scope.row.StateName=='待提交'" style="color: #ff007f;">{{scope.row.StateName}}</span>
44
+          <span v-if="scope.row.StateName=='确认耗材中'" style="color: #55007f;">{{scope.row.StateName}}</span>
44
         </template>
45
         </template>
45
       </el-table-column>
46
       </el-table-column>
46
       <el-table-column v-if="fieldListFlag.AssistanceState" label="协作" align="center" min-width>
47
       <el-table-column v-if="fieldListFlag.AssistanceState" label="协作" align="center" min-width>

+ 1 - 0
CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/index.vue

47
           <span v-if="scope.row.StateName=='待派单'" style="color: #ff55ff;">{{scope.row.StateName}}</span>
47
           <span v-if="scope.row.StateName=='待派单'" style="color: #ff55ff;">{{scope.row.StateName}}</span>
48
           <span v-if="scope.row.StateName=='待提交'" style="color: #ff007f;">{{scope.row.StateName}}</span>
48
           <span v-if="scope.row.StateName=='待提交'" style="color: #ff007f;">{{scope.row.StateName}}</span>
49
           <span v-if="scope.row.StateName=='待分配'" style="color: #aa0000;">{{scope.row.StateName}}</span>
49
           <span v-if="scope.row.StateName=='待分配'" style="color: #aa0000;">{{scope.row.StateName}}</span>
50
+          <span v-if="scope.row.StateName=='确认耗材中'" style="color: #55007f;">{{scope.row.StateName}}</span>
50
         </template>
51
         </template>
51
       </el-table-column>
52
       </el-table-column>
52
       <el-table-column v-if="fieldListFlag.F_CreateTime" prop="F_CreateTime" label="创建时间" align="center" />
53
       <el-table-column v-if="fieldListFlag.F_CreateTime" prop="F_CreateTime" label="创建时间" align="center" />

+ 1 - 0
CallCenterWeb.UI/RMYY/src/views/orderManage/orderList/index.vue

55
           <span v-if="scope.row.StateName=='待派单'" style="color: #ff55ff;">{{scope.row.StateName}}</span>
55
           <span v-if="scope.row.StateName=='待派单'" style="color: #ff55ff;">{{scope.row.StateName}}</span>
56
           <span v-if="scope.row.StateName=='待提交'" style="color: #ff007f;">{{scope.row.StateName}}</span>
56
           <span v-if="scope.row.StateName=='待提交'" style="color: #ff007f;">{{scope.row.StateName}}</span>
57
           <span v-if="scope.row.StateName=='待分配'" style="color: #aa0000;">{{scope.row.StateName}}</span>
57
           <span v-if="scope.row.StateName=='待分配'" style="color: #aa0000;">{{scope.row.StateName}}</span>
58
+          <span v-if="scope.row.StateName=='确认耗材中'" style="color: #55007f;">{{scope.row.StateName}}</span>
58
         </template>
59
         </template>
59
       </el-table-column>
60
       </el-table-column>
60
       <el-table-column v-if="fieldListFlag.MYD" prop="MYD" label="满意度" align="center">
61
       <el-table-column v-if="fieldListFlag.MYD" prop="MYD" label="满意度" align="center">