Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_fiftynine.vue

@@ -1292,7 +1292,7 @@
                         </tr>
                         <tr>
                           <td width="60">时间</td>
-                          <td width="60">体温<br />(℃)</td>
+                          <td width="60" v-if="org_id!=10480 && org_id!=0">体温<br />(℃)</td>
                           <td width="60">血压<br />(mmHg)</td>
                           <td width="50">脉搏<br />(次/分)</td>
                           <td width="50">呼吸<br />(次/分)</td>
@@ -1339,7 +1339,7 @@
                               getTime(monitor_record.operate_time, "{h}:{i}")
                             }}
                           </td>
-                           <td>
+                           <td v-if="org_id!=10480 && org_id!=0"> 
                             {{
                               monitor_record.temperature
                                 ? monitor_record.temperature

src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue

@@ -573,12 +573,12 @@
                                      {{ record.prescription.oxygen_time ? record.prescription.oxygen_time : "" }}
                                 </div>
                                 </td>
-                                <td width="30">h</td>
+                                <!-- <td width="30">h</td>
                                 <td width="10">无</td>
                                 <td width="30">
                                 <label-box :isChecked="record.prescription.oxygen_uptake ==2 ? true : false"></label-box>
                                 &nbsp;
-                                </td>
+                                </td> -->
                                 <td></td>
                                 <td></td>
                             </tr>

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

@@ -5167,6 +5167,15 @@ mu
        }
 
       },
+      'dialysisPrescription.prescription_water':function(){
+        if(this.$store.getters.xt_user.template_info.org_id==10598){
+           
+          if(this.dialysisPrescription.prescription_water > this.dialysisPrescription.target_ultrafiltration){
+            this.dialysisPrescription.target_ultrafiltration = this.dialysisPrescription.prescription_water 
+          }
+           
+        }
+      },
       stockType: function() {
         console.log('stockType', this.stockType)
         var arr = []

src/xt_pages/dialysis/hisLongSignPrint.vue

@@ -11,8 +11,9 @@
         <div class="app-container" style="background-color: white;" v-show="show">
             <div id="dialysisTable">
                 <div v-for="(item, index) in list" :key="index">
-                    <div class="signPrint" style="page-break-after: always;" v-for="(it,i) in item.his_advice_list">
-                       
+                   <div v-if="org_id!=0&& org_id!=10571">
+                        <div class="signPrint" style="page-break-after: always;" v-for="(it,i) in item.his_advice_list">
+                        
                         <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
 
@@ -28,6 +29,51 @@
                         </div>
                         <div>打印时间:{{$route.query.selected_date}}</div> 
                     </div>  
+                   </div>
+
+                   <div v-if="org_id ==0 || org_id ==10571">
+                    <span v-if="item.his_doctor_advice.length == 0">
+                       
+                       <div class="signPrint" style="page-break-after: always;" v-for="(it,i) in item.his_advice_list">
+                        
+                        <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
+                        <div>姓名:{{item.patient.name}}</div>  
+
+                        <div>
+                            <div>医嘱内容:{{ it.advice_name }} 
+                            </div>  
+                            <div>
+                            规格:{{getSpecialName(it.drug_id)}} 
+                            </div>  
+                            <div>单次用量:   {{it.single_dose}}{{ it.single_dose_unit }}</div>  
+                            <div>执行频率:{{it.execution_frequency}}</div>  
+                            <div>给药途径:{{it.delivery_way}}</div>  
+                        </div>
+                        <div>打印时间:{{$route.query.selected_date}}</div> 
+                      </div>  
+
+                    </span>
+
+                    <span v-if="item.his_doctor_advice.length > 0">
+                       <div class="signPrint" style="page-break-after: always;" v-for="(it,i) in item.his_doctor_advice">
+                        <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
+                        <div>姓名:{{item.patient.name}}</div>  
+
+                        <div>
+                            <div>医嘱内容:{{ it.advice_name }} 
+                            </div>  
+                            <div>
+                            规格:{{getSpecialName(it.drug_id)}} 
+                            </div>  
+                            <div>单次用量:   {{it.single_dose}}{{ it.single_dose_unit }}</div>  
+                            <div>执行频率:{{it.execution_frequency}}</div>  
+                            <div>给药途径:{{it.delivery_way}}</div>  
+                        </div>
+                        <div>打印时间:{{$route.query.selected_date}}</div> 
+                      </div>  
+                    </span>
+                   </div>
+                 
                 </div>
             </div>
         </div>
@@ -244,8 +290,8 @@ export default {
                 // console.log("寄哪里地方",this.$route.query.keywords)
                for(let i=0;i<list.length;i++){
                  list[i].new_arr = []
+                 list[i].new_arr_one = []
                  for(let j=0;j<list[i].his_advice_list.length;j++){
-                    console.log("iiiiii",list[i].his_advice_list[j].advice_name.indexOf(this.$route.query.keywords))
                     if(list[i].his_advice_list[j].advice_name.indexOf(this.$route.query.keywords)!=-1){
                        list[i].new_arr.push(list[i].his_advice_list[j])
                     }
@@ -258,6 +304,27 @@ export default {
                 }
             }
           }
+
+            if(this.$route.query.keywords!=""){
+               for(let i=0;i<list.length;i++){
+                 for(let j=0;j<list[i].his_doctor_advice.length;j++){
+                    if(list[i].his_doctor_advice[j].advice_name.indexOf(this.$route.query.keywords)!=-1){
+                       list[i].new_arr_one.push(list[i].his_doctor_advice[j])
+                    }
+                 }
+               }
+            
+             if(list!=null && list.length>0){
+                for(let i=0;i<list.length;i++){
+                    list[i].his_doctor_advice =[]
+                    list[i].his_doctor_advice = list[i].new_arr_one 
+                }
+              }
+            }
+
+          
+
+         
          
         }
         

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyNine.vue

@@ -1143,7 +1143,7 @@
                       </tr>
                       <tr>
                         <td width="60">时间</td>
-                        <td width="60">体温<br />(℃)</td>
+                        <td width="60" v-if="org_id!=10480 && org_id!=0">体温<br />(℃)</td>
                         <td width="70">血压<br />(mmHg)</td>
                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="50">呼吸<br />(次/分)</td>
@@ -1181,7 +1181,7 @@
                       </tr>
                       <tr v-for="(monitor, monindex) in monitors" :key="monindex">
                         <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
-                        <td>{{ monitor.temperature ? monitor.temperature : "" }}</td>
+                        <td v-if="org_id!=0&&org_id!=10480">{{ monitor.temperature ? monitor.temperature : "" }}</td>
                         <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + "/" : ""}}
                             {{monitor.diastolic_blood_pressure? monitor.diastolic_blood_pressure: ""}}</td>
                         <td>{{monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
@@ -1204,14 +1204,7 @@
                                 : ""
                             }}
                           </span>
