XMLWAN hace 4 años
padre
commit
957be7a4a5

+ 1 - 1
src/api/consumable.js Ver fichero

14
 //获取透析参数
14
 //获取透析参数
15
 
15
 
16
 export function getDialysisParameters(params){
16
 export function getDialysisParameters(params){
17
-   console.log("params============heyuan",params)
17
+   
18
   return request({
18
   return request({
19
      url:"/api/dialysis/getdialysisparameters",
19
      url:"/api/dialysis/getdialysisparameters",
20
      method:"Get",
20
      method:"Get",

+ 9 - 0
src/api/project/project.js Ver fichero

461
       method:"Get",
461
       method:"Get",
462
       params:params
462
       params:params
463
     })
463
     })
464
+  }
465
+
466
+  export function getPatientDetail(id,params){
467
+    
468
+     return request({
469
+       url:"/api/histpatient/getpatientdetail?id="+id,
470
+       method:"Get",
471
+       params:params
472
+     })
464
   }
473
   }

+ 9 - 0
src/api/schedule.js Ver fichero

113
   })
113
   })
114
 }
114
 }
115
 
115
 
116
+
117
+export function getNextScheduleWeekDay(params){
118
+  
119
+  return request({
120
+    url:"/api/schedule/getnextscheduleweekday",
121
+    method:"get",
122
+    params:params
123
+  })
124
+}

+ 12 - 0
src/router/modules/workforce.js Ver fichero

70
         title: 'remind_print',
70
         title: 'remind_print',
71
         noCache: true
71
         noCache: true
72
       }
72
       }
73
+    },
74
+
75
+    {
76
+      path:'/schedule/remind/print/next',
77
+      component:()=>import('@/xt_pages/workforce/next_remind_print'),
78
+      name:'next_remind_print',
79
+      hidden:true,
80
+      is_menu:false,
81
+      meta:{
82
+        title:'next_reminde_print',
83
+        noCache:true
84
+      }
73
     }
85
     }
74
   ]
86
   ]
75
 }
87
 }

+ 26 - 6
src/xt_pages/dialysis/components/consumables.vue Ver fichero

42
         </div>
42
         </div>
43
       </div>
43
       </div>
44
       <div>
44
       <div>
45
-        <!--<el-button size="small" icon="el-icon-printer" type="primary">打印</el-button>-->
45
+        <el-button size="small" icon="el-icon-printer" @click="exportList" type="primary">导出</el-button>
46
         <el-button size="small" type="primary" @click="statistics">统计表</el-button>
46
         <el-button size="small" type="primary" @click="statistics">统计表</el-button>
47
       </div>
47
       </div>
48
     </div>
48
     </div>
219
             var res = response.data
219
             var res = response.data
220
             this.total = res.data.total
220
             this.total = res.data.total
221
             this.good_types.push("姓名")
221
             this.good_types.push("姓名")
222
-
222
+           
223
             for (let a = 0; a <  res.data.good_type.length; a++){
223
             for (let a = 0; a <  res.data.good_type.length; a++){
224
               this.good_types.push(res.data.good_type[a].type_name)
224
               this.good_types.push(res.data.good_type[a].type_name)
225
+              
225
             }
226
             }
226
-            console.log("res====",res.data.good_type)
227
+            console.log("姓名",this.good_types)
227
             this.allGoodInfo = res.data.dialysis_goods
228
             this.allGoodInfo = res.data.dialysis_goods
228
-            console.log("dis===",res.data.dialysis_goods)
229
+           
229
             for(let i = 0; i < res.data.dialysis_goods.length; i++){
230
             for(let i = 0; i < res.data.dialysis_goods.length; i++){
230
               let arr =[]
231
               let arr =[]
231
               let obj = {
232
               let obj = {
271
 
272
 
272
           }
273
           }
273
 
274
 
274
-         console.log("list",this.list)
275
+         console.log("list222222",this.list)
275
 
276
 
276
         })
277
         })
277
 
278
 
320
       search() {
321
       search() {
321
         this.query.page = 1
322
         this.query.page = 1
322
         this.GetDialysisgoods()
323
         this.GetDialysisgoods()
323
-      }
324
+      },
325
+
326
+       exportList(){
327
+         import('@/vendor/Export2Excel').then(excel => {
328
+         const tHeader = this.good_types
329
+         const filterVal = ['name','']
330
+        
331
+         const data = this.formatJson(filterVal, this.list)
332
+         excel.export_json_to_excel({
333
+           header: tHeader,
334
+           data,
335
+           filename: '透析耗材查询'
336
+         })
337
+          this.downloadLoading = false
338
+        })
339
+       },
340
+       formatJson(filterVal, jsonData) {
341
+        return jsonData.map(v => filterVal.map(j => v[j]));
342
+      },
343
+
324
     }
