Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -7,15 +7,36 @@
           <label>透析模式 : </label>
           <span class="content">{{dialysis_mode}}</span>
         </li>
+
+        <li v-if="isShow('置换量')">
+          <label>置换量 : </label>
+          <span class="content">{{replacement_total != '0'?replacement_total:""}}</span>
+          <span class="unit">{{replacement_total != '0'?"L":""}}</span>
+        </li>
+
+        <li v-if="isShow('透析液配方')">
+          <label>透析液配方 : </label>
+          <span class="content">{{dialysate_formulation}}</span>
+        </li>
+
+
+        <li v-if="isShow('透析液温度')">
+          <label>透析液温度 : </label>
+          <span class="content">{{dialysate_temperature != '0'?dialysate_temperature:""}}</span>
+          <span class="unit">{{dialysate_temperature != '0'?"℃":""}}</span>
+        </li>
+
         <li v-if="isShow('抗凝剂')">
           <label>抗凝剂 : </label>
           <span class="content">{{anticoagulant}}</span>
         </li>
+
+
+
         <li v-if="isShow('总量')&&getValueStr('anticoagulant','anticoagulant') != 5">
           <label>总量: </label>
           <span class="content" v-if="getValueStr('anticoagulant','anticoagulant') != 1">{{anticoagulant_zongliang != '0'?anticoagulant_zongliang:""}}</span>
           <span class="content" v-if="getValueStr('anticoagulant','anticoagulant') == 1"></span>
-
           <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 2">{{anticoagulant_zongliang != '0'?"iu":""}}</span>
           <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 3">{{anticoagulant_zongliang != '0'?"iu":""}}</span>
           <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 1">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
@@ -23,15 +44,18 @@
           <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{anticoagulant_zongliang != '0'?"ml":""}}</span>
         </li>
 
-        <li v-if="isShow('目标超滤量')">
-          <label>目标超滤量 : </label>
-          <span class="content">{{target_ultrafiltration != '0'?target_ultrafiltration:''}}</span>
-          <span class="unit">{{target_ultrafiltration != '0'?"L":''}}</span>
+        <li v-if="isShow('透析器/灌流器')">
+          <label>透析器/灌流器 : </label>
+          <span class="content">{{dialyzer_perfusion_apparatus}}</span>
+          <span class="unit"></span>
         </li>
 
 
-
-
+        <li v-if="isShow('透析前使用特殊药物')">
+          <label>透析前使用特殊药物: </label>
+          <span class="content">{{special_medicine}}</span>
+          <span class="unit"></span>
+        </li>
 
 
 
@@ -45,48 +69,41 @@
         </li>
 
 
-        <li v-if="isShow('钠')">
-          <label>钠 : </label>
-          <span class="content">{{sodium != '0'?sodium:""}}</span>
-          <span class="unit">{{sodium != '0'?"mmol/L":""}}</span>
-        </li>
 
-        <li v-if="isShow('体液过多症状')">
-          <label>体液过多症状 : </label>
-          <span class="content">{{body_fluid}}</span>
-          <span class="unit"></span>
-        </li>
 
 
 
-        <li v-if="isShow('置换量')">
-          <label>置换量 : </label>
-          <span class="content">{{replacement_total != '0'?replacement_total:""}}</span>
-          <span class="unit">{{replacement_total != '0'?"L":""}}</span>
-        </li>
 
 
-        <li v-if="isShow('透析前使用其他特殊药物')">
-          <label>透析前使用其他特殊药物: </label>
-          <span class="content">{{special_medicine_other}}</span>
-          <span class="unit"></span>
-        </li>
 
+      </ul>
+
+
+      <ul>
+        <li v-if="isShow('目标超滤量')">
+          <label>目标超滤量 : </label>
+          <span class="content">{{target_ultrafiltration != '0'?target_ultrafiltration:''}}</span>
+          <span class="unit">{{target_ultrafiltration != '0'?"L":''}}</span>
+        </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>
           <span class="content">{{glucose != '0'?glucose:""}}</span>
           <span class="unit">{{glucose != '0'?"mmol/l":""}}</span>
         </li>
 
