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

src/xt_pages/dialysis/PatientBox.vue

       this.patient_id = schedual.patient_id
       this.getScheduleDetail()
       this.getLongAdvice()
-      this.$refs.prescription.show(this.prescription);
+      this.$refs.prescription.show(this.prescription,schedual);
       
     },
     open1(schedual){

src/xt_pages/dialysis/batch_print/batch_print_order_nine.vue

                                   "
                                   showValue="低血压"
                                 ></label-box>
-                                <label-box showValue="发热"></label-box>
+                                <label-box
+                                  :isChecked="
+                                    record.assessment_after_dislysis.complication.indexOf(
+                                      '发热'
+                                    ) > -1
+                                      ? true
+                                      : false
+                                  "
+                                 showValue="发热"></label-box>
                                 <label-box
                                   :isChecked="
                                     record.assessment_after_dislysis.complication.indexOf(
                             <td width="40">其他:</td>
                             <td width="">
                               <div class="under-line">
-                                &nbsp;
+                                &nbsp;{{ record.assessment_after_dislysis.complication ? getComplication(record.assessment_after_dislysis.complication) : '' }}
                               </div>
                             </td>
                           </tr>
           console.log('weight', weight)
         }
       })
+    },
+    getComplication(complication){
+      if(complication.indexOf(',') == -1){
+        let str = complication
+        if(['无','头晕','头痛','呕吐','低血压','发热','抽搐','高血压','心律失常'].indexOf(str) == -1){
+          return str
+        }
+      }else if(complication.indexOf(',') > -1){
+        let str = complication
+        if(['无','头晕','头痛','呕吐','低血压','发热','抽搐','高血压','心律失常'].indexOf(str) == -1){
+          let newStr = ''
+          str.split(',').map(item => {
+            if(['无','头晕','头痛','呕吐','低血压','发热','抽搐','高血压','心律失常'].indexOf(item) == -1){
+              newStr += item + ','
+            }
+          })
+          return newStr.substring(0, newStr.length - 1)
+        }
+      }
     }
   }
 }

src/xt_pages/dialysis/details/DialysisPrescription.vue

           <span class="content">{{
             target_ultrafiltration != "0" ? target_ultrafiltration : ""
           }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>
           <span class="content">{{
             displace_liqui != "0" ? displace_liqui : ""
           }}</span>
-          <span class="unit">{{ displace_liqui != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 21" class="unit">{{ displace_liqui != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 21" class="unit">{{ displace_liqui != "0" ? "ml" : "" }}</span>
         </li>
 
         <li v-if="isShow('血管通路')">

src/xt_pages/dialysis/details/assessmentAfter.vue

           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20" >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21" >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

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

           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20"  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>

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

           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20)">
+                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21)">
             <el-form-item label="目标超滤量(ml)：">
               <el-input
                 type="number"
           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20">
+                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21">
             <el-form-item label="目标超滤量(L)：">
               <el-input
                 type="number"
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('置换液总量')" v-show="totalShow">
+          <el-col :span="8" v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id == 21)" v-show="totalShow">
+            <el-form-item label="置换液总量(ml)">
+              <el-input
+                v-model="dialysisPrescription.displace_liqui_value"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="isShows('置换液总量') && this.$store.getters.xt_user.template_info.template_id != 21" v-show="totalShow">
             <el-form-item label="置换液总量(L)">
               <el-input
                 v-model="dialysisPrescription.displace_liqui_value"

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

                   template_id == 17 ||
                   template_id == 18 ||
                   template_id == 19 ||
-                  template_id == 20)
+                  template_id == 20 ||
+                  template_id == 21)
             "
           >
             <template slot-scope="scope">
                 template_id != 17 &&
                 template_id != 18 &&
                 template_id != 19 &&
-                template_id != 20
+                template_id != 20 &&
+                template_id != 21
             "
           >
             <template slot-scope="scope">
             align="center"
             label="超滤率(ml/h)"
             width="100"
-            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) "
+            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 slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
             align="center"
             label="超滤率(L/h)"
             width="100"
-            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"
+            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 slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" 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) ">
+          <el-col :span="8" 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) ">
             <el-form-item label="超滤率(ml/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" 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">
