Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_seventythree.vue

@@ -230,13 +230,6 @@
                       </div>
                     </div>
                     <div class="row" style="padding: 2px 0; line-height: 23px;display: flex;">
-                      <div class="inline_block" style="flex: 1;">
-                        透析间期：
-                        <div class="under_line" style=" width: 50%;text-align: center; white-space: normal;">
-                          {{ record.assessment_before_dislysis.last_post_dialysis ? 
-                          record.assessment_before_dislysis.last_post_dialysis : "/" }}
-                        </div>
-                      </div>
                       <div class="inline_block" style=" flex: 1">
                         透前症状：
                         <div class="under_line" style="width: 50%; text-align: left">
@@ -263,12 +256,18 @@
                           </span>
                         </div>
                       </div>
+                      <div class="inline_block" style=" flex: 1">
+                        跌倒评估：
+                        <div class="under_line" style="width: 50%; text-align: left">
+                         {{ record.receive_assessment.score ? record.receive_assessment.score : '/' }}
+                        </div>
+                      </div>
                     </div>
 
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                       <div class="inline_block" style="flex: 1">
                         内瘘：
-                        <div class="under_line" style="width: 70%; text-align: center">
+                        <div class="under_line" style="width: 70%; text-align: left;white-space: normal;">
                           {{
                             record.assessment_before_dislysis &&
                             record.assessment_before_dislysis.internal_fistula
@@ -280,8 +279,8 @@
                       </div>
                       <div class="inline_block" style="flex: 1">
                         导管：
-                        <div
-                          style="width: 70%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
+                        <div class="under_line"
+                          style="width: 70%; text-align: left;white-space: normal;"
                         >
                           {{
                             record.assessment_before_dislysis &&
@@ -299,9 +298,9 @@
                           {{ record.assessment_before_dislysis.complication ? record.assessment_before_dislysis.complication : "/" }}                        </div>
                       </div>
                       <div class="inline_block" style=" flex: 1">
-                        跌倒评估：
-                        <div class="under_line" style="width: 50%; text-align: left">
-                         {{ record.receive_assessment.score ? record.receive_assessment.score : '/' }}
+                        备注：
+                        <div class="under_line" style="width: 70%; text-align: left;white-space: normal;">
+                         {{ record.assessment_before_dislysis.remark ? record.assessment_before_dislysis.remark : '/' }}
                         </div>
                       </div>
                     </div>
@@ -332,8 +331,10 @@
                       <div class="inline_block" style="flex: 1;">
                         体重增加：
                         <div class="under_line" style=" width: 50%;text-align: center; white-space: normal;">
-                          {{ record.assessment_before_dislysis.weight_before > 0 && record.lastafterweight.weight_after > 0 ? 
-                          parseFloat(record.assessment_before_dislysis.weight_before - record.lastafterweight.weight_after).toFixed(2): "/" 
+                          {{ record.assessment_before_dislysis.weight_before > 0 && 
+                          record.assessment_before_dislysis.additional_weight > 0 && 
+                          record.assessment_before_dislysis.dry_weight >0 ? 
+                          parseFloat(record.assessment_before_dislysis.weight_before - record.assessment_before_dislysis.additional_weight - record.assessment_before_dislysis.dry_weight).toFixed(2): "/" 
                           }}
                         </div>kg
                       </div>
@@ -2154,6 +2155,9 @@ export default {
           case 2:
             return "ml";
             break;
+          case 3:
+            return 'kg'
+            break
         }
       }
     },

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1197,6 +1197,18 @@
                               : "/"
                           }}
                         </div>
+                        <span v-if="record.prescription.anticoagulant == 5"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 6"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 7"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 8"
+                          >iu</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 4"
                           >mg</span
                         >
@@ -1242,6 +1254,16 @@
                               : 0
                           }}
                         </div>
+                       
+                        <span v-if="record.prescription.anticoagulant == 6"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 7"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 8"
+                          >iu</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 5"
                           >ml/h</span
                         >
@@ -1271,6 +1293,18 @@
                               : "/"
                           }}
                         </div>
+                        <span v-if="record.prescription.anticoagulant == 5"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 6"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 7"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 8"
+                          >iu</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 4"
                           >mg</span
                         >
