Browse Source

Merge branches '2022-10-17_vue_schedule_branch' and '20220812' of http://git.shengws.com/csx/Vue_New into 20220812

XMLWAN 2 years ago
parent
commit
e2863a5c29

+ 13 - 1
src/router/modules/dialysis.js View File

480
       }
480
       }
481
     },
481
     },
482
     {
482
     {
483
-      path: '/dialysis/print/batch/twentyFive',
483
+      path: '/dialysis/print/batch/twentyFive',                            
484
       component: () =>
484
       component: () =>
485
         import('@/xt_pages/dialysis/batch_print/batch_print_order_twentyFive'),
485
         import('@/xt_pages/dialysis/batch_print/batch_print_order_twentyFive'),
486
       hidden: true,
486
       hidden: true,
491
         noCache: true
491
         noCache: true
492
       }
492
       }
493
     },
493
     },
494
+    {
495
+      path: '/dialysis/print/batch/twentySeven',
496
+      component: () =>
497
+      import('@/xt_pages/dialysis/batch_print/batch_print_order_twentySeven'),
498
+      hidden: true,
499
+      is_menu: false,
500
+      name: 'dialysis_batch_twentySeven',
501
+      meta: {
502
+        title: '批量打印',
503
+        noCache: true
504
+      }
505
+    },
494
     {
506
     {
495
       path: '/dialysis/print/batch/twentyEight',
507
       path: '/dialysis/print/batch/twentyEight',
496
       component: () =>
508
       component: () =>

+ 13 - 1
src/xt_pages/dialysis/bloodPresssWatch.vue View File

219
           >批量打印</el-button
219
           >批量打印</el-button
220
         >
220
         >
221
       </template>
221
       </template>
222
+      <template v-if="this.template_id == 27">
223
+        <el-button
224
+          size="small"
225
+          icon="el-icon-printer"
226
+          :disabled="selecting_schs.length == 0"
227
+          @click="batchPrintAction"
228
+          type="primary"
229
+          >批量打印</el-button
230
+        >
231
+      </template>
222
       <template v-if="this.template_id == 28">
232
       <template v-if="this.template_id == 28">
223
         <el-button
233
         <el-button
224
           size="small"
234
           size="small"
962
         this.$router.push({ path: "/dialysis/print/batch/twentyTwo" });
972
         this.$router.push({ path: "/dialysis/print/batch/twentyTwo" });
963
       } else if (this.template_id == 25) {
973
       } else if (this.template_id == 25) {
964
         this.$router.push({ path: "/dialysis/print/batch/twentyFive" });
974
         this.$router.push({ path: "/dialysis/print/batch/twentyFive" });
965
-      }else if(this.template_id == 28){
975
+      }else if (this.template_id == 27) {
976
+        this.$router.push({ path: "/dialysis/print/batch/twentySeven" });
977
+      } else if(this.template_id == 28){
966
          this.$router.push({path:"/dialysis/print/batch/twentyEight"})
978
          this.$router.push({path:"/dialysis/print/batch/twentyEight"})
967
       } else if (this.template_id == 30) {
979
       } else if (this.template_id == 30) {
968
         this.$router.push({ path: "/dialysis/print/batch/thirty" });
980
         this.$router.push({ path: "/dialysis/print/batch/thirty" });

+ 7 - 1
src/xt_pages/dialysis/dialysisPrintOrder.vue View File

760
       </template>
760
       </template>
761
       <template
761
       <template
762
         v-if="
762
         v-if="
763
-          org_template_info.template_id == 61
763
+          org_template_info.template_id == 61||org_template_info.template_id == 63
764
         "
764
         "
765
       >
765
       >
766
         <el-button
766
         <el-button
1220
           v-bind:childResponse="childResponse"
1220
           v-bind:childResponse="childResponse"
1221
             v-if="org_template_info.template_id == 62">
1221
             v-if="org_template_info.template_id == 62">
1222
           </DialysisPrintOrderSixtyTwo>
1222
           </DialysisPrintOrderSixtyTwo>
1223
+          <DialysisPrintOrderSixtyThree
1224
+          v-bind:childResponse="childResponse"
1225
+            v-if="org_template_info.template_id == 63">
1226
+          </DialysisPrintOrderSixtyThree>
1223
         </div>
1227
         </div>
1224
       </el-container>
1228
       </el-container>
1225
     </div>
1229
     </div>
1300
 import DialysisPrintOrderSixty from "./template/DialysisPrintOrderSixty";
1304
 import DialysisPrintOrderSixty from "./template/DialysisPrintOrderSixty";
1301
 import DialysisPrintOrderSixtyOne from "./template/DialysisPrintOrderSixtyOne"
1305
 import DialysisPrintOrderSixtyOne from "./template/DialysisPrintOrderSixtyOne"
1302
 import DialysisPrintOrderSixtyTwo from "./template/DialysisPrintOrderSixtyTwo"
1306
 import DialysisPrintOrderSixtyTwo from "./template/DialysisPrintOrderSixtyTwo"
1307
+import DialysisPrintOrderSixtyThree from "./template/DialysisPrintOrderSixtyThree"
1303
 export default {
1308
 export default {
1304
   name: "dialysisPrintOrder",
1309
   name: "dialysisPrintOrder",
1305
   components: {
1310
   components: {
1311
+    DialysisPrintOrderSixtyThree,
1306
     DialysisPrintOrderSixtyTwo,
1312
     DialysisPrintOrderSixtyTwo,
1307
     DialysisPrintOrderSixtyOne,
1313
     DialysisPrintOrderSixtyOne,
1308
     DialysisPrintOrderSixty,
1314
     DialysisPrintOrderSixty,

+ 26 - 14
src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue View File

42
                     <td colspan="11" style="padding-left: 10px">
42
                     <td colspan="11" style="padding-left: 10px">
43
                       <div style="display: flex">
43
                       <div style="display: flex">
44
                         <div style="width: 250px">
44
                         <div style="width: 250px">
45
-                          病情评估:&nbsp;<span>{{sick_condition ? sick_condition : ""}}</span>
45
+                          病情评估:&nbsp;<span>{{
46
+                            sick_condition ? sick_condition : ""
47
+                          }}</span>
46
                         </div>
48
                         </div>
47
                         <div style="width: 250px">
49
                         <div style="width: 250px">
48
                           入科方式:&nbsp;<span
50
                           入科方式:&nbsp;<span
66
                     </td>
68
                     </td>
67
                   </tr>
69
                   </tr>
68
                   <tr class="list_table_1">
70
                   <tr class="list_table_1">
69
-                     <td colspan="11" style="padding-left: 10px">
71
+                    <td colspan="11" style="padding-left: 10px">
70
                       <div style="display: flex">
72
                       <div style="display: flex">
71
                         <div style="width: 100%">
73
                         <div style="width: 100%">
72
                           病情描述:&nbsp;<span>{{
74
                           病情描述:&nbsp;<span>{{
73
-                            receiverTreatmentAccess.sick_condition_other ? receiverTreatmentAccess.sick_condition_other : ""
75
+                            receiverTreatmentAccess.sick_condition_other
76
+                              ? receiverTreatmentAccess.sick_condition_other
77
+                              : ""
74
                           }}</span>
78
                           }}</span>
75
                         </div>
79
                         </div>
76
                       </div>
80
                       </div>
77
-                     </td>
81
+                    </td>
78
                   </tr>
82
                   </tr>
79
                   <tr class="list_table_1">
83
                   <tr class="list_table_1">
80
                     <td
84
                     <td
618
             <td>
622
             <td>
619
               <table class="print-table" border="1">
623
               <table class="print-table" border="1">
620
                 <tr style="text-align: center">
624
                 <tr style="text-align: center">
621
-                  <td colspan="15" style="margin-left: 15px; font-size: 20px">
625
+                  <td
626
+                    :colspan="org_id == 10441 || org_id == 9675 ? 14 : 15"
627
+                    style="margin-left: 15px; font-size: 20px"
628
+                  >
622
                     治 疗 过 程 记 录
629
                     治 疗 过 程 记 录
623
                   </td>
630
                   </td>
624
                 </tr>
631
                 </tr>
625
                 <tr>
632
                 <tr>
626
                   <td style="width: 60px" rowspan="2">时间</td>
633
                   <td style="width: 60px" rowspan="2">时间</td>
627
                   <td colspan="4">透析参数</td>
634
                   <td colspan="4">透析参数</td>
628
-                  <td colspan="5">生命体征</td>
635
+                  <td :colspan="org_id == 10441 || org_id == 9675 ? 4 : 5">
636
+                    生命体征
637
+                  </td>
629
                   <td colspan="1">治疗中病情变化</td>
638
                   <td colspan="1">治疗中病情变化</td>
630
                 </tr>
639
                 </tr>
631
                 <tr class="short_tr">
640
                 <tr class="short_tr">
667
                     <p style="height: 20px; line-height: 20px">mmHg</p>
676
                     <p style="height: 20px; line-height: 20px">mmHg</p>
668
                   </th>
677
                   </th>
669
 
678
 
670
-                  <th style="width: 80px; font-weight: normal">
679
+                  <th
680
+                    style="width: 80px; font-weight: normal"
681
+                    v-if="org_id != 10441 && org_id != 9675"
682
+                  >
671
                     <p style="height: 20px; line-height: 20px">SpO₂</p>
683
                     <p style="height: 20px; line-height: 20px">SpO₂</p>
672
                     <p style="height: 20px; line-height: 20px">%</p>
684
                     <p style="height: 20px; line-height: 20px">%</p>
673
                   </th>
685
                   </th>
710
                     </span>
722
                     </span>
711
                   </td>
723
                   </td>
712
                   <td style="min-width: 45px">
724
                   <td style="min-width: 45px">
713
-                    <span v-if="getTime(monitor.operate_time) != ''">
714
-                      {{
715
-                        monitor.ultrafiltration_volume
716
-                          ? monitor.ultrafiltration_volume
717
-                          : ""
718
-                      }}
725
+                    <span v-if="getTime(monitor.operate_time) != ''&&monindex == 0 && (org_id == 10441||org_id == 9675)">
726
+                      {{'/'}}
727
+                    </span>
728
+                    <span v-else-if="getTime(monitor.operate_time) != ''&&monindex == 0 && (org_id != 10441&&org_id != 9675)">
729
+                      {{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}
719
                     </span>
730
                     </span>
731
+                    <span v-else>{{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
720
                   </td>
732
                   </td>
721
 
733
 
722
                   <td>
734
                   <td>
751
                       }}
763
                       }}
752
                     </span>
764
                     </span>
753
                   </td>
765
                   </td>
754
-                  <td>
766
+                  <td v-if="org_id != 10441 && org_id != 9675">
755
                     <span v-if="getTime(monitor.operate_time) != ''">
767
                     <span v-if="getTime(monitor.operate_time) != ''">
756
                       {{
768
                       {{
757
                         monitor.blood_oxygen_saturation
769
                         monitor.blood_oxygen_saturation

+ 14 - 6
src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue View File

174
             </td>
174
             </td>
175
             <td style="text-align: left" colspan="2">
175
             <td style="text-align: left" colspan="2">
176
               <span style="display: inline-block; margin-left: 15px">
176
               <span style="display: inline-block; margin-left: 15px">
177
-                钙:
177
+                 钙:
178
                 {{
178
                 {{
179
                   prescription.calcium ? prescription.calcium : "/"
179
                   prescription.calcium ? prescription.calcium : "/"
180
                 }}&nbsp;mmol/L
180
                 }}&nbsp;mmol/L
252
                 <span v-if="prescription.anticoagulant == 10"
252
                 <span v-if="prescription.anticoagulant == 10"
253
                   >体外抗凝肝素首剂:</span
253
                   >体外抗凝肝素首剂:</span
254
                 >
254
                 >
255
+                <span v-if="prescription.anticoagulant == 11"
256
+                  >那屈肝素首剂:</span
257
+                >
255
 
258
 
256
                 {{
259
                 {{
257
                   prescription.anticoagulant_shouji
260
                   prescription.anticoagulant_shouji
259
                     : "/"
262
                     : "/"
260
                 }}
263
                 }}
261
               </span>
264
               </span>
265
+              <span v-if="prescription.anticoagulant == 5">iu</span>
266
+              <span v-if="prescription.anticoagulant == 6">iu</span>
262
               <span v-if="prescription.anticoagulant == 4">mg</span>
267
               <span v-if="prescription.anticoagulant == 4">mg</span>
263
               <span v-if="prescription.anticoagulant == 3">iu</span>
268
               <span v-if="prescription.anticoagulant == 3">iu</span>
264
               <span v-if="prescription.anticoagulant == 2">mg</span>
269
               <span v-if="prescription.anticoagulant == 2">mg</span>
273
                     : "/"
278
                     : "/"
274
                 }}
279
                 }}
275
               </span>
280
               </span>
281
+              <span v-if="prescription.anticoagulant == 6">iu/h</span>
276
               <span v-if="prescription.anticoagulant == 5">ml/h</span>
282
               <span v-if="prescription.anticoagulant == 5">ml/h</span>
277
               <span v-if="prescription.anticoagulant == 4">mg/h</span>
283
               <span v-if="prescription.anticoagulant == 4">mg/h</span>
278
               <span v-if="prescription.anticoagulant == 3">iu/h</span>
284
               <span v-if="prescription.anticoagulant == 3">iu/h</span>
288
                     : "/"
294
                     : "/"
289
                 }}
295
                 }}
290
               </span>
296
               </span>
297
+              <span v-if="prescription.anticoagulant == 5">iu</span>
298
+              <span v-if="prescription.anticoagulant == 6">iu</span>
291
               <span v-if="prescription.anticoagulant == 4">mg</span>
299
               <span v-if="prescription.anticoagulant == 4">mg</span>
292
               <span v-if="prescription.anticoagulant == 3">iu</span>
300
               <span v-if="prescription.anticoagulant == 3">iu</span>
293
               <span v-if="prescription.anticoagulant == 2">mg</span>
301
               <span v-if="prescription.anticoagulant == 2">mg</span>
319
             </td>
327
             </td>
320
             <td style="text-align: left" colspan="2">
328
             <td style="text-align: left" colspan="2">
321
               <span style="display: inline-block; margin-left: 15px">
329
               <span style="display: inline-block; margin-left: 15px">
322
-                透析时间:
330
+                实际治疗时长:
323
                 {{
331
                 {{
324
-                  prescription.dialysis_duration_hour
325
-                    ? prescription.dialysis_duration_hour
332
+                  afterdialysis.actual_treatment_hour
333
+                    ? afterdialysis.actual_treatment_hour
326
                     : "0"
334
                     : "0"
327
                 }}小时{{
335
                 }}小时{{
328
-                  prescription.dialysis_duration_minute
329
-                    ? prescription.dialysis_duration_minute
336
+                  afterdialysis.actual_treatment_minute
337
+                    ? afterdialysis.actual_treatment_minute
330
                     : "0"
338
                     : "0"
331
                 }}分钟
339
                 }}分钟
332
               </span>
340
               </span>

+ 1 - 1
src/xt_pages/outpatientCharges/statementPrint.vue View File

828
         }
