8月15日

src/api/advice.js

@@ -504,6 +504,14 @@ export function getSchedualDoctors(params) {
   })
 }
 
+export function getNewSchedualDoctors(params) {
+  return request({
+    url: '/api/schedule/new/advices',
+    method: 'get',
+    params: params
+  })
+}
+
 export function getDoctorAdviceCount(params) {
   return request({
     url: '/api/schedule/getdoctoradvicecount',
@@ -527,3 +535,11 @@ export function getPatientSchedule(params) {
     params: params
   })
 }
+
+export function excutionDoctorAdvice(params) {
+  return request({
+    url: '/api/schedule/excutiondoctoradvice',
+    method: 'Get',
+    params: params
+  })
+}

src/api/config.js

@@ -209,3 +209,11 @@ export function changeDrugOpenConfig(params) {
     params: params
   })
 }
+
+export function changeSettleOpenConfig(params) {
+  return request({
+    url: '/api/changesettleopenconfig',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/dialysis.js

@@ -38,9 +38,18 @@ export default {
     //     noCache: true
     //   }
     // },
+    // {
+    //   path: '/dialysis/dialysisDoctorAdvice',
+    //   component: () => import('@/xt_pages/dialysis/dialysisDoctorAdvice'),
+    //   name: '透析医嘱',
+    //   meta: {
+    //     title: '透析医嘱',
+    //     noCache: true
+    //   }
+    // },
     {
       path: '/dialysis/dialysisDoctorAdvice',
-      component: () => import('@/xt_pages/dialysis/dialysisDoctorAdvice'),
+      component: () => import('@/xt_pages/dialysis/newDoctorAdvice'),
       name: '透析医嘱',
       meta: {
         title: '透析医嘱',
@@ -58,6 +67,7 @@ export default {
         noCache: true
       }
     },
+
     {
       path: '/dialysis/signPrint',
       component: () => import('@/xt_pages/dialysis/signPrint'),

src/utils/tools.js

@@ -152,7 +152,7 @@ export function uParseTime(time, cFormat) {
   return time_str
 }
 
-export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
+export function calculateAnticoagulantZL(type, shouji, shichang, weichi, add_amount, reduce_amount) {
   console.log('t', type)
   var t = 0.5
   if (type == 1) {
@@ -165,11 +165,14 @@ export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
   shouji = parseFloat(shouji) ? parseFloat(shouji) : 0
   shichang = parseFloat(shichang) ? parseFloat(shichang) : 0
   weichi = parseFloat(weichi) ? parseFloat(weichi) : 0
+  shouji = parseFloat(shouji) ? parseFloat(shouji) : 0
+  add_amount = parseFloat(add_amount) ? parseFloat(add_amount) : 0
+  reduce_amount = parseFloat(reduce_amount) ? parseFloat(reduce_amount) : 0
   if (isNaN(shouji) || isNaN(shichang) || isNaN(weichi)) {
     return 0
   }
   console.log((shouji + (shichang - t) * weichi).toFixed(1))
-  return (shouji + (shichang - t) * weichi).toFixed(1)
+  return (shouji + (shichang - t) * weichi + add_amount - reduce_amount).toFixed(1)
 }
 
 export function formatDate(date, format) {

src/xt_pages/data/basicConfig.vue

@@ -42,6 +42,10 @@
             <p style="margin-top:20px;">药品在保存处方时出库：
                 <el-switch v-model="drug_out_open" @change="changeDrugOpen"></el-switch>
             </p>
+
+            <p style="margin-top:20px;">药品耗材在结算时出库：
+                <el-switch v-model="drug_settle_open" @change="changeSettleOpen"></el-switch>
+            </p>
         </div>
 
 
@@ -97,7 +101,7 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig,changeDrugOpenConfig} from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig,changeDrugOpenConfig,changeSettleOpenConfig} from '@/api/config'
 
 export default {
   name: "printTemplate",
@@ -119,6 +123,7 @@ export default {
       is_open_advice_xt_his:false,
       is_open_prescription_xt_his:false,
       drug_out_open:false,
+      drug_settle_open:false,
     };
   },
   methods: {
@@ -164,6 +169,12 @@ export default {
               this.drug_out_open = false
             }
 
+            if(response.data.data.is_seetle_open == 1){
+               this.drug_settle_open = true
+            }else{
+              this.drug_settle_open = false
+            }
+
           } else {
             this.$message.error(response.data.msg)
           }
@@ -405,6 +416,25 @@ export default {
         }
       })
 
+    },
+
+    changeSettleOpen(){
+      var settle_open = 0
+      if(this.drug_settle_open == false){
+        settle_open = 2
+      }
+      if(this.drug_settle_open == true){
+       settle_open = 1
+      }
+      var params= {
+        drug_settle_open:settle_open,
+      }
+      changeSettleOpenConfig(params).then(response=>{
+          if(response.data.state == 1){
+            this.$message.success("保存成功!")
+            this.getInitIsOpenConfig()
+          }
+      })
     }
 
   },

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -477,6 +477,80 @@
           <label>带水上机: </label>
           <span class="content">{{this.prescription.water_machine}}</span>
         </li>
+
+        <li v-if=" isShow('追加肝素量')" >
+          <label>追加肝素量 : </label>
+          <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ add_amount != "0" ? add_amount : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
+            <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 ">{{ add_amount != "0" ? "iu" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)" >{{ add_amount != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
+              <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671">
+                 {{ add_amount != "0" ? "mg" : "" }}
+              </span>
+              <span v-else> {{ add_amount != "0" ? "iu" : "" }}</span>
+            </span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" >{{ add_amount != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4" >{{ add_amount != "0" ? "mg" : "" }}</span >
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 5" >{{ add_amount != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6" >
+             <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671">
+                 {{ add_amount != "0" ? "mg" : "" }}
+              </span>
+              <span v-else> {{ add_amount != "0" ? "iu" : "" }}</span>
+            </span >
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7" >
+              <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671">
+                 {{ add_amount != "0" ? "mg" : "" }}
+              </span>
+              <span v-else> {{ add_amount != "0" ? "iu" : "" }}</span>
+            </span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 8" >{{ add_amount != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 9" >{{ add_amount != "0" ? "iu" : "" }}</span>
+          </span>
+          <span v-else>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2">{{ add_amount != "0" ? "mg" : "" }}</span>
+            <span class="unit"  v-else>{{ add_amount != "0" ? "iu" : "" }}</span>
+          </span>
+        </li>
+
+       <li v-if=" isShow('减肝素量')" >
+          <label>减肝素量 : </label>
+          <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ reduce_amount != "0" ? reduce_amount : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
+            <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 ">{{ reduce_amount != "0" ? "iu" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)" >{{ reduce_amount != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
+              <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671">
+                 {{ reduce_amount != "0" ? "mg" : "" }}
+              </span>
+              <span v-else> {{ reduce_amount != "0" ? "iu" : "" }}</span>
+            </span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" >{{ reduce_amount != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4" >{{ reduce_amount != "0" ? "mg" : "" }}</span >
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 5" >{{ reduce_amount != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6" >
+             <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671">
+                 {{ reduce_amount != "0" ? "mg" : "" }}
+              </span>
+              <span v-else> {{ reduce_amount != "0" ? "iu" : "" }}</span>
+            </span >
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7" >
+              <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671">
+                 {{ reduce_amount != "0" ? "mg" : "" }}
+              </span>
+              <span v-else> {{ reduce_amount != "0" ? "iu" : "" }}</span>
+            </span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 8" >{{ reduce_amount != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 9" >{{ reduce_amount != "0" ? "iu" : "" }}</span>
+          </span>
+          <span v-else>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2">{{ reduce_amount != "0" ? "mg" : "" }}</span>
+            <span class="unit"  v-else>{{ reduce_amount != "0" ? "iu" : "" }}</span>
+          </span>
+        </li>
        
       </ul>
     </div>
@@ -795,6 +869,12 @@ export default {
     displace_speed:function(){
       return this.getValueStr('displace_speed','displace_speed')
     },
+    add_amount:function(){
+       return this.getValueStr('add_amount','add_amount')
+    },
+    reduce_amount:function(){
+       return this.getValueStr('reduce_amount','reduce_amount')
+    }
   
   },
   created() {

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

@@ -1663,12 +1663,12 @@
           this.$message.error('你没有执行医嘱的权限')
           return false
         }
-        if(this.org_id == 9671){
-           if(this.currentRow.checker == 0){
-              this.$message.error("请先核对医嘱")
-              return
-           }
-        }
+        // if(this.org_id == 9671){
+        //    if(this.currentRow.checker == 0){
+        //       this.$message.error("请先核对医嘱")
+        //       return
+        //    }
+        // }
         this.execTimeDialogVisible = true
         if (this.current_select_object == 1) {
           var isExecution = true

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

@@ -211,9 +211,9 @@
 
                     <el-col :span="8" v-if="isShows('鱼精蛋白') && dialysisPrescription.anticoagulant ==10">
                         <el-form-item label="鱼精蛋白(mg/h)：">
-                            <el-input
+                            <el-input肝素
                                     v-model="dialysisPrescription.nucleoprotamine"
-                            ></el-input>
+                            ></el-input肝素>
                         </el-form-item>
                     </el-col>
 
@@ -225,12 +225,37 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="8" v-if="isShows('无肝素备注') && dialysisPrescription.anticoagulant ==1">
-                        <el-form-item label="无肝素备注：">
-                            <el-input
-                                    v-model="dialysisPrescription.no_heparin_remarks"
-                            ></el-input>
-                        </el-form-item>
+                    <el-col :span="8" v-if="isShows('追加肝素量')">
+                       <el-form-item v-if="dialysisPrescription.anticoagulant == 2" :label="'追加肝素量(mg) : '">
+                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.add_amount"></el-input>
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.add_amount"></el-input>
+                            </el-form-item>
+
+                            <el-form-item v-else :label="'追加肝素量(' + anticoagulant.shouji_unit + ') : '">
+                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.add_amount"></el-input>
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.add_amount"></el-input>
+                            </el-form-item>
+                    </el-col>
+
+                   
+                  <el-col :span="8" v-if="isShows('减肝素量')">
+                       <el-form-item v-if="dialysisPrescription.anticoagulant == 2" :label="'减肝素量(mg) : '">
+                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.reduce_amount" v-on:input="searchReduceAmount"></el-input>
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.reduce_amount" v-on:input="searchReduceAmount"></el-input>
+                            </el-form-item>
+
+                            <el-form-item v-else :label="'减肝素量(' + anticoagulant.shouji_unit + ') : '">
+                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.reduce_amount" v-on:input="searchReduceAmount"></el-input>
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.reduce_amount" v-on:input="searchReduceAmount"></el-input>
+                            </el-form-item>
                     </el-col>
 
                     <el-col :span="8" v-if="anticoagulant.shouji != -1 && isShows('首剂')">
@@ -272,7 +297,7 @@
                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
 
-
+ 
 
                           </div>
 
@@ -374,6 +399,8 @@
 
                     </el-col>
 
+
+
                     <el-col :span="8" v-if="anticoagulant.zongliang != -1 && isShows('总量')">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && 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.$store.getters.xt_user.template_info.org_id != 10432">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
@@ -1438,6 +1465,9 @@
           is_water:0,
           dry_water_hour:"",
           water_machine:"否",
+          add_amount:"",
+          reduce_amount:"",
+          
         },
 
         anticoagulant: {
@@ -1481,7 +1511,8 @@
         machineList:[
           {id:1,name:"是"},
           {id:2,name:"否"}
-        ]
+        ],
+        zongliang:""
       }
     },
     methods: {
@@ -2206,6 +2237,7 @@
         if (pre.id > 0) {
           this.dialysisPrescription.mode_id = pre.mode_id
           this.dialysisPrescription.water_machine = pre.water_machine
+          this.zongliang = this.dialysisPrescription.anticoagulant_zongliang
         }
         // console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
         // console.log('this.schedual', schedual.mode_id)
@@ -2267,7 +2299,8 @@
             this.dialysisPrescription.tubing_hemodialysis = last.tubing_hemodialysis
             this.dialysisPrescription.package = last.package
             this.dialysisPrescription.a_liquid = last.a_liquid
-          
+            this.zongliang = last.anticoagulant_zongliang
+            this.remark = last.remark
             weight_before = 0
 
           }
@@ -3468,6 +3501,8 @@
           } 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) {
                 // 长期处方不为空
@@ -3512,6 +3547,10 @@
                 this.dialysisPrescription.mode_id = id
               }
             }
+
+            if(response.data.data.dialysisPrescription!=null){
+               this.dialysisPrescription.remark =  response.data.data.dialysisPrescription.remark 
+            }
           }
 
           if (
@@ -3624,7 +3663,6 @@
         const res = new Map()
         return arr.filter((arr) => !res.has(arr.name) && res.set(arr.name, 1))
       },