-
-      </ul>
+        <li v-if="isShow('钾')">
+          <label>钾 : </label>
+          <span class="content">{{kalium != '0'?kalium:""}}</span>
+          <span class="unit">{{kalium != '0'?"mmol/L":""}}</span>
+        </li>
 
 
-      <ul>
-        <li v-if="isShow('透析时长')">
-          <label>透析时长 : </label>
-          <span class="content">{{dialysis_duration != '0'?dialysis_duration:""}}</span>
+        <li v-if="isShow('血流量')">
+          <label>血流量 : </label>
+          <span class="content">{{blood_flow_volume != '0'?blood_flow_volume:''}}</span>
+          <span class="unit">{{blood_flow_volume != '0'?"ml/min":''}}</span>
         </li>
+
         <li v-if="isShow('首剂')&&getValueStr('anticoagulant','anticoagulant') != 5">
           <label>首剂 : </label>
           <span class="content" v-if="getValueStr('anticoagulant','anticoagulant') != 1">{{anticoagulant_shouji != '0'?anticoagulant_shouji:''}}</span>
@@ -97,41 +114,40 @@
           <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 4">{{anticoagulant_shouji != '0'?"mg":""}}</span>
           <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{anticoagulant_shouji != '0'?"mg":""}}</span>
         </li>
+        <li v-if="isShow('钠')">
+          <label>钠 : </label>
+          <span class="content">{{sodium != '0'?sodium:""}}</span>
+          <span class="unit">{{sodium != '0'?"mmol/L":""}}</span>
+        </li>
+
+        <li v-if="isShow('体液过多症状')">
+          <label>体液过多症状 : </label>
+          <span class="content">{{body_fluid}}</span>
+          <span class="unit"></span>
+        </li>
 
 
-        <li v-if="isShow('透析液温度')">
-          <label>透析液温度 : </label>
-          <span class="content">{{dialysate_temperature != '0'?dialysate_temperature:""}}</span>
-          <span class="unit">{{dialysate_temperature != '0'?"℃":""}}</span>
+
+        <li v-if="isShow('透析前使用其他特殊药物')">
+          <label>透析前使用其他特殊药物: </label>
+          <span class="content">{{special_medicine_other}}</span>
+          <span class="unit"></span>
         </li>
 
 
 
 
+
+
+
         <li v-if="isShow('钙名称')&&getValueStr('anticoagulant','anticoagulant') == 5">
           <label>钙名称: </label>
           <span class="content">{{getValueStr('anticoagulant_gaimingcheng','anticoagulant_gaimingcheng')}}</span>
         </li>
 
-        <li v-if="isShow('钾')">
-          <label>钾 : </label>
-          <span class="content">{{kalium != '0'?kalium:""}}</span>
-          <span class="unit">{{kalium != '0'?"mmol/L":""}}</span>
-        </li>
 
 
 
-        <li v-if="isShow('碳酸氢盐')">
-          <label>碳酸氢盐 : </label>
-          <span class="content">{{bicarbonate != '0'?bicarbonate:""}}</span>
-          <span class="unit">{{bicarbonate != '0'?"mmol/L":""}}</span>
-        </li>
-
-        <li v-if="isShow('体液过多其他症状')">
-          <label>体液过多其他症状 : </label>
-          <span class="content">{{body_fluid_other}}</span>
-          <span class="unit"></span>
-        </li>
 
 
 
@@ -143,26 +159,35 @@
           <span class="unit">{{blood_flow_volume != '0'?"ml/min":''}}</span>
         </li>
 
