Merge remote-tracking branch 'origin/20220812' into 20220812

src/xt_pages/dialysis/template/DialysisPrintOrderFiftySix.vue

@@ -1115,7 +1115,6 @@
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
                     </div>
-                    
                   </div>
                 </td>
               </tr>
@@ -3268,7 +3267,7 @@ export default {
               monitor.operate_time == this.dialysisOrder.end_time
             ) {
               this.monitors[index].end = "【结束透析】";
-              
+
               tempmonitorflag = false;
             }
             if (tempmonitorflag == false && index == this.monitors.length - 1) {
@@ -3433,8 +3432,17 @@ export default {
             }
           }
         }
+
         if (this.org_id == 10330 || this.org_id == 0 || this.org_id == 9675) {
-          this.doctor_advices = this.doctor_advices.filter(o => o.delivery_way.indexOf("注射") > -1)
+          let newArr = [];
+          this.doctor_advices.forEach((o) => {
+            if (o.delivery_way && o.delivery_way != "") {
+              if (o.delivery_way.indexOf("注射") > -1) {
+                newArr.push(o);
+              }
+            }
+          });
+          this.doctor_advices = newArr;
         }
 
         this.totollength = this.doctor_advices.length + this.monitors.length;

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -2,7 +2,7 @@
   <div id="dialysis-print-box" style="position: relative">
     <div class="dialysis-print-order">
       <table class="dialysis-print-order">
-        <thead>
+        <thead style="transform: translateY(3px);">
           <tr>
             <td>
               <div class="order-yy-name">{{ orgname }}</div>

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -743,7 +743,7 @@
                     class="row"
                     style="padding: 2px 0; line-height: 20px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1">
+                    <!-- <div class="inline_block" style="flex: 1">
                       透析(滤)器：
                       <div
                         class="under_line"
@@ -781,6 +781,19 @@
                             : "/"
                         }}
                       </div>
+                    </div> -->
+                    <div class="inline_block" style="flex: 1">
+                      透析器/灌流器:
+                      <div
+                        class="under_line"
+                        style="width: 130px; text-align: center"
+                      >
+                        {{
+                          prescription.dialyzer_perfusion_apparatus
+                            ? prescription.dialyzer_perfusion_apparatus
+                            : "/"
+                        }}
+                      </div>
                     </div>
 
                     <div class="inline_block" style="flex: 1">

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -774,7 +774,7 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1" v-if="org_id!=10290">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10290&&org_id!=9675">
                       透析(滤)器：
                       <div
                         class="under_line"
@@ -785,14 +785,15 @@
                             ? prescription.dialyzer_perfusion_apparatus
                             : ""
                         }}
+                        <span v-if="prescription.dialysis_dialyszers&&prescription.dialysis_dialyszers!=''">/</span>
                         {{
                           prescription.dialysis_dialyszers
                             ? prescription.dialysis_dialyszers
-                            : "/"
+                            : ""
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 1" v-if="org_id!=10290">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10290&&org_id!=9675">
                       灌流器：
                       <div
                         class="under_line"
@@ -805,7 +806,7 @@
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 1" v-if="org_id==10290">
+                    <div class="inline_block" style="flex: 1" v-if="org_id==10290||org_id==9675">
                       透析器/灌流器：
                       <div
                         class="under_line"
@@ -816,10 +817,11 @@
                             ? prescription.dialyzer_perfusion_apparatus
                             : ""
                         }}
+                        <span v-if="prescription.dialysis_dialyszers&&prescription.dialysis_dialyszers!=''">/</span>
                         {{
                           prescription.dialysis_dialyszers
                             ? prescription.dialysis_dialyszers
-                            : "/"
+                            : ""
                         }}
                       </div>
                     </div>

src/xt_pages/user/components/PatientDetail.vue

@@ -903,6 +903,7 @@
                     ></div>
                   </td>
                 </tr>
+                
                 <tr>
                   <td>
                     <div class="td_proj_title">既<br />往<br />史</div>
@@ -914,6 +915,16 @@
                     ></div>
                   </td>
                 </tr>
+                <tr v-if="org_id==10090||org_id==0||org_id==9675">
+                  <td>
+                    <div class="td_proj_title">传<br />染<br />病</div>
+                  </td>
+                  <td colspan="7">
+                    <div class="td_proj_content td_align_left">
+                      {{ patientPrint.contagions }}
+                    </div>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="8"><div class="td_proj_title">体格检查</div></td>
                 </tr>
@@ -942,7 +953,7 @@
                     ></div>
                   </td>
                 </tr>
-                <tr>
+                <tr v-if="org_id!=10090&&org_id!=0&&org_id!=9675">
                   <td>
                     <div class="td_proj_title">传<br />染<br />病</div>
                   </td>
@@ -963,6 +974,17 @@
                     ></div>
                   </td>
                 </tr>
+                <tr v-if="org_id==10090||org_id==0||org_id==9675">
+                  <td>
+                    <div class="td_proj_title">诊<br />疗<br />计<br />划</div>
+                  </td>
+                  <td colspan="7">
+                    <div
+                      class="td_proj_content td_align_left"
+                      v-html="patientPrint.diagnose"
+                    ></div>
+                  </td>
+                </tr>
               </tbody>
             </table>
             <div class="print_footnote_panel">