-   
 
     },
 
@@ -3649,10 +3687,11 @@
         }
         duration = parseFloat(dialysis_duration_hour) + parseFloat(dialysis_duration_minute) / 60
 
-        this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(1, this.dialysisPrescription.anticoagulant_shouji, duration, this.dialysisPrescription.anticoagulant_weichi)
+        this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(1, this.dialysisPrescription.anticoagulant_shouji, duration, this.dialysisPrescription.anticoagulant_weichi,this.dialysisPrescription.add_amount,this.dialysisPrescription.reduce_amount)
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
+        this.zongliang =  this.dialysisPrescription.anticoagulant_zongliang
       },
       'dialysisPrescription.dialysis_duration_minute': function() {
         let dialysis_duration_minute = 0
@@ -3676,7 +3715,7 @@
           parseFloat(dialysis_duration_minute) / 60
 
         this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(1, this.dialysisPrescription.anticoagulant_shouji, duration,
-          this.dialysisPrescription.anticoagulant_weichi
+          this.dialysisPrescription.anticoagulant_weichi,this.dialysisPrescription.add_amount,this.dialysisPrescription.reduce_amount
         )
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
@@ -3707,17 +3746,20 @@
           1,
           this.dialysisPrescription.anticoagulant_shouji,
           duration,
-          this.dialysisPrescription.anticoagulant_weichi
+          this.dialysisPrescription.anticoagulant_weichi,
+          this.dialysisPrescription.add_amount,
+          this.dialysisPrescription.reduce_amount
         )
