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/batch_print/batch_print_order_fortyOne.vue

@@ -439,33 +439,53 @@
                                 L
                             </div>
                             </div>
-                            <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
-                            <div class="inline_block" style="flex:1.4">
+                            <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" v-if="org_id == 10233">
+                              <div class="inline_block" style="flex:1">
                                 血管通路：
-                                <div class="under_line" style="width: 300px;text-align: center;">
-                                <!-- {{record.prescription.blood_access_part_opera_name}} -->
-                                {{ QueryPartById(record.prescription && record.prescription.blood_access ? record.prescription.blood_access : 0) }}
+                                <div class="under_line" style="width: 260px;text-align: center;">
+                                  {{ QueryPartById(record.assessment_before_dislysis && record.assessment_before_dislysis.blood_access_part_opera_id ? record.assessment_before_dislysis.blood_access_part_opera_id : 0)}}
                                 </div>
-                            </div>
-                            <div class="inline_block" style="flex:1">
-                                透析机型：
-                                <div class="under_line" style="width: 150px;text-align: center;">
-                                {{ record.assessment_before_dislysis.machine_type ? record.assessment_before_dislysis.machine_type : '' }}
-                                </div>
-                            </div>
-                            <div class="inline_block" style="flex:1">
-                                机号：
-                                <div class="under_line" style="width: 60px;text-align: center;">
-                                {{
-                                    record.dialysis_order &&
-                                    record.dialysis_order.device_number &&
-                                    record.dialysis_order.device_number.number.length >
-                                    0
-                                    ? record.dialysis_order.device_number.number
-                                    : record.device_number.number
-                                }}
+                              </div>
+                              <div class="inline_block" style="flex:1">
+                                血管通路部位：
+                                <div class="under_line" style="width: 160px;text-align: center;">
+                                  {{record.assessment_before_dislysis.blood_access_part_id}}
                                 </div>
+                              </div>
                             </div>
+                            <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+                              <div class="inline_block" style="flex:1" v-if="org_id != 10233">
+                                  血管通路：
+                                  <div class="under_line" style="width: 260px;text-align: center;">
+                                  <!-- {{record.prescription.blood_access_part_opera_name}} -->
+                                  {{ QueryPartById(record.prescription && record.prescription.blood_access ? record.prescription.blood_access : 0) }}
+                                  </div>
+                              </div>
+                              <div class="inline_block" style="flex:1">
+                                  透析机型：
+                                  <div class="under_line" style="width: 150px;text-align: center;">
+                                  {{ record.assessment_before_dislysis.machine_type ? record.assessment_before_dislysis.machine_type : '' }}
+                                  </div>
+                              </div>
+                              <div class="inline_block" style="flex:1">
+                                  机号：
+                                  <div class="under_line" style="width: 60px;text-align: center;">
+                                  {{
+                                      record.dialysis_order &&
+                                      record.dialysis_order.device_number &&
+                                      record.dialysis_order.device_number.number.length >
+                                      0
+                                      ? record.dialysis_order.device_number.number
+                                      : record.device_number.number
+                                  }}
+                                  </div>
+                              </div>
+                              <div v-if="org_id == 10233" class="inline_block" style="flex:1;margin-left:10px;">
+                                透析器/灌流器：
+                                <div class="under_line" style="width: 120px;text-align: center;">
+                                  {{ record.prescription.dialyzer_perfusion_apparatus ? record.prescription.dialyzer_perfusion_apparatus : "" }}
+                                </div>
+                              </div>
                             </div>
                             <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                             <div class="inline_block" style="flex:1;">
@@ -695,8 +715,8 @@
                                 <td style="line-height:16px;padding:0px;">
                                     <div style="min-height:20px;line-height:20px; overflow:hidden;">
                                     <span v-if="getTime(monitor.operate_time, '{h}:{i}')" style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
-                                        <template v-if="(record.dialysis_order && monitor.operate_time == record.dialysis_order.start_time)">【开始透析】引血100ml/min</template>
-                                        <span v-if="record.dialysis_order && monitor.operate_time == record.dialysis_order.end_time">【结束透析】回血100ml/min</span> 
+                                        <template v-if="(record.dialysis_order && monitor.operate_time == record.dialysis_order.start_time)">【开始透析】<span v-if="org_id != 10233"> 引血100ml/min</span></template>
+                                        <span v-if="record.dialysis_order && monitor.operate_time == record.dialysis_order.end_time">【结束透析】<span v-if="org_id != 10233"> 回血100ml/min</span></span> 
                                         {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
                                     </span>
                                     </div>
@@ -894,6 +914,7 @@ export default {
     var xtuser = this.$store.getters.xt_user
     // console.log('xtuser', xtuser)
     this.orgname = xtuser.org.org_name
+    this.org_id = this.$store.getters.xt_user.org.id
     //   this.orgname = "遂溪方济医院";
     this.modeOptions = this.$store.getters.treatment_mode
     //   this.replacementWays = this.$store.getters.replacement_ways;

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -416,25 +416,27 @@
                     L
                   </div>
                 </div>
-                <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
-                  <div class="inline_block" style="flex:1.5" v-if="org_id != 10233">
+                <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" v-if="org_id == 10233">
+                  <div class="inline_block" style="flex:1">
                     血管通路：
                     <div class="under_line" style="width: 260px;text-align: center;">
-                      {{prescription.blood_access_part_opera_name}}
-                    </div>
-                  </div>
-                  <div class="inline_block" style="flex:1" v-else>
-                    血管通路：
-                    <div class="under_line" style="width: 200px;text-align: center;">
                       {{predialysis.blood_access_part_opera_name}}
                     </div>
                   </div>
-                  <div class="inline_block" style="flex:1" v-if="org_id == 10233">
+                  <div class="inline_block" style="flex:1" v-if="org_id == 0">
                     血管通路部位：
-                    <div class="under_line" style="width: 100px;text-align: center;">
+                    <div class="under_line" style="width: 120px;text-align: center;">
                       {{predialysis.blood_access_part_id}}
                     </div>
                   </div>
+                </div>
+                <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+                  <div class="inline_block" style="flex:1.5" v-if="org_id != 10233">
+                    血管通路：
+                    <div class="under_line" style="width: 260px;text-align: center;">
+                      {{prescription.blood_access_part_opera_name}}
+                    </div>
+                  </div>
                   <div class="inline_block" style="flex:1">
                     透析机型：
                     <div class="under_line" style="width: 150px;text-align: center;">

src/xt_pages/outpatientTool/components/detail.vue

@@ -316,7 +316,7 @@
               // console.log(111,tempPatientsTwo[i].total)
               if(tempPatientsTwo[i].new_order_info.length > 0){
 
-              
+
               for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
                 let new_name = tempPatientsTwo[i].new_order_info[b].item_name
                 new_name=new_name.replace("（ ","");