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.vue

@@ -48,15 +48,17 @@
               岁
             </div>
             <div class="inline_block" style="margin-left: 25px">
-              科室22：
-              <check-box
+              科室：
+              <label-box showValue="门诊透析" :isChecked="record.receive_assessment.condition == 2 ? true : false"></label-box>
+              <label-box showValue="住院" :isChecked="record.receive_assessment.condition == 1 ? true : false"></label-box>
+              <!-- <check-box
                 text="门诊透析"
                 :checked="record.patient.source == 1"
               ></check-box>
               <check-box
                 text="住院"
                 :checked="record.patient.source == 2"
-              ></check-box>
+              ></check-box> -->
               <!-- TODO -->
             </div>
             <div class="inline_block" style="margin-left: 25px">

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -1410,49 +1410,49 @@
                             {{
                               monitor_record.breathing_rate
                                 ? monitor_record.breathing_rate
-                                : ""
+                                : "/"
                             }}
                           </td>
                           <td>
                             {{
                               monitor_record.blood_flow_volume
                                 ? monitor_record.blood_flow_volume
-                                : ""
+                                : "/"
                             }}
                           </td>
                           <td v-if="org_id == 10478">
                             {{
                               monitor_record.arterial_pressure
                                 ? monitor_record.arterial_pressure
-                                : ""
+                                : "/"
                             }}
                           </td>
                           <td>
                             {{
                               monitor_record.venous_pressure
                                 ? monitor_record.venous_pressure
-                                : ""
+                                : "/"
                             }}
                           </td>
                           <td>
                             {{
                               monitor_record.transmembrane_pressure
                                 ? monitor_record.transmembrane_pressure
-                                : ""
+                                : "/"
                             }}
                           </td>
                           <td v-if="org_id != 9836">
                             {{
                               monitor_record.dialysate_temperature
                                 ? monitor_record.dialysate_temperature
-                                : ""
+                                : "/"
                             }}
                           </td>
                           <td v-if="org_id == 9836">
                             {{
                               monitor_record.temperature
                                 ? monitor_record.temperature
-                                : ""
+                                : "/"
                             }}
                           </td>
 
@@ -1469,7 +1469,7 @@
                             {{
                               monitor_record.conductivity
                                 ? monitor_record.conductivity
-                                : ""
+                                : "/"
                             }}
                           </td>
 
@@ -1481,7 +1481,7 @@
                             {{
                               monitor_record.blood_oxygen_saturation
                                 ? monitor_record.blood_oxygen_saturation
-                                : ""
+                                : "/"
                             }}
                           </td>
 
@@ -1493,7 +1493,7 @@
                             {{
                               monitor_record.sodium_concentration
                                 ? monitor_record.sodium_concentration
-                                : ""
+                                : "/"
                             }}
                           </td>
 
@@ -1505,7 +1505,7 @@
                             {{
                               monitor_record.replacement_speed
                                 ? monitor_record.replacement_speed
-                                : ""
+                                : "/"
                             }}
                           </td>
 
@@ -1513,7 +1513,7 @@
                             {{
                               monitor_record.sodium_concentration
                                 ? monitor_record.sodium_concentration
-                                : ""
+                                : "/"
                             }}
                           </td>
                           <td width="50" v-if="org_id == 10375"><br />
@@ -1524,14 +1524,14 @@
                                 {{
                               monitor_record.ultrafiltration_volume
                                 ? monitor_record.ultrafiltration_volume
-                                : "0"
+                                : "/"
                             }}
                             </span>
                              <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10471">
                                 {{
                               monitor_record.ultrafiltration_volume
                                 ? monitor_record.ultrafiltration_volume
-                                : "0"
+                                : "/"
                             }}
                             </span>
                           </td>
@@ -1555,7 +1555,7 @@
                             {{
                               monitor_record.filter_pressure
                                 ? monitor_record.filter_pressure
-                                : ""
+                                : "/"
                             }}
                           </td>
                           <td

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -2032,7 +2032,7 @@ export default {
           style: style12,
           scanStyles: false,
         });
