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

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

                         <tr><td colspan="10" style="font-size:16px;padding: 6px 8px;line-height: 30px;text-align:left;">二、透析中护理纪录：</td></tr>
                         <tr>
                           <td width="100">时间</td>
-                          <td width="100">BP<br/>mmHg</td>
+                          <td width="30">T<br>C°</td>
                           <td width="30">P<br/>次/分</td>
                           <td width="30">R<br/>次/分</td>
+                          <td width="100">BP<br/>mmHg</td>
                           <td width="60">静脉压/动脉压<br/>mmHg</td>
                           <td width="80">血流量<br/>ml/min</td>
                           <td width="90">超滤量累计L</td>
                         </tr>
                         <!-- </thead>
                         <tbody> -->
-                        <tr v-if="(record.assessment_before_dislysis&&record.assessment_before_dislysis.systolic_blood_pressure != 0&&record.assessment_before_dislysis.diastolic_blood_pressure != 0)||(record.assessment_before_dislysis&&record.assessment_before_dislysis.remark.length > 0) ||(record.assessment_before_dislysis&&record.assessment_before_dislysis.pulse_frequency != 0) ||(record.assessment_before_dislysis&&record.assessment_before_dislysis.breathing_rate  != 0)">
+                        <tr v-if="(record.assessment_before_dislysis&&record.assessment_before_dislysis.systolic_blood_pressure != 0&&record.assessment_before_dislysis.diastolic_blood_pressure != 0)||(record.assessment_before_dislysis&&record.assessment_before_dislysis.remark.length > 0) ||(record.assessment_before_dislysis&&record.assessment_before_dislysis.pulse_frequency != 0) ||(record.assessment_before_dislysis&&record.assessment_before_dislysis.breathing_rate  != 0)||(record.assessment_before_dislysis&&record.assessment_before_dislysis.temperature  != 0)">
                           <td>{{'透析前'}}</td>
-                          <td>{{record.assessment_before_dislysis&&record.assessment_before_dislysis.systolic_blood_pressure?record.assessment_before_dislysis.systolic_blood_pressure:''}}/{{record.assessment_before_dislysis &&record.assessment_before_dislysis.diastolic_blood_pressure?record.assessment_before_dislysis.diastolic_blood_pressure:''}}</td>
+                          <td>{{record.assessment_before_dislysis.temperature?record.assessment_before_dislysis.temperature:''}}</td>
                           <td>{{record.assessment_before_dislysis&&record.assessment_before_dislysis.pulse_frequency?record.assessment_before_dislysis.pulse_frequency:''}}</td>
                           <td>{{record.assessment_before_dislysis&&record.assessment_before_dislysis.breathing_rate?record.assessment_before_dislysis.breathing_rate:''}}</td>
+                          <td>{{record.assessment_before_dislysis&&record.assessment_before_dislysis.systolic_blood_pressure?record.assessment_before_dislysis.systolic_blood_pressure:''}}/{{record.assessment_before_dislysis &&record.assessment_before_dislysis.diastolic_blood_pressure?record.assessment_before_dislysis.diastolic_blood_pressure:''}}</td>
                           <td>{{''}}/{{''}}</td>
                           <td>{{''}}</td>
                           <td>{{''}}</td>
                         </tr>
                         <tr v-for="(monitor_record, index) in record.monitor_records" :key="index">
                           <td>{{getTime(monitor_record.operate_time,'{h}:{i}')}}</td>
-                          <td>{{monitor_record.systolic_blood_pressure?monitor_record.systolic_blood_pressure:''}} /{{monitor_record.diastolic_blood_pressure?monitor_record.diastolic_blood_pressure:''}}</td>
+                          <td>{{monitor_record.temperature?monitor_record.temperature:''}}</td>
                           <td>{{monitor_record.pulse_frequency?monitor_record.pulse_frequency:''}}</td>
                           <td>{{monitor_record.breathing_rate?monitor_record.breathing_rate:''}}</td>
