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

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne.vue

@@ -192,6 +192,14 @@
                             }}
                           </div>
                         </div>
+                       
+                      </div>
+
+                      <div
+                        class="row"
+                        style="padding: 2px 0; line-height: 23px; display: flex"
+                      >
+                       
                         <div class="inline_block" style="flex: 1">
                           透前症状：
                           <div
@@ -1275,8 +1283,9 @@
                                     advice[0].advice_desc != undefined
                                   "
                                 >
-                                  ({{ advice[0].advice_desc
-                                  }}{{ advice[0].drug_spec_unit }} )
+                                 <span v-if="advice[0].advice_desc!=''"> (</span>{{ advice[0].advice_desc
+                                  }}{{ advice[0].drug_spec_unit }} 
+                                  <span v-if="advice[0].advice_desc!=''">)</span>
                                 </span>
   
                                 <span v-if="advice[0].prescribing_number"
@@ -2621,9 +2630,9 @@
               var delghTwo = 0;
               if (
                 this.records[recordIndex].advices &&
-                this.records[recordIndex].advices.length < 12
+                this.records[recordIndex].advices.length < 48
               ) {
-                delghTwo = 12 - this.records[recordIndex].advices.length;
+                delghTwo = this.records[recordIndex].advices.length;
               } else {
                 delghTwo = 0;
               }

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -609,7 +609,7 @@
                           type="number"
                           v-model="dialysisPrescription.glucose"
                         ></el-input>
-                      </el-form-item>
+                      </el-form-item>28
                     </el-col> -->
                     <el-col :span="8" v-if="isShows('透析液流量')">
                         <el-form-item label="透析液流量(ml/min)：">
