Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/user/components/PatientDetail.vue

@@ -1033,12 +1033,12 @@
     </el-form>
     <!-- 打印预览 style="display: none"-->
     <div style="display: none">
-      <div id="print-info-box" v-if="org_id !=10206&&org_id !=0">
+      <div id="print-info-box" v-if="org_id !=10206">
         <div class="print_main_content" style="margin-top: 70px;">
           <div class="order_title" v-if="org_id!=10210">{{ orgname }} 血液透析门诊病历</div>
           <div class="order_title" v-if="org_id==10210">{{ orgname }} 血液透析住院病历</div>
           <div >
-            <table >
+            <table style="border-collapse: collapse;">
               <!-- 用 thead 规定好宽度 -->
               <!-- <thead>
                 <tr v-show="false">
@@ -1252,9 +1252,6 @@
                     >  {{ patientPrint.remark }}</div>
                   </td>
                 </tr>
-
-
-
                 <tr>
                   <td>
                     <div class="td_proj_title">诊<br />断</div>
@@ -1286,10 +1283,6 @@
               <div class="proj">
                 <span class="proj_title">日期：</span>
 
-                <!-- <span v-if="org_id == 3907 || org_id == 9671|| org_id == 9675 || org_id == 10394 || org_id ==10612 || org_id == 0 || org_id ==10617">
-                {{getTime(patientPrint.created_time)}}</span>
-                <span v-else>{{ printDate }}</span> -->
-
                 <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span>
                 <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span>