新分支

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyseven.vue

                 </td>
               </tr>
               <tr>
-                <td colspan="4">
+                <td colspan="2">
                   <span style="width: 14%;">通路评估：</span>
-                  <span style="width: 14%;">震颤：</span>
-                  <span style="width: 14%;">外观：</span>
+                  <span style="width: 14%;">内瘘：
+                    {{
+                      record.assessment_after_dislysis.internal_fistula
+                        ? record.assessment_after_dislysis.internal_fistula
+                        : ""
+                     }}
+                  </span>
+                  <span style="width: 14%;">导管：
+                    {{
+                      record.assessment_after_dislysis.catheter
+                        ? record.assessment_after_dislysis.catheter
+                        : ""
+                     }}
+                  </span>
+                </td>
+                <td >
+                  <span style="width: 14%;">透析器凝血：
+                    {{
+                      record.assessment_after_dislysis &&
+                      record.assessment_after_dislysis
+                        ?  record.assessment_after_dislysis.cruor
+                        : "/"
+                     }}
+                  </span>
+                
+                </td>
+                <td>
+                  <span style="width: 14%;">实际置换量：
+                    {{
+                      record.assessment_after_dislysis.actual_ultrafiltration
+                        ? record.assessment_after_dislysis.actual_ultrafiltration
+                        : ""
+                     }}L
+
+                  </span>
+                 
                 </td>
               </tr>
             </table>

src/xt_pages/dialysis/batch_print/batch_print_order_twentySeven.vue

                               <td width="70">抗凝方式:</td>
                               <td width="120">
                                 <label-box
-                                  :isChecked="(record.prescription.anticoagulant == 6 || record.prescription.anticoagulant == 7 || record.prescription.anticoagulant == 3)
+                                  :isChecked="(record.prescription.anticoagulant == 8)
                                       ? true
                                       : false
                                   "
-                                  showValue="低分子肝素"
+                                  showValue="依诺肝素"
                                 ></label-box>
                               </td>
 
                                   &nbsp;
                                   <span
                                     v-if="
-                                      record.prescription.anticoagulant == 6 || record.prescription.anticoagulant == 7 || record.prescription.anticoagulant == 3
+                                      record.prescription.anticoagulant == 8
                                     "
-                                    >{{
-                                      record.prescription
-                                        .anticoagulant_zongliang
-                                    }}</span
+                                    >{{record.prescription.anticoagulant_zongliang}}</span
                                   >
                                 </div>
                               </td>
                                   v-if="record.prescription.anticoagulant == 7"
                                   >iu</span
                                 >
+                                <span
+                                  v-if="record.prescription.anticoagulant == 8"
+                                  >iu</span
+                                >
                               </td>
                               <td width="120">
                                 <label-box
                                   v-if="record.prescription.anticoagulant == 7"
                                   >iu</span
                                 >
+                                <span
+                                  v-if="record.prescription.anticoagulant == 8"
+                                  >iu</span
+                                >
                                 <span
                                   v-if="record.prescription.anticoagulant == 5"
                                   >mg</span
                                   v-if="record.prescription.anticoagulant == 7"
                                   >iu/h</span
                                 >
+                                <span
+                                  v-if="record.prescription.anticoagulant == 8"
+                                  >iu/h</span
+                                >
                                 <span
                                   v-if="record.prescription.anticoagulant == 6"
                                   >iu/h</span

src/xt_pages/dialysis/details/DialysisPrescription.vue

          <li v-if="isShow('置换速度')&& this.$store.getters.xt_user.template_info.org_id!=10375">
           <label>置换速度 : </label>
           <span class="content">{{displace_speed }}</span>
-            <span class="unit">ml/min</span>
+            <span class="unit">L/h</span>
         </li>
 
         <li v-if="isShow('置换速度') && this.$store.getters.xt_user.template_info.org_id == 10375">

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

                 org_id == 10495 ||
                 org_id == 10375 ||
                 org_id == 10485 ||
-                org_id == 10375) &&
+                org_id == 10375 ||
+                org_id == 10480) &&
                 org_id!=10387
             "
           >
               org_id != 9555
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
-               org_id!=10485 && org_id!=10395 && org_id!=10375 )
+               org_id!=10485 && org_id!=10395 && org_id!=10375
+               && org_id!=10480 )
               || org_id == 10387
             "
           >
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480)
                 && org_id!=10387
             "
           >
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480) ||
               org_id == 10387
             "
           >
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480) &&
                 org_id!=10387
             "
           >
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375)
+              org_id!=10375 &&  org_id!=10480)
               || org_id == 10387
             "
           >
                 org_id == 10495 ||
                 org_id == 10485 ||
                 org_id == 10395 ||
