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

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -314,12 +314,13 @@
                           style="font-size:16px;padding:8px 8px;">透析中记录
                       </td>
                       <td width="100">时间</td>
-                      <td width="80">血压<br/>mmHg</td>
-                      <td width="60">脉率<br/>次/分</td>
-                      <td width="60">呼吸<br/>次/分</td>
+                      <td width="80">BP<br/>mmHg</td>
+                      <td width="60">P<br/>次/分</td>
+                      <td width="60">R<br/>次/分</td>
+                      <td width="60">静脉压/动脉压<br/>mmHg</td>
+
                       <td width="60">血流量<br/>ml/min</td>
                       <td width="60">超滤量累计<br/>L</td>
-                      <td width="60">静脉压/动脉压<br/>mmHg</td>
                       <td width="60">钠浓度<br/>mmol/L</td>
 
                       <td>病情特殊情况处理<br/>及专科护理措施记录</td>
@@ -335,11 +336,11 @@
                       </td>
                       <td>{{monitor_record.pulse_frequency?monitor_record.pulse_frequency:''}}</td>
                       <td>{{monitor_record.breathing_rate?monitor_record.breathing_rate:''}}</td>
-                      <td>{{monitor_record.blood_flow_volume?monitor_record.blood_flow_volume:''}}</td>
-                      <td>{{monitor_record.ultrafiltration_volume?monitor_record.ultrafiltration_volume:''}}</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>
                       <td>{{monitor_record.sodium_concentration?monitor_record.sodium_concentration:''}}</td>
                       <td>
                         {{monitor_record.symptom}}
@@ -539,7 +540,7 @@
 
                     <div class="inline_block">
                       &emsp;核对时间：
-                      <div class="under_line" style="width: 150px;">
+                      <div class="under_line" style="width: 200px;">
                         {{record.check?getTime(record.check.updated_time,'{y}年{m}月{d}日 {h}时'):''}}
                       </div>
                     </div>
@@ -873,7 +874,7 @@
                       <td height="60px" v-if="advice_index == 0"
                           :rowspan="group.advices.length">
                                     <span v-if="advice.start_time">
-                                      {{getTime(advice.start_time,'{h}:{i}')}}
+                                      {{getTime(advice.start_time,'{y}-{m}-{d} {h}:{i}')}}
                                     </span>
                         <span v-else>&nbsp;<br/>&nbsp;</span>
                       </td>
@@ -923,7 +924,7 @@
 
 
                     <td height="60px"><span v-if="advice.execution_time">
-                    {{getTime(advice.execution_time,'{h}:{i}')}}
+                    {{getTime(advice.execution_time,'{y}-{m}-{d} {h}:{i}')}}
                   </span>
                     </td>
 

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1519,14 +1519,12 @@
               <tr><td colspan="12" class="title-box text-align-left">二、透析中护理记录：</td></tr>
             <tr class="print-table-tr-new">
               <td width="100">时间</td>
-              <td width="40">T<br/>C°</td>
+              <td width="60">BP<br/><span class="text-align-right">mmHg</span></td>
               <td width="30">P<br/><small>次/分</small></td>
               <td width="30">R<br/><small>次/分</small></td>
-              <td width="60">BP<br/><span class="text-align-right">mmHg</span></td>
               <td width="80">静脉压/动脉压mmHg</td>
               <td width="80">血流量<br>ml/min</td>
               <td width="80">超滤量累计L</td>
-              <td width="80">肝素剩余量ml</td>
               <td width="80">钠浓度<br/>mmol/L</td>
 
               <td width="">病情特殊情况、处理<br/>及专科护理措施记录</td>
@@ -1541,10 +1539,9 @@
               </td>
               <td>&nbsp;{{monitor.pulse_frequency?monitor.pulse_frequency:''}}</td>
               <td>&nbsp;{{monitor.breathing_rate?monitor.breathing_rate:''}}</td>
+              <td>{{monitor.venous_pressure?monitor.venous_pressure:''}}/{{monitor.arterial_pressure?monitor.arterial_pressure:''}}</td>
               <td>&nbsp;{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
               <td>&nbsp;{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:''}}</td>
-              <td>&nbsp;{{monitor.displacement_quantity?monitor.displacement_quantity:''}}</td>
-              <td>{{monitor.venous_pressure?monitor.venous_pressure:''}}/{{monitor.arterial_pressure?monitor.arterial_pressure:''}}</td>
               <td>{{monitor.sodium_concentration?monitor.sodium_concentration:''}}</td>
 
               <td>&nbsp;{{monitor.symptom}}
@@ -1559,7 +1556,7 @@
             </tr>
             </tbody>
           </table>
-          <table class="print-table" border="1" style="margin-bottom: 400px">
+          <table class="print-table" border="1" >
             <tbody>
               <tr class="title-box-pro-tr">
                 <td class="title-box-pro">三、透析后护理纪录：</td>
@@ -1780,8 +1777,8 @@
                     </td>
 
                     <td width="60">核对时间:</td>
-                    <td width="100">
-                      <div class="under-line">&nbsp;{{getTime(check.updated_time,'{y}年{m}月{d}日 {h}时')}}</div>
+                    <td width="200">
+                      <div class="under-line">{{getTime(check.updated_time,'{y}年{m}月{d}日 {h}时')}}</div>
 
                     </td>
 
@@ -1842,7 +1839,7 @@
                       </div>
                     </td>
                     <td width="60">时间:</td>