+          <el-col :span="8" 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">
             <el-form-item label="超滤率(L/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
 
           <el-col
             :span="8"
-            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) " >
+            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) " >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
 
           <el-col
             :span="8"
-            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" >
+            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" >
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21"  width="76px"> 超滤量(L) </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) " width="92px" > 置换率(ml/min) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量')" width="92px">置换液流量(ml/h)</th>
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
-          <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)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <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" width="50px"> 超滤率 <br />(L/h) </th>
+          <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)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <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" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
           <th v-if="isShow('处理')" width="92px">处理</th>

src/xt_pages/dialysis/details/index.vue

                 >
                 <template slot-scope="scope">
                   {{ scope.row.patient.name }}
+                  <span v-if="scope.row.assessment_before_dislysis && patientStateVal == 1">
+                    （{{ getTime(scope.row.assessment_before_dislysis.created_time) }}）
+                  </span>
                 </template>
               </el-table-column>
               <el-table-column
                 >
                 <template slot-scope="scope">
                   {{ scope.row.patient.name }}
+                  <span v-if="scope.row.assessment_before_dislysis && patientStateVal == 1">
+                    （{{ getTime(scope.row.assessment_before_dislysis.created_time) }}）
+                  </span>
                 </template>
               </el-table-column>
               <el-table-column
       return function(a,b){
         var value1 = a[property];
         var value2 = b[property];
-        return value1 - value2;
+        return value2 - value1;
       }
+    },
+    getTime(date){
+      date = new Date(date * 1000)
+      var Y = date.getFullYear() + '-';
+      var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1);
+      var D = (date.getDate() < 10 ? '0'+date.getDate() : date.getDate());
+      var h = (date.getHours() < 10 ? '0'+date.getHours() : date.getHours());
+      var m = (date.getMinutes() < 10 ? '0'+date.getMinutes() : date.getMinutes());
+      var s = (date.getSeconds() < 10 ? '0'+date.getSeconds() : date.getSeconds());
+      
+      let strDate = h  + ':' + m;
+      return strDate;
     }
   }
 }

src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue

                       <label-box :isChecked="afterdialysis.complication.indexOf('头痛') > -1 ? true : false" showValue="头痛"></label-box>
                       <label-box :isChecked="afterdialysis.complication.indexOf('呕吐') > -1 ? true : false" showValue="呕吐"></label-box>
                       <label-box :isChecked="afterdialysis.complication.indexOf('低血压') > -1 ? true : false" showValue="低血压"></label-box>
-                      <label-box showValue="发热"></label-box>
+                      <label-box :isChecked="afterdialysis.complication.indexOf('发热') > -1 ? true : false" showValue="发热"></label-box>
                       <label-box :isChecked="afterdialysis.complication.indexOf('抽搐') > -1 ? true : false" showValue="抽搐"></label-box>
                       <label-box :isChecked="afterdialysis.complication.indexOf('高血压') > -1 ? true : false" showValue="高血压"></label-box>
                       <label-box :isChecked="afterdialysis.complication.indexOf('心律失常') > -1 ? true : false" showValue="心律失常"></label-box>
                   <td width="40">其他:</td>
                   <td width="">
                     <div class="under-line">
-                      &nbsp;
+                      &nbsp;{{ afterdialysis.complication ? getComplication(afterdialysis.complication) : '' }}
                     </div>
                   </td>
                 </tr>
       }
   },
     methods: {
+      getComplication(complication){
+        if(complication.indexOf(',') == -1){
+          let str = complication
+          if(['无','头晕','头痛','呕吐','低血压','发热','抽搐','高血压','心律失常'].indexOf(str) == -1){
+            return str
+          }
+        }else if(complication.indexOf(',') > -1){
+          let str = complication
+          if(['无','头晕','头痛','呕吐','低血压','发热','抽搐','高血压','心律失常'].indexOf(str) == -1){
+            let newStr = ''
+            str.split(',').map(item => {
+              if(['无','头晕','头痛','呕吐','低血压','发热','抽搐','高血压','心律失常'].indexOf(item) == -1){
+                newStr += item + ','
+              }
+            })
+            return newStr.substring(0, newStr.length - 1)
+          }
+        }
+      },
       getAdminUser(id) {
         if (id == 0) {
           return ''