@@ -3973,9 +3973,13 @@ mu
     },
 
     watch: {
-      'dialysisPrescription.blood_flow_volume': function () {
-        this.dialysisPrescription.replacement_flow = replacementFlow(this.dialysisPrescription.blood_flow_volume)
-      },
+      // 'dialysisPrescription.blood_flow_volume': function () {
+      //   this.dialysisPrescription.blood_flow_volume = replacementFlow(this.dialysisPrescription.blood_flow_volume)
+      // },
+      // 'dialysisPrescription.replacement_flow': function () {
+      //   console.log("血流量",this.dialysisPrescription.replacement_flow)
+      //   this.dialysisPrescription.replacement_flow = this.dialysisPrescription.replacement_flow
+      // },
       'dialysisPrescription.dialysis_duration_hour': function() {
         let dialysis_duration_minute = 0
         let dialysis_duration_hour = 0

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -14,8 +14,8 @@
       </template>
       <template
         v-if="
-          org_template_info.template_id == 2 ||
-          org_template_info.template_id == 0
+          org_template_info.template_id == 2
+       
         "
       >
         <div>
@@ -110,7 +110,8 @@
           org_template_info.template_id == 11 ||
           org_template_info.template_id == 50 ||
           org_template_info.template_id == 52 ||
-          org_template_info.template_id == 53
+          org_template_info.template_id == 53  ||
+          $store.getters.xt_user.org.id == 0
         "
       >
         <el-button
@@ -186,8 +187,8 @@
       </template>
       <template
         v-if="
-          org_template_info.template_id == 14 ||
-          org_template_info.template_id == 0
+          org_template_info.template_id == 14
+         
         "
       >
         <div>
@@ -289,8 +290,8 @@
       </template> -->
       <template
         v-if="
-          org_template_info.template_id == 21 ||
-          org_template_info.template_id == 0
+          org_template_info.template_id == 21 
+         
         "
       >
         <div>
@@ -1577,8 +1578,8 @@ export default {
           scanStyles: false,
         });
       } else if (
-        this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0
+        this.org_template_info.template_id == 2
+       
       ) {
         printJS({
           printable: "dialysis-print-box-1",
@@ -1616,7 +1617,8 @@ export default {
         // this.org_template_info.template_id == 51 ||
         this.org_template_info.template_id == 58 ||
         this.org_template_info.template_id == 60 ||
-        this.org_template_info.template_id == 61
+        this.org_template_info.template_id == 61  ||
+        this.org_template_info.template_id ==0
       ) {
         printJS({
           printable: "dialysis-print-box-1",
@@ -1978,7 +1980,6 @@ export default {
         });
       } else if (
         this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0 ||
         this.org_template_info.template_id == 5 ||
         this.org_template_info.template_id == 22 ||
         this.org_template_info.template_id == 33
@@ -2037,7 +2038,6 @@ export default {
         });
       } else if (
         this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0 ||
         this.org_template_info.template_id == 5 ||
         this.org_template_info.template_id == 22 ||
         this.org_template_info.template_id == 33
@@ -2782,6 +2782,8 @@ export default {
     },
   },
   created() {
+    console.log("hhahahhahahahah=======",this.org_template_info.template_id)
+    console.log("this.$store.getters.xt_user.org.id",this.$store.getters.xt_user.org.id)
     var schedule_type_selected = this.$store.getters.schedule_type_selected;
     var zone_selected = this.$store.getters.zone_selected;
     var patient_state_selected = this.$store.getters.patient_state_selected;

src/xt_pages/dialysis/signPrint.vue

@@ -19,8 +19,12 @@
                             {{it.prescribing_number}}{{ it.prescribing_number_unit }}
                           </span> 
                         </div>  
+                        <div v-if="org_id ==0 || org_id == 10138 || org_id == 10278">
+                          规格:{{getSpecialName(it.drug_id)}} 
+                         
+                        </div>  
                         <div v-if=" org_id ==0 || org_id==10440">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
-                        <div>执行频率:{{it.execution_frequency}}</div>  
+                        <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>  
                         <div>给药途径:{{it.delivery_way}}</div>  
                         <div>打印时间:{{time}}</div>   
                     </div>  
@@ -37,9 +41,13 @@
                         <div>医嘱内容:{{getAdvice(item.doctor_advice)}} 
                            <span v-if="it.prescribing_number >0&& org_id !=0 && org_id!=10440"> {{it.prescribing_number}}{{ it.prescribing_number_unit }}</span>
                         </div>  
+                        <div v-if="org_id ==0 || org_id == 10138 || org_id == 10278">
+                          规格:{{getSpecialName(it.drug_id)}} 
+                         
+                        </div>  
                         <div v-if=" org_id ==0 || org_id==10440">单次用量:{{it.single_dose}}&nbsp;{{it.single_dose_unit }}</div>
                         <div>给药途径:{{item.doctor_advice[0].execution_frequency}}</div>  
-                        <div>执行频率:{{item.doctor_advice[0].delivery_way}}</div>  
+                        <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{item.doctor_advice[0].delivery_way}}</div>  
                         <div>打印时间:{{time}}</div>   
                     </div>  
                   
@@ -79,6 +87,7 @@ export default {
             list:[],
             execution_frequency:"",
             org_id:0,
+            drugList:[],
         }
     },
     methods:{
@@ -266,6 +275,7 @@ export default {
                
                  if(config.is_open == 1){
                    var schedulesArr = resp.data.hisAdvices
+                   this.drugList = resp.data.drug
                    let schedules = []
                    var ids = this.$store.getters.temp_params.advice_ids
                    console.log('ids',ids)
@@ -528,6 +538,15 @@ export default {
         return ""
       }
     },
+    getSpecialName(drug_id){
+        var name = ""
+        for(let i=0;i<this.drugList.length;i++){
+            if(drug_id == this.drugList[i].id){
+            name = this.drugList[i].dose + this.drugList[i].dose_unit + "*" + this.drugList[i].min_number + this.drugList[i].min_unit +"/"+this.drugList[i].max_unit
+            }
+        }
+        return name
+     }
     },
     computed: {
     filtedScheduals: function () {
@@ -640,6 +659,8 @@ export default {
         console.log("222222",scheduleMap)
         return scheduleMap
         },
+
+      
     
     },
     created(){

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -289,6 +289,18 @@
                                 }}
                               </div>
                             </div>
+                          
+                          </div>
+
+                          <div
+                            class="row"
+                            style="
+                              padding: 2px 0;
+                              line-height: 23px;
+                              display: flex;
+                            "
+                          >
+                          
                             <div class="inline_block" style="flex: 1">
                               透前症状：
                               <div
@@ -3496,8 +3508,8 @@ export default {
         }
 
         this.totollength = this.doctor_advices.length + this.monitors.length;
-        if (this.totollength > 18) {
-          var temp_advice_length = 17 - this.monitors.length;
+        if (this.totollength > 32) {
+          var temp_advice_length = 31 - this.monitors.length;
           var doctor_advices_1 = [];
           var doctor_advices_2 = [];
           for (let index = 0; index < this.doctor_advices.length; index++) {

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -819,9 +819,9 @@
                   >
                     <p style="height: 20px; line-height: 20px">执行时间</p>
                   </td>
-                  <td style="height: 20px" width="90" v-if="org_id == 10249  || org_id == 0">
+                  <!-- <td style="height: 20px" width="90" v-if="org_id == 10249  || org_id == 0">
                     <p style="height: 20px; line-height: 20px">开嘱医生</p>
-                  </td>
+                  </td> -->
                   <td style="height: 20px" width="90">
                     <p style="height: 20px; line-height: 20px">执行</p>
                   </td>
@@ -903,7 +903,7 @@
                       getTime(advice.execution_time, "{h}:{i}")
                     }}</span>
                   </td>
-                  <td
+                  <!-- <td
                     style="line-height: 30px"
                     width="90"
                     v-if="org_id == 10249 || org_id == 0"
@@ -917,7 +917,7 @@
                       alt=""
                       srcset=""
                     />
-                  </td>
+                  </td> -->
                   <td style="line-height: 10px" width="90">
                     <span v-if="setAdminUserES(advice.execution_staff) == ''">{{
                       getAdminUser(advice.execution_staff)

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -3699,7 +3699,7 @@ export default {
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
         }
-
+       console.log("total--------------------------",this.doctor_advices)
         // if (this.doctor_advices.length > 0) {
         //   var group = this.newAdviceGroupObject()
         //   var initGroupBlock = function(group, advice) {
@@ -3795,6 +3795,7 @@ export default {
         }
 
         this.totollength = this.doctor_advices.length + this.monitors.length;
+        console.log("this.totollength",this.totollength)
         if (this.totollength > 18) {
           var temp_advice_length = 17 - this.monitors.length;
           var doctor_advices_1 = [];

src/xt_pages/workforce/remind_print_setting.vue

@@ -19,7 +19,7 @@
         <div class="print_main_content">
           <div class="table_panel">
             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
-              <div class="signPrint" v-if="org_id != 10188 && org_id!=10217  && org_id!=10340 && org_id!=9671 && org_id!=9675">
+              <div class="signPrint" v-if="org_id != 10188  && org_id!=10340 && org_id!=9671 && org_id!=9675">
                 <div>
                   <span v-if="printObj.mode == 1">透析模式:
                     <span v-if="main_collection.mode_id ==1">HD</span>
@@ -75,7 +75,7 @@
                   <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
                 </div>
                 <div v-if="printObj.anticoagulant == 1">抗凝剂:
-                  <span v-if="org_id == 10138 ">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
+                  <span v-if="org_id == 10138 || org_id == 0 || org_id == 10278">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
                   <span v-else >
                    <span>{{getAnticoagulant(main_collection.dialysissolution.anticoagulant)}}</span>
                   </span>
@@ -382,7 +382,7 @@
                 days = '星期日';
                 break;
           }
-          var str = year + "年" + month + "月" + day + "日  " + days;
+          var str = year + "年" + month + "月" + day + "日  ";
           this.currentDate = str
           }
        })