+                          <td>{{monitor_record.systolic_blood_pressure?monitor_record.systolic_blood_pressure:''}} /{{monitor_record.diastolic_blood_pressure?monitor_record.diastolic_blood_pressure:''}}</td>
                           <td>{{monitor_record.venous_pressure?monitor_record.venous_pressure:''}}/{{monitor_record.arterial_pressure?monitor_record.arterial_pressure:''}}</td>
                           <td>{{monitor_record.blood_flow_volume?monitor_record.blood_flow_volume:''}}</td>
                           <td>{{monitor_record.ultrafiltration_volume?monitor_record.ultrafiltration_volume:'/'}}</td>
                         <tr><td colspan="10" style="font-size:16px;padding: 6px 8px;line-height: 30px;text-align:left;">二、透析中护理纪录：</td></tr>
                         <tr>
                           <td width="100">时间</td>
-                          <td width="100">BP<br/>mmHg</td>
+                          <td width="30">T<br>C°</td>
                           <td width="30">P<br/>次/分</td>
                           <td width="30">R<br/>次/分</td>
+                          <td width="100">BP<br/>mmHg</td>
                           <td width="60">静脉压/动脉压<br/>mmHg</td>
                           <td width="80">血流量<br/>ml/min</td>
                           <td width="90">超滤量累计L</td>
                         </tr>
                         <tr v-for="(monitor_record, index) in record.monitor_records2" :key="index">
                           <td>{{getTime(monitor_record.operate_time,'{h}:{i}')}}</td>
-                          <td>{{monitor_record.systolic_blood_pressure?monitor_record.systolic_blood_pressure:''}} /{{monitor_record.diastolic_blood_pressure?monitor_record.diastolic_blood_pressure:''}}</td>
+                          <td>{{monitor_record.temperature?monitor_record.temperature:''}}</td>
                           <td>{{monitor_record.pulse_frequency?monitor_record.pulse_frequency:''}}</td>
                           <td>{{monitor_record.breathing_rate?monitor_record.breathing_rate:''}}</td>
