新分支

src/api/role/admin.js

@@ -135,6 +135,15 @@ export function toTestFive(params){
   })
 }
 
+export function toTestSeven(params){
+ 
+  return request({
+    url:"api/sign/addcontractsignatory",
+    method:"Get",
+    params:params
+  })
+}
+
 export function toTestEight(params){
   
   return request({

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne.vue

@@ -78,13 +78,14 @@
               <div class="inline_block">
                 病区：
                 <div class="under_line" style="width: 50px; text-align: center">
-                  {{ "/" }}
+                  {{ record.device_zone.name? record.device_zone.name:"/" }}
                 </div>
               </div>
               <div class="inline_block">
                 床号：
                 <div class="under_line" style="width: 50px; text-align: center">
-                  {{ "/" }}
+                 
+                  {{ record.device_number.number? record.device_number.number:"/" }}
                 </div>
               </div>
               <div class="inline_block">

src/xt_pages/dialysis/batch_print/batch_print_order_sixty.vue

@@ -890,7 +890,7 @@
                           class="under_line"
                           style="width: 100px; text-align: center"
                         >
-                          <span v-if="org_id == 10290">{{
+                          <span v-if="org_id == 10290 || org_id == 10138 || org_id == 10278">{{
                             record.lastafterweight.weight_after
                           }}</span>
                           <span v-else>{{

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue

@@ -740,7 +740,9 @@
                             class="under_line"
                             style="width: 100px; text-align: center"
                           >
-                            /
+                          {{
+                          getDisplaceLiquiPart(record.prescription.displace_liqui_part)
+                        }}
                           </div>
                         </div>
                         <div
@@ -1887,13 +1889,13 @@
                 <div class="inline_block">
                   病区：
                   <div class="under_line" style="width: 50px; text-align: center">
-                    {{ "/" }}
+                    {{ record.device_zone.name? record.device_zone.name:"/" }}
                   </div>
                 </div>
                 <div class="inline_block">
                   床号：
                   <div class="under_line" style="width: 50px; text-align: center">
-                    {{ "/" }}
+                    {{ record.device_number.number? record.device_number.number:"/" }}
                   </div>
                 </div>
                 <div class="inline_block">
@@ -2909,9 +2911,11 @@
           "腹痛",
         ],
         org_id: "",
+        displaceLiquiPartOptions:[],
       };
     },
     created() {
+      this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
       var bloodAccessParOpera = getDataConfig(
         "hemodialysis",
         "vascular_access_desc"
@@ -3139,6 +3143,18 @@
         });
     },
     methods: {
+      getDisplaceLiquiPart: function(val) {
+       
+        let displace_liqui_part_name = "/";
+        const displace_liqui_part = this.displaceLiquiPartOptions;
+      
+        for (let i = 0; i < displace_liqui_part.length; i++) {
+           if (displace_liqui_part[i].id == val) {
+           displace_liqui_part_name = displace_liqui_part[i].name;
+        }
+      }
+      return displace_liqui_part_name;
+     },
       getUnit: function (val) {
         if (val.assessment_after_dislysis == null) {
           return "";

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

@@ -29,7 +29,7 @@
             >
                 <el-row :gutter="24">
                     <el-col :span="8" v-if="isShows('透析模式')">
-                        <el-form-item label="透析模式" :prop="isName('透析模式')" :rules="isCheckmust('透析模式')">
+                        <el-form-item label="透析模式" :prop="isName('透析模式')">
                             <el-select
                                    filterable
                                     v-model="dialysisPrescription.mode_id"
@@ -2066,7 +2066,7 @@ mu
             }
           }
         } else {
-          if (schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12) {
+          if (schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12 || schedual.mode_id == 28) {
             this.zhiShow = true
             this.huShow = true
             this.totalShow = true
@@ -2598,7 +2598,7 @@ mu
         }
         // console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
         // console.log('this.schedual', schedual.mode_id)
-        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12) {
+        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12 || schedual.mode_id == 28) {
           this.zhiShow = true
           this.huShow = true
           this.totalShow = true
@@ -2809,7 +2809,7 @@ mu
             //   }
 
             // }
-            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12){
+            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12 && this.dialysisPrescription.mode_id!=28){
               this.dialysisPrescription.displace_liqui_part = 0
               this.dialysisPrescription.displace_liqui_value = 0
               this.dialysisPrescription.replacement_total = 0
@@ -3920,17 +3920,17 @@ mu
           filedList[i].is_show == 1
         ) {
           // console.log(filedList[i],'false')
-          if (name == "透析模式" || name == "透析时长") {
-            return [
-              { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
-              {
-                required: true,
-                pattern: /^[1-9]\d*$/,
-                message: `请输入${name}`,
-                trigger: ['blur','change']
-              },
-            ];
-          }
+          // if (name == "透析时长") {
+          //   return [
+          //     { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
+          //     {
+          //       required: true,
+          //       pattern: /^[1-9]\d*$/,
+          //       message: `请输入${name}`,
+          //       trigger: ['blur','change']
+          //     },
+          //   ];
+          // }
           return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
 
         }
@@ -3961,17 +3961,17 @@ mu
             filedList[i].is_write == 1&&
             filedList[i].is_show == 1
           ) {
-            if(name == '置换速度'){
-              return [
-                { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
-                {
-                  required: true,
-                  pattern: /^[1-9]\d*$/,
-                  message: `请输入${name}`,
-                  trigger: ['blur','change']
-                },
-              ];
-            }
+            // if(name == '置换速度'){
+            //   return [
+            //     { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
+            //     {
+            //       required: true,
+            //       pattern: /^[1-9]\d*$/,
+            //       message: `请输入${name}`,
+            //       trigger: ['blur','change']
+            //     },
+            //   ];
+            // }
             return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
 
           }
@@ -4073,7 +4073,8 @@ mu
     },
     changePrescription(id) {
       console.log("id233223232323232323",id)
-      if(id != 2 && id!=5 && id!= 12){
+      this.dialysisPrescription.mode_id = id
+      if(id != 2 && id!=5 && id!= 12 && id!=28){
         this.dialysisPrescription.displace_liqui_value = ""
         this.dialysisPrescription.displace_liqui_part = ""
         this.dialysisPrescription.replacement_total = ""
@@ -4089,17 +4090,18 @@ mu
           return false
         } else {
           console.log('切换数据', response.data.data.solution)
+
+
           this.$message.success('切换成功')
           console.log("dialysisPrescription",response.data.data.dialysisPrescription)
-
+        
           if (response.data.data.solution != null) {
             for (const key in response.data.data.solution) {
               // 长期处方不为空
               if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
                 && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
                 && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
-                this.dialysisPrescription[key] =
-                  response.data.data.solution[key]
+                this.dialysisPrescription[key] = response.data.data.solution[key]
               }
             }
               if (this.$store.getters.xt_user.template_info.org_id== 9671 || this.$store.getters.xt_user.template_info.org_id == 9675 || this.$store.getters.xt_user.template_info.org_id == 10340) {
@@ -4113,28 +4115,30 @@ mu
             }
           } else {
             if (response.data.data.prescription != null) {
+              console.log("wowowowwo")
               // 临时处方不为空
               for (const key in response.data.data.prescription) {
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
                   && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
-                  this.dialysisPrescription[key] =
-                    response.data.data.prescription[key]
+                  this.dialysisPrescription[key] = response.data.data.prescription[key]
                 }
               }
             } else if (response.data.data.system_prescription != null) {
+              console.log("见啦地方232332")
               // 系统处方不为空
               for (const key in response.data.data.system_prescription) {
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
                   && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
-                  this.dialysisPrescription[key] =
-                    response.data.data.system_prescription[key]
+                  this.dialysisPrescription[key] =  response.data.data.system_prescription[key]
+                  
                 }
               }
 
             } else {
               for (const key in this.dialysisPrescription) {
+                console.log("wowowowo")
                 // 临时处方为空
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
@@ -4142,7 +4146,7 @@ mu
                   this.dialysisPrescription[key] = ''
                 }
               }
-              this.dialysisPrescription.mode_id = id
+              // this.dialysisPrescription.mode_id = id
             }
               if (this.$store.getters.xt_user.template_info.org_id == 9671 ||this.$store.getters.xt_user.template_info.org_id == 9675 ||this.$store.getters.xt_user.template_info.org_id== 10340) {
               this.dialysisPrescription.sodium = 138
@@ -4157,8 +4161,8 @@ mu
           if(response.data.data.dialysisPrescription!=null){
               this.dialysisPrescription.remark =  response.data.data.dialysisPrescription.remark
           }
-        }
-        if (response.data.data.solution == null) {
+
+          if (response.data.data.solution == null) {
             if (this.$store.getters.xt_user.template_info.org_id== 9671 || this.$store.getters.xt_user.template_info.org_id == 9675 ||this.$store.getters.xt_user.template_info.org_id== 10340) {
               this.dialysisPrescription.sodium = 138
               this.dialysisPrescription.bicarbonate = 31.1
@@ -4168,10 +4172,8 @@ mu
               }
             }
           }
-        if (
-          this.dialysisPrescription.dialysis_duration_hour === '' ||
-          this.dialysisPrescription.dialysis_duration_minute === ''
-        ) {
+
+          if ( this.dialysisPrescription.dialysis_duration_hour === '' || this.dialysisPrescription.dialysis_duration_minute === '') {
           this.timeValue = ''
           this.time = '03:00'
         } else {
@@ -4188,40 +4190,43 @@ mu
             (this.dialysisPrescription.dialysis_duration_minute > 10
               ? this.dialysisPrescription.dialysis_duration_minute
               : '0' + this.dialysisPrescription.dialysis_duration_minute)
-        }
-      })
+          }
 
-      if (
-        id === 1 ||
-        id === 3 ||
-        id === 4 ||
-        id === 6 ||
-        id === 7 ||
-        id === 8 ||
-        id === 9 ||
-        id === 10 ||
-        id === 11 ||
-        id === 13 ||
-        id === 14 ||
-        id === 15 ||
-        id === 16 ||
-        id === 19
-      ) {
-        this.zhiShow = false
-        this.huShow = false
-        this.totalShow = false
-      } else {
-        this.zhiShow = true
-        this.huShow = true
-        this.totalShow = true
-
-        //针对新化博翔
-        if(this.$store.getters.xt_user.template_info.org_id ==10447){
-            this.dialysisPrescription.displace_liqui_part = 1
-            this.dialysisPrescription.displace_liqui_value = 35
-        }
-      }
+          if (
+            id === 1 ||
+            id === 3 ||
+            id === 4 ||
+            id === 6 ||
+            id === 7 ||
+            id === 8 ||
+            id === 9 ||
+            id === 10 ||
+            id === 11 ||
+            id === 13 ||
+            id === 14 ||
+            id === 15 ||
+            id === 16 ||
+            id === 19
+          ) {
+            this.zhiShow = false
+            this.huShow = false
+            this.totalShow = false
+          } else {
+            this.zhiShow = true
+            this.huShow = true
+            this.totalShow = true
 
+            //针对新化博翔
+            if(this.$store.getters.xt_user.template_info.org_id ==10447){
+                this.dialysisPrescription.displace_liqui_part = 1
+                this.dialysisPrescription.displace_liqui_value = 35
+            }
+          }
+
+          this.dialysisPrescription.mode_id = id
+          console.log("成功2332Owo",this.dialysisPrescription.mode_id)
+        }
+      })
     },
     handlePatientInfo() {
       this.isVisibility = false

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

@@ -243,7 +243,8 @@
                 || org_id == 10410 ||
                 org_id == 10495 ||
                 org_id == 10375 ||
-                org_id == 10485) &&
+                org_id == 10485 ||
+                org_id == 10375) &&
                 org_id!=10387
             "
           >
