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/details/DialysisPrescription.vue

@@ -519,7 +519,9 @@ export default {
          for(let i=0;i<arr.length;i++){
            for(let j=0;j<this.preparestock.length;j++){
               if(arr[i] == this.preparestock[j].specification_name){
-                 arr[i] = arr[i]+"("+this.preparestock[j].commdity_code+")"
+                 if(this.preparestock[j].commdity_code!=""){
+                   arr[i] = arr[i]+"("+this.preparestock[j].commdity_code+")"
+                 }
               }
            }
          }
@@ -538,7 +540,9 @@ export default {
          for(let i=0;i<arr.length;i++){
            for(let j=0;j<this.preparestock.length;j++){
               if(arr[i] == this.preparestock[j].specification_name){
-                 arr[i] = arr[i]+"("+this.preparestock[j].commdity_code+")"
+                if(this.preparestock[j].commdity_code!=""){
+                  arr[i] = arr[i]+"("+this.preparestock[j].commdity_code+")"
+                } 
               }
            }
          }

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -509,7 +509,8 @@
                     <td width="140">透析器/灌流器型号:</td>
                     <td width="">
                       <div class="under-line">
-                        &nbsp;{{ prescription.dialyzer_perfusion_apparatus }}
+                          <span v-if="org_id ==9987 || org_id== 3877 || org_id == 4 || org_id == 9671">{{prescription.dialysis_dialyszers}}/{{prescription.dialysis_irrigation}}</span>
+                        &nbsp;<span else>{{ prescription.dialyzer_perfusion_apparatus }}</span> 
                       </div>
                     </td>
                   </tr>