-        console.log("printjswowoowowowwoow",style12)
+       
 
       }else if (this.org_template_info.template_id == 65 || this.org_template_info.template_id == 6) {
         printJS({

src/xt_pages/dialysis/schedualPatient.vue

@@ -220,10 +220,13 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
             var filtedSchedules = []
             for (let s_i = 0; s_i < originSchedules.length; s_i++) {
               const schedule = originSchedules[s_i]
-              if (schedule.patient.name.indexOf(search_keyword) != -1) {
+              if(schedule.patient!=null){
+                if (schedule.patient.name.indexOf(search_keyword) != -1) {
                 filtedSchedules.push(schedule)
                 // break
+               }
               }
+              
             }
             if (filtedSchedules.length > 0) {
               schedules.push({ zone_id: scheduleInfo.zone_id, zone_name: scheduleInfo.zone_name, schedules: filtedSchedules })

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -31,8 +31,10 @@
               <td width="50">科 室:</td>
               <td width="200">
                 <div>
-                  <label-box :isChecked="patientInfo_source_1" showValue="门 诊 透 析"></label-box>
-                  <label-box :isChecked="patientInfo_source_2" showValue="住 院"></label-box>
+                  <!-- <label-box :isChecked="patientInfo_source_1" showValue="门 诊 透 析"></label-box>
+                  <label-box :isChecked="patientInfo_source_2" showValue="住 院"></label-box> -->
+                  <label-box showValue="门诊透析" :isChecked="receiverTreatmentAccess.condition == 2 ? true : false"></label-box>
+              <label-box showValue="住院" :isChecked="receiverTreatmentAccess.condition == 1 ? true : false"></label-box>
                 </div>
               </td>
 

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1265,8 +1265,8 @@
                         <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>
-                        <td v-if="org_id!=10489">{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
-                        <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
+                        <td v-if="org_id!=10489">{{monitor.breathing_rate ? monitor.breathing_rate : "/"}}</td>
+                        <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: "/"}}</td>
                         <td v-if="org_id ==10478">
                           {{
                             monitor.arterial_pressure
@@ -1278,7 +1278,7 @@
                           {{
                             monitor.venous_pressure
                               ? monitor.venous_pressure
-                              : ""
+                              : "/"
                           }}
                         </td>
                         <td>
@@ -1294,7 +1294,7 @@
                             {{
                               monitor.transmembrane_pressure
                                 ? monitor.transmembrane_pressure
-                                : ""
+                                : "/"
                             }}
                           </span>
                           <span
@@ -1308,48 +1308,48 @@
                             {{
                               monitor.transmembrane_pressure
                                 ? monitor.transmembrane_pressure
-                                : ""
+                                : "/"
                             }}
                           </span>
                         </td>
                         <td v-if="org_id == 9919">
-                          {{monitor.dialysate_temperature? monitor.dialysate_temperature: ""}}
+                          {{monitor.dialysate_temperature? monitor.dialysate_temperature: "/"}}
                         </td>
                         <td v-if="org_id == 9671">
-                          {{monitor.dialysate_temperature? monitor.dialysate_temperature: ""}}
+                          {{monitor.dialysate_temperature? monitor.dialysate_temperature: "/"}}
                         </td>
 
                         <td v-if="org_id == 9836">
-                          {{ monitor.temperature ? monitor.temperature : "" }}
+                          {{ monitor.temperature ? monitor.temperature : "/" }}
                         </td>
 
                          <td v-if="org_id!=9919 && org_id!=9671 && org_id!=9836">
-                          {{monitor.dialysate_temperature? monitor.dialysate_temperature: ""}}
+                          {{monitor.dialysate_temperature? monitor.dialysate_temperature: "/"}}
                         </td>
 
 
                         <td v-if="org_id == 10121">
-                          {{monitor.blood_oxygen_saturation? monitor.blood_oxygen_saturation: ""}}
+                          {{monitor.blood_oxygen_saturation? monitor.blood_oxygen_saturation: "/"}}
                         </td>
 
                        <td v-if="org_id == 9538">
-                          {{monitor.sodium_concentration? monitor.sodium_concentration: ""}}
+                          {{monitor.sodium_concentration? monitor.sodium_concentration: "/"}}
                         </td>
 
 
                         <td v-if="org_id != 9538 &&org_id != 10121">
-                          <span v-if="org_id!=0&&org_id!=10469 && org_id!=10490"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
-                          <span v-if="org_id==10469"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
-                          <span v-if="org_id==0||org_id==10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}</span>
+                          <span v-if="org_id!=0&&org_id!=10469 && org_id!=10490"> {{ monitor.conductivity ? monitor.conductivity : "/" }}</span>
+                          <span v-if="org_id==10469"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "/" }}</span>
+                          <span v-if="org_id==0||org_id==10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "/" }}</span>
                         </td>
 
                       
                         <td v-if="org_id == 10375 || org_id == 0"><br />
-                          {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
+                          {{ monitor.replacement_rate? monitor.replacement_rate: "/"}}
                         </td>
                         <td>
-                          <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
-                          <span v-if="org_id==9671 || org_id==10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
+                          <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "/"}}</span>
+                          <span v-if="org_id==9671 || org_id==10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "/"}}</span>
                         </td>
                         <!-- <td style="width:50px">
                           <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time))">
@@ -1376,15 +1376,15 @@
                             }}
                           </span>
                         </td> -->