@@ -313,7 +314,7 @@
               org_id != 9555
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
-               org_id!=10485 && org_id!=10395 )
+               org_id!=10485 && org_id!=10395 && org_id!=10375 )
               || org_id == 10387
             "
           >
@@ -369,7 +370,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485)
+                || org_id == 10485 || org_id == 10375)
                 && org_id!=10387
             "
           >
@@ -422,7 +423,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375) ||
               org_id == 10387
             "
           >
@@ -1147,7 +1148,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485) &&
+                org_id == 10485 || org_id == 10375) &&
                 org_id!=10387
             "
           >
@@ -1194,7 +1195,8 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 &&
-              org_id!=10485)
+              org_id!=10485 &&
+              org_id!=10375)
               || org_id == 10387
             "
           >
@@ -1252,7 +1254,8 @@
                 org_id == 10410 ||
                 org_id == 10495 ||
                 org_id == 10485 ||
-                org_id == 10395)
+                org_id == 10395 ||
+                org_id == 10375)
                 && org_id!=10387
             "
           >
@@ -1310,7 +1313,8 @@
               org_id!=10410 &&
               org_id!=10495 &&
               org_id!=10485 &&
-              org_id!=10395
+              org_id!=10395 &&
+              org_id!=10375
               )
               || org_id == 10387
             "

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,10 +14,10 @@
           <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!=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 == 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!=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==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!=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('钠浓度')" 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/DialysisPrintOrderEight.vue

