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

src/utils/tools.js

 }
 
 export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
+  console.log(type)
+  console.log(shouji)
+  console.log(shichang)
+  console.log(weichi)
+
   var t = 0.5;
   if (type == 1) {
     t = 0.5;
   if (isNaN(shouji) || isNaN(shichang) || isNaN(weichi)) {
     return 0;
   }
+  console.log((shouji + (shichang - t) * weichi).toFixed(1))
   return (shouji + (shichang - t) * weichi).toFixed(1);
 }

src/xt_pages/dialysis/details/NavIgation.vue

           </li>
           <li @click="showDoctorAdviceDialog">
             <img src="@/assets/record/4.png">
-            <p>临时医嘱</p>
+            <div>
+              <p>临时医嘱</p>
+              <span class="redpoint" v-if="getUnReadNum()">{{getUnReadNum()}}</span>
+            </div>
           </li>
           <li @click="showDoubleCheck">
             <img src="@/assets/record/5.png">
     <computer-dialog title="透析上机" ref="computer_dialog" :dialysis_order="dialysis_order" :schedule="schedual" @monitor="add_monitor"
                      :admins="admin_users" :device_numbers="device_numbers" :special_premission="special_premission"></computer-dialog>
 
-    <monitor-dialog title="透析监测" ref="monitor_dialog" :monitors="monitor_records" ></monitor-dialog>
+    <monitor-dialog title="透析监测" ref="monitor_dialog" :monitors="monitor_records" @monitor="add_monitor"></monitor-dialog>
 
     <finish-dialog title="透析下机" ref="finish_dialog" :dialysis_order="dialysis_order" :schedule="schedual"
                    :admins="admin_users"  :prescription="prescription"  @assessmentAfterDislysis="assessmentAfterDislysisFunc" :special_premission="special_premission"></finish-dialog>
 
     },
     methods: {
+      getUnReadNum:function(){
+        let doctorAdvice = []
+        for (let y = 0; y < this.doctor_advices.length; y++) {
+          if (this.doctor_advices[y].execution_state == 2) {
+            doctorAdvice.push(this.doctor_advices[y])
+          }
+        }
+        const sorted = this.groupBy(doctorAdvice, function (item) {
+          return [item.groupno]
+        })
+        console.log(doctorAdvice)
+        console.log(sorted.length)
+
+
+        return sorted.length
+
+      },
+      groupBy (array, f) {
+        const groups = {}
+        array.forEach(function (o) {
+          const group = JSON.stringify(f(o))
+          groups[group] = groups[group] || []
+          groups[group].push(o)
+        })
+        return Object.keys(groups).map(function (group) {
+          return groups[group]
+        })
+      },
       setLastRecord:function(lastPredialysisEvaluation,lastMonitorRecord,lastAssessmentAfterDislysis,lastDialysisPrescribe,lastDryWeightDislysis,schedual){
         console.log(lastPredialysisEvaluation)
         console.log(lastMonitorRecord)
 
       add_monitor:function(monitor){
 
-
         this.monitor_records.push(monitor)
+        console.log( this.monitor_records)
         this.monitor_records.sort((a, b) => b.operate_time - a.operate_time)
         this.monitor_records.reverse()
+        console.log( this.monitor_records)
+
         this.$refs.monitor_dialog.setRecords(this.monitor_records)
       },
       adviceFunc: function() {
   text-align: center;
   margin-bottom: 20px;
   }
+  .redpoint {
+  display: inline-block;
+  height: 30px;
+  width: 30px;
+  line-height: 26px;
+  text-align: center;
+  font-size: 0.8em;
+  border-radius: 20px;
+  color: #fff;
+  background: #f56c6c;
+  position: absolute;
+  top: -6px;
+  right: -8px;
+  border: 1px solid #fff;
+  }
 </style>
 

src/xt_pages/dialysis/details/assessmentAfter.vue

         <li v-if="isShow('收缩压')">
           <label>收缩压 : </label>
           <span class="content" v-if="systolic_blood_pressure!='0'">{{ systolic_blood_pressure }}</span>
-          <span class="unit" v-if="systolic_blood_pressure!='0'">mmhg</span>
+          <span class="unit" v-if="systolic_blood_pressure!='0'">mmHg</span>
         </li>
         <li v-if="isShow('实际超滤量')">
           <label>实际超滤量: </label>
         <li v-if="isShow('舒张压')">
           <label>舒张压 : </label>
           <span class="content" v-if="diastolic_blood_pressure!='0'">{{ diastolic_blood_pressure }}</span>
-          <span class="unit" v-if="diastolic_blood_pressure!='0'">mmhg</span>
+          <span class="unit" v-if="diastolic_blood_pressure!='0'">mmHg</span>
         </li>
         <li v-if="isShow('实际置换量')">
           <label>实际置换量 : </label>

src/xt_pages/dialysis/details/assessmentBefore.vue

         <li v-if="isShow('收缩压')">
           <label>收缩压 : </label>
           <span class="content" v-if="systolic_blood_pressure!='0'">{{ systolic_blood_pressure }}</span>
-          <span class="unit" v-if="systolic_blood_pressure!='0'">mmhg</span>
+          <span class="unit" v-if="systolic_blood_pressure!='0'">mmHg</span>
         </li>
         <li v-if="isShow('前次透析后')">
           <label>前次透析后: </label>
         <li v-if="isShow('舒张压')">
           <label>舒张压 : </label>
           <span class="content" v-if="diastolic_blood_pressure!='0'">{{ diastolic_blood_pressure }}</span>
-          <span class="unit" v-if="diastolic_blood_pressure!='0'">mmhg</span>
+          <span class="unit" v-if="diastolic_blood_pressure!='0'">mmHg</span>
         </li>
 
         <li v-if="isShow('透析频次')">

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

           <!-- </el-row>
 
           <el-row :gutter="20"> -->
-          <el-col :span="8" v-if="isShows('透析液温度')">
-            <el-form-item label="透析液温度(°C)：">
-              <el-input type="number" v-model="dialysisPrescription.dialysate_temperature"></el-input>
-            </el-form-item>
-          </el-col>
 
 
 
           </el-col>
 
 
+          <el-col :span="8" v-if="isShows('置换量')" v-show="zhiShow">
+            <el-form-item label="置换量(L)：">
+              <el-input type="number" v-model="dialysisPrescription.replacement_total"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+
           <el-col :span="8" v-if="anticoagulant.gaimingcheng != -1&&isShows('钙名称')">
             <el-form-item label="钙名称 : ">
               <el-input v-model="dialysisPrescription.anticoagulant_gaimingcheng"
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('置换量')" v-show="zhiShow">
-            <el-form-item label="置换量(L)：">
-              <el-input type="number" v-model="dialysisPrescription.replacement_total"></el-input>
-            </el-form-item>
-          </el-col>
-
 
           <el-col :span="8" v-if="isShows('钾')">
             <el-form-item label="钾(mmol/L)： ">
               <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="透析液温度(°C)：">
+              <el-input type="number" v-model="dialysisPrescription.dialysate_temperature"></el-input>
+            </el-form-item>
+          </el-col>
+
           <!-- </el-row>
 
           <el-row :gutter="20"> -->
       </div>
       <div class="newLine">
         <span>透前体重(kg)</span>
-        <span>{{ predialysis.weight_before }}</span>
+        <span>{{ getBeforeWeight(predialysis)}}</span>
       </div>
       <div class="newLine">
         <span>干体重(kg)</span>
       </div>
       <div class="newLine">
         <span>透后体重(kg)</span>
-        <span>{{ record.weight_after }}</span>
+        <span>{{ getAfterWeight(record) }}</span>
       </div>
       <div class="newLine">
         <span>体重减少(kg)</span>
       }
     },
     methods: {
+      getBeforeWeight(predialysis){
+        if(predialysis.id > 0){
+          if(predialysis.weight_before > 0) {
+            return predialysis.weight_before - predialysis.additional_weight
+          }else{
+            return ''
+          }
+        }
+      }, getAfterWeight(record){
+        if(record.id > 0){
+          if(record.weight_after > 0) {
+            return record.weight_after - this.predialysis.additional_weight
+          }else{
+            return ''
+          }
+        }
+      },
       isPermission () {
         if (this.$store.getters.xt_user.user.user_type == 3 && ( this.$store.getters.xt_user.template_info.template_id == 2 ||  this.$store.getters.xt_user.template_info.template_id == 6)) {
           return false
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
       show() {
+        let last_weight_after = 0
+        let weight_before = 0
 
-        if (
-          this.predialysis.weight_before > 0 &&
-          this.last_record.weight_after > 0
-        ) {
-          this.add_weight = parseFloat(
-            this.predialysis.weight_before - this.last_record.weight_after
-          ).toFixed(2)
+        if(this.last_record == null){
+          last_weight_after = 0
+        }else{
+          last_weight_after = this.last_record.weight_after
         }
 
+        if(this.predialysis == null || this.predialysis.id == 0 ){
+          weight_before = 0
+        }else{
+          weight_before = this.predialysis.weight_before
+        }
+
+        if(weight_before > 0){
+          this.add_weight = parseFloat(weight_before - last_weight_after).toFixed(2)
+        }
+
+
         this.isVisibility = true
         this.checkedCities = []
         for (let i = 0; i < this.targetAdvices.length; i++) {
           dialysis_duration_hour = this.dialysisPrescription.dialysis_duration_hour
 
         }
-        duration = parseFloat(dialysis_duration_hour) * 60 + parseFloat(dialysis_duration_minute)
+        duration = parseFloat(dialysis_duration_hour) + parseFloat(dialysis_duration_minute) / 60
 
 
 
           dialysis_duration_hour = this.dialysisPrescription.dialysis_duration_hour
 
         }
-        duration = parseFloat(dialysis_duration_hour) * 60 + parseFloat(dialysis_duration_minute)
+        duration = parseFloat(dialysis_duration_hour) + parseFloat(dialysis_duration_minute) / 60
 
 
 
           dialysis_duration_hour = this.dialysisPrescription.dialysis_duration_hour
 
         }
-        duration = parseFloat(dialysis_duration_hour) * 60 + parseFloat(dialysis_duration_minute)
+        duration = parseFloat(dialysis_duration_hour)  + parseFloat(dialysis_duration_minute) / 60
         this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
           this.dialysisPrescription.anticoagulant_shouji,
           duration,
           dialysis_duration_hour = this.dialysisPrescription.dialysis_duration_hour
 
         }
-        duration = parseFloat(dialysis_duration_hour) * 60 + parseFloat(dialysis_duration_minute)
+        duration = parseFloat(dialysis_duration_hour)  + parseFloat(dialysis_duration_minute) / 60
 
         this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
           this.dialysisPrescription.anticoagulant_shouji,

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

 
             if (this.isAdd) {
               this.monitors.unshift(monitor)
+              this.monitors.sort((a, b) => b.operate_time - a.operate_time)
+              this.monitors.reverse()
             } else {
               for (let index = 0; index < this.monitors.length; index++) {
                 const m = this.monitors[index]

src/xt_pages/dialysis/details/dialysisComputer.vue

         if (this.record.id == 0) {
           return '-'
         }
-        return this.device_number_map[this.record.bed_id] == null ? '' :this.device_number_map[this.record.bed_id].zone_name +"-"+ this.device_number_map[this.record.bed_id].number
+
+
+        if(this.device_number_map[this.record.bed_id].number.indexOf(this.device_number_map[this.record.bed_id].zone_name) == -1){
+
+          return this.device_number_map[this.record.bed_id] == null ? '' :this.device_number_map[this.record.bed_id].zone_name +"-"+ this.device_number_map[this.record.bed_id].number
+
+
+        }else{
+
+          return this.device_number_map[this.record.bed_id].number
+
+        }
+
+
       },
       nurse: function() {
         if (this.record.id == 0) {

src/xt_pages/dialysis/details/dialysisMonitoring.vue

         <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
         <th v-if="isShow('脉搏')" width="80px">脉搏(次/分)</th>
         <th v-if="isShow('呼吸频率')" width="110px">呼吸频率(次/分)</th>
-        <th width="76px">静脉压/动脉压(mmhg)</th>
+        <th width="76px">静脉压/动脉压(mmHg)</th>
         <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
         <th v-if="isShow('跨膜压')" width="76px">跨膜压(mmhg)</th>
         <th v-if="isShow('超滤量') && template_id == 6" width="76px">超滤量(ml)</th>

src/xt_pages/user/dialysisRecord.vue

             prop="predialysis_evaluation"
             width="140"
             align="center"
-            label="透前血压(mmhg)"
+            label="透前血压(mmHg)"
           >
             <template slot-scope="scope"
               ><span
             prop="assessment_after_dislysis"
             width="140"
             align="center"
-            label="透后血压(mmhg)"
+            label="透后血压(mmHg)"
           >
             <template slot-scope="scope"
               ><span
           >
             <template slot-scope="scope"
               ><span>{{
-                getNurseName(scope.row.treatment_summary)
+                getNurseName(scope.row.start_nurse)
               }}</span></template
             >
           </el-table-column>
                 <td>{{ setVascularAccess(item.prescription) }}</td>
                 <td>{{ setAnticoagulantsConfit(item.prescription) }}</td>
                 <td>{{ item.prescription.dialyzer_perfusion_apparatus }}</td>
-                <td>{{ getNurseName(item.treatment_summary) }}</td>
+                <td>{{ getNurseName(item.start_nurse) }}</td>
                 <td>{{ getDoctorName(item.treatment_summary) }}</td>
               </tr>
             </tbody>
       }
       return "";
     },
-    getNurseName(summary) {
+    getNurseName(start_nurse) {
       var dl = this.nurseOptions.length;
       if (dl > 0) {
         for (let index = 0; index < dl; index++) {
-          if ((this.nurseOptions[index].id = summary.zl_nurse)) {
+          if ((this.nurseOptions[index].id = start_nurse)) {
             return this.nurseOptions[index].name;
           }
         }