Browse Source

提交代码

陈少旭 1 year ago
parent
commit
0cf1b5529f

+ 1 - 0
src/xt_pages/Dialysisanalysis/platelets/all_ktv.vue View File

210
           prop="inspect_value"
210
           prop="inspect_value"
211
           label="结果"
211
           label="结果"
212
         >
212
         >
213
+          <template slot-scope="scope">{{ parseFloat(scope.row.inspect_value).toFixed(2)}}</template>
213
         </el-table-column>
214
         </el-table-column>
214
 
215
 
215
       </el-table>
216
       </el-table>

+ 2 - 0
src/xt_pages/Dialysisanalysis/platelets/all_urr.vue View File

210
           prop="inspect_value"
210
           prop="inspect_value"
211
           label="结果"
211
           label="结果"
212
         >
212
         >
213
+          <template slot-scope="scope">{{ (scope.row.inspect_value) + '%'}}</template>
214
+
213
         </el-table-column>
215
         </el-table-column>
214
 
216
 
215
       </el-table>
217
       </el-table>

+ 2 - 2
src/xt_pages/Dialysisanalysis/platelets/p_ktv.vue View File

106
 
106
 
107
                 <el-table-column width="100" label="KTV" align="center">
107
                 <el-table-column width="100" label="KTV" align="center">
108
                   <template slot-scope="scope">
108
                   <template slot-scope="scope">
109
-                    {{scope.row.value}}
109
+                    {{parseFloat(scope.row.value).toFixed(2)}}
110
                   </template>
110
                   </template>
111
                 </el-table-column>
111
                 </el-table-column>
112
               </el-table>
112
               </el-table>
484
             for (let i = 0; i < resp.data.inspections.length; i++) {
484
             for (let i = 0; i < resp.data.inspections.length; i++) {
485
               let obj = {
485
               let obj = {
486
                 name:resp.data.patient.name,
486
                 name:resp.data.patient.name,
487
-                value:resp.data.inspections[i].inspect_value,
487
+                value:parseFloat(resp.data.inspections[i].inspect_value).toFixed(2),
488
                 inspect_date:resp.data.inspections[i].inspect_date
488
                 inspect_date:resp.data.inspections[i].inspect_date
489
               }
489
               }
490
               this.tableData.push(obj)
490
               this.tableData.push(obj)

+ 1 - 1
src/xt_pages/Dialysisanalysis/platelets/p_urr.vue View File

104
                   </template>
104
                   </template>
105
                 </el-table-column>
105
                 </el-table-column>
106
 
106
 
107
-                <el-table-column width="100" label="URR" align="center">
107
+                <el-table-column width="100" label="URR(%)" align="center">
108
                   <template slot-scope="scope">
108
                   <template slot-scope="scope">
109
                     {{scope.row.value}}
109
                     {{scope.row.value}}
110
                   </template>
110
                   </template>

+ 2 - 2
src/xt_pages/outpatientTool/labelPrint.vue View File

134
                               <div>{{getTime(current_ctime,'{m}-{d}')}}</div>
134
                               <div>{{getTime(current_ctime,'{m}-{d}')}}</div>
135
                               <div>{{getTime(current_ctime,'{h}:{i}')}}</div>
135
                               <div>{{getTime(current_ctime,'{h}:{i}')}}</div>
136
                           </div>
136
                           </div>
137
-                          <img  v-if=" $store.getters.xt_user.org.id != 10138"  id="barcode">
137
+                          <img  v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217"  id="barcode">
138
                       </div>
138
                       </div>
139
                       <div style="margin-bottom:5px;">{{current_number}}</div>
139
                       <div style="margin-bottom:5px;">{{current_number}}</div>
140
                       <div style="display:flex;">
140
                       <div style="display:flex;">
166
                 <div>{{getTime(item.ctime,'{m}-{d}')}}</div>
166
                 <div>{{getTime(item.ctime,'{m}-{d}')}}</div>
167
                 <div>{{getTime(item.ctime,'{h}:{i}')}}</div>
167
                 <div>{{getTime(item.ctime,'{h}:{i}')}}</div>
168
               </div>
168
               </div>
169
-              <img  v-if=" $store.getters.xt_user.org.id != 10138"  id="barcode">
169
+              <img   v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217"  id="barcode">
170
             </div>
170
             </div>
171
                 <div style="margin-bottom:5px;">{{item.number}}</div>
171
                 <div style="margin-bottom:5px;">{{item.number}}</div>
172
                <div style="display:flex;">
172
                <div style="display:flex;">

+ 40 - 19
src/xt_pages/qcd/patientControlAnalysis.vue View File

311
     }
311
     }