-        <li v-if="isShow('透析液配方')">
-          <label>透析液配方 : </label>
-          <span class="content">{{dialysate_formulation}}</span>
+
+
+      </ul>
+      <ul>
+        <li v-if="isShow('钙')">
+          <label>钙: </label>
+          <span class="content">{{calcium != '0'?calcium:""}}</span>
+          <span class="unit">{{calcium != '0'?"mmol/L":""}}</span>
+        </li>
+
+        <li v-if="isShow('透析时长')">
+          <label>透析时长 : </label>
+          <span class="content">{{dialysis_duration != '0'?dialysis_duration:""}}</span>
         </li>
 
 
-          <li v-if="isShow('透析液流量')">
+
+        <li v-if="isShow('碳酸氢盐')">
+          <label>碳酸氢盐 : </label>
+          <span class="content">{{bicarbonate != '0'?bicarbonate:""}}</span>
+          <span class="unit">{{bicarbonate != '0'?"mmol/L":""}}</span>
+        </li>
+
+        <li v-if="isShow('透析液流量')">
           <label>透析液流量 : </label>
           <span class="content">{{dialysate_flow != '0'?dialysate_flow:""}}</span>
           <span class="unit">{{dialysate_flow != '0'?"ml/min":""}}</span>
         </li>
 
-      </ul>
-      <ul>
-
-        <li v-if="isShow('透析器/灌流器')">
-          <label>透析器/灌流器 : </label>
-          <span class="content">{{dialyzer_perfusion_apparatus}}</span>
-          <span class="unit"></span>
-        </li>
         <li v-if="isShow('维持')&&getValueStr('anticoagulant','anticoagulant') != 5">
           <label>维持 : </label>
           <span class="content" v-if="getValueStr('anticoagulant','anticoagulant') != 1">{{anticoagulant_weichi != '0'?anticoagulant_weichi:""}}</span>
@@ -173,6 +198,22 @@
           <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 4">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
           <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{anticoagulant_weichi != '0'?"ml/h":""}}</span>
         </li>
+
+
+
+        <li v-if="isShow('体液过多其他症状')">
+          <label>体液过多其他症状 : </label>
+          <span class="content">{{body_fluid_other}}</span>
+          <span class="unit"></span>
+        </li>
+
+
+
+
+
+
+
+
         <li v-if="isShow('实际超滤量')">
           <label>实际超滤量: </label>
           <span class="content">{{ultrafiltration != '0'? ultrafiltration:''}}</span>
@@ -180,11 +221,6 @@
         </li>
 
 
-        <li v-if="isShow('钙')">
-          <label>钙: </label>
-          <span class="content">{{calcium != '0'?calcium:""}}</span>
-          <span class="unit">{{calcium != '0'?"mmol/L":""}}</span>
-        </li>
 
         <li v-if="isShow('电导度')">
           <label>电导度 : </label>
@@ -202,12 +238,6 @@
         </li>
 
 
-        <li v-if="isShow('透析前使用特殊药物')">
-          <label>透析前使用特殊药物: </label>
-          <span class="content">{{special_medicine}}</span>
-          <span class="unit"></span>
-        </li>
-
 
         <li v-if="isShow('血管通路')">
           <label>血管通路: </label>

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

@@ -93,7 +93,8 @@
                          v-else>
           <template slot-scope="scope">
             <span v-if="scope.row.parent_id == 0 " class="el-dropdown-link">{{getAdviceContent(scope.row,1)}}</span>
-            <span v-if="scope.row.parent_id > 0 " class="el-dropdown-link">&emsp;{{getAdviceContent(scope.row,2)}}</span>
+            <span v-if="scope.row.parent_id > 0 "
+                  class="el-dropdown-link">&emsp;{{getAdviceContent(scope.row,2)}}</span>
           </template>
         </el-table-column>
 
@@ -122,32 +123,31 @@
       <!-- 医嘱表单 -->
       <el-form ref="form" :model="form" label-width="100px" v-show="showAdviceForm">
         <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="医嘱类型：">