828
         }
829
 
829
 
830
       } else {
830
       } else {
831
-        if (this.org_id == 10191) {
831
+        if (this.org_id == 10191 || this.org_id == 0) {
832
           let params = {
832
           let params = {
833
             his_patient_id: obj.his_patient_id,
833
             his_patient_id: obj.his_patient_id,
834
             id: obj.order_id,
834
             id: obj.order_id,

+ 10 - 0
src/xt_pages/outpatientCharges/statementTemplate/printFive.vue View File

57
         <tr>
57
         <tr>
58
           <td colspan="6">
58
           <td colspan="6">
59
             <table class="list_table">
59
             <table class="list_table">
60
+              <tr>
61
+                <td colspan="2">{{'名称'}}</td>
62
+                <td>{{'规格'}}</td>
63
+                <td>{{'数量'}}</td>
64
+                <td>{{'价格'}}</td>
65
+              </tr>
60
               <tr colspan="6" v-for="(v, index) in info.L_list" :key="index">
66
               <tr colspan="6" v-for="(v, index) in info.L_list" :key="index">
61
                 <td colspan="2">{{v.name}}</td>
67
                 <td colspan="2">{{v.name}}</td>
62
                 <td>{{v.spec}}</td>
68
                 <td>{{v.spec}}</td>
68
 
74
 
69
           <td colspan="6">
75
           <td colspan="6">
70
             <table class="list_table">
76
             <table class="list_table">
77
+              <td colspan="2">{{'名称'}}</td>
78
+              <td>{{'规格'}}</td>
79
+              <td>{{'数量'}}</td>
80
+              <td>{{'价格'}}</td>
71
               <tr colspan="6" v-for="(v, index) in info.R_list" :key="index">
81
               <tr colspan="6" v-for="(v, index) in info.R_list" :key="index">
72
                 <td colspan="2">{{v.name}}</td>
82
                 <td colspan="2">{{v.name}}</td>
73
                 <td>{{v.spec}}</td>
83
                 <td>{{v.spec}}</td>

+ 2 - 2
src/xt_pages/outpatientCharges/statementTemplate/printOne.vue View File

30
       </tr>
30
       </tr>
31
       <tr>
31
       <tr>
32
         <td width="70">就医登记号</td>
32
         <td width="70">就医登记号</td>
33
-        <td colspan="11">{{info.psn_no}}</td>
34
-        <td width="80">门诊号</td>
33
+        <td colspan="7">{{info.psn_no}}</td>
34
+        <td width="50">门诊号</td>
35
         <td colspan="3">{{info.number}}</td>
35
         <td colspan="3">{{info.number}}</td>
36
       </tr>
36
       </tr>
37
       <tr>
37
       <tr>