-                org_id == 10375)
+                org_id == 10375 ||
+                org_id == 10480)
                 && org_id!=10387
             "
           >
               org_id!=10495 &&
               org_id!=10485 &&
               org_id!=10395 &&
-              org_id!=10375
+              org_id!=10375 &&
+              org_id!=10480
               )
               || org_id == 10387
             "

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <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!=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 == 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!=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==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!=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 == 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!=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==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) " width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

                     <tr>
                       <td width="70">抗凝方式:</td>
                       <td width="120">
-                          <label-box :isChecked="prescription.anticoagulant == '低分子肝素钙' ? true : false" showValue="低分子肝素钙"></label-box>
+                          <label-box :isChecked="prescription.anticoagulant == '依诺肝素' ? true : false" showValue="依诺肝素"></label-box>
                       </td>
                       <td width="60">
-                          <div class="under-line">&nbsp;{{ prescription.anticoagulant == '低分子肝素钙' && prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : ""}}</div>
+                          <div class="under-line">&nbsp;{{ prescription.anticoagulant == '依诺肝素' && prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : ""}}</div>
                       </td>
                       <td width="10">iu</td>
                       <td width="100">
           if (prescription.anticoagulant == 7) {
             prescription.anticoagulant = '低分子肝素钠'
           }
+          if (prescription.anticoagulant == 8) {
+            prescription.anticoagulant = '依诺肝素'
+          }
           if (prescription.blood_access === 1) {
             prescription.blood_access = '正常'
           }

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

                 </td>
               </tr>
               <tr>
-                <td colspan="4">
+                <td colspan="2">
                   <span>通路评估：
                     内瘘:{{
                       afterdialysis.internal_fistula
                     }}
                   </span>
                 </td>
+                <td>
+                  <span>透析器凝血：
+                   
+                    {{
+                     afterdialysis &&
+                     afterdialysis
+                        ? afterdialysis.cruor
+                        : "/"
+                     }}
+
+                 
+                  </span>
+                </td>
+                <td>
+                  <span>实际置换量：
+                   
+                    {{
+                      afterdialysis.actual_ultrafiltration
+                        ? afterdialysis.actual_ultrafiltration
+                        : ""
+                     }}L
+
+                 
+                  </span>
+                </td>
               </tr>
             </table>
           </div>

src/xt_pages/stock/drugs/components/drugOutDetail.vue

              this.tablePrint[i].total_price =  ((parseInt((this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child))/this.tablePrint[i].min_number))*this.tablePrint[i].price).toFixed(2)
              this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
              this.tablePrint[i].total = this.getCountSenvenOne(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)/this.tablePrint[i].min_number
+            
            }else{
               this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
               this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
 
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号','生产厂商','进销商', '单位','数量','单价','总价','出库时间','备注']
-       const filterVal = ['index','drug_name', 'unit', 'manufacturer_name','dealer_name','min_unit','count','min_price','total_price','ctime','remark']
+       if(this.org_id == 9919){
+        const filterVal = ['index','drug_name', 'unit', 'manufacturer_name','dealer_name','max_unit','count','min_price','total_price','ctime','remark']
+           
        let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tablePrint.length;i++){
          obj.total_price += this.tablePrint[i].total
        excel.export_json_to_excel({
            header: tHeader,
            data,
-           filename: '药品出库明细'
+           filename: '药品汇总明细'
+         })
+          this.downloadLoading = false
+       }else{
+        const filterVal = ['index','drug_name', 'unit', 'manufacturer_name','dealer_name','min_unit','count','min_price','total_price','ctime','remark']
+           
+       let obj = {'index':'合计','total_price':0.00}
+       for(let i=0;i<this.tablePrint.length;i++){
+         obj.total_price += this.tablePrint[i].total
+       }
+       obj.total_price = obj.total_price.toFixed(2)
+       this.tablePrint.push(obj)
+       const data = this.formatJson(filterVal, this.tablePrint)
+
+
+       excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品汇总明细'
          })
           this.downloadLoading = false
+       }
+   
         })
        },
 

src/xt_pages/user/vascularAccess.vue

         <el-button type="primary" @click="updatedVasularAccess('form')">保存</el-button>
      </span>
      </el-dialog>
-     <!-- <sitemap> </sitemap> -->
+     <sitemap> </sitemap>
     </div>
 
      <multi-select-box