@@ -777,7 +777,7 @@
             <td>{{ monitor.blood_flow_volume }}</td>
             <td>{{ monitor.venous_pressure }}</td>
             <td>{{ monitor.transmembrane_pressure }}</td>
-            <td>{{ monitor.ultrafiltration_rate }}</td>//
+            <td>{{ monitor.ultrafiltration_rate }}</td>
             <td>{{ monitor.ultrafiltration_volume }}</td>
             <td>{{ monitor.sodium_concentration }}</td>
             <td>

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -80,11 +80,11 @@
                       class="under_line"
                       style="width: 50px; text-align: center"
                     >
-                      <span>{{
-                        patientInfo.DialysisSchedule.device_zone.name
-                          ? patientInfo.DialysisSchedule.device_zone.name
-                          : ""
-                      }}</span>
+                    <span>{{
+                      patientInfo.DialysisSchedule.device_zone.name
+                        ? patientInfo.DialysisSchedule.device_zone.name
+                        : "/"
+                    }}</span>
                     </div>
                   </div>
                   <div
@@ -100,38 +100,16 @@
                       class="under_line"
                       style="width: 50px; text-align: center"
                     >
-                      <!-- <span>{{
-                        (dialysisOrder &&
-                          dialysisOrder != null &&
-                          dialysisOrder.DeviceNumber &&
-                          dialysisOrder.DeviceNumber.number.length > 0) ||
-                        (dialysisOrder &&
-                          dialysisOrder != null &&
-                          receiverTreatmentAccess.condition &&
-                          receiverTreatmentAccess.condition != 1)
-                          ? patientInfo.DialysisSchedule.device_number.number
-                          : dialysisOrder.DeviceNumber.number
-                      }}</span> -->
-
-                      <span
-                        v-if="
-                          dialysisOrder == null ||
-                          receiverTreatmentAccess.condition != 1
-                        "
-                      >
-                        {{ patientInfo.DialysisSchedule.device_number.number }}
-                      </span>
-                      <span
-                        v-else-if="
-                          dialysisOrder &&
-                          dialysisOrder != null &&
-                          dialysisOrder.DeviceNumber &&
-                          receiverTreatmentAccess.condition == 1
-                        "
-                      >
-                        {{ dialysisOrder.DeviceNumber.number }}
-                      </span>
-                      <span v-else>/</span>
+                    <span>{{
+                      dialysisOrder &&
+                      dialysisOrder.DeviceNumber &&
+                      dialysisOrder.DeviceNumber.number.length > 0
+                        ? dialysisOrder.DeviceNumber.number
+                        : patientInfo.DialysisSchedule.device_number.number
+                    }}</span>
+              
+
+                     
                     </div>
                   </div>
                   <div