-              <el-input value="临时" disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="医嘱时间：">
-              <el-input v-model="form.advice_date" readonly></el-input>
-              <!-- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker> -->
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="8">-->
+          <!--<el-form-item label="医嘱类型：">-->
+          <!--<el-input value="临时" disabled></el-input>-->
+          <!--</el-form-item>-->
+          <!--</el-col>-->
+          <!--<el-col :span="8">-->
+          <!--<el-form-item label="医嘱时间：">-->
+          <!--<el-input v-model="form.advice_date" readonly></el-input>-->
+          <!--&lt;!&ndash; <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker> &ndash;&gt;-->
+          <!--</el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="8">
             <el-form-item label="开始时间：">
-              <el-date-picker format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" type="datetime"
+              <el-date-picker format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" type="datetime" :disabled="form.parent_id==0?false:true"
                               placeholder="选择日期" v-model="form.start_time" style="width: 100%;"></el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
 
-        <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="医嘱名称：">
               <el-input v-model="form.advice_name"></el-input>
 
             </el-form-item>
           </el-col>
+
           <el-col :span="8">
             <el-form-item label="药品规格：">
               <el-input v-model="form.advice_desc" style="width: 40%;"></el-input>
@@ -156,10 +156,11 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <!-- <el-form-item label="医嘱内容：">
-                <el-input v-model="form.advice_desc"></el-input>
-            </el-form-item> -->
           </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+
 
           <el-col :span="8">
             <el-form-item label="开药数量：">
@@ -172,11 +173,6 @@
             </el-form-item>
           </el-col>
 
-
-
-        </el-row>
-
-        <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="单次用量：">
               <el-input v-model="form.single_dose" style="width: 40%;"></el-input>
@@ -189,6 +185,7 @@
             </el-form-item>
           </el-col>
 
+
           <el-col :span="8">
             <el-form-item label="给药途径：">
               <el-select v-model="form.delivery_way" :disabled="form.parent_id==0?false:true" filterable
@@ -198,6 +195,13 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+
+        </el-row>
+
+        <el-row :gutter="20">
+
+
           <el-col :span="8">
             <el-form-item label="执行频率：">
               <el-select v-model="form.execution_frequency" :disabled="form.parent_id==0?false:true" filterable
@@ -1329,14 +1333,12 @@
           }
         }
 
