10月23

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1498,10 +1498,6 @@
                           医嘱内容
                         </td>
                       </tr>
-                      <!-- <tr style="line-height:35px;padding:8px 5px;">
-                    <td colspan="4" style="font-size: 16px">开医嘱</td>
-                    <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
-                  </tr> -->
                       <tr style="line-height: 35px; padding: 8px 5px">
                         <td style="font-size: 16px" width="10%">时间</td>
                         <td style="font-size: 16px" colspan="2" width="45%">
@@ -1510,16 +1506,8 @@
                         <td style="font-size: 16px" width="10%">医生签名</td>
                         <td style="font-size: 16px" width="10%">时间</td>
                         <td style="font-size: 16px" width="10%">执行人签名</td>
-                        <td
-                          style="font-size: 16px"
-                          width="10%"
-                          v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375"
-                        >
-                          核对护士
-                        </td>
+                       
                       </tr>
-                      <!-- <template v-for="group in doctor_advices" > -->
-
                       <tr
                         v-for="(advice, advice_index) in doctor_advices"
                         :key="advice_index"
@@ -1528,7 +1516,7 @@
                           <span v-if="advice.start_time">
                             {{ getTime(advice.start_time, "{h}:{i}") }}
                           </span>
-                          <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
+
                         </td>
                         <td
                           height="32px"
@@ -1536,7 +1524,8 @@
                           class="advice-name"
                           style="padding-left: 7px"
                         >