+                          <td>{{monitor_record.systolic_blood_pressure?monitor_record.systolic_blood_pressure:''}} /{{monitor_record.diastolic_blood_pressure?monitor_record.diastolic_blood_pressure:''}}</td>
                           <td>{{monitor_record.venous_pressure?monitor_record.venous_pressure:''}}/{{monitor_record.arterial_pressure?monitor_record.arterial_pressure:''}}</td>
                           <td>{{monitor_record.blood_flow_volume?monitor_record.blood_flow_volume:''}}</td>
                           <td>{{monitor_record.ultrafiltration_volume?monitor_record.ultrafiltration_volume:'/'}}</td>
         }
       },
       setAdminUserES(key, id) {
-
-
         if (typeof (key) === 'undefined' || key == null || typeof (key[id]) === 'undefined') {
-          console.log("11111"+id)
-
           return ''
         }
         if (key[id] == 0) {
-          console.log("2222"+id)
-
           return ''
         }
         if (key[id] in this.operatorMaps) {
-          console.log(this.operatorMaps[key[id]].es_url)
           return this.operatorMaps[key[id]].es_url
         } else {
-          console.log("333333"+id)
-
           return ''
         }
       },getFloat: function(x) {

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

               {{scope.row.pulse_frequency?scope.row.pulse_frequency:''}}
             </template>
           </el-table-column>
+          <el-table-column prop="temperature" align="center" width="100" label="体温(℃)">
+            <template slot-scope="scope">
+              {{scope.row.temperature?scope.row.temperature:''}}
+            </template>
+          </el-table-column>
           <el-table-column prop="breathing_rate" align="center" label="呼吸(次/分)" width="100">
             <template slot-scope="scope">
               {{scope.row.breathing_rate?scope.row.breathing_rate:''}}
                 <el-input v-model="form.diastolic_bp"></el-input>
               </el-form-item>
             </el-col>
+
+            <el-col :span="8" v-if="isShow('脉率')">
+              <el-form-item label="脉率(次/分)：">
+                <el-input v-model="form.pulse_frequency"></el-input>
+              </el-form-item>
+            </el-col>
           <!-- </el-row>
 
           <el-row :gutter="20"> -->
-            <el-col :span="8"  v-if="isShow('脉率')">
-              <el-form-item label="脉率(次/分)：" >
-                <el-input v-model="form.pulse_frequency"></el-input>
+
+            <el-col :span="8" v-if="isShow('体温')" >
+              <el-form-item label="体温(℃)：" >
+                <el-input v-model="form.temperature"></el-input>
               </el-form-item>
             </el-col>
+
             <el-col :span="8" v-if="isShow('呼吸频率')">
               <el-form-item label="呼吸频率(次/分)：">
                 <el-input v-model="form.breathing_rated"></el-input>
           systolic_bp: '', // 收缩压
           diastolic_bp: '', // 舒张压
           pulse_frequency: '', // 心率
+          temperature: '', // 体温
           breathing_rated: '', // 呼吸频率
           blood_flow_volume: '', // 血流量
           venous_pressure: '', // 静脉压
           this.form.pulse_frequency = ''
           this.form.breathing_rated = ''
           this.form.blood_flow_volume = ''
+          this.form.temperature = ''
           this.form.venous_pressure = ''
           this.form.transmembrane_pressure = ''
           this.form.ultrafiltration_volume = ''
           // this.form.monitoring_time = monitor.monitoring_time
           this.form.operate_time = monitor.operate_time * 1000
           this.form.systolic_bp = monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure : ''
+          this.form.temperature = monitor.temperature ? monitor.temperature : ''
           this.form.diastolic_bp = monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : ''
           this.form.pulse_frequency = monitor.pulse_frequency ? monitor.pulse_frequency : ''
           this.form.breathing_rated = monitor.breathing_rate ? monitor.breathing_rate : ''
         this.form.operate_time = parseInt(this.form.operate_time / 1000)
         this.form.systolic_bp = parseFloat(this.form.systolic_bp) == NaN ? 0 : parseFloat(this.form.systolic_bp)
         this.form.diastolic_bp = parseFloat(this.form.diastolic_bp) == NaN ? 0 : parseFloat(this.form.diastolic_bp)
+        this.form.temperature = parseFloat(this.form.temperature) == NaN ? 0 : parseFloat(this.form.temperature)
         this.form.pulse_frequency = parseFloat(this.form.pulse_frequency) == NaN ? 0 : parseFloat(this.form.pulse_frequency)
         this.form.breathing_rated = parseFloat(this.form.breathing_rated) == NaN ? 0 : parseFloat(this.form.breathing_rated)
         this.form.blood_flow_volume = parseFloat(this.form.blood_flow_volume) == NaN ? 0 : parseFloat(this.form.blood_flow_volume)

src/xt_pages/dialysis/details/dialysisMonitoring.vue

         <th  v-if="isShow('监测时间')"  width="124px">时间</th>
         <th v-if="isShow('血压')" width="72px">血压(mmhg)</th>
         <th v-if="isShow('脉率')" width="80px">脉率(次/分)</th>
+        <th v-if="isShow('体温')" width="72px">体温(℃)</th>
         <th v-if="isShow('呼吸')" width="110px">呼吸(次/分)</th>
         <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
         <th width="76px">静脉压/动脉压(mmhg)</th>
       <tr v-for="(monitor, index) in monitores" :key="index">
         <td  v-if="isShow('监测时间')">{{ parseTime(monitor.operate_time, "{y}-{m}-{d} {h}:{i}") }}</td>
         <td v-if="isShow('血压')">{{ monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:'' }}/{{ monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:'' }}</td>
+        <td v-if="isShow('体温')">{{ monitor.temperature?monitor.temperature:'' }}</td>
         <td v-if="isShow('脉率')">{{ monitor.pulse_frequency?monitor.pulse_frequency:'' }}</td>
         <td v-if="isShow('呼吸')">{{ monitor.breathing_rate?monitor.breathing_rate:'' }}</td>
         <td v-if="isShow('血流量')">{{ monitor.blood_flow_volume?monitor.blood_flow_volume:'' }}</td>

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

                     <tr><td colspan="10" style="font-size:16px;padding: 6px 8px;line-height: 30px;text-align:left;">二、透析中护理纪录：</td></tr>
                     <tr>
                       <td width="100">时间</td>
-                      <td width="100">BP<br/>mmHg</td>
+                      <td width="30">T<br>C°</td>
                       <td width="30">P<br/>次/分</td>
                       <td width="30">R<br/>次/分</td>
+                      <td width="100">BP<br/>mmHg</td>
                       <td width="60">静脉压/动脉压<br/>mmHg</td>
                       <td width="80">血流量<br/>ml/min</td>
                       <td width="90">超滤量累计L</td>
                       <td  width="100">护士签名</td>
                     </tr>
 
-                    <tr v-if="this.predialysis.systolic_blood_pressure != 0&&this.predialysis.diastolic_blood_pressure != 0||this.predialysis.remark.length > 0 || predialysis.pulse_frequency != 0 || predialysis.breathing_rate != 0">
+                    <tr v-if="this.predialysis.systolic_blood_pressure != 0&&this.predialysis.diastolic_blood_pressure != 0||this.predialysis.remark.length > 0 || predialysis.pulse_frequency != 0 || predialysis.breathing_rate != 0 || predialysis.temperature != 0">
                       <td>{{'透析前'}}</td>
-                      <td>{{predialysis.systolic_blood_pressure?predialysis.systolic_blood_pressure:''}}/{{predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:''}}</td>
+                      <td>{{predialysis.temperature?predialysis.temperature:''}}</td>
                       <td>{{predialysis.pulse_frequency?predialysis.pulse_frequency:''}}</td>
                       <td>{{predialysis.breathing_rate?predialysis.breathing_rate:''}}</td>
+                      <td>{{predialysis.systolic_blood_pressure?predialysis.systolic_blood_pressure:''}}/{{predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:''}}</td>
+
                       <td>{{''}}/{{''}}</td>
                       <td>{{''}}</td>
                       <td>{{''}}</td>
 
                     <tr v-for="(monitor,index) in monitors" :key="index">
                       <td>{{getTime(monitor.operate_time,'{h}:{i}')}}</td>
-                      <td>{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:''}}/{{monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:''}}</td>
+                      <td>{{monitor.temperature?monitor.temperature:''}}</td>
                       <td>{{monitor.pulse_frequency?monitor.pulse_frequency:''}}</td>
                       <td>{{monitor.breathing_rate?monitor.breathing_rate:''}}</td>