@@ -1459,7 +1493,7 @@
                             v-if="
                              (record.prescription.mode_id == 2 ||
                               record.prescription.mode_id == 5 ||
-                              record.prescription.mode_id == 12 || org_id == 0)&&org_id!=10478 && org_id!=10206
+                              record.prescription.mode_id == 12 || org_id == 0)&&org_id!=10478 && org_id!=10206 && org_id!=10598
                             "
                             width="50"
                           >
@@ -1681,7 +1715,7 @@
                               (record.prescription.mode_id == 2 ||
                               record.prescription.mode_id == 5 ||
                               record.prescription.mode_id == 12 || org_id == 0)
-                              && org_id!=10478 && org_id!=10206
+                              && org_id!=10478 && org_id!=10206 && org_id!=10598
                             "
                             style="width: 50px"
                           >
@@ -3587,9 +3621,9 @@ export default {
             var dlegh = 0;
             if (
               this.records[recordIndex].monitor_records &&
-              this.records[recordIndex].monitor_records.length < 6
+              this.records[recordIndex].monitor_records.length < 8
             ) {
-              dlegh = 6 - this.records[recordIndex].monitor_records.length;
+              dlegh = 8 - this.records[recordIndex].monitor_records.length;
             } else {
               dlegh = 0;
             }
@@ -3625,9 +3659,9 @@ export default {
             var delghTwo = 0;
             if (
               this.records[recordIndex].advices &&
-              this.records[recordIndex].advices.length < 12
+              this.records[recordIndex].advices.length < 14
             ) {
-              delghTwo = 12 - this.records[recordIndex].advices.length;
+              delghTwo = 14 - this.records[recordIndex].advices.length;
             } else {
               delghTwo = 0;
             }
@@ -3728,12 +3762,12 @@ export default {
                 rightIndex in advices ? advices[i + halfLen] : []
               );
             }
-            if (halfLen < 6) {
-              var nl = 6 - leftAdvice.length;
+            if (halfLen < 8) {
+              var nl = 8 - leftAdvice.length;
               for (let index = 0; index < nl; index++) {
                 leftAdvice.push([]);
               }
-              var nl = 6 - rightAdvice.length;
+              var nl = 8 - rightAdvice.length;
               for (let index = 0; index < nl; index++) {
                 rightAdvice.push([]);
               }

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -267,7 +267,7 @@
                 org_id == 10597 ||
                 org_id == 10599 || 
                 org_id == 10612 ||
-                org_id ==10580) &&
+                org_id ==10580 || org_id ==10629) &&
                 org_id!=10387
             "
           >
@@ -338,7 +338,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10580)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10580 && org_id!=10629)
               || org_id == 10387
             "
           >
@@ -394,7 +394,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id ==10580)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id ==10580 || org_id ==10629)
                 && org_id!=10387
             "
           >
@@ -447,7 +447,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10580) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10580 && org_id!=10629) ||
               org_id == 10387
             "
           >
@@ -511,7 +511,7 @@
                 org_id ==10410 ||
                 org_id == 10395
 
-               )
+               )&& org_id!=10598
             "
           >
             <template slot-scope="scope">
@@ -526,7 +526,7 @@
             width="120"
             v-if="
               isShow('置换率') &&
-              template_id != 6 &&
+              (template_id != 6 &&
               template_id != 10 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -539,7 +539,7 @@
               org_id !=10432 &&
               org_id !=10445 &&
               org_id!=10395 &&
-              org_id !=10410
+              org_id !=10410)|| org_id==10598
             "
           >
             <template slot-scope="scope">
@@ -576,7 +576,8 @@
                 template_id != 43 &&
                 template_id != 47 &&
                 org_id!=10558 &&
-                org_id!=10517) ||
+                org_id!=10517 && 
+                org_id!=10598) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||
@@ -608,7 +609,7 @@
             width="100"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598) &&
               template_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -1291,7 +1292,7 @@
                 org_id == 10597||
                 org_id == 10599 ||
                 org_id ==10612 || 
-                org_id==10580)
+                org_id==10580 || org_id ==10629)
                 && org_id!=10387
             "
           >
@@ -1356,7 +1357,8 @@
               org_id!=10597 &&
               org_id!=10599 &&
               org_id!=10612 &&
-              org_id!=10580
+              org_id!=10580 &&
+              org_id!=10629
               )
               || org_id == 10387
             "
@@ -1401,7 +1403,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10395)
-              || org_id ==10558
+              || org_id ==10558 || org_id==10598
             "
           >
             <el-form-item label="置换率(L/h)：" :prop="isName('置换率')"
