Преглед изворни кода

11月14日 库存扣减更新

XMLWAN пре 3 година
родитељ
комит
2a3d1380f4

+ 2 - 4
src/api/patient.js Прегледај датотеку

@@ -276,13 +276,11 @@ export function code(id) {
276 276
   })
277 277
 }
278 278
 
279
-export function GetCoursePrintData(id) {
279
+export function GetCoursePrintData(params) {
280 280
   return request({
281 281
     url: '/api/print/course',
282 282
     method: 'Get',
283
-    params: {
284
-      id: id
285
-    }
283
+    params: params
286 284
   })
287 285
 }
288 286
 

+ 4 - 4
src/xt_pages/user/components/PatientSidebar.vue Прегледај датотеку

@@ -106,10 +106,10 @@ export default {
106 106
               name: '1-9',
107 107
               label: '阶段小结'
108 108
             },
109
-            {
110
-              name: '1-10',
111
-              label: '住院小结'
112
-            },
109
+            // {
110
+            //   name: '1-10',
111
+            //   label: '住院小结'
112
+            // },
113 113
             {
114 114
               name: '1-3',
115 115
               label: '检验检查'

+ 19 - 4
src/xt_pages/user/courseOfDisease.vue Прегледај датотеку

@@ -218,7 +218,9 @@
218 218
         selectingRows: [],
219 219
         table_current_index: -1,
220 220
         edit_current_id: 0,
221
-        edit_title: ''
221
+        edit_title: '',
222
+        ids:"",
223
+        idArr:[],
222 224
       }
223 225
     },
224 226
     created() {
@@ -366,6 +368,14 @@
366 368
       },
367 369
 
368 370
       didSelectionChange: function(selectRows) {
371
+       
372
+        var arr = []
373
+        for(let i=0;i<selectRows.length;i++){
374
+           arr.push(selectRows[i].id)
375
+        }
376
+        var newArr = arr.join(',') 
377
+        this.ids = newArr
378
+        console.log("select23322332",this.ids)
369 379
         this.selectingRows = selectRows
370 380
       },
371 381
       deleteAction: function() {
@@ -422,12 +432,17 @@
422 432
         row.index = rowIndex
423 433
       }, onRowClick(row, event, column) {
424 434
         this.table_current_index = row.index
425
-      },print(){
426
-        if (this.table_current_index == -1) {
435
+      },
436
+      print(){
437
+        // if (this.table_current_index == -1) {
438
+        //   this.$message.error('请选择要打印的病程')
439
+        //   return
440
+        // }
441
+        if(this.ids.length == 0){
427 442
           this.$message.error('请选择要打印的病程')
428 443
           return
429 444
         }
430
-        this.$router.push({ path: "/course/print?id="+this.records[this.table_current_index].id});
445
+        this.$router.push({ path: "/course/print?ids="+this.ids+"&patient_id="+this.patient_id});
431 446
       }
432 447
     }
433 448
   }

+ 27 - 19
src/xt_pages/user/coursePrint.vue Прегледај датотеку

@@ -25,34 +25,36 @@
25 25
 
26 26
             <div style="flex:1;text-align: center;">
27 27
               床位:
28
-              <div  style="width: 120px;text-align: left;display:inline-block;">{{patient.DialysisSchedule&&patient.DialysisSchedule.device_number?patient.DialysisSchedule.device_number.number:''}}</div>
28
+                <div  style="width: 120px;text-align: left;display:inline-block;"></div>
29 29
             </div>
30 30
 
31 31
             <div  style="flex:1;text-align: center;">
32 32
               住院号:
33
-              <div style="width: 100px;text-align: left;display:inline-block;" v-if="patient.admission_number">
34
-                {{patient.admission_number}}
35
-              </div>
36
-              <div style="width: 100px;;display:inline-block;" v-else>
37
-                {{'/'}}
33
+              <div style="width: 100px;text-align: left;display:inline-block;">
34
+                 {{patient.admission_number?patient.admission_number:"/"}}
38 35
               </div>
36
+           
39 37
             </div>
40 38
 
41 39
           </div>
42
-          <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;">
40
+          <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;" v-for="(item,index) in this.record" :key="index">
43 41
             <div class="inline_block">
44
-              <div>{{getTime(record.record_time,'{y}-{m}-{d} {h}:{i}')}}</div>
42
+              <div>{{getTime(item.record_time,'{y}-{m}-{d} {h}:{i}')}}</div>
45 43
             </div>
46 44
             <div class="inline_block" style="margin-left: 30px">
47
-              <div>{{record.title}}</div>
45
+              <div>{{item.title}}</div>
46
+            </div>
47
+
48
+             <div class="inline_block" style="width:100%;">
49
+              <div v-html="item.content" class="printP">{{item.content}}</div>
48 50
             </div>
49 51
           </div>
50 52
 
51
-          <div class="row" style="padding: 2px 0;line-height:24px;">
53
+          <!-- <div class="row" style="padding: 2px 0;line-height:24px;">
52 54
             <div class="inline_block" style="width:100%;">