src/xt_pages/dialysis/template/DialysisPrintOrderSixty.vue

@@ -820,10 +820,10 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956">{{
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10138 || org_id == 10278">{{
                           lastafterdialysis.weight_after
                         }}</span>
-                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956">{{
+                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id!=10138&&org_id!=10278">{{
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1113,8 +1113,6 @@ export default {
         { value: '1402', label: '门诊特殊病(1402)' },
         { value: '1401', label: '门诊慢性病(1401)' },
         { value: '2302', label: '异地就医(2302)' },
-
-
         { value: '0', label: '自费' }
 
       ],
@@ -4866,6 +4864,9 @@ export default {
         case 1401:
           return '门诊慢性病(1401)' + '处方' + index
           break
+        case 2302:
+          return '异地就医(2302)' + '处方' + index
+          break
         case 9922:
           return '家庭通道' + '处方' + index
           break

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1765,7 +1765,7 @@ export default {
               // }
 
               var preTime = nowTime
-              if ( this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485){
+              if ( this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191){
                 if (prescription.pre_time == 0) {
                   if (this.schedule.schedule_type == 1) {
                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -1922,7 +1922,7 @@ export default {
                   tempProject.push(obj)
                 }
                 var preTime = nowTime
-                if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485) {
+                if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191) {
                   if (this.schedule.schedule_type == 1) {
                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                   } else if (this.schedule.schedule_type == 2) {
@@ -2232,7 +2232,7 @@ export default {
                     // }
 
                     var preTime = nowTime
-                    if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 ) {
+                    if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 ) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -2390,7 +2390,7 @@ export default {
 
                       var preTime = nowTime
                       // var preTime = ''
-                      if(this.org_id != 0 && this.org_id !=  9919 && this.org_id !=  10485) {
+                      if(this.org_id != 0 && this.org_id !=  9919 && this.org_id !=  10485 && this.org_id !=  10191) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
@@ -3896,7 +3896,7 @@ export default {
 
                     var preTime = nowTime
 
-                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id  != 10485 ) {
+                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id  != 10485 && this.org_id  != 10191 ) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -4050,7 +4050,7 @@ export default {
 
                       // var preTime = nowTime
                       var preTime = nowTime
-                      if( this.org_id != 0 && this.org_id != 9919 &&  this.org_id != 10485) {
+                      if( this.org_id != 0 && this.org_id != 9919 &&  this.org_id != 10485 &&  this.org_id != 10191) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
@@ -4533,7 +4533,7 @@ export default {
 
                     var preTime = nowTime
 
-                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485) {
+                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191) {
                       if (prescription.pre_time == 0) {
                         // preTime = nowTime
                         if (this.schedule.schedule_type == 1) {
@@ -4690,7 +4690,7 @@ export default {
 
                       var preTime = nowTime
                       // var preTime = ''
-                      if(this.org_id != 0 && this.org_id != 9919  && this.org_id != 10485) {
+                      if(this.org_id != 0 && this.org_id != 9919  && this.org_id != 10485 && this.org_id != 10191 ) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {

src/xt_pages/role/admin.vue

@@ -66,12 +66,12 @@
           style="float:left"
           @click="toTestSeven">添加合同签署人</el-button> -->
 
-          <el-button   type="primary"
+          <!-- <el-button   type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"  @click="toTestEight">
             脚本
-          </el-button>
+          </el-button> -->
           
      </div>
     
@@ -227,7 +227,7 @@
 </template>
 
 <script>
-import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestEight } from "@/api/role/admin";
+import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight } from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 
 import { parseTime } from "@/utils";

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -809,7 +809,7 @@ export default {
         this.tableOut[i].specification_name = this.tableOut[i].specification_name
         this.tableOut[i].packing_unit = this.tableOut[i].packing_unit
         this.tableOut[i].ctime = this.getTime(this.tableOut[i].ctime)
-        if(this.orgId == 9919 || this.orgId == 10402 || this.orgId == 0){
+        if(this.orgId == 9919 || this.orgId == 10402){
           this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].buy_price).toFixed(2)
           this.tableOut[i].packing_price = this.tableOut[i].buy_price
         }else if(this.orgId == 10265){
@@ -830,6 +830,10 @@ export default {
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId == 10188){
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10489){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10375){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else{
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
@@ -838,11 +842,11 @@ export default {
 
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
-        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191){
+        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 0 || this.orgId ==10489 || this.orgId == 10375){
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
           console.log("out_count232233232332",this.tableOut[i].out_count)
         }
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402){
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
        }