-                          <span
-                            v-if="
-                              dialysisOrder &&
-                              monitor.operate_time <= dialysisOrder.end_time &&
-                              dialysisOrder &&
-                              monitor.operate_time >= dialysisOrder.start_time
-                            "
-                          >
+                          <span>
                             {{
                               monitor.transmembrane_pressure
                                 ? monitor.transmembrane_pressure
@@ -1355,7 +1348,7 @@
                       >
                         <td></td>
                         <td></td>
-                        <td></td>
+                        <td v-if="org_id!=0 && org_id!=10480"></td>
                         <td></td>
                         <td></td>
                         <td></td>

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -660,11 +660,11 @@
                     </div>
                   </td>
                   <td width="30">h</td>
-                  <td width="10">无</td>
+                  <!-- <td width="10">无</td>
                   <td width="30">
                     <label-box :isChecked="prescription.oxygen_uptake ==2 ? true : false"></label-box>
                     &nbsp;
-                  </td>
+                  </td> -->
                   <td></td>
                   <td></td>
                 </tr>

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -262,6 +262,39 @@
                       <p>血浆胆红素吸附+HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
+
+                  <span v-if="item.mode_id == 'HPD'">
+                      <p>HPD:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+                  <span v-if="item.mode_id == 'HDP'">
+                      <p>HDP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+                  <span v-if="item.mode_id == 'HFD'">
+                      <p>HFD:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+                  <span v-if="item.mode_id == 'HDF100'">
+                      <p>HDF100:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+                  <span v-if="item.mode_id == 'HDF600'">
+                      <p>HDF600:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+                  <span v-if="item.mode_id == 'HDF800'">
+                      <p>HDF800:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+                  <span v-if="item.mode_id == 'HDF800'">
+                      <p>HDF800:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+                  <span v-if="item.mode_id == 'HDF1000'">
+                      <p>HDF1000:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
                </div>
               </div>
             </div>
@@ -1044,6 +1077,21 @@ export default {
             if(modedate[i].mode_id == 32){
               modedate[i].mode_id = "HDP"
             }
+            if(modedate[i].mode_id == 33){
+              modedate[i].mode_id = "HFD"
+            }
+            if(modedate[i].mode_id == 34){
+              modedate[i].mode_id = "HDF100"
+            }
+            if(modedate[i].mode_id == 35){
+              modedate[i].mode_id = "HDF600"
+            }
+            if(modedate[i].mode_id == 36){
+              modedate[i].mode_id = "HDF800"
+            }
+            if(modedate[i].mode_id == 37){
+              modedate[i].mode_id = "HDF1000"
+            }
             this.modetype = modedate
 
             // this.modesData.xAxis.push(modedate[i].mode_id)