1

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -612,7 +612,8 @@
                         <div style="min-height:20px;line-height:20px; overflow:hidden;">
                           <span v-if="getTime(monitor.operate_time, '{h}:{i}')" style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
                             <template v-if="(dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">【开始透析】引血100ml/min</template>
-                            {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
+                            <span v-if="dialysisOrder && monitor.operate_time == dialysisOrder.end_time">{{ monitor.end }}</span> 
+                            {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
                           </span>
                         </div>
                       </td>

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -6,6 +6,7 @@
             <div style="display:flex;">
                 <div>单据号：<span style="display:inline-block;width:200px;">{{info.order_number ? info.order_number : ''}}</span></div>
                 <div>透析号：<span style="display:inline-block;width:200px;">{{info.patient.dialysis_no ? info.patient.dialysis_no : ''}}</span></div>
+                <div style="margin-left:2px;">电脑号：<span style="display:inline-block;">{{info.psn_no ? info.psn_no : ''}}</span></div>
             </div>
             <div style="display:flex;justify-content: space-between;">
                 <div style="display:flex;">
@@ -14,7 +15,6 @@
                   <div>年龄：<span style="display:inline-block;width:50px;">{{info.patient.age ? info.patient.age : ''}}岁</span></div>
                   <div>费别：<span style="display:inline-block;min-width:80px;">医保</span>
                   </div>
-                  <div style="margin-left:2px;">电脑号：<span style="display:inline-block;width:80px;">{{info.psn_no ? info.psn_no : ''}}</span></div>
                   <div>收费日期：<span style="display:inline-block;width:100px;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</span></div>
                 </div>
                 <div style="float:right">金额单位：元</div>
@@ -113,6 +113,7 @@
             <div style="display:flex;">
                 <div>单据号：<span style="display:inline-block;width:200px;">{{balanceAccounts.his.number ? balanceAccounts.his.number : ''}}</span></div>
                 <div>透析号：<span style="display:inline-block;width:200px;">{{balanceAccounts.patient ? balanceAccounts.patient.dialysis_no : ''}}</span></div>
+                <div>电脑号：<span style="display:inline-block;width:80px;"></span></div>
             </div>
             <div style="display:flex;justify-content: space-between;">
                 <div style="display:flex;">
@@ -121,7 +122,6 @@
                   <div>年龄：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.age : ''}}岁</span></div>
                   <div>费别：<span style="display:inline-block;width:80px;">自费</span>
                   </div>
-                  <div>电脑号：<span style="display:inline-block;width:80px;"></span></div>
                   <div>收费日期：<span style="display:inline-block;width:100px;">{{getTime(new Date(),"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</span></div>
                 </div>
                 <div style="float:right">金额单位：元</div>