修改bug和需求

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -487,6 +487,8 @@
                                  :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '心衰')"></check-box>
                       <check-box text="腹痛"
                                  :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '腹痛')"></check-box>
+                      <check-box text="无"
+                                 :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '无')"></check-box>
                     </div>
                   </div>
                   <div class="row" style="padding: 2px 0;">

src/xt_pages/dialysis/batch_print/batch_print_order_five_two.vue

@@ -266,8 +266,8 @@
                   </div>
                   <div class="inline_block">
                     &emsp;实际超滤量:
-                    <div class="under_line" style="width:60px;text-align: left" v-if="record.prescription&&record.prescription.ultrafiltration">
-                      {{getFloat(record.prescription.ultrafiltration)}}
+                    <div class="under_line" style="width:60px;text-align: left" v-if="record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_ultrafiltration">
+                      {{getFloat(record.assessment_after_dislysis.actual_ultrafiltration)}}
                     </div>
                     <div class="under_line" style="width:60px;" v-else>
                       {{'/'}}

src/xt_pages/dialysis/batch_print/batch_print_order_four.vue

@@ -519,6 +519,8 @@
                                  :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '心衰')"></check-box>
                       <check-box text="腹痛"
                                  :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '腹痛')"></check-box>
+                      <check-box text="无"
+                                 :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '无')"></check-box>
                     </div>
                   </div>
                   <div class="row" style="padding: 2px 0;">

src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue

@@ -248,8 +248,8 @@
                     </div>
                     <div class="inline_block">
                       &emsp;实际超滤量:
-                      <div class="under_line" style="width:60px;text-align: left" v-if="record.prescription&&record.prescription.ultrafiltration">
-                        {{getFloat(record.prescription.ultrafiltration)}}
+                      <div class="under_line" style="width:60px;text-align: left" v-if="record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_ultrafiltration">
+                        {{getFloat(record.assessment_after_dislysis.actual_ultrafiltration)}}
                       </div>
                       <div class="under_line" style="width:60px;" v-else>
                         {{'/'}}

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -280,7 +280,7 @@
                                     <div class="under_line" style="width: 150px;text-align: center">
                                         {{record.prescription&&record.prescription.target_ultrafiltration?record.prescription.target_ultrafiltration:'/'}}
                                     </div>
-                                    L
+                                      ml
                                     </div>
                                 </div>
 

src/xt_pages/dialysis/batch_print/batch_print_order_three.vue

@@ -510,6 +510,8 @@
                                  :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '心衰')"></check-box>
                       <check-box text="腹痛"
                                  :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '腹痛')"></check-box>
+                      <check-box text="无"
+                                 :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '无')"></check-box>
                     </div>
                   </div>
 

src/xt_pages/dialysis/template/DialysisPrintOrderFour.vue

@@ -750,7 +750,8 @@
                                  showValue='心衰'></label-box>
                       <label-box :isChecked="afterdialysis.complications_index.indexOf('腹痛')>-1?true:false"
                                  showValue='腹痛'></label-box>
-
+                      <label-box :isChecked="afterdialysis.complications_index.indexOf('无')>-1?true:false"
+                                 showValue='无'></label-box>
                     </td>
                     <td></td>
                   </tr>

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -691,6 +691,8 @@
                                  showValue='心衰'></label-box>
                       <label-box :isChecked="afterdialysis.complications_index.indexOf('腹痛')>-1?true:false"
                                  showValue='腹痛'></label-box>
+                      <label-box :isChecked="afterdialysis.complications_index.indexOf('无')>-1?true:false"
+                                 showValue='无'></label-box>
 
                     </td>
                     <td></td>
@@ -1048,7 +1050,7 @@
           DeviceNumber: []
         },
         operatorMaps: {},
-        complications: ['低血压', '高血压', '心律失常', '头晕', '头痛', '呕吐', '抽搐', '出血', '心衰', '腹痛'],
+        complications: ['低血压', '高血压', '心律失常', '头晕', '头痛', '呕吐', '抽搐', '出血', '心衰', '腹痛','无'],
         jilurow: 0,
         advice_jilurow: 0,
         loading: false,

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -265,7 +265,7 @@
                     <div class="under_line" style="width: 150px;text-align: center">
                       {{prescription.target_ultrafiltration?prescription.target_ultrafiltration:'/'}}
                     </div>
-                    L
+                    ml
                   </div>
                 </div>
 
@@ -1308,7 +1308,7 @@
               }
             }
           }
-          
+
           this.totollength = this.doctor_advices.length + this.monitors.length
           if (this.totollength > 18) {
             var temp_advice_length = 17 - this.monitors.length;
@@ -1324,7 +1324,7 @@
             }
             this.doctor_advices = doctor_advices_1
             this.doctor_advices_2 = doctor_advices_2
