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

src/xt_pages/user/components/PatientSidebar.vue

@@ -187,10 +187,11 @@ export default {
               name: '1-11',
               label: '首次病程记录'
             },
+            // {
+            //   name: '1-2',
+            //   label: '病程记录'
+            // }, 
             {
-              name: '1-2',
-              label: '病程记录'
-            }, {
               name: '1-5',
               label: '抢救记录'
             }, {

src/xt_pages/user/courseOfDisease_new.vue

@@ -364,7 +364,7 @@
           <el-button type="primary" @click="toMonitorPint">应用</el-button>
           <!-- <el-button type="danger" @click="template_dele">删除模板</el-button>
           <el-button type="primary" @click="template_save">保存模板</el-button> -->
-          <el-button type="primary" @click="toContentPint(2)">应用</el-button>
+          <!-- <el-button type="primary" @click="toContentPint(2)">应用</el-button> -->
           <el-button @click="blood_dialog = false">取消</el-button>
         </span>
       </el-dialog>
@@ -2432,10 +2432,18 @@
             total_length = this.monitorList.length
           }
         }
-        pingjun_blood_flow_volume = (blood_flow_volume_total/total_length).toFixed(2)
+        pingjun_blood_flow_volume =  (blood_flow_volume_total/total_length).toFixed(2)
+        if(pingjun_blood_flow_volume=="NaN"){
+          pingjun_blood_flow_volume = ""
+        }
         pingjun_ultrafiltration_volume_total = (ultrafiltration_volume_total/total_length).toFixed(2)
+        if(pingjun_ultrafiltration_volume_total=="NaN"){
+          pingjun_ultrafiltration_volume_total = ""
+        }
         pingjun_ultrafiltration_rate_total = (ultrafiltration_rate_total/total_length).toFixed(2)
-
+        if(pingjun_ultrafiltration_rate_total == "NaN"){ 
+          pingjun_ultrafiltration_rate_total = ""
+        }
         var dry_weight_str = ""
         //干体重
         if(this.dryweightList!=null && this.dryweightList.length>0){