@@ -1427,7 +1429,7 @@
                 org_id==10432 ||
                 org_id!=10445 ||
                 org_id!=10410 ||
-                org_id!=10395) && org_id !=10558
+                org_id!=10395) && org_id !=10558 && org_id!=10598
             "
           >
             <el-form-item label="置换率(ml/min)：" :prop="isName('置换率')"
@@ -1445,7 +1447,7 @@
             :span="8"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598) &&
               org_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -1476,7 +1478,7 @@
                 org_id != 9919 &&
                 org_id != 10191 &&
                 org_id != 10551 &&
-                template_id != 43 && org_id!=10558 && org_id!=10346) ||
+                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -15,17 +15,17 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10580) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10580) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10580) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10580 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) && org_id!=10558" width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410) || org_id == 10558" width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) && org_id!=10558 && org_id!=10598" width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410) || org_id == 10558 || org_id ==10598" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558 && org_id!=10598" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558 || org_id ==10598" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27 && template_id != 60" width="92px">置换液流量(ml/h)</th>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue

@@ -218,12 +218,6 @@
                   <div class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1;">
-                      透析间期：
-                      <div class="under_line" style=" width: 50%;text-align: center; white-space: normal;">
-                        {{ predialysis.last_post_dialysis ? predialysis.last_post_dialysis : "/" }}
-                      </div>
-                    </div>
                     <div class="inline_block" style=" flex: 1">
                       透前症状：
                       <div
@@ -242,6 +236,14 @@
                         <span v-if="predialysis&&predialysis.symptom_before_dialysis==''&&predialysis.symptom_before_dialysis_other==''">/</span>
                       </div>
                     </div>
+                    <div class="inline_block" style=" flex: 1">
+                      跌倒评估：
+                      <div
+                        style="width: 50%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
+                      >
+                        {{ receiverTreatmentAccess.score ? receiverTreatmentAccess.score : '/' }}
+                      </div>
+                    </div>
                   </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
@@ -279,11 +281,11 @@
                       </div>
                     </div>
                     <div class="inline_block" style=" flex: 1">
-                      跌倒评估：
+                      备注：
                       <div
-                        style="width: 50%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
+                        style="width: 70%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
                       >
-                        {{ receiverTreatmentAccess.score ? receiverTreatmentAccess.score : '/' }}
+                        {{ predialysis.remark }}
                       </div>
                     </div>
                   </div>
@@ -314,9 +316,8 @@
                         class="under_line"
                         style=" width: 50%;text-align: center;white-space: normal;"
                       >
-                      {{ predialysis.weight_before > 0 && predialysis.weight_after > 0
-                        ? parseFloat(predialysis.weight_before - predialysis.weight_after).toFixed(2): "/"
-                      }}
+                      {{ predialysis.weight_before > 0 && predialysis.dry_weight > 0 ? 
+                      parseFloat(predialysis.weight_before - predialysis.dry_weight - predialysis.additional_weight).toFixed(2): "/" }}
                       </div>kg
                     </div>
                     <div class="inline_block" style=" flex: 1">
@@ -508,9 +509,7 @@
                         "
                       >
                         {{
-                          afterdialysis.weight_loss
-                            ? afterdialysis.weight_loss
-                            : "/"
+                          afterdialysis.weight_loss ? afterdialysis.weight_loss : "/"
                         }}
                       </div>kg
                     </div>
@@ -2378,6 +2377,9 @@ export default {
         case 2:
           return "ml";
           break;
+        case 3:
+          return 'kg'
+          break
       }
     },
     printThisPage() {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1237,6 +1237,14 @@
                       </div>
 
                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">
+                      <span v-if="prescription.anticoagulant == 5">ml</span>
+                      <span v-if="prescription.anticoagulant == 6">iu</span>
+                     <span v-if="prescription.anticoagulant == 7">iu</span>
+                     <span v-if="prescription.anticoagulant == 8">iu</span>
+                     <span v-if="prescription.anticoagulant == 9">iu</span>
+                     <span v-if="prescription.anticoagulant == 10">iu</span>
+                     <span v-if="prescription.anticoagulant == 11">iu</span>
+                     <span v-if="prescription.anticoagulant == 13">iu</span>
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">mg</span>
@@ -1283,7 +1291,13 @@
                         }}
                       </div>
                       <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">