-        if(row.advice_desc){
+        if (row.advice_desc) {
           tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')'
         }
 
-
         if (isChild == 1) { // 不是子药
 
-
           return row.advice_name + tempDrugSpecDesc + ' ' + tempPrescribingNumberDesc + tempSingleDoseDesc + ' ' + row.delivery_way + ' ' + row.execution_frequency
         } else { // 是子药
           return row.advice_name + tempDrugSpecDesc + ' ' + tempPrescribingNumberDesc + tempSingleDoseDesc

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -446,6 +446,8 @@
         </el-button>
       </div>
     </el-dialog>
+
+
   </div>
 </template>
 

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -5,12 +5,12 @@
 
 
         <el-row>
-          <el-col :span="12">
+          <el-col :span="12" >
             <el-form-item label="医嘱类型 :" required prop="advice_type">
               <el-input value="临时" disabled></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" >
             <el-form-item label="开始时间 :" required prop="start_time">
               <el-date-picker
                 type="datetime"

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

@@ -148,11 +148,7 @@
 
 
 
-          <el-col :span="8" v-if="isShows('透析器/灌流器')">
-            <el-form-item label="透析器/灌流器：">
-              <el-input v-model="dialysisPrescription.dialyzer_perfusion_apparatus"></el-input>
-            </el-form-item>
-          </el-col>
+
 
           <el-col :span="8" v-if="isShows('碳酸氢盐')">
             <el-form-item label="碳酸氢盐(mmol/L)：">
@@ -165,6 +161,11 @@
               <el-input type="number" v-model="dialysisPrescription.glucose"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8" v-if="isShows('透析液流量')">
+            <el-form-item label="透析液流量(ml/min)：">
+              <el-input type="number" v-model="dialysisPrescription.dialysate_flow"></el-input>
+            </el-form-item>
+          </el-col>
 
           <el-col :span="8" v-if="isShows('透析液温度')">
             <el-form-item label="透析液温度(°C)：">
@@ -172,19 +173,21 @@
             </el-form-item>
           </el-col>
 
-          <!-- </el-row>
 
-          <el-row :gutter="20"> -->
-          <el-col :span="8" v-if="isShows('透析液流量')">
-            <el-form-item label="透析液流量(ml/min)：">
-              <el-input type="number" v-model="dialysisPrescription.dialysate_flow"></el-input>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="8" v-if="isShows('电导度')">
             <el-form-item label="电导度(mS/m)： ">
               <el-input type="number" v-model="dialysisPrescription.conductivity"></el-input>
             </el-form-item>
           </el-col>
+
+          <el-col :span="8" v-if="isShows('透析器/灌流器')">
+            <el-form-item label="透析器/灌流器：">
+              <el-input v-model="dialysisPrescription.dialyzer_perfusion_apparatus"></el-input>
+            </el-form-item>
+          </el-col>
+
+
           <el-col :span="8" v-if="isShows('体液过多症状')">
             <el-form-item label="体液过多症状：">
               <el-select v-model="dialysisPrescription.body_fluid" placeholder="请选择" style="width:100%;"
@@ -224,16 +227,17 @@
 
 
           <el-col :span="8" v-if="isShows('透析前使用其他特殊药物')">
-            <el-form-item label="使用其他特殊药物">
+            <el-form-item label="透析前使用其他特殊药物">
               <el-input v-model="dialysisPrescription.special_medicine_other"></el-input>
             </el-form-item>
           </el-col>
 
+
           <!-- </el-row>
 
           <el-row :gutter="20" > -->
           <el-col :span="8">
-            <el-form-item label="置换液：" v-if="isShows('置换液')&&this.$store.getters.xt_user.template_info.template_id != 6"
+            <el-form-item label="置换液：" v-if="isShows('置换液')"
                           v-show="huShow">
               <el-select v-model="dialysisPrescription.displace_liqui_part" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
@@ -241,17 +245,6 @@
                            :label="option.name" :value="option.id"></el-option>
               </el-select>
             </el-form-item>
-
-
-            <el-form-item label="置换方式："
-                          v-if="isShows('置换液')&&this.$store.getters.xt_user.template_info.template_id == 6">
-              <el-select v-model="dialysisPrescription.displace_liqui_part" placeholder="请选择">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-                <el-option v-for="(option, index) in displace_liqui_part_option" :key="index+1"
-                           :label="option.name" :value="option.id"></el-option>
-              </el-select>
-            </el-form-item>
-
           </el-col>
 
           <el-col :span="8" v-if="isShows('置换液总量')" v-show="totalShow">
@@ -261,6 +254,12 @@
           </el-col>
 
 
+          <el-col :span="8" v-if="isShows('目标KT/V')">
+            <el-form-item label="目标KT/V">
+              <el-input v-model="dialysisPrescription.target_ktv"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShows('血管通路')">
             <el-form-item label="血管通路：">
               <el-select v-model="dialysisPrescription.blood_access" placeholder="请选择">
@@ -281,12 +280,6 @@
           </el-col>
 
 
-          <el-col :span="8" v-if="isShows('目标KT/V')">
-            <el-form-item label="目标KT/V">
-              <el-input v-model="dialysisPrescription.target_ktv"></el-input>
-            </el-form-item>
-          </el-col>
-
 
           <!--透析耗材-->
           <el-col :span="8" v-if="isShows('血液透析干粉')&&config.is_open == 1">
@@ -537,7 +530,7 @@
       </div>
       <div class="newLine">
         <span>上次透后体重(kg)</span>
-        <span>{{last_record?last_record.weight_after:''}}</span>
+        <span>{{getLastAfterWeight(last_record)}}</span>
       </div>
 
       <span slot="footer" class="dialog-footer">
@@ -874,6 +867,19 @@
       }
     },
     methods: {
+      getLastAfterWeight(record){
+        if(record != null&& record.id > 0){
+          if(record.weight_after > 0) {
+            let additional_weight = 0
+            if(this.predialysis.additional_weight != undefined){
+              additional_weight = this.predialysis.additional_weight
+            }
+            return parseFloat(record.weight_after - additional_weight).toFixed(1);
+          }else{
+            return ''
+          }
+        }
+      },
       getBeforeWeight(predialysis){
         if(predialysis.id > 0){
           if(predialysis.weight_before > 0) {
@@ -1209,6 +1215,21 @@
         }
         this.anticoagulant = this.anticoagulantsConfit[thismode]
       }, handleCommit: function() {
+        if(this.dialysisPrescription.anticoagulant == 1){
+          this.dialysisPrescription.anticoagulant_weichi = '0'
+          this.dialysisPrescription.anticoagulant_shouji = '0'
+          this.dialysisPrescription.anticoagulant_zongliang = '0'
+        }
+        if (this.$store.getters.xt_user.template_info.template_id == 6) {
+          if (this.dialysisPrescription.mode_id == 2) {
+            if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.displace_liqui_value == 0 || this.dialysisPrescription.displace_liqui_value == '') {
+              this.$message.error('HDF模式下置换液和置换液总量不能为空!')
+              return
+            }
+          }
+        }
+
+
         this.is_pre = 1
         if (this.prescription.id == 0) {
           if (this.is_open == 0) {
@@ -1562,8 +1583,21 @@
       }, handleCancle: function() {
         this.hide()
       }, handleSolution: function() {
-        this.is_pre = 2
+        if(this.dialysisPrescription.anticoagulant == 1){
+          this.dialysisPrescription.anticoagulant_weichi = '0'
+          this.dialysisPrescription.anticoagulant_shouji = '0'
+          this.dialysisPrescription.anticoagulant_zongliang = '0'
+        }
+        if (this.$store.getters.xt_user.template_info.template_id == 6) {
+          if (this.dialysisPrescription.mode_id == 2) {
+            if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.displace_liqui_value == 0 || this.dialysisPrescription.displace_liqui_value == '') {
+              this.$message.error('HDF模式下置换液和置换液总量不能为空!')
+              return
+            }
+          }
+        }
 
+        this.is_pre = 2
         if (this.prescription.id == 0) {
           if (this.is_open == 0) {
             if (this.patient.id <= 0) {

src/xt_pages/user/dialysisRecord.vue

@@ -138,6 +138,9 @@
             align="center"
             label="透析时长(h)"
           >
+            <template slot-scope="scope">
+              <span>{{getTime(scope.row.assessment_after_dislysis)}}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="predialysis_evaluation.dry_weight"
@@ -247,7 +250,7 @@
           >
             <template slot-scope="scope"
               ><span>{{
-                getDoctorName(scope.row.prescription.creater)
+               scope.row.prescription.role.user_name
               }}</span></template
             >
           </el-table-column>
@@ -389,6 +392,15 @@ export default {
     PatientSidebar
   },
   methods: {
+    getTime(record){
+      if(record != null&&record.id > 0) {
+        let actual_treatment_hour = 0
+        let actual_treatment_minute = 0
+        actual_treatment_hour = parseFloat(record.actual_treatment_hour)
+        actual_treatment_minute = parseFloat(record.actual_treatment_minute) / 60
+        return (actual_treatment_hour + actual_treatment_minute).toFixed(2)
+      }
+    },
     changeSearch() {
       this.getPatientDialysisRecords();
     },
@@ -419,12 +431,6 @@ export default {
             response.data.data.nursers == null
               ? []
               : response.data.data.nursers;
-
-          console.log(response.data.data)
-
-
-
-
         }
       });
     },

src/xt_pages/workforce/components/tableWeeks.vue

@@ -75,13 +75,12 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column label="低分子肝素" min-width="100" align="center">
+      <el-table-column label="总量" min-width="100" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.prescription.anticoagulant == 1">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'mg':''}}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 2">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'mg':''}}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 3">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'IU':''}}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 2">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'iu':''}}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 3">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'iu':''}}</span>
           <span v-if="scope.row.prescription.anticoagulant == 4">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'mg':''}}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 5">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'mg':''}}</span>
 
         </template>
       </el-table-column>