53
-              <div v-html="record.content" class="printP">{{record.content}}</div>
55
+              <div v-html="item.content" class="printP">{{item.content}}</div>
54 56
             </div>
55
-          </div>
57
+          </div> -->
56 58
 
57 59
         </div>
58 60
       </div>
@@ -81,7 +83,7 @@
81 83
 
82 84
         loading: false,
83 85
         orgname: '',
84
-        record: {},
86
+        record:[],
85 87
         patient: {}
86 88
       }
87 89
     },
@@ -92,16 +94,22 @@
92 94
     },
93 95
     mounted() {
94 96
       this.loading = true
95
-      var id = this.$route.query.id
96
-      if (id == 0) {
97
-        this.$router.back(-1)
98
-        return
97
+      var ids = this.$route.query.ids
98
+      var patient_id = parseInt(this.$route.query.patient_id)
99
+      var params = {
100
+          ids:ids,
101
+          patient_id:patient_id,
99 102
       }
100
-      GetCoursePrintData(id).then(rs => {
103
+      console.log("para2333223233223",params)
104
+      GetCoursePrintData(params).then(rs => {
101 105
         var resp = rs.data
102 106
         if (resp.state == 1) {
103 107
           this.record = resp.data.record
104
-          this.record.content = resp.data.record.content.replace(new RegExp('<p>','g'),"<div>").replace(new RegExp('</p>','g'),"</div>")
108
+          console.log("h2232323223",this.record)
109
+          // for(let i=0;i<this.record.length;i++){
110
+          //   this.record[i].content = this.record[i].content.replace(new RegExp('<p>','g'),"<div>").replace(new RegExp('</p>','g'),"</div>")
111
+          // }
112
+          console.log("h2232323223",this.record)
105 113
           this.patient = resp.data.patient
106 114
 
107 115
           this.loading = false

+ 30 - 28
src/xt_pages/user/hospitalSummary.vue Прегледај датотеку

@@ -98,22 +98,22 @@
98 98
                    {{hosDetail.pathology}}
99 99
                  </div>
100 100
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">入院诊断:
101
-                   {{hosDetail.admitting_diagnosis}}
101
+                   <span v-html="hosDetail.admitting_diagnosis"></span> 
102 102
                  </div>
103 103
                   <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">出院诊断:
104
-                   {{hosDetail.discharge_diagnosis}}
104
+                   <span v-html="hosDetail.discharge_diagnosis"></span>
105 105
                  </div>
106 106
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">入院时病情:
107
-                   {{hosDetail.diagnosis_admission}}
107
+                   <span v-html="hosDetail.diagnosis_admission"></span>
108 108
                  </div>
109 109
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">诊断经过:
110
-                   {{hosDetail.treatment}}
110
+                   <span v-html="hosDetail.treatment"></span> 
111 111
                  </div>
112 112
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">出院时病情:
113
-                   {{hosDetail.illness_discharge}}
113
+                   <span v-html="hosDetail.illness_discharge"></span> 
114 114
                  </div>
115 115
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">出院医嘱:
116
-                   {{hosDetail.discharge_advice}}
116
+                    <span v-html="hosDetail.discharge_advice"></span>
117 117
                  </div>
118 118
                
119 119
               </div>
@@ -583,8 +583,8 @@
583 583
         form:{
584 584
           id:0,
585 585
           title:"",
586
-          admission_time:new Date(),
587
-          discharge_time:new Date(),
586
+          admission_time:this.getTime(new Date()),
587
+          discharge_time:this.getTime(new Date()),
588 588
           sick_personnel:"",
589 589
           xray:"",
590 590
           admitting_diagnosis_id:"",
@@ -599,7 +599,7 @@
599 599
           illness_discharge:"",
600 600
           dean:"",
601 601
           doctor:"",
602
-          record_date:new Date(),
602
+          record_date:this.getTime(new Date()),
603 603
           discharge_advice_id:"",
604 604
           discharge_advice:"",
605 605
           connecticut:"",
@@ -673,6 +673,8 @@
673 673
 
674 674
        },
675 675
       changeCurrentRecordTwo(row){
676
+        console.log("ro2233322332323223",row)
677
+        this.form.id = 0
676 678
         this.form.id = row.id 
677 679
         this.getHospitalSummaryDetail(row.id)
678 680
       },
@@ -698,36 +700,36 @@
698 700
         this.form.discharge_advice = content
699 701
       },
700 702
       createAction(){
701
-         
703
+         console.log("hhj232322323",this.form.admission_time)
702 704
          var params = {
703 705
           patient_id:parseInt(this.patient_id),
704 706
           title:this.form.title,
705
-          admission_time:this.getTime(this.form.admission_time),
706
-          discharge_time:this.getTime(this.form.discharge_time),
707
+          admission_time:this.form.admission_time,
708
+          discharge_time:this.form.discharge_time,
707 709
           sick_personnel:this.form.sick_personnel,
708 710
           xray:this.form.xray,
709 711
           admitting_diagnosis_id:this.form.admitting_diagnosis_id,
710
-          admitting_diagnosis:this.form.admitting_diagnosis,
711
-          discharge_diagnosis:this.form.discharge_diagnosis,
712
+          admitting_diagnosis:this.$refs.editor.content,
713
+          discharge_diagnosis:this.$refs.editorOne.content,
712 714
           discharge_diagnosis_id:this.form.discharge_diagnosis_id,
713 715
           diagnosis_admission_id:this.form.diagnosis_admission_id,
714
-          diagnosis_admission:this.form.diagnosis_admission,
715
-          illness_discharge:this.form.illness_discharge,
716
+          diagnosis_admission:this.$refs.editorTwo.content,
717
+          illness_discharge:this.$refs.editorFive.content,
716 718
           illness_discharge_id:this.form.illness_discharge_id,
717 719
           discharge_advice_id:this.form.discharge_advice_id,
718
-          discharge_advice:this.form.discharge_advice,
720
+          discharge_advice:this.$refs.editorSix.content,
719 721
           treatment_id:this.form.treatment_id,
720
-          treatment:this.form.treatment,
722
+          treatment:this.$refs.editorFour.content,
721 723
           dean:this.form.dean,
722 724
           doctor:this.form.doctor,
723
-          record_date:this.getTime(this.form.record_date),
725
+          record_date:this.form.record_date,
724 726
           connecticut:this.form.connecticut,
725 727
           nuclear_magnetic_resonance:this.form.nuclear_magnetic_resonance,
726 728
           ultrasound:this.form.ultrasound,
727 729
           pathology:this.form.pathology,
728 730
          }
729 731
          console.log("oaram2322323",params)
730
-         
732
+        
731 733
          createHospitalSummary(params).then(response=>{
732 734
             if(response.data.state == 1){
733 735
               var list = response.data.data.list
@@ -831,7 +833,7 @@
831 833
              this.form.illness_discharge = detail.illness_discharge
832 834
              this.form.discharge_advice_id = detail.discharge_advice_id
833 835
              this.form.discharge_advice = detail.discharge_advice
834
-             this.form.record_time = detail.record_time
836
+             this.form.record_time = this.getTime(detail.record_time)
835 837
              this.form.dean = detail.dean_id
836 838
              this.form.doctor = detail.doctor
837 839
              this.form.record_date = detail.record_date
@@ -854,17 +856,17 @@
854 856
           sick_personnel:this.form.sick_personnel,
855 857
           xray:this.form.xray,
856 858
           admitting_diagnosis_id:this.form.admitting_diagnosis_id,
857
-          admitting_diagnosis:this.form.admitting_diagnosis,
858
-          discharge_diagnosis:this.form.discharge_diagnosis,
859
+          admitting_diagnosis:this.$refs.editorTen.content,
860
+          discharge_diagnosis:this.$refs.editorSeven.content,
859 861
           discharge_diagnosis_id:this.form.discharge_diagnosis_id,
860 862
           diagnosis_admission_id:this.form.diagnosis_admission_id,
861
-          diagnosis_admission:this.form.diagnosis_admission,
862
-          illness_discharge:this.form.illness_discharge,
863
+          diagnosis_admission:this.$refs.editorEight.content,
864
+          illness_discharge:this.$refs.editorElement.content,
863 865
           illness_discharge_id:this.form.illness_discharge_id,
864 866
           discharge_advice_id:this.form.discharge_advice_id,
865 867
           discharge_advice:this.form.discharge_advice,
866 868
           treatment_id:this.form.treatment_id,
867
-          treatment:this.form.treatment,
869
+          treatment:this.$refs.editorNight.content,
868 870
           dean:this.form.dean,
869 871
           doctor:this.form.doctor,
870 872
           record_date:this.getTime(this.form.record_date),
@@ -883,7 +885,7 @@
883 885
           }
884 886
         }) 
885 887
       },
886
-      deleteAction(id,index){
888
+      deleteAction(){
887 889
           this.$confirm('确认删除吗?', '删除', {
888 890
             confirmButtonText: '确 定',
889 891
             cancelButtonText: '取 消',
@@ -895,7 +897,7 @@
895 897
             deleteHospitalSummary(params).then(response => {
896 898
               if (response.data.state == 1) {
897 899
                   var msg = response.data.data.msg
898
-                  this.tableData.splice(index, 1);
900
+                  this.getlist()
899 901
                   this.$message.success("删除成功")
900 902
               } else {
901 903
                   this.$message.error("删除失败")

+ 1 - 0
src/xt_pages/user/hospitalSummaryPrint.vue Прегледај датотеку

@@ -7,6 +7,7 @@
7 7
     <div class="dialysis-print-order">
8 8
       <div class="order-yy-name"></div>
9 9
       <div class="order-title">{{ orgname }}出院小结</div>
10
+      <div style="margin-float:right">病案号:{{hosDetail.sick_personnel}}</div>
10 11
       <div>
11 12
         <table class="print-table" border="1" style="margin-top: 10px;">
12 13
           <tr>