yq1 пре 1 недеља
родитељ
комит
e16171d771

+ 3 - 3
src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue Прегледај датотеку

@@ -490,12 +490,12 @@
490 490
                                 <td width="20">mg</td>
491 491
                                 <td width="10">)</td>
492 492
                                 <td width="100">
493
-                                    <label-box :isChecked="record.prescription.anticoagulant==3 || record.prescription.anticoagulant==6 || record.prescription.anticoagulant==7?true:false" showValue='低分子肝素'></label-box> 
493
+                                    <label-box :isChecked="record.prescription.anticoagulant==3 || record.prescription.anticoagulant==6 || record.prescription.anticoagulant==7 || record.prescription.anticoagulant==16?true:false" showValue='低分子肝素'></label-box> 
494 494
                                 </td>
495 495
                                 
496 496
                                 <td width="10">(</td>
497 497
                                 <td width="40">
498
-                                    <label-box :isChecked="record.prescription.anticoagulant==6?true:false" showValue='钙'></label-box> 
498
+                                    <label-box :isChecked="record.prescription.anticoagulant==6 || record.prescription.anticoagulant==16?true:false" showValue='钙'></label-box> 
499 499
                                 </td>
500 500
                                 <td width="40">
501 501
                                     <label-box :isChecked="record.prescription.anticoagulant==7?true:false" showValue='钠'></label-box> 
@@ -504,7 +504,7 @@
504 504
                                 <td width="10">)</td>
505 505
                                 <td width="50">
506 506
                                     <div class="under-line">&nbsp;
507
-                                        <span v-if="record.prescription.anticoagulant==6 || record.prescription.anticoagulant==7 || record.prescription.anticoagulant==14">{{record.prescription.anticoagulant_zongliang}}</span>
507
+                                        <span v-if="record.prescription.anticoagulant==6 || record.prescription.anticoagulant==7 || record.prescription.anticoagulant==14 || record.prescription.anticoagulant==16">{{record.prescription.anticoagulant_zongliang}}</span>
508 508
                                     </div>
509 509
                                 </td>
510 510
                                 <td width="10">iu</td>

+ 3 - 3
src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue Прегледај датотеку

@@ -576,12 +576,12 @@
576 576
                   <td width="20">mg</td>
577 577
                   <td width="10">)</td>
578 578
                   <td width="100">
579
-                      <label-box :isChecked="prescription.anticoagulant==3 || prescription.anticoagulant==6 || prescription.anticoagulant==7?true:false" showValue='低分子肝素'></label-box> 
579
+                      <label-box :isChecked="prescription.anticoagulant==3 || prescription.anticoagulant==6 || prescription.anticoagulant==7 || prescription.anticoagulant==16?true:false" showValue='低分子肝素'></label-box> 
580 580
                   </td>
581 581
                   
582 582
                   <td width="10">(</td>
583 583
                   <td width="40">
584
-                      <label-box :isChecked="prescription.anticoagulant==6?true:false" showValue='钙'></label-box> 
584
+                      <label-box :isChecked="prescription.anticoagulant==6 || prescription.anticoagulant==16?true:false" showValue='钙'></label-box> 
585 585
                   </td>
586 586
                   <td width="40">
587 587
                       <label-box :isChecked="prescription.anticoagulant==7?true:false" showValue='钠'></label-box> 
@@ -590,7 +590,7 @@
590 590
                   <td width="10">)</td>
591 591
                   <td width="50">
592 592
                       <div class="under-line">&nbsp;
593
-                          <span v-if="prescription.anticoagulant==6 || prescription.anticoagulant==7 || prescription.anticoagulant==14">{{prescription.anticoagulant_zongliang}}</span>
593
+                          <span v-if="prescription.anticoagulant==6 || prescription.anticoagulant==7 || prescription.anticoagulant==14 || prescription.anticoagulant==16">{{prescription.anticoagulant_zongliang}}</span>
594 594
                       </div>
595 595
                   </td>
596 596
                   <td width="10">iu</td>

+ 9 - 5
src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue Прегледај датотеку

@@ -351,10 +351,12 @@
351 351
           <div class="inline_block under_line" style="width:100px;text-align: center;">
352 352
             {{ receiverTreatmentAccess.precaution ? receiverTreatmentAccess.precaution : '' }}
353 353
           </div> -->
354
-          换药护士
355
-          <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
356
-            <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.change_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.change_nurse)}}</span>
357
-            <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.change_nurse)" alt="" srcset="" v-else>
354
+          <div v-if="org_id==10727||org_id==0" style="display: inline-block;width: 250px;">
355
+            换药护士
356
+            <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
357
+              <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.change_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.change_nurse)}}</span>
358
+              <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.change_nurse)" alt="" srcset="" v-else>
359
+            </div>
358 360
           </div>
359 361
         </div>
360 362
         <div class="row">