+        this.zongliang =  this.dialysisPrescription.anticoagulant_zongliang
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
-
+    
       if(this.$store.getters.xt_user.template_info.template_id == 41 && this.dialysisPrescription.anticoagulant == 2){
           this.dialysisPrescription.anticoagulant_zongliang = ""
           this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)
        }
-
+ 
       },
       'dialysisPrescription.anticoagulant_weichi': function() {
         let dialysis_duration_minute = 0
@@ -3739,16 +3781,20 @@
         }
         duration = parseFloat(dialysis_duration_hour) + parseFloat(dialysis_duration_minute) / 60
 
-        this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(1, this.dialysisPrescription.anticoagulant_shouji, duration, this.dialysisPrescription.anticoagulant_weichi)
+        this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(1, this.dialysisPrescription.anticoagulant_shouji, duration, this.dialysisPrescription.anticoagulant_weichi,this.dialysisPrescription.add_amount,this.dialysisPrescription.reduce_amount)
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
-
+         this.zongliang =  this.dialysisPrescription.anticoagulant_zongliang
         if(this.$store.getters.xt_user.template_info.template_id == 41 && this.dialysisPrescription.anticoagulant == 2){
          this.dialysisPrescription.anticoagulant_zongliang = ""
          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)
        }
+        this.zongliang =  this.dialysisPrescription.anticoagulant_zongliang
+     
       },