src/xt_pages/workforce/remind_print.vue

@@ -40,7 +40,7 @@
                   <td width="120">透析模式</td>
                   <td width="100">透析器</td>
                   <td width="120">抗凝剂</td>
-                  <td width="100">低分子肝素</td>
+                  <td width="100">总量</td>
                   <td width="300">长期医嘱</td>
                 </tr>
               </thead>
@@ -69,10 +69,9 @@
                 </td>
                 <td :width="td_1_width">
                   <span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'IU':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 4">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 5">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
                 </td>
                 <td :width="td_4_width" >
                   <span style="white-space: pre">{{getAdvice(main_collection.doctor_advice)}}</span>
@@ -135,6 +134,67 @@
       })
     },
     methods: {
+      getAdvice:function(doctor_advice) {
+        console.log(doctor_advice)
+
+        let name = ""
+        for (let i = 0; i< doctor_advice.length; i++){
+
+          let prescribing_number = ''
+          let single_dose = ''
+          let drug_spec = ''
+
+          if (doctor_advice[i].prescribing_number > 0) {
+            prescribing_number = doctor_advice[i].prescribing_number + doctor_advice[i].prescribing_number_unit
+          }
+          if (doctor_advice[i].single_dose > 0) {
+            single_dose = ' 单次用量 ' + doctor_advice[i].single_dose + doctor_advice[i].single_dose_unit
+          }
+
+          if (doctor_advice[i].drug_spec > 0) {
+            drug_spec =  doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit
+          }
+
+
+          name = name + doctor_advice[i].advice_name +" "+ drug_spec+" "+ prescribing_number + " "+single_dose+" " + doctor_advice[i].delivery_way+" "+ doctor_advice[i].execution_frequency +" " + doctor_advice[i].remark +"\n"
+
+          // if (doctor_advice[i].child.length > 0){
+          //   for (let a = 0 ; a < doctor_advice[a].child.length; a++){
+          //     if(doctor_advice[i].child[a].prescribing_number > 0){
+          //       doctor_advice[i].child[a]['presc'] = doctor_advice[i].child[a].prescribing_number + doctor_advice[i].child[a].prescribing_number_unit
+          //     }else{
+          //       doctor_advice[i].child[a]['presc'] = ''
+          //     }
+          //
+          //     if(doctor_advice[i].child[a].single_dose > 0){
+          //       doctor_advice[i].child[a]['single'] = " "+' 单次用量 '+" "+doctor_advice[i].child[a].single_dose + doctor_advice[i].child[a].single_dose_unit
+          //     }else{
+          //       doctor_advice[i].child[a]['single'] = ''
+          //     }
+          //     name = name+"▲"+doctor_advice[i].child[a].advice_name+""
+          //       + doctor_advice[i].child[a].advice_desc
+          //       + doctor_advice[i].child[a].drug_spec_unit
+          //       + doctor_advice[i].child[a].presc
+          //       + doctor_advice[i].child[a].single
+          //
+          //
+          //   }
+          //   return  doctor_advice[i].advice_name +"  "+ doctor_advice[i].advice_desc+" "
+          //     + doctor_advice[i].drug_spec_unit
+          //     + prescribing_number
+          //     + " "+single_dose+" "+ " "+doctor_advice[i].delivery_way+" "+ doctor_advice[i].execution_frequency + doctor_advice[i].remark +name
+          //
+          // }else{
+          //
+          //
+          //
+          // }
+
+
+        }
+        return name
+
+      },
       printAction: function() {
         const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'