344
     }
325
   }
345
   }
326
 </script>
346
 </script>

+ 6 - 3
src/xt_pages/dialysis/components/dialysisParameters.vue Ver fichero

220
     methods:{
220
     methods:{
221
         selectSchedulType(scheduleType) {
221
         selectSchedulType(scheduleType) {
222
             this.scheduleType = scheduleType;
222
             this.scheduleType = scheduleType;
223
+            this.tableData = []
223
             this.getlist()
224
             this.getlist()
224
         },
225
         },
225
         selectPartitionType(partitionType) {
226
         selectPartitionType(partitionType) {
226
           this.partitionType = partitionType;
227
           this.partitionType = partitionType;
228
+          this.tableData = []
227
           this.getlist()
229
           this.getlist()
228
         },
230
         },
229
         getAllZone: function() {
231
         getAllZone: function() {
258
           getDialysisParameters(params).then(response=>{
260
           getDialysisParameters(params).then(response=>{
259
              if(response.data.state == 1){
261
              if(response.data.state == 1){
260
                 var schedule = response.data.data.schedule
262
                 var schedule = response.data.data.schedule
261
-            
263
+              
262
                 this.tableData = schedule
264
                 this.tableData = schedule
263
                 var total = response.data.data.total
265
                 var total = response.data.data.total
264
                 this.total = total
266
                 this.total = total
352
               limit:this.limit,
354
               limit:this.limit,
353
               page:this.page
355
               page:this.page
354
             }
356
             }
357
+           console.log("params9999999",params)
355
           getDialysisParameters(params).then(response=>{
358
           getDialysisParameters(params).then(response=>{
356
              if(response.data.state == 1){
359
              if(response.data.state == 1){
357
                 var schedule = response.data.data.schedule
360
                 var schedule = response.data.data.schedule
478
              dryWeight = this.dialysisBefor[i].dry_weight
481
              dryWeight = this.dialysisBefor[i].dry_weight
479
           }
482
           }
480
         }
483
         }
481
-        console.log("dryweight=====",dryWeight)
484
+       
482
        return dryWeight
485
        return dryWeight
483
      },
486
      },
484
      getSysBloodPressure(id){
487
      getSysBloodPressure(id){
488
              sysBloodPressure = this.dialysisBefor[i].systolic_blood_pressure
491
              sysBloodPressure = this.dialysisBefor[i].systolic_blood_pressure
489
           }
492
           }
490
         }
493
         }
491
-        console.log("sysBloodPressure=====",sysBloodPressure)
494
+      
492
         return sysBloodPressure
495
         return sysBloodPressure
493
      },
496
      },
494
      getTargetUltrafiltration(id){
497
      getTargetUltrafiltration(id){

+ 3 - 3
src/xt_pages/outpatientDoctorStation/components/deskRecord.vue Ver fichero

54
     </el-form>
54
     </el-form>
55
     <div class="mainTitle">体格信息:</div>
55
     <div class="mainTitle">体格信息:</div>
56
     <el-form class="physiqueForm" :model="case_history" ref="form" label-width="80px">
56
     <el-form class="physiqueForm" :model="case_history" ref="form" label-width="80px">
57
-      <el-form-item label="体温:" prop="name">
57
+      <el-form-item label="体温:" prop="temperature">
58
         <el-input v-model="case_history.temperature" placeholder=""></el-input>
58
         <el-input v-model="case_history.temperature" placeholder=""></el-input>
59
         <span>℃</span>
59
         <span>℃</span>
60
       </el-form-item>
60
       </el-form-item>
61
-      <el-form-item label="脉搏: " prop="name">
61
+      <el-form-item label="脉搏: " prop="pulse">
62
         <el-input v-model="case_history.pulse" placeholder=""></el-input>
62
         <el-input v-model="case_history.pulse" placeholder=""></el-input>
63
         (次/分)
63
         (次/分)
64
       </el-form-item>
64
       </el-form-item>
65
-      <el-form-item label="呼吸: " prop="name">
65
+      <el-form-item label="呼吸: " prop="breathing">
66
         <el-input v-model="case_history.breathing" placeholder=""></el-input>
66
         <el-input v-model="case_history.breathing" placeholder=""></el-input>
67
         (次/分)
67
         (次/分)
68
       </el-form-item>
68
       </el-form-item>

+ 6 - 2
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Ver fichero

257
             this.addtions_charge = []
257
             this.addtions_charge = []
258
             this.patientInfo = response.data.data.xt_info
258
             this.patientInfo = response.data.data.xt_info
259
             this.hisPatientInfo = response.data.data.his_info
259
             this.hisPatientInfo = response.data.data.his_info
260
-            this.case_history = response.data.data.case_history
261
-
260
+            var case_history = response.data.data.case_history
261
+            console.log("case_history22222222",case_history)
262
+            if (case_history.breathing  == 0) {
263
+                case_history.breathing = ""
264
+            }
265
+            this.case_history = case_history
262
             this.info = response.data.data.info
266
             this.info = response.data.data.info
263
 
267
 
264
             this.addtions_charge = response.data.data.addtions_charge
268
             this.addtions_charge = response.data.data.addtions_charge

+ 50 - 13
src/xt_pages/outpatientRegistration/index.vue Ver fichero

9
                 <el-form class="basicForm" :model="form"  :rules="rules"  ref="form"  label-width="100px">
9
                 <el-form class="basicForm" :model="form"  :rules="rules"  ref="form"  label-width="100px">
10
                     <el-form-item label="患者姓名:"  prop="name" :validate-event="is_Name">
10
                     <el-form-item label="患者姓名:"  prop="name" :validate-event="is_Name">
11
                         <!-- <el-input  v-model="form.name"></el-input> -->
11
                         <!-- <el-input  v-model="form.name"></el-input> -->
12
-                       <el-select v-model="form.name" placeholder="请选择">
12
+                       <el-select v-model="form.name" placeholder="请选择" @change="changeName">
13
                             <el-option
13
                             <el-option
14
                             v-for="item in patient"
14
                             v-for="item in patient"
15
                             :key="item.patient_id"
15
                             :key="item.patient_id"
16
                             :label="item.name"
16
                             :label="item.name"
17
-                            :value="item.name">
17
+                            :value="item.patient_id">
18
                             </el-option>
18
                             </el-option>
19
                         </el-select>
19
                         </el-select>
20
                     </el-form-item>
20
                     </el-form-item>
46
 
46
 
47
                       <el-form-item label="医疗类别:">
47
                       <el-form-item label="医疗类别:">
48
                         <el-select v-model="form.medicalCare" placeholder="请选择">
48
                         <el-select v-model="form.medicalCare" placeholder="请选择">
49
-                            <el-option
49
+                            <!-- <el-option
50
                             v-for="item in medicalCare"
50
                             v-for="item in medicalCare"
51
                             :key="item.value"
51
                             :key="item.value"
52
                             :label="item.label"
52
                             :label="item.label"
53
                             :value="item.value">
53
                             :value="item.value">
54
+                            </el-option> -->
55
+                           <el-option
56
+                            v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
57
+                            :key="index"
58
+                            :label="item.name"
59
+                            :value="item.id">
54
                             </el-option>
60
                             </el-option>
55
                         </el-select>
61
                         </el-select>
56
                     </el-form-item>
62
                     </el-form-item>
86
 
92
 
87
                    <el-form-item label="社保类型:">
93
                    <el-form-item label="社保类型:">
88
                         <el-select v-model="form.social_type" placeholder="请选择">
94
                         <el-select v-model="form.social_type" placeholder="请选择">
89
-                            <el-option
95
+                            <!-- <el-option
90
                             v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
96
                             v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
91
                             :key="index"
97
                             :key="index"
92
                             :label="item.name"
98
                             :label="item.name"
93
                             :value="item.id">
99
                             :value="item.id">
100
+                            </el-option> -->
101
+                          <el-option
102
+                            v-for="item in medicalCare"
103
+                            :key="item.value"
104
+                            :label="item.label"
105
+                            :value="item.value">
94
                             </el-option>
106
                             </el-option>
95
                         </el-select>
107
                         </el-select>
96
                     </el-form-item>
108
                     </el-form-item>
165
 <script>
177
 <script>
166
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
178
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
167
 import { basename } from 'path'
179
 import { basename } from 'path'
168
-import { getAllDoctorList,saveHisPatient,getTodaySchedulePatient } from "@/api/project/project"
180
+import { getAllDoctorList,saveHisPatient,getTodaySchedulePatient,getPatientDetail } from "@/api/project/project"
169
 import { getDictionaryDataConfig } from '@/utils/data'
181
 import { getDictionaryDataConfig } from '@/utils/data'
182
+import { uParseTime } from "@/utils/tools";
170
 const moment = require('moment')
183
 const moment = require('moment')
171
 export default {
184
 export default {
172
     components:{
185
     components:{
199
                 phone:'',
212
                 phone:'',
200
                 social_type:'',
213
                 social_type:'',
201
             },
214
             },
202
-            settlement: [{
203
-                value: 1,
204
-                label: '医保'
205
-                }, {
206
-                value: 2,
207
-                label: '自费'
208
-            }],
215
+          settlement: 
216
+            [
217
+              {value: 1,label: '医保'},
218
+              {value: 2,label: '自费'},
219
+              {value: 3,label:'公费'},
220
+              {value: 4,label:'农保'},
221
+              {value: 5,label:'会员'},
222
+              {value: 6,label:'职工'},
223
+              {value: 7,label:'合同'}
224
+            ],
209
             sex: [{
225
             sex: [{
210
                 value: 1,
226
                 value: 1,
211
                 label: '男'
227
                 label: '男'
447
              this.is_Name = true
463
              this.is_Name = true
448
              return
464
              return
449
           }
465
           }
466
+          var name = ""
467
+          for(let i=0;i<this.patient.length;i++){
468
+            if(this.form.name == this.patient[i].patient_id){
469
+                name = this.patient[i].name
470
+            }
471
+          }
472
+          console.log("name",name)
473
+          this.form.name  = name
450
           this.$refs[formName].validate((valid)=>{
474
           this.$refs[formName].validate((valid)=>{
451
              if(valid){
475
              if(valid){
452
                   if(this.form.costChecked == true){
476
                   if(this.form.costChecked == true){
480
                     social_type:this.form.social_type
504
                     social_type:this.form.social_type
481
                 }
505
                 }
482
                 console.log("params",params)
506
                 console.log("params",params)
483
-
507
+                
484
                 saveHisPatient(params).then(response=>{
508
                 saveHisPatient(params).then(response=>{
485
                    if(response.data.state == 1){
509
                    if(response.data.state == 1){
486
                      var patient =  response.data.data.patient
510
                      var patient =  response.data.data.patient
535
              
559
              
536
             }
560
             }
537
          }
561
          }
562
+      },
563
+      changeName(id){
564
+        getPatientDetail(id).then(response=>{
565
+           if(response.data.state == 1){
566
+             var patient =  response.data.data.patient
567
+             console.log("patient",patient)
568
+             this.form.sex = patient.gender 
569
+             this.form.age = patient.age
570
+             this.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
571
+             this.form.phone = patient.phone
572
+             this.form.idCard = patient.id_card_no
573
+          }
574
+        })
538
       }
575
       }
539
     },
576
     },
540
     created(){
577
     created(){

+ 6 - 4
src/xt_pages/outpatientRegistration/registrationHistory.vue Ver fichero

79
                 <el-table-column align="center" prop="name" label="证件号" width='180'>
79
                 <el-table-column align="center" prop="name" label="证件号" width='180'>
80
                     <template slot-scope="scope">{{ scope.row.id_card_no }}</template>
80
                     <template slot-scope="scope">{{ scope.row.id_card_no }}</template>
81
                 </el-table-column>
81
                 </el-table-column>
82
-                <el-table-column align="center" label="患者保险类型">
83
-                    <template slot-scope="scope">{{getMedicalTreatment(scope.row.medical_treatment_type)}}</template>
82
+                <el-table-column align="center" label="社保类型">
83
+                    <template slot-scope="scope">{{getMedicalTreatment(scope.row.social_type)}}</template>
84
                 </el-table-column>
84
                 </el-table-column>
85
                 <el-table-column align="center" prop="name" label="医生" width="80">
85
                 <el-table-column align="center" prop="name" label="医生" width="80">
86
                     <template slot-scope="scope">{{getDoctor(scope.row.doctor) }}</template>
86
                     <template slot-scope="scope">{{getDoctor(scope.row.doctor) }}</template>
126
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
126
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
127
 import { getHisPatientHistory,changePatient,getHisPatient } from "@/api/project/project"
127
 import { getHisPatientHistory,changePatient,getHisPatient } from "@/api/project/project"
128
 import { uParseTime } from "@/utils/tools";
128
 import { uParseTime } from "@/utils/tools";
129
+
129
 export default {
130
 export default {
130
     components:{
131
     components:{
131
         BreadCrumb
132
         BreadCrumb
148
                 {value: 4,label: "免收诊金"},
149
                 {value: 4,label: "免收诊金"},
149
                 {value: 5,label: "专家"}
150
                 {value: 5,label: "专家"}
150
             ],
151
             ],
151
-            start_time:"",
152
-            end_time:"",
152
+            start_time:moment().format("YYYY-MM-DD"),
153
+            end_time:moment().format("YYYY-MM-DD"),
153
             limit:20,
154
             limit:20,
154
             page:1,
155
             page:1,
155
             total:0,
156
             total:0,
178
                 id: 7,
179
                 id: 7,
179
                 name: "生育保险"
180
                 name: "生育保险"
180
             }],
181
             }],
182
+            
181
             tablePatient:[]
183
             tablePatient:[]
182
         }
184
         }
183
     },
185
     },

+ 3 - 2
src/xt_pages/workforce/components/tableWeeks.vue Ver fichero

208
   },
208
   },
209
   watch: {
209
   watch: {
210
     weekTime: function() {
210
     weekTime: function() {
211
+     
211
       var theType = this.weekType(this.weekTime);
212
       var theType = this.weekType(this.weekTime);
212
       this.getSchedules(theType);
213
       this.getSchedules(theType);
213
     }
214
     }
224
           week_type:this.week_type,
225
           week_type:this.week_type,
225
           week_time:this.week_time,
226
           week_time:this.week_time,
226
         }
227
         }
227
-        console.log("params------",params)
228
+       
228
       getScheduleWeekDay(params).then(response => {
229
       getScheduleWeekDay(params).then(response => {
229
         this.scheduleData = [];
230
         this.scheduleData = [];
230
         if (response.data.state == 1) {
231
         if (response.data.state == 1) {
231
           this.scheduleData = response.data.data.schdules;
232
           this.scheduleData = response.data.data.schdules;
232
-          console.log("排班-----", this.scheduleData);
233
+         
233
         } else {
234
         } else {
234
           this.$message.error("网络错误");
235
           this.$message.error("网络错误");
235
           return false;
236
           return false;

+ 18 - 4
src/xt_pages/workforce/remind.vue Ver fichero

10
         <el-tab-pane name="thisWeek">
10
         <el-tab-pane name="thisWeek">
11
             <span slot="label"><i class="el-icon-date"></i> 本周({{theWeek.thisWeek}})</span>
11
             <span slot="label"><i class="el-icon-date"></i> 本周({{theWeek.thisWeek}})</span>
12
         </el-tab-pane>
12
         </el-tab-pane>
13
-        <!-- <el-tab-pane name="nextWeek">
13
+        <el-tab-pane name="nextWeek">
14
             <span slot="label"><i class="el-icon-date"></i> 下一周({{theWeek.nextWeek}})</span>
14
             <span slot="label"><i class="el-icon-date"></i> 下一周({{theWeek.nextWeek}})</span>
15
-        </el-tab-pane>  -->
15
+        </el-tab-pane> 
16
     </el-tabs>
16
     </el-tabs>
17
     <table-push v-if="activeName=='pushTime'"></table-push>
17
     <table-push v-if="activeName=='pushTime'"></table-push>
18
-    <table-weeks v-else :week-time="activeName"> </table-weeks>
18
+    <!-- <table-weeks v-else :week-time="activeName"> </table-weeks> -->
19
+     
20
+   <table-weeks v-if="activeName == 'thisWeek'"> </table-weeks>
21
+   <nextTableWeeks v-if="activeName =='nextWeek'"></nextTableWeeks>
19
   </div>
22
   </div>
20
 </div>
23
 </div>
21
 </template>
24
 </template>
23
 <script>
26
 <script>
24
 import {getWeekPanels} from '@/api/schedule';
27
 import {getWeekPanels} from '@/api/schedule';
25
 import tableWeeks from './components/tableWeeks'
28
 import tableWeeks from './components/tableWeeks'
29
+import nextTableWeeks from './components/nextTableWeeks'
26
 import tablePush from './components/tablePush'
30
 import tablePush from './components/tablePush'
27
 import BreadCrumb from '../components/bread-crumb'
31
 import BreadCrumb from '../components/bread-crumb'
28
 export default {
32
 export default {
40
     components:{
44
     components:{
41
       BreadCrumb,
45
       BreadCrumb,
42
         tableWeeks,
46
         tableWeeks,
43
-        tablePush
47
+        tablePush,
48
+        nextTableWeeks
44
     },
49
     },
45
     methods: {
50
     methods: {
46
 
51
 
61
       },
66
       },
62
       handleClick(tab, event) {
67
       handleClick(tab, event) {
63
         console.log(tab, event);
68
         console.log(tab, event);
69
+      },
70
+      changeActiveName(val){
71
+        console.log("val------",val)
72
+        this.activeName = val
64
       }
73
       }
65
     },
74
     },
66
     created(){
75
     created(){
67
         this.getWeekPanels();
76
         this.getWeekPanels();
77
+    },
78
+    watch:{
79
+      activeName:function(val){
80
+       console.log("val----",val)
81
+      }
68
     }
82
     }
69
 };
83
 };
70
 </script>
84
 </script>