+   
+   
       'prescription.id': {
         immediate: true,
         deep: true,
@@ -4104,6 +4150,84 @@
           }
         }
       },
+      'dialysisPrescription.add_amount': function() {
+        let dialysis_duration_minute = 0
+        let dialysis_duration_hour = 0
+        let duration = 0
+        if (this.dialysisPrescription.dialysis_duration_minute == '') {
+          dialysis_duration_minute = 0
+        } else {
+          dialysis_duration_minute = this.dialysisPrescription
+            .dialysis_duration_minute
+        }
+        if (this.dialysisPrescription.dialysis_duration_hour == '') {
+          dialysis_duration_hour = 0
+        } else {
+          dialysis_duration_hour = this.dialysisPrescription
+            .dialysis_duration_hour
+        }
+        duration =
+          parseFloat(dialysis_duration_hour) +
+          parseFloat(dialysis_duration_minute) / 60
+
+        this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(
+          1,
+          this.dialysisPrescription.anticoagulant_shouji,
+          duration,
+          this.dialysisPrescription.anticoagulant_weichi,
+          this.dialysisPrescription.add_amount,
+          this.dialysisPrescription.reduce_amount
+        )
+        this.zongliang =  this.dialysisPrescription.anticoagulant_zongliang
+        if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
+          this.dialysisPrescription.anticoagulant_zongliang = ''
+        }
+    
+      if(this.$store.getters.xt_user.template_info.template_id == 41 && this.dialysisPrescription.anticoagulant == 2){
+          this.dialysisPrescription.anticoagulant_zongliang = ""
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)
+       }
+ 
+      },
+      'dialysisPrescription.reduce_amount': function() {
+        let dialysis_duration_minute = 0
+        let dialysis_duration_hour = 0
+        let duration = 0
+        if (this.dialysisPrescription.dialysis_duration_minute == '') {
+          dialysis_duration_minute = 0
+        } else {
+          dialysis_duration_minute = this.dialysisPrescription
+            .dialysis_duration_minute
+        }
+        if (this.dialysisPrescription.dialysis_duration_hour == '') {
+          dialysis_duration_hour = 0
+        } else {
+          dialysis_duration_hour = this.dialysisPrescription
+            .dialysis_duration_hour
+        }
+        duration =
+          parseFloat(dialysis_duration_hour) +
+          parseFloat(dialysis_duration_minute) / 60
+
+        this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(
+          1,
+          this.dialysisPrescription.anticoagulant_shouji,
+          duration,
+          this.dialysisPrescription.anticoagulant_weichi,
+          this.dialysisPrescription.add_amount,
+          this.dialysisPrescription.reduce_amount
+        )
+        this.zongliang =  this.dialysisPrescription.anticoagulant_zongliang
+        if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
+          this.dialysisPrescription.anticoagulant_zongliang = ''
+        }
+    
+      if(this.$store.getters.xt_user.template_info.template_id == 41 && this.dialysisPrescription.anticoagulant == 2){
+          this.dialysisPrescription.anticoagulant_zongliang = ""
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)
+       }
+ 
+      },
       stockType: function() {
         console.log('stockType', this.stockType)
         var arr = []

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

@@ -448,7 +448,8 @@
                 template_id == 48 ||
                 template_id == 53 ||
                 template_id == 54 ||
-                template_id == 56 
+                template_id == 56 ||
+                org_id ==10432
                )
             "
           >
