修改方剂bug

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -33,14 +33,15 @@
               <check-box text="住院" :checked="record.patient.source == 2"></check-box>
               <!-- TODO -->
             </div>
-          </div>
-          <div class="row flex">
             <div class="inline_block">
               住院号/透析卡号：
               <div class="under_line" style="width: 100px;">
                 {{record.patient.admission_number?record.patient.admission_number:'无'}}/{{ record.patient.dialysis_no }}
               </div>
             </div>
+          </div>
+          <div class="row flex">
+
             <div class="inline_block">
               诊断：
               <div class="under_line" style="width: 500px;">{{record.patient.diagnose}}</div>
@@ -206,11 +207,11 @@
                     <div class="inline_block">
                       透析时间：
                       <div class="under_line" style="width: 30px;">
-                        {{record.prescription&&record.prescription.dialysis_duration_hour?record.prescription.dialysis_duration_hour:''}}
+                        {{record.prescription&&record.prescription.dialysis_duration_hour?record.prescription.dialysis_duration_hour:'0'}}
                       </div>
                       h
                       <div class="under_line" style="width: 30px;">
-                        {{record.prescription&&record.prescription.dialysis_duration_minute?record.prescription.dialysis_duration_minute:''}}
+                        {{record.prescription&&record.prescription.dialysis_duration_minute?record.prescription.dialysis_duration_minute:'0'}}
                       </div>
                       min
                     </div>
@@ -330,7 +331,7 @@
                       <div class="under_line" style="width: 100px;">
                         <span
                           v-if="!record.advices || typeof(record.advices[0]) == 'undefined' || typeof(record.advices[0][0]) == 'undefined'"></span>
-                        <span v-else-if="setAdminUserES(record.advices[0][0], 'advice_doctor') == ''">{{getAdminUser(record.advices, 'advice_doctor')}}</span>
+                        <span v-else-if="setAdminUserES(record.advices[0][0], 'advice_doctor') == ''">{{getAdminUser(record.advices[0][0], 'advice_doctor')}}</span>
                         <img class="es-img" :src="setAdminUserES(record.advices[0][0], 'advice_doctor')" alt=""
                              srcset="" v-else style="height: 20px;">
 
@@ -402,11 +403,11 @@
                     <div class="inline_block">
                       实际治疗时间：
                       <div class="under_line" style="width: 30px;">
-                        {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_treatment_hour?record.assessment_after_dislysis.actual_treatment_hour:''}}
+                        {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_treatment_hour?record.assessment_after_dislysis.actual_treatment_hour:'0'}}
                       </div>
                       h
                       <div class="under_line" style="width: 30px;">
-                        {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_treatment_minute?record.assessment_after_dislysis.actual_treatment_minute:''}}
+                        {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_treatment_minute?record.assessment_after_dislysis.actual_treatment_minute:'0'}}
                       </div>
                       min
                     </div>
@@ -442,7 +443,7 @@
                       <check-box text="有"
                                  :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'puncture_point_oozing_blood', 1)"></check-box>
                       <check-box text="无"
-                                 :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'puncture_point_oozing_blood', 1)"></check-box>
+                                 :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'puncture_point_oozing_blood', 2)"></check-box>
                     </div>
                     <div class="inline_block" style="margin-left: 40px;">
                       穿刺点血肿：

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -45,7 +45,7 @@
 
             <div class="inline_block" style="margin-left: 10px;">
               诊断：
-              <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
+              <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
             </div>
 
           </div>
@@ -333,7 +333,7 @@
 
               <div class="inline_block" style="margin-left: 10px;">
                 诊断：
-                <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
+                <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
               </div>
 
             </div>
@@ -644,7 +644,7 @@
 
             <div class="inline_block" style="margin-left: 10px;">
               诊断：
-              <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
+              <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
             </div>
 
           </div>
@@ -980,7 +980,7 @@
 
                 <div class="inline_block" style="margin-left: 10px;">
                   诊断：
-                  <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
+                  <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
                 </div>
 
               </div>

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

@@ -45,7 +45,7 @@
 
             <div class="inline_block" style="margin-left: 10px;">
               诊断：
-              <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
+              <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
             </div>
 
           </div>
@@ -330,7 +330,7 @@
 
               <div class="inline_block" style="margin-left: 10px;">
                 诊断：
-                <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
+                <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
               </div>
 
             </div>

src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue

@@ -45,52 +45,10 @@
 
             <div class="inline_block" style="margin-left: 10px;">
               诊断：
-              <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
+              <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
             </div>
 
           </div>
-          <div class="row">
-            <div class="inline_block">
-              科室：
-              <check-box text="门诊透析" :checked="record.patient.source == 1"></check-box>
-              &nbsp;
-              <check-box text="住院" :checked="record.patient.source == 2"></check-box>
-              <!-- TODO -->
-            </div>
-            <div class="inline_block" style="margin-left: 5px;">
-              住院号：
-              <div class="under_line" style="width: 70px;text-align: left" v-if="record.patient.admission_number">
-                {{record.patient.admission_number}}
-              </div>
-              <div class="under_line" style="width: 70px;" v-else>
-                {{'/'}}
-              </div>
-            </div>
-            <div class="inline_block" style="margin-left:10px;">
-              姓名：
-              <div class="under_line" style="width: 50px;text-align: left">{{ record.patient.name }}</div>
-            </div>
-            <div class="inline_block" style="margin-left: 10px;">
-              性别：
-              <check-box text="男" :checked="record.patient.gender == 1"></check-box>
-              &nbsp
-              <check-box text="女" :checked="record.patient.gender == 2"></check-box>
-            </div>
-            <div class="inline_block" style="margin-left: 10px;">
-              年龄：
-              <div class="under_line" style="width:30px;text-align: left">{{getAge(record.patient)}}</div>
-              岁
-            </div>
-
-            <div class="inline_block" style="margin-left: 10px;">
-              诊断：
-              <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
-            </div>
-
-          </div>
-
-
-
           <table class="proj_table">
             <tbody>
               <tr>