-
+                        <span v-if="prescription.anticoagulant == 6">iu/h</span>
+                        <span v-if="prescription.anticoagulant == 7">iu/h</span>
+                        <span v-if="prescription.anticoagulant == 8">iu/h</span>
+                        <span v-if="prescription.anticoagulant == 9">iu/h</span>
+                        <span v-if="prescription.anticoagulant == 10">iu/h</span>
+                        <span v-if="prescription.anticoagulant == 11">iu/h</span>
+                        <span v-if="prescription.anticoagulant == 13">iu/h</span>
                         <span v-if="prescription.anticoagulant == 5">ml/h</span>
                           <span v-if="prescription.anticoagulant == 4">mg/h</span>
                           <span v-if="prescription.anticoagulant == 3">iu/h</span>
@@ -1356,6 +1370,14 @@
                         }}
                       </div>
                       <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">
+                        <span v-if="prescription.anticoagulant == 5">ml</span>
+                       <span v-if="prescription.anticoagulant == 6">iu</span>
+                       <span v-if="prescription.anticoagulant == 7">iu</span>
+                       <span v-if="prescription.anticoagulant == 8">iu</span>
+                       <span v-if="prescription.anticoagulant == 9">iu</span>
+                       <span v-if="prescription.anticoagulant == 10">iu</span>
+                      <span v-if="prescription.anticoagulant == 11">iu</span>
+                      <span v-if="prescription.anticoagulant == 13">iu</span>
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">mg</span>
@@ -1581,7 +1603,9 @@
                         <td width="50" v-if="org_id == 10600 || org_id ==10598">超滤率<br/>(ml/h)</td>
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 || org_id ==0">累计超滤量<br />(ml)</td>
                         <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0 && org_id!=10206" width="50">
-                          置换量<br />(ml)
+                          置换量<br />
+                          <span v-if="org_id!=10598">(ml)</span> 
+                          <span v-if="org_id==10598">(L)</span> 
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">滤前压(mmHg)</td>
                         <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629">KT/V</td>

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -12,14 +12,14 @@
       <el-button
       v-if="org_id==10088 || org_id == 0"
       style="position:fixed;right:115px;z-index:999"
-      size="small" type="success" 
-      @click="showclick = !showclick">{{ showclick==false ? '白纸' : '发票' }}</el-button>  
+      size="small" type="success"
+      @click="showclick = !showclick">{{ showclick==false ? '白纸' : '发票' }}</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 "><!--&& org_id != 10188 && org_id != 0-->
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 && org_id != 0"><!--&& org_id != 10188 && org_id != 0-->
         <div class='dialysisPage'>
           <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 " >
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
-            <printThree v-if="org_id == 10088 || org_id == 0" :paramsObj="invoiceParams" :show="showclick"></printThree>
+            <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams" :show="showclick"></printThree>
             <printfifteen v-if="org_id == 10510  " :paramsObj="invoiceParams"></printfifteen>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
@@ -45,7 +45,7 @@
         <printSix :paramsObj="invoiceParams"></printSix>
       </div>
     </div>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10375">
+    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10375 || org_id == 0">
       <div class='dialysisPage'>
         <print-ten :paramsObj="invoiceParams"></print-ten>
       </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printTen.vue

@@ -26,7 +26,7 @@
         </div>
         <div style=" width: 608px;min-height: 200px;">
           <div style="display:flex;justify-content: space-around;">
-            
+
             <div style="">西药费</div>
             <div style="">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
             <div style="">检查费</div>
@@ -36,7 +36,7 @@
           </div>
 
           <div style="display:flex;justify-content: space-around;">
-           
+
             <div style="">床位费</div>
             <div style="">{{ list.bedCostTotal ? list.bedCostTotal.toFixed(2) : '' }}</div>
             <div style="position:  relative;left: -15px;">中成药</div>
@@ -62,7 +62,7 @@
           </div>
         </div>
         <div style="border-top:1px solid black;width: 608px;">
-          
+
           <div style="border-right: 1px solid black;display: inline-block;width: 360px;padding: 5px;">
             <span>合计（大写）:</span>
             <span>
@@ -135,7 +135,7 @@
           <div style="width:140px">收款人：{{list.admin_user_name}}</div>
         </div>
       </div>
-      
+
   </div>
 </template>
 <script>

src/xt_pages/role/admin.vue

@@ -25,12 +25,12 @@
         >医药师登记</el-button>
 
 
-        <!-- <el-button
+        <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toJiaBan">首拼</el-button>  -->
+          @click="toJiaBan">首拼</el-button>