@@ -473,7 +474,8 @@
               template_id != 48 &&
               template_id != 53 &&
               template_id != 54 &&
-              template_id != 56 
+              template_id != 56 &&
+              org_id !=10432
             "
           >
             <template slot-scope="scope">
@@ -1217,7 +1219,8 @@
               template_id != 48 &&
               template_id != 54 &&
               template_id != 56 &&
-              template_id != 53
+              template_id != 53 &&
+              org_id!=10432
             "
           >
             <el-form-item label="置换率(L/h)：">
@@ -1238,7 +1241,8 @@
                 template_id == 53 ||
                 template_id == 54 ||
                 template_id == 56 ||
-                template_id == 48)
+                template_id == 48 ||
+                org_id==10432)
             "
           >
             <el-form-item label="置换率(ml/min)：">

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -20,8 +20,8 @@
           <th v-if="isShow('超滤率') && template_id !=6 && 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" 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) " 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" 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) " 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" 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 == 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 )" width="92px"  > 置换量(ml)  </th>
           <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && 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)" width="92px" > 置换量(L) </th>

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -1009,11 +1009,6 @@ export default {
           )
         }
     },
-    handleSelectionChange(val){
-        // console.log('val',val)
-        this.selecting_schs = val;
-    },
-
     querySearchAsync(keyword, cb) {
         let key = '';
         if (keyword != undefined) {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1450,6 +1450,28 @@ export default {
             this.$refs.charge.hide()
             return false
           } else {
+            if(response.data.data.msg == 2){
+              var drug_name = response.data.data.drug.drug_name
+              var dose = response.data.data.drug.dose
+              var dose_unit = response.data.data.drug.dose_unit
+              var min_number = response.data.data.drug.min_number
+              var min_unit = response.data.data.drug.min_unit
+              var max_unit = response.data.data.drug.max_unit
+              var str = drug_name + " " + dose + dose_unit +"*" + min_number + min_unit + "/"+max_unit
+              this.$message.error(str + "库存不足,结算失败!")
+              this.loadingtwo = false
+              this.newLoading = false
+              return
+            }
+            if(response.data.data.msg == 3){
+              var good_name = response.data.data.good.good_name
+              var specification_name =  response.data.data.good.specification_name
+              var str = good_name + " " + specification_name
+              this.$message.error(str+"库存不足,结算失败!")
+              this.loadingtwo = false
+              this.newLoading = false
+              return
+            }
             this.$refs.charge.hide()
             this.radio = 2
             this.changeRadioAndPatient(2)
@@ -3019,8 +3041,7 @@ export default {
             }
             axios.get('http://127.0.0.1:9532/api/refund/post', {
               params: params
-            })
-                .then(function(response) {
+            }).then(function(response) {
                   if (response.data.state == 0) {
                     that.$message.error(response.data.msg)
                     that.loadingtwo = false