@@ -413,7 +371,7 @@
 
                 <div class="inline_block" style="margin-left: 10px;">
                   诊断：
-                  <div class="under_line_two" style="width: 200px;text-align: left">{{record.patient.diagnose}}</div>
+                  <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
                 </div>
 
               </div>

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -1,4 +1,4 @@
-<template>   
+<template>
   <div id="dialysis-print-box">
         <div class="dialysis-print-order">
           <div class="order-yy-name">{{orgname}}</div>
@@ -10,42 +10,43 @@
               <td width="90">
                 <div class="under-line">&nbsp;{{patientInfo.name}}</div>
               </td>
+              <td width="30"></td>
               <td width="50">性 别:</td>
               <td width="120">
                 <div>
                   <label-box :isChecked='patientInfo_gender_1' showValue='男'></label-box>
-                  &nbsp;
                   <label-box :isChecked='patientInfo_gender_2' showValue='女'></label-box>
                 </div>
               </td>
+
               <td width="50">年 龄:</td>
               <td width="40">
                 <div class="under-line">{{getAge(patientInfo)}}</div>
               </td>
               <td>岁</td>
-              <td width="10">&nbsp;</td>
+              <td width="30"></td>
 
               <td width="50">科 室:</td>
               <td width="200">
                 <div>
                   <label-box :isChecked='patientInfo_source_1' showValue='门 诊 透 析'></label-box>
-                  &nbsp;
                   <label-box :isChecked='patientInfo_source_2' showValue='住 院'></label-box>
                 </div>
               </td>
 
+              <td width="120" >住院号/透析卡号:</td>
+              <td width="130">
+                <div class="under-line">&nbsp;{{patientInfo.admission_number?patientInfo.admission_number:'无'}}
+                  /{{patientInfo.dialysis_no}}
+                </div>
+              </td>
+              <td></td>
             </tr>
             </tbody>
           </table>
           <table class="table-box" style="margin-top: 10px;">
             <tbody>
             <tr>
-              <td width="130">住院号/透析卡号:</td>
-              <td width="90">
-                <div class="under-line">&nbsp;{{patientInfo.admission_number?patientInfo.admission_number:'无'}}
-                  /{{patientInfo.dialysis_no}}
-                </div>
-              </td>
 
               <td width="40">诊 断:</td>
               <td width="">
@@ -308,11 +309,11 @@
                   <tr>
                     <td width="70">透析时间:</td>
                     <td width="40">
-                      <div class="under-line">&nbsp;{{prescription.dialysis_duration_hour?prescription.dialysis_duration_hour:''}}</div>
+                      <div class="under-line">&nbsp;{{prescription.dialysis_duration_hour?prescription.dialysis_duration_hour:'0'}}</div>
                     </td>
                     <td width="10">h</td>
                     <td width="40">
-                      <div class="under-line">&nbsp;{{prescription.dialysis_duration_minute?prescription.dialysis_duration_minute:''}}</div>
+                      <div class="under-line">&nbsp;{{prescription.dialysis_duration_minute?prescription.dialysis_duration_minute:'0'}}</div>
                     </td>
                     <td width="35">min</td>
                     <td></td>
@@ -596,11 +597,11 @@
                   <tr>
                     <td width="90">实际治疗时间</td>
                     <td width="40">
-                      <div class="under-line">&nbsp;{{afterdialysis.actual_treatment_hour?afterdialysis.actual_treatment_hour:''}}</div>
+                      <div class="under-line">&nbsp;{{afterdialysis.actual_treatment_hour?afterdialysis.actual_treatment_hour:'0'}}</div>
                     </td>
                     <td width="10">h</td>
                     <td width="40">
-                      <div class="under-line">&nbsp;{{afterdialysis.actual_treatment_minute?afterdialysis.actual_treatment_minute:''}}</div>
+                      <div class="under-line">&nbsp;{{afterdialysis.actual_treatment_minute?afterdialysis.actual_treatment_minute:'0'}}</div>
                     </td>
                     <td width="35">min</td>
                     <td></td>

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -36,7 +36,7 @@
         </div>
         <div class="inline_block" style="margin-left: 10px;">
           诊断：
-          <div class="under_line" style="width: 200px;text-align: left">{{patientInfo.diagnose}}</div>
+          <div class="under_line" style="width: 180px;text-align: left">{{patientInfo.diagnose}}</div>
         </div>
       </div>
 
@@ -320,7 +320,7 @@
           </div>
           <div class="inline_block" style="margin-left: 10px;">
             诊断：
-            <div class="under_line" style="width: 200px;text-align: left">{{patientInfo.diagnose}}</div>
+            <div class="under_line" style="width: 180px;text-align: left">{{patientInfo.diagnose}}</div>
           </div>
         </div>
 
@@ -616,7 +616,7 @@
         </div>
         <div class="inline_block" style="margin-left: 10px;">
           诊断：
-          <div class="under_line" style="width: 200px;text-align: left">{{patientInfo.diagnose}}</div>
+          <div class="under_line" style="width:180px;text-align: left">{{patientInfo.diagnose}}</div>
         </div>
       </div>
 
@@ -940,7 +940,7 @@
             </div>
             <div class="inline_block" style="margin-left: 10px;">
               诊断：
-              <div class="under_line" style="width: 200px;text-align: left">{{patientInfo.diagnose}}</div>
+              <div class="under_line" style="width: 180px;text-align: left">{{patientInfo.diagnose}}</div>
             </div>
           </div>