-                          <span v-if="advice.parent_id > 0">---></span>
+                      
+                          <span v-if="advice.parent_id > 0"></span>
                           <span>{{ advice.advice_name }}</span>
                           <span v-if="advice && advice.advice_desc"
                             >({{ advice.advice_desc
@@ -1563,12 +1552,7 @@
                             >({{ advice.remark }})</span
                           >
                         </td>
-                        <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
-                      <span>{{advice.delivery_way}}</span>
-                      <span>{{advice.execution_frequency}}</span>
-                      <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
-                    </td> -->
-                        <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
+                      
                         <td height="32px">
                           <span
                             v-if="setAdminUserES(advice.advice_doctor) == ''"
@@ -1582,10 +1566,7 @@
                             v-else
                           />
                         </td>
-                        <!-- <td height="35px">
-                      <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
-                      <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
-                    </td> -->
+                       
                         <td height="32px">
                           <span v-if="advice.execution_time">{{
                             getTime(advice.execution_time, "{h}:{i}")
@@ -1604,21 +1585,7 @@
                             v-else
                           />
                         </td>
-
-                        <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375">
-                          <span v-if="setAdminUserES(advice.checker) == ''">{{
-                            getAdminUser(advice.checker)
-                          }}</span>
-                          <img
-                            style="height: 30px"
-                            :src="setAdminUserES(advice.checker)"
-                            alt=""
-                            srcset=""
-                            v-else
-                          />
-                        </td>
                       </tr>
-                      <!-- </template> -->
                     </tbody>
                   </table>
                 </td>
@@ -1820,6 +1787,7 @@
             </div>
           </div>
         </template>
+
         <div class="row" style="margin-top: -11px; position: relative">
           <table class="proj_table">
             <tbody>
@@ -1839,10 +1807,7 @@
                     医嘱内容
                   </td>
                 </tr>
-                <!-- <tr style="line-height:35px;padding:8px 5px;">
-                <td colspan="4" style="font-size: 16px">开医嘱</td>
-                <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
-              </tr> -->
+              
                 <tr style="line-height: 35px; padding: 8px 5px">
                   <td style="font-size: 15px" width="10%">时间</td>
                   <td style="font-size: 15px" colspan="2" width="45%">
@@ -1851,15 +1816,9 @@
                   <td style="font-size: 15px" width="10%">医生签名</td>
                   <td style="font-size: 15px" width="10%">时间</td>
                   <td style="font-size: 15px" width="10%">执行人签名</td>
-                  <td
-                    style="font-size: 15px"
-                    width="10%"
-                    v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375"
-                  >
-                    核对护士
-                  </td>
+                 
                 </tr>
-                <!-- <template v-for="group in doctor_advices" > -->
+               
                 <tr
                   v-for="(advice, advice_index) in doctor_advices"
                   :key="advice_index"
@@ -1868,7 +1827,7 @@
                     <span v-if="advice.start_time">
                       {{ getTime(advice.start_time, "{h}:{i}") }}
                     </span>
-                    <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
+                  
                   </td>
                   <td
                     height="32px"
@@ -1876,7 +1835,7 @@
                     class="advice-name"
                     style="padding-left: 7px"
                   >
-                    <span v-if="advice.parent_id > 0">---></span>
+                    <span v-if="advice.parent_id > 0"></span>
                     <span>{{ advice.advice_name }}</span>
                     <span v-if="advice && advice.advice_desc"
                       >({{ advice.advice_desc
@@ -1903,12 +1862,7 @@
                       >({{ advice.remark }})</span
                     >
                   </td>
-                  <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
-                <span>{{advice.delivery_way}}</span>
-                <span>{{advice.execution_frequency}}</span>
-                <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
-              </td> -->
-                  <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
+                
                   <td height="32px">
                     <span
                       v-if="setAdminUserES(advice.advice_doctor) == ''"
@@ -1922,10 +1876,7 @@
                       v-else
                     />
                   </td>
-                  <!-- <td height="35px">
-                <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
-                <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
-              </td> -->
+                  
                   <td height="32px">
                     <span v-if="advice.execution_time">{{
                       getTime(advice.execution_time, "{h}:{i}")
@@ -1945,18 +1896,6 @@
                     />
                   </td>
 
-                  <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375">
-                    <span v-if="setAdminUserES(advice.checker) == ''">{{
-                      getAdminUser(advice.checker)
-                    }}</span>
-                    <img
-                      style="height: 30px"
-                      :src="setAdminUserES(advice.checker)"
-                      alt=""
-                      srcset=""
-                      v-else
-                    />
-                  </td>
                 </tr>
               </template>
 
@@ -2562,12 +2501,12 @@
          <div style="position: relative; left: 70%;top: 50px;width: 288px;">
           患者签名：
           <div class="under_line" style="width: 120px;">
-            <img
+            <!-- <img
               style="height: 30px"
               :src="dialysisOrder == null? 0: dialysisOrder.url"
               alt=""
               srcset=""
-            />
+            /> -->
           </div>
         </div>
       </div>
@@ -3679,8 +3618,8 @@ export default {
       
         console.log("时间我我我哦我我",this.doctor_advices)
         if (this.doctor_advices.length <= 6) {
-          var nl = 6;
-          this.print_length = 6;
+          var nl = 3;
+          this.print_length = 3;
 
           for (let index = 0; index < nl; index++) {
             if (

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -8,8 +8,8 @@
         class="dialysis-print-order print-template-two print_page_main_content"
         
       >
-        <div id="dialysis-print-box-64" style="padding: 10px 0 0 50px;">
-          <!-- <div
+        <div id="dialysis-print-box-64" style="padding:10px 0 0 40px  ;">
+          <!-- <div 10px 0 0 40px
             class="order-yy-name"
             style=" letter-spacing: 0;
                 font-weight: 600;
@@ -25,16 +25,16 @@
               <div style="display:inline-block; ;">病历号：
                 {{patientInfo.record_number?patientInfo.record_number:"" }}
               </div>
-              <div style="display:inline-block;margin-left: 90px;">
+              <div style="display:inline-block;margin-left: 50px;">
                 姓名：{{ patientInfo.name }}
               </div>
-              <div style="display:inline-block; margin-left: 90px;">
+              <div style="display:inline-block; margin-left: 50px;">
                 性别：{{ patientInfo_gender_1 == true ? "男" : "女" }}
               </div>
-              <div style="display:inline-block; margin-left: 90px;">
+              <div style="display:inline-block; margin-left: 50px;">
                 年龄：{{ getAge(patientInfo) }}
               </div>
-              <div style="display:inline-block; margin-left: 90px;">
+              <div style="display:inline-block; margin-left: 50px;">
                 透析次数：{{
                   patientInfo.total_dialysis +
                     patientInfo.user_sys_before_count