Browse Source

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

陈少旭 2 days ago
parent
commit
fac9dc7d65

+ 4 - 3
src/xt_pages/user/components/PatientSidebar.vue View File

187
               name: '1-11',
187
               name: '1-11',
188
               label: '首次病程记录'
188
               label: '首次病程记录'
189
             },
189
             },
190
+            // {
191
+            //   name: '1-2',
192
+            //   label: '病程记录'
193
+            // }, 
190
             {
194
             {
191
-              name: '1-2',
192
-              label: '病程记录'
193
-            }, {
194
               name: '1-5',
195
               name: '1-5',
195
               label: '抢救记录'
196
               label: '抢救记录'
196
             }, {
197
             }, {

+ 11 - 3
src/xt_pages/user/courseOfDisease_new.vue View File

364
           <el-button type="primary" @click="toMonitorPint">应用</el-button>
364
           <el-button type="primary" @click="toMonitorPint">应用</el-button>
365
           <!-- <el-button type="danger" @click="template_dele">删除模板</el-button>
365
           <!-- <el-button type="danger" @click="template_dele">删除模板</el-button>
366
           <el-button type="primary" @click="template_save">保存模板</el-button> -->
366
           <el-button type="primary" @click="template_save">保存模板</el-button> -->
367
-          <el-button type="primary" @click="toContentPint(2)">应用</el-button>
367
+          <!-- <el-button type="primary" @click="toContentPint(2)">应用</el-button> -->
368
           <el-button @click="blood_dialog = false">取消</el-button>
368
           <el-button @click="blood_dialog = false">取消</el-button>
369
         </span>
369
         </span>
370
       </el-dialog>
370
       </el-dialog>
2432
             total_length = this.monitorList.length
2432
             total_length = this.monitorList.length
2433
           }
2433
           }
2434
         }
2434
         }
2435
-        pingjun_blood_flow_volume = (blood_flow_volume_total/total_length).toFixed(2)
2435
+        pingjun_blood_flow_volume =  (blood_flow_volume_total/total_length).toFixed(2)
2436
+        if(pingjun_blood_flow_volume=="NaN"){
2437
+          pingjun_blood_flow_volume = ""
2438
+        }
2436
         pingjun_ultrafiltration_volume_total = (ultrafiltration_volume_total/total_length).toFixed(2)
2439
         pingjun_ultrafiltration_volume_total = (ultrafiltration_volume_total/total_length).toFixed(2)
2440
+        if(pingjun_ultrafiltration_volume_total=="NaN"){
2441
+          pingjun_ultrafiltration_volume_total = ""
2442
+        }
2437
         pingjun_ultrafiltration_rate_total = (ultrafiltration_rate_total/total_length).toFixed(2)
2443
         pingjun_ultrafiltration_rate_total = (ultrafiltration_rate_total/total_length).toFixed(2)
2438
-
2444
+        if(pingjun_ultrafiltration_rate_total == "NaN"){ 
2445
+          pingjun_ultrafiltration_rate_total = ""
2446
+        }
2439
         var dry_weight_str = ""
2447
         var dry_weight_str = ""
2440
         //干体重
2448
         //干体重
2441
         if(this.dryweightList!=null && this.dryweightList.length>0){
2449
         if(this.dryweightList!=null && this.dryweightList.length>0){