@@ -475,7 +477,7 @@
475 477
                 <td>&nbsp;{{monitor.conductivity?monitor.conductivity:''}}</td>
476 478
                 <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>
477 479
                 <!-- <td>&nbsp; <span v-if="monitor.operate_time"> {{ monitor.dialysate_flow ? monitor.dialysate_flow : "" }} </span></td> -->
478
-                <td>&nbsp;{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:''}}</td>
480
+                <td>&nbsp;{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:'0'}}</td>
479 481
                 <td>
480 482
                   <span v-if="monitor.symptom"> {{ monitor.symptom }} </span>
481 483
                   <span v-if="monitor.dispose"> {{ "  " + monitor.dispose }} </span>
@@ -872,6 +874,7 @@ export default {
872 874
       displaceLiquiPartOptions: [],
873 875
       arterial_tube:[],
874 876
       intravenous_tube:[],
877
+      org_id:'',
875 878
     }
876 879
   },
877 880
   methods: {
@@ -1844,6 +1847,7 @@ export default {
1844 1847
     }
1845 1848
   },
1846 1849
   created() {
1850
+    this.org_id = this.$store.getters.xt_user.org.id;
1847 1851
     var xtuser = this.$store.getters.xt_user
1848 1852
     this.orgname = xtuser.org.org_name
1849 1853
     // this.orgname = "遂溪方济医院";

+ 18 - 17
src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue Прегледај датотеку

@@ -1774,13 +1774,13 @@ export default {
1774 1774
       ) {
1775 1775
         const obj28 ='总量'
1776 1776
         checkDate.push(obj28)
1777
-      } if (this.dialysisOrder.DeviceNumber.number == 0 &&
1778
-            this.patientInfo.DialysisSchedule.device_number.number ==''
1777
+      } if (( this.dialysisOrder !=undefined && this.dialysisOrder.DeviceNumber.number == 0  &&
1778
+            this.patientInfo.DialysisSchedule.device_number.number =='')|| this.dialysisOrder ==undefined
1779 1779
       ) {
1780 1780
         const obj29 ='透析机号'
1781 1781
         checkDate.push(obj29)
1782
-      } if (this.patientInfo.DialysisSchedule.bed_id == 0 &&
1783
-            this.dialysisOrder && this.dialysisOrder.bed_id ==0
1782
+      } if (( this.dialysisOrder != undefined && this.patientInfo.DialysisSchedule.bed_id == 0 &&
1783
+             this.dialysisOrder.bed_id ==0) || this.dialysisOrder ==undefined
1784 1784
       ) {
1785 1785
         const obj30 ='型号'
1786 1786
         checkDate.push(obj30)
@@ -1839,45 +1839,46 @@ export default {
1839 1839
         const obj44 ='宣教知识'
1840 1840
         checkDate.push(obj44)
1841 1841
       } if (
1842
-        this.dialysisOrder == null ||
1843
-        this.dialysisOrder.puncture_nurse == 0
1842
+        (this.dialysisOrder == null ||
1843
+        this.dialysisOrder.puncture_nurse == 0)|| this.dialysisOrder ==undefined
1844 1844
       ) {
1845 1845
         const obj45 ='穿刺护士'
1846 1846
         checkDate.push(obj45)
1847 1847
       } if (
1848
-        this.dialysisOrder == null ||
1849
-        this.dialysisOrder.start_nurse == 0
1848
+        (this.dialysisOrder == null ||
1849
+        this.dialysisOrder.start_nurse == 0) || this.dialysisOrder ==undefined
1850 1850
       ) {
1851 1851
         const obj46 ='治疗护士'
1852 1852
         checkDate.push(obj46)
1853
-      } if (this.dialysisOrder == null && this.check.creater == 0) {
1853
+      } if ((this.dialysisOrder == null && this.check.creater == 0) || this.dialysisOrder ==undefined
1854
+      ) {
1854 1855
         const obj47 ='核对护士'
1855 1856
         checkDate.push(obj47)
1856 1857
       } else if (
1857
-        this.dialysisOrder != null &&
1858
+        (this.dialysisOrder != null &&
1858 1859
         this.dialysisOrder.start_nurse == this.check.modifier &&
1859
-        this.check.creater == 0
1860
+        this.check.creater == 0) || this.dialysisOrder ==undefined
1860 1861
       ) {
1861 1862
         const obj47 ='核对护士'
1862 1863
         checkDate.push(obj47)
1863 1864
       } else if (
1864
-        this.dialysisOrder != null &&
1865
+        (this.dialysisOrder != null &&
1865 1866
         this.dialysisOrder.start_nurse == this.check.creater &&
1866
-        this.check.modifier == 0
1867
+        this.check.modifier == 0)|| this.dialysisOrder ==undefined
1867 1868
       ) {
1868 1869
         const obj47 ='核对护士'
1869 1870
         checkDate.push(obj47)
1870 1871
       } else if (
1871
-        this.dialysisOrder != null &&
1872
+        (this.dialysisOrder != null &&
1872 1873
         this.dialysisOrder.start_nurse != this.check.creater &&
1873 1874
         this.dialysisOrder.start_nurse != this.check.modifier &&
1874
-        this.check.creater == 0
1875
+        this.check.creater == 0)|| this.dialysisOrder ==undefined
1875 1876
       ) {
1876 1877
         const obj47 ='核对护士'
1877 1878
         checkDate.push(obj47)
1878 1879
       } if (
1879
-        this.dialysisOrder == null ||
1880
-        this.dialysisOrder.finish_nurse == 0
1880
+       ( this.dialysisOrder == null ||
1881
+        this.dialysisOrder.finish_nurse == 0)|| this.dialysisOrder ==undefined
1881 1882
       ) {
1882 1883
         const obj48 ='下机护士'
1883 1884
         checkDate.push(obj48)

+ 3 - 3
src/xt_pages/outpatientCharges/statementPrint.vue Прегледај датотеку

@@ -69,19 +69,19 @@
69 69
       <!-- 顺有好 -->
70 70
       <printSixtheen :info="info" v-if="org_id == 10697"></printSixtheen>
71 71
       <!-- 杏康 -->
72
-      <printSeventheen  :info="info" v-if=" org_id == 10721 || org_id == 0"></printSeventheen>
72
+      <printSeventheen  :info="info" v-if=" org_id == 10721"></printSeventheen>
73 73
       <printOne :info="info" v-if=" org_id != 9990 &&
74 74
             org_id != 10138 && org_id != 9504 && org_id != 10028 &&
75 75
             org_id != 10610 && org_id !=10537 && org_id !=10697 &&
76 76
             org_id != 10278 && org_id != 10387 && org_id != 10191 &&
77 77
             org_id != 10210 &&org_id != 10485 &&org_id != 10480 &&
78
-            org_id != 10510 &&org_id != 10088 && org_id != 10721 &&org_id != 10633 &&org_id != 0 && this.paramsObj.balance_accounts_type == 1">
78
+            org_id != 10510 &&org_id != 10088 && org_id != 10721 &&org_id != 10633 &&org_id != 10731 &&org_id != 0 && this.paramsObj.balance_accounts_type == 1">
79 79
       </printOne>
80 80
       <privateChargePrint :info="info" v-if="org_id != 9990 &&
81 81
             org_id != 10138 && org_id != 9504 &&  org_id != 10028 && org_id !=10697 &&
82 82
             org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 &&
83 83
             org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&
84
-            org_id != 10510 &&org_id != 10633 && org_id != 10721 &&org_id != 0  && this.paramsObj.balance_accounts_type == 2">
84
+            org_id != 10510 &&org_id != 10633 && org_id != 10721   && this.paramsObj.balance_accounts_type == 2">
85 85
       </privateChargePrint>
86 86
 
87 87
     </div>

+ 2 - 1
src/xt_pages/outpatientCharges/statementTemplate/privateChargePrint.vue Прегледај датотеку

@@ -8,6 +8,7 @@
8 8
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10515">湖南省社会医疗保险医疗费用结算单</div>
9 9
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10694">江西省社会医疗保险医疗费用结算单</div>
10 10
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10489">湖北省社会医疗保险医疗费用结算单</div>
11
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10731">医疗费用结算单</div>
11 12
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10635 || this.$store.getters.xt_user.org_id == 0">河北省社会医疗保险医疗费用结算单</div>
12 13
 
13 14
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10489 && this.$store.getters.xt_user.org_id != 10515 &&
@@ -15,7 +16,7 @@
15 16
                   this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&
16 17
                   this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10633  &&
17 18
                   this.$store.getters.xt_user.org_id != 10694 && this.$store.getters.xt_user.org_id != 10635 &&
18
-                  this.$store.getters.xt_user.org_id != 0"
19
+                  this.$store.getters.xt_user.org_id != 10731 && this.$store.getters.xt_user.org_id != 0"
19 20
     >
20 21
       广东省社会医疗保险医疗费用结算单
21 22
     </div>

+ 2 - 2
src/xt_pages/outpatientCharges/summary.vue Прегледај датотеку

@@ -282,7 +282,7 @@
282 282
             <div v-if="scope.row.order_status == 3">已退费</div>
283 283
           </template>
284 284
         </el-table-column>
285
-        <el-table-column align="center" width="110" prop="name" label="操作">
285
+        <el-table-column align="center" width="" prop="name" label="操作">
286 286
           <template slot-scope="scope">
287 287
             <el-button class="butt_1" size="mini" type="primary" @click="toDetail(scope.row)"
288 288
             >详情
@@ -380,7 +380,7 @@
380 380
               size="mini"
381 381
               type="primary"
382 382
               @click="open(scope.row)"
383
-            >打印结算清单
383
+            >打印清单
384 384
             </el-button>
385 385
           </template>
386 386
         </el-table-column>