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

src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue

@@ -301,9 +301,11 @@
                     <div class="inline_block" style="margin-left:10px;flex:1;">
                       置换量：
                       <div class="under_line" style="width: 70px;text-align: center">
-                        {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}
+                        <span v-if="org_id != 9956">{{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}</span>
+                        <span v-else>{{ prescription.replacement_total ? prescription.replacement_total : "/" }}</span>
                       </div>
-                      L
+                      <span v-if="org_id != 9956">L</span>
+                      <span v-else>ml</span>
                     </div>
                     <div class="inline_block" style="margin-left:10px;flex:1;">
                       血流量：
@@ -344,7 +346,10 @@
                     <div class="inline_block" style="flex:1;">
                       上次透后体重：
                       <div class="under_line" style="width: 100px;text-align: center">
-                        {{ predialysis.weight_after_last_transparency ? parseFloat(predialysis.weight_after_last_transparency - predialysis.additional_weight).toFixed(1) : "未称重" }}
+                        <span v-if="org_id != 9956">
+                          {{ predialysis.weight_after_last_transparency ? parseFloat(predialysis.weight_after_last_transparency - predialysis.additional_weight).toFixed(1) : "未称重" }}
+                        </span>
+                        <span v-else>{{ assessmentafter.weight_after ? assessmentafter.weight_after : "/" }}</span>
                       </div>
                       kg
                     </div>
@@ -455,10 +460,13 @@
                       <div class="under_line" style="width: 50px;text-align: center;">
                         {{ prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "/" }}
                       </div>
+                      <span v-if="prescription.anticoagulant == 5">mg</span>
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
-                      <span v-if="prescription.anticoagulant == 2">iu</span>
+                      <span v-if="prescription.anticoagulant == 2">mg</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
+                      <span v-if="prescription.anticoagulant == 6">iu</span>
+                      <span v-if="prescription.anticoagulant == 7">iu</span>
                     </div>
                     <div class="inline_block" style="margin-left:20px;">
                       透析机号：
@@ -1155,7 +1163,8 @@ export default {
         zongliang_unit: "mg",
         gaimingcheng_unit: "",
         gaijiliang_unit: ""
-      }
+      },
+      assessmentafter:{}
     };
   },
   methods: {
@@ -1497,6 +1506,7 @@ export default {
           this.predialysis.blood_access_part_opera_id
         );
         this.afterdialysis = response.data.data.AssessmentAfterDislysis;
+        this.assessmentafter = response.data.data.assessmentAfterDislysis;
         this.operators = response.data.data.operators;
         this.dialysisOrder =
           response.data.data.dialysisOrder === null
@@ -1925,6 +1935,7 @@ export default {
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
 
     var xtuser = this.$store.getters.xt_user;
+    this.org_id = xtuser.org.id
     this.orgname = xtuser.org.org_name;
     // this.orgname = "遂溪方济医院";
     this.modeOptions = this.$store.getters.treatment_mode;

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySix.vue

@@ -175,17 +175,17 @@
                 <tbody>
                   <tr>
                     <td width="190"></td>
-                    <td width='100'>穿刺针型号：</td>
-                    <td width="110">
-                      <div>
-                        <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G-动脉') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G-静脉') > -1 ? true : false" showValue="16G"></label-box>
+                    <td width='100'>穿刺针：</td>
+                    <td>
+                      <span>{{ predialysis.puncture_needle ? predialysis.puncture_needle : '/' }}</span>
+                      <!-- <div>
+                        <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G-静脉') > -1 ? true : false" showValue="16G"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G-动脉') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G-静脉') > -1 ? true : false" showValue="17G"></label-box>
+                        <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G-静脉') > -1 ? true : false" showValue="17G"></label-box>
                         &nbsp;
-                      </div>
+                      </div> -->
                     </td>
-                    <td width="30"></td>
-                    <td width='80'>钝针穿刺：</td>
+                    <!-- <td width='80'>钝针穿刺：</td>
                     <td width="140">
                       <div>
                         <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G-动脉') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G-动脉') > -1 ? true : false" showValue="动脉"></label-box>
@@ -193,7 +193,7 @@
                         <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G-静脉') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G-静脉') > -1 ? true : false" showValue="静脉"></label-box>
                         &nbsp;)
                       </div>
-                    </td>
+                    </td> -->
                     <td></td>
                   </tr>
                 </tbody>
@@ -274,8 +274,8 @@
                     <td width='50'>打折：</td>
                     <td width="80">
                       <div>
-                        <label-box :isChecked="predialysis.catheter.indexOf('打折-无') > -1" showValue="无"></label-box>&nbsp;
-                        <label-box :isChecked="predialysis.catheter.indexOf('打折-有') > -1" showValue="有"></label-box>
+                        <label-box :isChecked="predialysis.catheter_bend == 2" showValue="无"></label-box>&nbsp;
+                        <label-box :isChecked="predialysis.catheter_bend == 1" showValue="有"></label-box>
                       </div>
                     </td>
                     <td width='30'></td>