-          } 
+          }
           console.log(this.advice_groups)
         } else {
           this.loading = false

src/xt_pages/dialysis/template/DialysisPrintOrderThree.vue

@@ -725,7 +725,8 @@
                                  showValue='心衰'></label-box>
                       <label-box :isChecked="afterdialysis.complications_index.indexOf('腹痛')>-1?true:false"
                                  showValue='腹痛'></label-box>
-
+                      <label-box :isChecked="afterdialysis.complications_index.indexOf('无')>-1?true:false"
+                                 showValue='无'></label-box>
                     </td>
                     <td></td>
                   </tr>

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -820,8 +820,8 @@
               </div>
               <div class="inline_block">
                 &emsp;实际超滤量：
-                <div class="under_line" style="width: 70px;text-align: left" v-if="getFloat(prescription.ultrafiltration)">
-                  {{getFloat(prescription.ultrafiltration)}}
+                <div class="under_line" style="width: 70px;text-align: left" v-if="getFloat(afterdialysis.actual_ultrafiltration)">
+                  {{getFloat(afterdialysis.actual_ultrafiltration)}}
                 </div>
                 <div class="under_line" style="width: 70px;" v-else>
                   {{'/'}}

src/xt_pages/user/dialysisSolution.vue

@@ -144,7 +144,6 @@
 
           <el-col :span="8" v-if="isShows('透析时长')">
             <el-form-item label="透析时长（h）:" prop="dialysis_duration">
-              <!-- <el-input v-model="addPlan.dialysis_duration"></el-input> -->
               <el-time-picker
                 v-model="dialysisTimeShow"
                 :picker-options="{
@@ -691,52 +690,27 @@
       }
     },
     watch: {
-      'addPlan.anticoagulant_shouji': function() {
-
-        if (this.addPlan.anticoagulant_shouji == '' && this.addPlan.anticoagulant_weichi == '') {
-          this.addPlan.anticoagulant_zongliang = parseInt(0) + parseInt(0)
-        } else if (this.addPlan.anticoagulant_shouji != '' && this.addPlan.anticoagulant_weichi != '') {
-          this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
-        } else if (this.addPlan.anticoagulant_shouji != '' && this.addPlan.anticoagulant_shouji == '') {
-          this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(0)
-        } else if (this.addPlan.anticoagulant_shouji == '' && this.addPlan.anticoagulant_shouji != '') {
-          this.addPlan.anticoagulant_zongliang = parseInt(0) + parseInt(this.addPlan.anticoagulant_shouji)
-
-        }
-        // if(this.addPlan.anticoagulant_zongliang  === NaN){
-        //   console.log("222222")
-        //
-        //   this.addPlan.anticoagulant_zongliang = ''
-        // }
-        if(isNaN(this.addPlan.anticoagulant_zongliang)){
-          this.addPlan.anticoagulant_zongliang = ''
-
-        }
-
+      "addPlan.dialysis_duration":function(){
+        this.addPlan.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+          this.addPlan.anticoagulant_shouji,
+          this.addPlan.dialysis_duration,
+          this.addPlan.anticoagulant_weichi
+        );
       },
-      'addPlan.anticoagulant_weichi': function() {
-        if (this.addPlan.anticoagulant_shouji == '' && this.addPlan.anticoagulant_weichi == '') {
-          this.addPlan.anticoagulant_zongliang = parseInt(0) + parseInt(0)
-        } else if (this.addPlan.anticoagulant_shouji != '' && this.addPlan.anticoagulant_weichi != '') {
-          this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
-        } else if (this.addPlan.anticoagulant_shouji != '' && this.addPlan.anticoagulant_shouji == '') {
-          this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(0)
-        } else if (this.addPlan.anticoagulant_shouji == '' && this.addPlan.anticoagulant_shouji != '') {
-          this.addPlan.anticoagulant_zongliang = parseInt(0) + parseInt(this.addPlan.anticoagulant_shouji)
-        }
-
-        if(isNaN(this.addPlan.anticoagulant_zongliang)){
-          this.addPlan.anticoagulant_zongliang = ''
-
-        }
-
-        // console.log(this.addPlan.anticoagulant_zongliang)
-
-        // if(this.addPlan.anticoagulant_zongliang  === NaN){
-        // }
-
+      "addPlan.anticoagulant_shouji":function(){
+        this.addPlan.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+          this.addPlan.anticoagulant_shouji,
+          this.addPlan.dialysis_duration,
+          this.addPlan.anticoagulant_weichi
+        );
       },
-
+      "addPlan.anticoagulant_weichi":function(){
+        this.addPlan.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+          this.addPlan.anticoagulant_shouji,
+          this.addPlan.dialysis_duration,
+          this.addPlan.anticoagulant_weichi
+        );
+      }
     },
     components: {
       tableTitle, PatientSidebar
@@ -754,7 +728,7 @@
 
       selectnDialysisTime(val) {
         var valTime = val.split(':')
-        this.addPlan.dialysis_duration = valTime[0] + '.' + valTime[1]
+        this.addPlan.dialysis_duration = parseFloat(valTime[0]) + parseFloat((valTime[1] / 60).toFixed(2))
         this.addPlan.dialysis_duration_hour = valTime[0]
         this.addPlan.dialysis_duration_minute = valTime[1]
       },

src/xt_pages/workforce/components/tableData.vue

@@ -14,7 +14,7 @@
 
         <el-table-column label="姓名" width="120">
           <template slot-scope="scope">
-            {{ scope.row.patient}}
+            {{scope.row.patient}}
           </template>
         </el-table-column>
         <el-table-column label="透析日期" width="200">
@@ -1078,7 +1078,7 @@
                     zone_device_map[device_number.zone.name].push(device_number)
                   }
                   this.zone_device_map = zone_device_map
-  
+
                   this.zone_names = Object.keys(this.zone_device_map)
                   if (this.zone_names.length > 0) {
                     this.zone_name = this.zone_names[0]