-                    <td width="100">
+                    <td width="200">
                       <div class="under-line" style="padding-bottom: 5px" v-if="dialysisOrder != null">&nbsp;{{getTime(dialysisOrder.end_time,'{y}年{m}月{d}日 {h}时')}}</div>
                     </td>
                     <td width=""></td>
@@ -2169,78 +2166,7 @@
             </tr>
             </tbody>
           </table>
-          <!--<table class="print-table-no" border="1" count="0" >-->
-            <!--<tbody>-->
-            <!--<tr><td colspan="6">医嘱</td></tr>-->
-            <!--<tr><td colspan="3">开医嘱</td><td colspan="3">执行核对医嘱</td></tr>-->
-            <!--<tr>-->
-              <!--<td width="40px">时间</td>-->
-              <!--<td width="120px">医嘱内容</td>-->
-              <!--<td width="80px">医生签名</td>-->
-              <!--<td width="75px">核对人签名</td>-->
-              <!--<td width="80px">执行人签名</td>-->
-              <!--<td width="55px">时间</td>-->
-            <!--</tr>-->
-           <!---->
-            <!--<tr v-for="(advice, index) in advice_groups" :key="index">-->
-              <!--<td height="10px">-->
-                                  <!--<span v-if="advice[0].start_time">-->
-                                    <!--{{getTime(advice[0].start_time,'{h}:{i}')}}-->
-                                  <!--</span>-->
-                <!--<span v-else>&nbsp;<br/>&nbsp;</span>-->
-              <!--</td>-->
-              <!--<td class="advice-name">-->
-                <!--<span v-if="advice[0].parent_id>0">└</span>-->
-                <!--<span>{{advice[0].advice_name }}</span>-->
-                <!--<span>{{advice[0].advice_desc}}</span>-->
-                <!--&lt;!&ndash; <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> &ndash;&gt;-->
-                <!--<span v-if="advice[0].prescribing_number">* {{advice[0].prescribing_number}}{{advice[0].prescribing_number_unit}}</span>-->
-                <!--<span-->
-                  <!--v-if="advice[0].single_dose != 0">单次用量 {{advice[0].single_dose}}{{advice[0].single_dose_unit}}</span>-->
-                <!--<span>{{advice[0].delivery_way}}</span>-->
-                <!--<span>{{advice[0].execution_frequency}}</span>-->
-                <!--<div v-for="(child, childindex) in advice[0].children" :key="childindex" class="advice-children">-->
-                  <!--<div>▲</div>-->
-                  <!--<div>-->
-                    <!--<span>{{child.advice_name }}</span>-->
-                    <!--<span>{{child.advice_desc}}</span>-->
-                    <!--<span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>-->
-                    <!--<span-->
-                      <!--v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>-->
-                    <!--<span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>-->
-                  <!--</div>-->
-                <!--</div>-->
-              <!--</td>-->
-              <!--<td>-->
-                <!--<span-->
-                  <!--v-if="setAdminUserES(advice[0].advice_doctor) == ''">{{getAdminUser(advice[0].advice_doctor)}}</span>-->
-                <!--<img class="es-img" :src="setAdminUserES(advice[0].advice_doctor)"-->
-                     <!--alt="" srcset="" v-else>-->
-              <!--</td>-->
-              <!--<td>-->
-                <!--<span v-if="setAdminUserES(advice[0].checker) == ''">{{getAdminUser(advice[0].checker)}}</span>-->
-                <!--<img class="es-img" :src="setAdminUserES(advice[0].checker)"-->
-                     <!--alt="" srcset="" v-else>-->
-
-              <!--</td>-->
-              <!--<td>-->
-                <!--<span-->
-                  <!--v-if="setAdminUserES(advice[0].execution_staff) == ''">{{getAdminUser(advice[0].execution_staff)}}</span>-->
-                <!--<img class="es-img" :src="setAdminUserES(advice[0].execution_staff)"-->
-                     <!--alt="" srcset="" v-else>-->
-
-              <!--</td>-->
-
-              <!--<td><span v-if="advice[0].execution_time">-->
-                    <!--{{getTime(advice[0].execution_time,'{h}:{i}')}}-->
-                  <!--</span>-->
-              <!--</td>-->
-
-            <!--</tr>-->
-
 
-            <!--</tbody>-->
-          <!--</table>-->
           <table class="print-table-no" border="1" count="0" >
             <tbody>
             <tr><td colspan="7">医嘱</td></tr>
@@ -2261,7 +2187,7 @@
               <td height="10px"               v-if="advice_index == 0"
                   :rowspan="group.advices.length">
                                   <span v-if="advice.start_time">
-                                    {{getTime(advice.start_time,'{h}:{i}')}}
+                                    {{getTime(advice.start_time,'{y}-{m}-{d} {h}:{i}')}}
                                   </span>
                 <span v-else>&nbsp;<br/>&nbsp;</span>
               </td>
@@ -2309,7 +2235,7 @@
               </td>
 
               <td><span v-if="advice.execution_time">
-                    {{getTime(advice.execution_time,'{h}:{i}')}}
+                    {{getTime(advice.execution_time,'{y}-{m}-{d} {h}:{i}')}}
                   </span>
               </td>
 
@@ -2607,8 +2533,8 @@
             this.monitors = response.data.data.monitors
             this.summary = response.data.data.summary
             this.org_template_info = response.data.data.org_template_info
-            if (this.monitors.length < 12) {
-              var nl = 12 - this.monitors.length
+            if (this.monitors.length < 9) {
+              var nl = 9 - this.monitors.length
               for (let index = 0; index < nl; index++) {
                 this.monitors.push([])
               }