新分支

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -172,66 +172,66 @@
           <span v-if="scope.row.dialysissolution.anticoagulant === 9">达肝素</span>
           <span v-if="scope.row.dialysissolution.anticoagulant === 10">体外抗凝</span>
           <span v-if="scope.row.dialysissolution.anticoagulant === 11">那屈肝素</span>
-         <span v-if="scope.row.prescription.antioxidant_commodity_name!=''">
+         <!-- <span v-if="scope.row.prescription.antioxidant_commodity_name!=''">
              (<span>{{scope.row.prescription.antioxidant_commodity_name}}</span>)
-          </span>
+          </span> -->
         </template>
       </el-table-column>
       <el-table-column label="总量" min-width="100" align="center">
         <template slot-scope="scope">
-          <span v-if="scope.row.prescription.anticoagulant == 1">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "mg"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 1">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "mg"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 2">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 2">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 3">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 3">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 4">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "mg"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 4">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "mg"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 5">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "mg"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 5">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "mg"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 6">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 6">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 7">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 7">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 8">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 8">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
-         <span v-if="scope.row.prescription.anticoagulant == 9">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+         <span v-if="scope.row.dialysissolution.anticoagulant == 9">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 10">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 10">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 11">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 11">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
         </template>

src/xt_pages/workforce/remind_print_setting.vue

@@ -125,11 +125,12 @@
                 <!-- 透析器灌流器 -->
                
                  <div>
-                  <span v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器:</span>
+                  <span v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器 <span v-if="org_id==10445">/滤过器</span>:</span>
                   <span v-if="printObj.dialyzers == 1&& main_collection.dialysissolution.dialysis_dialyszers!=''">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
                   <span v-if="printObj.perfusion_apparatus == 1&& main_collection.dialysissolution.dialysis_irrigation!=''">{{main_collection.dialysissolution.dialysis_irrigation}}</span>
-
+               
                   <span v-if="org_id == 10440 && main_collection.dialysissolution.dialyzer_perfusion_apparatus!=''">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
+                  <span v-if="org_id == 10445"><span v-if="main_collection.dialysissolution.dialysis_strainer!=''">/</span>{{ main_collection.dialysissolution.dialysis_strainer }}</span>
                 </div>
                 <div v-if="printObj.doctor_advice == 1">
                     医嘱：