Browse Source

HIS 系统提交

XMLWAN 4 years ago
parent
commit
f74f58d53a

+ 0 - 3
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

234
                if(response.data.state == 1){
234
                if(response.data.state == 1){
235
                  var hisPatient = response.data.data.hisPatient
235
                  var hisPatient = response.data.data.hisPatient
236
                  console.log("his",hisPatient)
236
                  console.log("his",hisPatient)
237
-                 for(let i=0;i<hisPatient.length;i++){
238
-                    hisPatient[i].id_card_no = hisPatient[i].id_number
239
-                 }
240
                  var scheduleList = response.data.data.scheduleList
237
                  var scheduleList = response.data.data.scheduleList
241
                  hisPatient.push(...scheduleList)
238
                  hisPatient.push(...scheduleList)
242
                  console.log("arrr",hisPatient)
239
                  console.log("arrr",hisPatient)

+ 7 - 5
src/xt_pages/outpatientDoctorStation/components/additionalCharges.vue View File

28
 <script>
28
 <script>
29
  import { saveCharges } from "@/api/project/project"
29
  import { saveCharges } from "@/api/project/project"
30
 export default {
30
 export default {
31
-    props:{
32
-     paitent_id:Number,   
31
+   props: {
32
+      hisPatientInfo: Object,
33
+      patientInfo:Object,
33
     },
34
     },
34
     data(){
35
     data(){
35
         return{
36
         return{
69
         },
70
         },
70
         submitAction(){
71
         submitAction(){
71
           var params = {
72
           var params = {
72
-             patient_id:this.patient_id,
73
+             his_patient_id:this.hisPatientInfo.id,
74
+             patient_id:this.patientInfo.id,
73
              medicineData:this.chargeTable
75
              medicineData:this.chargeTable
74
            }
76
            }
75
            console.log("params",params)
77
            console.log("params",params)
84
         }
86
         }
85
     },
87
     },
86
     watch:{
88
     watch:{
87
-       paitent_id:function(val){
88
-         console.log("患者ID=====",val)  
89
+       hisPatientInfo:function(val){
90
+         console.log("患者ID",this)  
89
        }
91
        }
90
     }
92
     }
91
 }
93
 }

+ 13 - 16
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

200
         </template>
200
         </template>
201
       </div>
201
       </div>
202
     </div>
202
     </div>
203
-    <additionalCharges ref='additionalCharges' :paitent_id="paitent_id"></additionalCharges>
203
+    <additionalCharges ref='additionalCharges' :hisPatientInfo="hisPatientInfo" :patientInfo="patientInfo"></additionalCharges>
204
     <select-template ref='selectTemplate'></select-template>
204
     <select-template ref='selectTemplate'></select-template>
205
     <save-template ref='saveTemplate'></save-template>
205
     <save-template ref='saveTemplate'></save-template>
206
   </div>
206
   </div>
221
     props: {
221
     props: {
222
       patientInfo: Object,
222
       patientInfo: Object,
223
       hisPatientInfo: Object,
223
       hisPatientInfo: Object,
224
-      prescriptions: Array,
224
+      prescriptions: Array
225
     },
225
     },
226
     components: {
226
     components: {
227
       selectTemplate,
227
       selectTemplate,
309
               this.curPrescriptions = this.prescriptions[i]
309
               this.curPrescriptions = this.prescriptions[i]
310
 
310
 
311
               //用来区分处方属于项目还是药品
311
               //用来区分处方属于项目还是药品
312
-              if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.projects.length == 0){
312
+              if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
313
                 this.customTabIndex = 1
313
                 this.customTabIndex = 1
314
               }
314
               }
315
-              if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length > 0){
315
+              if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0){
316
                
316
                
317
                 this.customTabIndex = 2
317
                 this.customTabIndex = 2
318
               }
318
               }
319
 
319
 
320
-              if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length == 0){
320
+              if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0){
321
                 this.customTabIndex = this.rightTab
321
                 this.customTabIndex = this.rightTab
322
               }
322
               }
323
 
323
 
357
         this.prescriptions.push({
357
         this.prescriptions.push({
358
           name: newTabName,
358
           name: newTabName,
359
           advices: [],
359
           advices: [],
360
-          projects: []
361
-
360
+          project:[],
361
+          projects:[]
362
+         
362
         })
363
         })
363
         this.editableTabsValue = newTabName
364
         this.editableTabsValue = newTabName
364
         this.curPrescriptions = this.prescriptions[this.prescriptions.length-1]
365
         this.curPrescriptions = this.prescriptions[this.prescriptions.length-1]
403
 
404
 
404
 
405
 
405
         //用来区分处方属于项目还是药品
406
         //用来区分处方属于项目还是药品