+                      <td>{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:''}}/{{monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:''}}</td>
                       <td>{{monitor.venous_pressure?monitor.venous_pressure:''}}/{{monitor.arterial_pressure?monitor.arterial_pressure:''}}</td>
                       <td>{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
                       <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:'/'}}</td>
                     <tr><td colspan="10" style="font-size:16px;padding: 6px 8px;line-height: 30px;text-align:left;">二、透析中护理纪录：</td></tr>
                     <tr>
                       <td width="100">时间</td>
-                      <td width="100">BP<br/>mmHg</td>
+                      <td width="30">T<br>C°</td>
                       <td width="30">P<br/>次/分</td>
                       <td width="30">R<br/>次/分</td>
+                      <td width="100">BP<br/>mmHg</td>
                       <td width="60">静脉压/动脉压<br/>mmHg</td>
                       <td width="80">血流量<br/>ml/min</td>
                       <td width="90">超滤量累计L</td>
                     </tr>
                     <tr v-for="(monitor,index) in monitors2" :key="index">
                       <td>{{getTime(monitor.operate_time,'{h}:{i}')}}</td>
-                      <td>{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:''}}/{{monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:''}}</td>
+                      <td>{{monitor.temperature?monitor.temperature:''}}</td>
                       <td>{{monitor.pulse_frequency?monitor.pulse_frequency:''}}</td>
                       <td>{{monitor.breathing_rate?monitor.breathing_rate:''}}</td>
+                      <td>{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:''}}/{{monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:''}}</td>
                       <td>{{monitor.venous_pressure?monitor.venous_pressure:''}}/{{monitor.arterial_pressure?monitor.arterial_pressure:''}}</td>
                       <td>{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
                       <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:'/'}}</td>