312
   },
312
   },
313
   methods: {
313
   methods: {
314
+    handleStartTimeChange(){
315
+      this.getlist()
316
+    },  handleEndTimeChange(){
317
+      this.getlist()
318
+    },
314
     handleSizeChange(limit) {
319
     handleSizeChange(limit) {
315
       this.tableData = []
320
       this.tableData = []
316
       this.listQuery.limit = limit
321
       this.listQuery.limit = limit
329
         this.$message.error('结束时间不能小于开始时间')
334
         this.$message.error('结束时间不能小于开始时间')
330
         this.listQuery.start_time = ''
335
         this.listQuery.start_time = ''
331
       } else {
336
       } else {
337
+        this.getlist()
332
 
338
 
333
       }
339
       }
334
 
340
 
340
         this.$message.error('结束时间不能小于开始时间')
346
         this.$message.error('结束时间不能小于开始时间')
341
         this.listQuery.end_time = ''
347
         this.listQuery.end_time = ''
342
       } else {
348
       } else {
349
+        this.getlist()
343
 
350
 
344
       }
351
       }
345
     },
352
     },
516
           //     }
523
           //     }
517
           //   }
524
           //   }
518
           // }
525
           // }
519
-        
526
+
520
         } else {
527
         } else {
521
           this.isLoadingTwo = false
528
           this.isLoadingTwo = false
522
 
529
 
529
         if (response.data.state == 1) {
536
         if (response.data.state == 1) {
530
           this.isLoadingTwo = false
537
           this.isLoadingTwo = false
531
           var patients = response.data.data.patients
538
           var patients = response.data.data.patients
532
-        
539
+
533
           this.tablePatients = patients
540
           this.tablePatients = patients
534
 
541
 
535
           //  let dataInfothree = {}
542
           //  let dataInfothree = {}
552
           var control = response.data.data.control
559
           var control = response.data.data.control
553
 
560
 
554
           var infectiousControl = response.data.data.infectiousControl
561
           var infectiousControl = response.data.data.infectiousControl
555
-         
562
+
556
           infectiousControl.map(item => {
563
           infectiousControl.map(item => {
557
             control.push(item)
564
             control.push(item)
558
           })
565
           })
572
           // 分页
579
           // 分页
573
           for (let i = 0; i < control.length; i++) {
580
           for (let i = 0; i < control.length; i++) {
574
             for (let j = 0; j < patients.length; j++) {
581
             for (let j = 0; j < patients.length; j++) {
575
-              if (control[i].inspect_date == patients[j].inspect_date) {
582
+              if (control[i].patient_id == patients[j].patient_id) {
576
                 newArr.push(control[i])
583
                 newArr.push(control[i])
577
               }
584
               }
578
             }
585
             }
579
           }
586
           }
587
+          console.log(newArr)
588
+
589
+          console.log("newArr")
590
+
591
+
580
 
592
 
581
           let dataInfo = {}
593
           let dataInfo = {}
582
           newArr.forEach((item, index) => {
594
           newArr.forEach((item, index) => {
583
-            let { inspect_date } = item
584
-            if (!dataInfo[inspect_date]) {
585
-              dataInfo[inspect_date] = {
586
-                inspect_date,
595
+            let { patient_id } = item
596
+            if (!dataInfo[patient_id]) {
597
+              dataInfo[patient_id] = {
587
                 name: item.name,
598
                 name: item.name,
588
                 child: [],
599
                 child: [],
589
                 patient_id: item.patient_id,
600
                 patient_id: item.patient_id,
593
           })
604
           })
594
           let list = Object.values(dataInfo)
605
           let list = Object.values(dataInfo)
595
 
606
 
607
+
596
           list.map(item => {
608
           list.map(item => {
597
             for (let i = 0; i < newArr.length; i++) {
609
             for (let i = 0; i < newArr.length; i++) {
598
-              if (item.inspect_date == newArr[i].inspect_date) {
610
+              if (item.patient_id == newArr[i].patient_id) {
599
                 item.child.push(newArr[i])
611
                 item.child.push(newArr[i])
600
               }
612
               }
601
             }
613
             }
602
           })
614
           })
603
 
615
 
616
+
617
+
604
           var newarrtwo = []
618
           var newarrtwo = []
605
           list.map(item => {
619
           list.map(item => {
606
             item.child.map(it => {
620
             item.child.map(it => {
608
             })
622
             })
609
           })
623
           })
610
 
624
 
625
+          console.log("list")
626
+          console.log(list)
627
+          console.log(newarrtwo)
628
+
629
+
611
           // 配置的才显示
630
           // 配置的才显示
612
           var arrthree = []
631
           var arrthree = []
613
           for (let i = 0; i < newarrtwo.length; i++) {
632
           for (let i = 0; i < newarrtwo.length; i++) {
624
             arrthree.push(item)
643
             arrthree.push(item)
625
           })
644
           })
626
 
645
 
646
+
647
+
627
           var dd = {}
648
           var dd = {}
628
           for (const index in arrthree) {
649
           for (const index in arrthree) {
629
-            if (!(arrthree[index].inspect_date in dd)) {
630
-              dd[arrthree[index].inspect_date] = {}
650
+            if (!(arrthree[index].patient_id in dd)) {
651
+              dd[arrthree[index].patient_id] = {}
631
             }
652
             }
632
-            if (!(arrthree[index].item_name in dd[arrthree[index].inspect_date]) && arrthree[index].item_name != 0) {
633
-              dd[arrthree[index].inspect_date][arrthree[index].item_name] = arrthree[index]
653
+            if (!(arrthree[index].item_name in dd[arrthree[index].patient_id]) && arrthree[index].item_name != 0) {
654
+              dd[arrthree[index].patient_id][arrthree[index].item_name] = arrthree[index]
634
 
655
 
635
             }
656
             }
636
           }
657
           }
637
 
658
 
638
           let dataInfotwo = {}
659
           let dataInfotwo = {}
639
           newArr.forEach((item, index) => {
660
           newArr.forEach((item, index) => {
640
-            let { inspect_date } = item
641
-            if (!dataInfotwo[inspect_date]) {
642
-              dataInfotwo[inspect_date] = {
643
-                inspect_date,
661
+            let { patient_id } = item
662
+            if (!dataInfotwo[patient_id]) {
663
+              dataInfotwo[patient_id] = {
664
+                patient_id,
644
                 name: item.name,
665
                 name: item.name,
645
                 inspect_value: item.inspect_value,
666
                 inspect_value: item.inspect_value,
646
                 id: item.id,
667
                 id: item.id,
647
-                inspect_date: item.inspect_date
648
               }
668
               }
649
             }
669
             }
650
           })
670
           })
666
 
686
 
667
           listtwo.map(item => {
687
           listtwo.map(item => {
668
             this.tableData.map(it => {
688
             this.tableData.map(it => {
669
-              if (item.inspect_date == parseInt(it.name)) {
689
+              if (item.patient_id == parseInt(it.name)) {
670
                 it.name = item.name
690
                 it.name = item.name
671
                 it.id = item.id
691
                 it.id = item.id
672
                 it.inspect_date = item.inspect_date
692
                 it.inspect_date = item.inspect_date
673
               }
693
               }
674
             })
694
             })
675
           })
695
           })
696
+
676
           for (let i = 0; i < this.patientsArr.length; i++) {
697
           for (let i = 0; i < this.patientsArr.length; i++) {
677
             for (let j = 0; j < this.tableData.length; j++) {
698
             for (let j = 0; j < this.tableData.length; j++) {
678
               if (this.patientsArr[i].name == this.tableData[j].name) {
699
               if (this.patientsArr[i].name == this.tableData[j].name) {