-                        <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
+                        <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:"/"}}</td>
                         <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671">
                           {{ monitor.ktv?monitor.ktv:"" }}
                         </td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">
-                          {{ monitor.accumulated_blood_volume? monitor.accumulated_blood_volume:"" }}
+                          {{ monitor.accumulated_blood_volume? monitor.accumulated_blood_volume:"/" }}
                         </td>
                         <td width="50" v-if="org_id ==10490 || org_id == 0">
-                          {{ monitor.dicarbonate?monitor.dicarbonate:"" }}
+                          {{ monitor.dicarbonate?monitor.dicarbonate:"/" }}
                         </td>
                         <td style="line-height: 16px; padding: 0px">
                           <div

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -8,7 +8,7 @@
         class="dialysis-print-order print-template-two print_page_main_content"
         
       >
-        <div id="dialysis-print-box-64" style="padding:10px 0 0 40px  ;">
+        <div id="dialysis-print-box-64" style="padding:10px 0 0 40px;">
           <!-- <div 10px 0 0 40px
             class="order-yy-name"
             style=" letter-spacing: 0;
@@ -652,7 +652,7 @@
                         summary.dialysis_summary ? summary.dialysis_summary : "/"
                       }}
                     </div>
-                    <div style="display: inline-block; margin-left: 120px;">
+                    <div style="display: inline-block; margin-left: 30px;">
                       医生签名：
 
                       <span v-if="setAdminUserES(prescription.creater) == ''">
@@ -667,7 +667,7 @@
                         v-else
                       />
                     </div>
-                    <div style="display: inline-block; margin-left: 150px;">
+                    <div style="display: inline-block; margin-left: 70px;">
                       护士签名：
                       <span v-if="
                           setAdminUserES(
@@ -699,7 +699,7 @@
                         v-else
                       />
                     </div>
-                    <div style="display: inline-block;  margin-left: 150px;">
+                    <div style="display: inline-block;  margin-left: 70px;">
                       核对护士签名：
                       <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                             {{ getAdminUser(check == null ? 0 : check.modifier) }}

src/xt_pages/workforce/remind_print_setting_two.vue

@@ -66,8 +66,8 @@
 
                 </div>
                 <div style="display: flex;margin: 5px 5px;">
-                  <div style="flex: 1;">血流量:{{main_collection.prescription.blood_flow_volume}}ml/min</div>
-                  <div style="flex: 1;">置换液总量:{{main_collection.prescription.displace_liqui_value}}L</div>
+                  <div style="flex: 1;">血流量:{{main_collection.prescription.blood_flow_volume?main_collection.dialysissolution.blood_flow_volume:""}}ml/min</div>
+                  <div style="flex: 1;">置换液总量:{{main_collection.prescription.displace_liqui_value?main_collection.dialysissolution.displace_liqui_value:""}}L</div>
                 </div>
                 <div style="margin: 5px 5px;">
                   <div>透析液类型:
@@ -76,7 +76,7 @@
                     <span>Ca:{{main_collection.prescription.calcium }}</span>
                     <span>
                       <span v-if="main_collection.prescription.chaptalization==0"> 不含 </span>
-                      <span v-if="main_collection.prescription.chaptalization>0"> 含糖:{{main_collection.prescription.chaptalization}} </span>
+                      <span v-if="main_collection.prescription.chaptalization>0"> 含糖:{{main_collection.prescription.chaptalization?main_collection.dialysissolution.chaptalization:""}} </span>
                       HCO3:</span>
                   </div>
                 </div>
@@ -196,7 +196,7 @@
                   </span>
                 </div>
                 <div style="margin: 5px 5px;">
-                  血管通路:{{getBloodAccess(main_collection.assessmentbefor.blood_access_part_opera_id)}}
+                  血管通路:{{getBloodAccess(main_collection.assessmentbefor.blood_access_part_opera_id)?getBloodAccess(main_collection.dialysissolution.blood_access):""}}
                 </div>
               </div>
               <div style="border: 1px solid black;width: 90%;">