406
-        if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.projects.length == 0){
407
+        if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
407
         
408
         
408
           this.customTabIndex = 1
409
           this.customTabIndex = 1
409
         }
410
         }
410
-        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length > 0){
411
+        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0){
411
          
412
          
412
           this.customTabIndex = 2
413
           this.customTabIndex = 2
413
         }
414
         }
414
-        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length == 0){
415
+        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0){
415
           // this.customTabIndex = this.rightTab
416
           // this.customTabIndex = this.rightTab
416
           this.customTabIndex = index
417
           this.customTabIndex = index
417
         }
418
         }
511
       this.getlist()
512
       this.getlist()
512
       //获取所以项目组套
513
       //获取所以项目组套
513
       this.getAllProjectTeam()
514
       this.getAllProjectTeam()
514
-    },
515
-    watch:{
516
-      hisPatientInfo:function(val){
517
-        console.log("333333333",this.hisPatientInfo)
518
-        deep:true
519
-      }
515
+
516
+   
520
     }
517
     }
521
   }
518
   }
522
 </script>
519
 </script>

+ 17 - 2
src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue View File

120
       </el-table-column>
120
       </el-table-column>
121
       <el-table-column align="center" width="40" prop="name" label="操作">
121
       <el-table-column align="center" width="40" prop="name" label="操作">
122
         <template slot-scope="scope">
122
         <template slot-scope="scope">
123
-          <i class="el-icon-delete"></i>
123
+          <i class="el-icon-delete" @click="deleteProject(scope.row)"></i>
124
         </template>
124
         </template>
125
       </el-table-column>
125
       </el-table-column>
126
     </el-table>
126
     </el-table>
196
           }
196
           }
197
         }
197
         }
198
       },
198
       },
199
+    
199
       setNewData:function(data){
200
       setNewData:function(data){
200
 
201
 
201
         // this.prescription.advices = data.advices
202
         // this.prescription.advices = data.advices
213
              }
214
              }
214
           }
215
           }
215
          return name
216
          return name
216
-      }
217
+      },
218
+      deleteProject(row){
219
+       
220
+        for (let i = 0; i < this.prescription.project.length; i++){
221
+          if(this.prescription.project[i].id == row.id){
222
+              this.prescription.project.splice(i, 1)
223
+          }
224
+        }
225
+      },
217
     },mounted(){
226
     },mounted(){
218
       this.getInitData()
227
       this.getInitData()
219
     },
228
     },
229
+    watch:{
230
+      prescription:function(){
231
+        console.log("8888888",this)
232
+        console.log("9999999",this.prescription)
233
+      }
234
+    }
220
   }
235
   }
221
 </script>
236
 </script>
222
 
237
 

+ 7 - 7
src/xt_pages/outpatientDoctorStation/doctorDesk.vue View File

28
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
28
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
29
                      highlight-current-row
29
                      highlight-current-row
30
                     ref="tab"
30
                     ref="tab"
31
-                    @current-change="changePatient">
31
+                   >
32
             <el-table-column align="center" prop="name" label="患者姓名">
32
             <el-table-column align="center" prop="name" label="患者姓名">
33
               <template slot-scope="scope">{{ scope.row.patients.name }}</template>
33
               <template slot-scope="scope">{{ scope.row.patients.name }}</template>
34
             </el-table-column>
34
             </el-table-column>
117
             return false
117
             return false
118
           } else {
118
           } else {
119
             this.patientTableData = response.data.data.list
119
             this.patientTableData = response.data.data.list
120
-            this.$refs.tab.setCurrentRow(this.patientTableData[0])
120
+            // this.$refs.tab.setCurrentRow(this.patientTableData[0])
121
             let cal_one = 0
121
             let cal_one = 0
122
             let cal_two = 0
122
             let cal_two = 0
123
             for (let i = 0; i < response.data.data.list.length; i++) {
123
             for (let i = 0; i < response.data.data.list.length; i++) {
214
         //     age:60.7
214
         //     age:60.7
215
         // }
215
         // }
216
       },
216
       },
217
-      changePatient(val){
218
-        console.log("患者val",val)
219
-        this.hisPatientInfo = val.his_patient
220
-        console.log("333333",this.hisPatientInfo)
221
-      }
217
+      // changePatient(val){
218
+      //   console.log("患者val",val)
219
+      //   this.hisPatientInfo = val.hisPatientInfo
220
+      //   console.log("333333",this.hisPatientInfo)
221
+      // }
222
     }, created() {
222
     }, created() {
223
       var nowDate = new Date()
223
       var nowDate = new Date()
224
       var nowYear = nowDate.getFullYear()
224
       var nowYear = nowDate.getFullYear()