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

@@ -103,7 +103,7 @@
               <div class="inline_block" style="flex: 2;" >
                 血管通路：
                 <div class="under_line"
-                  style=" width: 80%;
+                  style=" width: 52%;
                     text-align: center; white-space: normal;
                   ">
                   {{
@@ -459,7 +459,7 @@
               <div class="inline_block" style="flex: 1;">
                 肝素钠首剂:
                 <div class="under_line"
-                  style=" width: 60%;
+                  style=" width: 55%;
                     text-align: center; white-space: normal;
                   ">
                   <span v-if="record.prescription.anticoagulant == 17">
@@ -819,32 +819,36 @@
                 <tr v-for="(monitor_record, j) in record.monitor_records" :key="j" >
                   <td width="50" style="line-height: 30px;">{{ getTime(monitor_record.operate_time, "{h}:{i}") }}</td>
                   <td width="65">
-                    <span v-if="monitor_record.systolic_blood_pressure !='' && monitor_record.diastolic_blood_pressure !=''">
+                    <!-- <span v-if="monitor_record.systolic_blood_pressure !='' && monitor_record.diastolic_blood_pressure !=''">
                       {{monitor_record.systolic_blood_pressure ? monitor_record.systolic_blood_pressure : "未测"}} /
                       {{monitor_record.diastolic_blood_pressure ? monitor_record.diastolic_blood_pressure : "未测"}}
                     </span>
-                    <span v-else>未测</span>
+                    <span v-else>未测</span> -->
+                    {{monitor_record.monitor_systolic_blood_pressure_one ? monitor_record.monitor_systolic_blood_pressure_one : "未测"}} 
+                    <span v-if="monitor_record.monitor_systolic_blood_pressure_one!=''&&monitor_record.monitor_systolic_blood_pressure_one>0">/{{monitor_record.monitor_diastolic_blood_pressure_one ? monitor_record.monitor_diastolic_blood_pressure_one : "未测"}} </span>
                   </td>
-                  <td width="50">{{ monitor_record.pulse_frequency ? monitor_record.pulse_frequency : "未测" }}</td>
-                  <td width="50">{{monitor_record.arterial_pressure ? monitor_record.arterial_pressure: "/"}}</td>
-                  <td width="50">{{monitor_record.venous_pressure ? monitor_record.venous_pressure : "/"}}</td>
-                  <td width="50">{{monitor_record.transmembrane_pressure ? monitor_record.transmembrane_pressure : "/"}}</td>
-                  <td width="50">{{monitor_record.blood_flow_volume? monitor_record.blood_flow_volume: "/"}}</td>
-                  <td width="50">{{monitor_record.conductivity ? monitor_record.conductivity : "/" }}</td>
+                  <td width="50">{{ monitor_record.pulse_frequency_one ? monitor_record.pulse_frequency_one : "未测" }}</td>
+                  <td width="50">{{monitor_record.arterial_pressure_one ? monitor_record.arterial_pressure_one: "/"}}</td>
+                  <td width="50">{{monitor_record.venous_pressure_one ? monitor_record.venous_pressure_one : "/"}}</td>
+                  <td width="50">{{monitor_record.transmembrane_pressure_one ? monitor_record.transmembrane_pressure_one : "/"}}</td>
+                  <td width="50">{{monitor_record.blood_flow_volume_one? monitor_record.blood_flow_volume_one: "/"}}</td>
+                  <td width="50">{{monitor_record.conductivity_one ? monitor_record.conductivity_one : "/" }}</td>
                   <td width="50">
-                    <span v-if="j == 0">
-                      {{monitor_record.ultrafiltration_rate ? monitor_record.ultrafiltration_rate : '0' }}
+                    <!-- <span v-if="j == 0">
+                      {{monitor_record.ultrafiltration_rate_one ? monitor_record.ultrafiltration_rate : '0' }}
                     </span>
                     <span v-else-if="j == (record.monitor_records.length-1)">
                       {{monitor_record.ultrafiltration_rate ? monitor_record.ultrafiltration_rate : '/' }}
                     </span>
                     <span v-else>
                       {{monitor_record.ultrafiltration_rate ? monitor_record.ultrafiltration_rate : '/' }}
-                    </span> 
+                    </span>  -->
+
+                    {{ monitor_record.ultrafiltration_rate_one?monitor_record.ultrafiltration_rate_one:"/" }}
                     
                   </td>
                   <td width="50">
-                    <span v-if="j == 0">
+                    <!-- <span v-if="j == 0">
                       {{monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: "0" }}
                     </span>
                     <span v-else-if="j == (record.monitor_records.length-1)">
@@ -852,12 +856,14 @@
                     </span>
                     <span v-else>
                       {{monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: "/" }}
-                    </span> 
+                    </span>  -->
+
+                    {{ monitor_record.ultrafiltration_volume_one?monitor_record.ultrafiltration_volume_one:"/" }}
                     
                   </td>
 
                   <td width="65">
-                    <span v-if="j == 0">
+                    <!-- <span v-if="j == 0">
                       {{ monitor_record.heparin ? monitor_record.heparin :'0' }}
                     </span>
                     <span v-else-if="j == (record.monitor_records.length-1)">
@@ -865,7 +871,9 @@
                     </span>
                     <span v-else>
                       {{ monitor_record.heparin ? monitor_record.heparin :'/' }}
-                    </span> 
+                    </span>  -->
+
+                    {{ monitor_record.heparin_one?monitor_record.heparin_one:"/" }}
                     
                   </td>
                   <td width="200">

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -837,7 +837,7 @@
                            }}
                           </span>
 
-                          <span v-if="org_id==10510">
+                          <span v-if="org_id==10510 && record.prescription.mode_id!=2&& record.prescription.mode_id!=5&& record.prescription.mode_id!=12">
                               {{
                             record.assessment_after_dislysis.displace_liqui_value
                               ? record.assessment_after_dislysis.displace_liqui_value
@@ -3583,7 +3583,7 @@
                           v-if="!record.check"
                         ></div>
                       </div> -->
-                      <div class="inline_block" style="flex: 1">
+                      <div class="inline_block" style="flex: 1" v-if="org_id!=10579">
                         下机护士：
                         <div
                           class="under_line"
@@ -3623,6 +3623,16 @@
                           />
                         </div>
                       </div>
+
+                      <div class="inline_block" style="flex: 1" v-if="org_id==10579">
+                        患者签名：
+                        <div
+                          class="under_line"
+                          style="width: 80px; text-align: center"
+                        >
+                          
+                        </div>
+                      </div>
                       <div class="inline_block" style="flex: 1">
                         治疗医生：
                         <div

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -724,6 +724,24 @@
             </template>
         </el-table-column>
 
+        <el-table-column label="透中血压(mmHg)" align="center" width="180" v-if="isShow('血压1')">
+           <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+
+
+                    <span v-if="item.monitor_systolic_blood_pressure_one>=90 && item.monitor_systolic_blood_pressure_one<=140"> {{item.monitor_systolic_blood_pressure_one?item.monitor_systolic_blood_pressure_one:"未测"}}</span>
+                    <span  v-if="item.monitor_systolic_blood_pressure_one<90 || item.monitor_systolic_blood_pressure_one >140" style="color:red">{{item.monitor_systolic_blood_pressure_one?item.monitor_systolic_blood_pressure_one:"未测"}}</span>
+                    <span v-if="item.monitor_diastolic_blood_pressure_one >0">/</span>
+                    <span v-if="item.monitor_diastolic_blood_pressure_one >=60 &&item.monitor_diastolic_blood_pressure_one <=90">{{item.monitor_diastolic_blood_pressure_one?item.monitor_diastolic_blood_pressure_one:"未测"}}</span>
+                    <span v-if="item.monitor_diastolic_blood_pressure_one <60 || item.monitor_diastolic_blood_pressure_one >90" style="color:red">{{item.monitor_diastolic_blood_pressure_one?item.monitor_diastolic_blood_pressure_one:"未测" }}</span>
+
+                  </td>
+               </tr>
+
+            </template>
+        </el-table-column>
+
 
 
         <el-table-column label="体温(℃)" align="center" width="120"  v-if="isShow('体温')">
@@ -737,6 +755,17 @@
             </template>
         </el-table-column>
 
+        <el-table-column label="体温(℃)" align="center" width="120"  v-if="isShow('体温1')">
+           <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{ item.monitor_temperature_one ? item.monitor_temperature_one : "/" }}
+                  </td>
+               </tr>
+
+            </template>
+        </el-table-column>
+
 
 
           <el-table-column label="脉搏(次/分)" align="center" width="120"  v-if="isShow('脉搏')">
@@ -750,12 +779,23 @@
             </template>
         </el-table-column>
 
+        <el-table-column label="脉搏(次/分)" align="center" width="120"  v-if="isShow('脉搏1')">
+           <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{ item.pulse_frequency_one ? item.pulse_frequency_one : "/" }}
+                  </td>
+               </tr>
+
+            </template>
+        </el-table-column>
+
 
           <el-table-column label="呼吸频率(次/分)" align="center" width="120"  v-if="isShow('呼吸频率')">
            <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    {{ item.breathing_rate ? item.breathing_rate : "" }}
+                    {{ item.breathing_rate ? item.breathing_rate : "/" }}
                   </td>
                </tr>
 
@@ -767,8 +807,15 @@
            <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                   <span>{{item.venous_pressure ? item.venous_pressure : ""}}/
+                   <span v-if="org_id !=10693"> <span>{{item.venous_pressure ? item.venous_pressure : ""}}/
                      {{item.arterial_pressure ? item.arterial_pressure : ""}}</span>
+
+                     </span>
+
+                     <span v-if="org_id ==10693"> <span>{{item.venous_pressure_one ? item.venous_pressure_one : "/"}}/
+                     {{item.arterial_pressure_one ? item.arterial_pressure_one : "/"}}</span>
+
+                     </span>
                   </td>
                </tr>
 
@@ -787,6 +834,17 @@
             </template>
         </el-table-column>
 
+        <el-table-column label="血流量1" align="center" width="120" v-if="isShow('血流量')">
+           <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                     {{item.dialysate_flow_one?item.dialysate_flow_one:"/"}}
+                  </td>
+               </tr>
+
+            </template>
+        </el-table-column>
+
 
        <el-table-column label="跨膜压(mmHg)" align="center" width="120" v-if="isShow('跨膜压')">
            <template slot-scope="scope">
@@ -800,6 +858,18 @@
         </el-table-column>
 
 
+        <el-table-column label="跨膜压(mmHg)" align="center" width="120" v-if="isShow('跨膜压1')">
+           <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                     {{item.transmembrane_pressure_one?item.transmembrane_pressure_one:"/"}}
+                  </td>
+               </tr>
+
+            </template>
+        </el-table-column>
+
+
        <el-table-column label="超滤量(ml)" align="center"
              v-if="
               isShow('超滤量') &&
@@ -910,6 +980,20 @@
             </template>
         </el-table-column>
 
+
+        <el-table-column label="超滤量(ml)" align="center"
+             v-if="
+              isShow('超滤量1')">
+            <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                     {{item.ultrafiltration_volume_one?item.ultrafiltration_volume_one:"/"}}
+                  </td>
+               </tr>
+
+            </template>
+        </el-table-column>
+
         <el-table-column label="超滤率(ml/h)" align="center"
             v-if="isShow('超滤率') &&
               (template_id == 6 ||
@@ -1004,6 +1088,20 @@
 
         </el-table-column>
 
+        <el-table-column label="超滤率(ml/h)" align="center"
+             v-if="
+              isShow('超滤率2')">
+            <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                     {{item.ultrafiltration_rate_one?item.ultrafiltration_rate_one:"/"}}
+                  </td>
+               </tr>
+
+            </template>
+        </el-table-column>
+
+
        <el-table-column label="钠浓度(mmol/L)" align="center"  v-if="isShow('钠浓度')">
 
            <template slot-scope="scope">
@@ -1016,6 +1114,19 @@
             </template>
         </el-table-column>
 
+
+        <el-table-column label="钠浓度(mmol/L)" align="center"  v-if="isShow('钠浓度1')">
+
+        <template slot-scope="scope">
+            <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+              <td style="border-right: none; border-inline-end: none;text-align: center">
+                  {{item.sodium_concentration_one? item.sodium_concentration_one: "/"}}
+              </td>
+            </tr>
+
+        </template>
+        </el-table-column>
+
        <el-table-column label="透析液温度(℃)" align="center"   v-if="isShow('透析液温度')">
            <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
@@ -1026,6 +1137,19 @@
 
             </template>
 
+        </el-table-column>
+
+
+        <el-table-column label="透析液温度(℃)" align="center"   v-if="isShow('透析液温度1')">
+           <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                      {{item.dialysate_temperature_one? item.dialysate_temperature_one: "/"}}
+                  </td>
+               </tr>
+
+            </template>
+
         </el-table-column>
 
          <el-table-column label="置换率(ml/min)" align="center"
@@ -1083,7 +1207,21 @@
             </template>
         </el-table-column>
 
-       <el-table-column label="置换量(ml/h)" align="center"
+        <el-table-column label="置换率(ml/h)" align="center"
+        v-if="isShow('置换率1')"
+       >
+          <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                      {{item.replacement_rate_one? item.replacement_rate_one: "/"}}
+                  </td>
+               </tr>
+
+            </template>
+        </el-table-column>
+        
+
+       <el-table-column label="置换量(L)" align="center"
         v-if="isShow('置换量') && (template_id == 43 || template_id == 48)"
        >
           <template slot-scope="scope">
@@ -1156,6 +1294,20 @@
            </template>
         </el-table-column>
 
+
+        <el-table-column label="置换量(ml)" align="center"
+        v-if="isShow('置换量1')"
+       >
+          <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                      {{item.displacement_quantity_one? item.displacement_quantity_one: "/"}}
+                  </td>
+               </tr>
+
+            </template>
+        </el-table-column>
+
         <el-table-column label="SpO₂(%)" align="center"
           v-if="
               isShow('SpO₂') &&
@@ -1174,6 +1326,22 @@
            </template>
         </el-table-column>
 
+
+        <el-table-column label="SpO₂(%)" align="center"
+          v-if="
+              isShow('SpO₂1')
+            "
+        >
+         <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                      {{item.blood_oxygen_saturation_one? item.blood_oxygen_saturation_one: "/"}}
+                  </td>
+               </tr>
+
+           </template>
+        </el-table-column>
+
        <el-table-column label="电导度(mS/cm)" align="center"
         v-if="isShow('电导度')">
 
@@ -1187,6 +1355,20 @@
            </template>
         </el-table-column>
 
+
+        <el-table-column label="电导度(mS/cm)" align="center"
+        v-if="isShow('电导度1')">
+
+          <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                      {{item.conductivity_one? item.conductivity_one: "/"}}
+                  </td>
+               </tr>
+
+           </template>
+        </el-table-column>
+
        <el-table-column label="置换液流量(ml/h)" align="center"
        v-if="isShow('置换液流量') && template_id != 27"
        >
@@ -1214,6 +1396,19 @@
            </template>
         </el-table-column>
 
+        <el-table-column label="置换液流量(ml/min)" align="center"
+        v-if="isShow('置换液流量1')"
+       >
+          <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                      {{item.displacement_flow_quantity_one? item.displacement_flow_quantity_one: "/"}}
+                  </td>
+               </tr>
+
+           </template>
+        </el-table-column>
+
        <el-table-column label="透析液流量(ml/h)" align="center" v-if="isShow('透析液流量')">
            <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
@@ -1225,6 +1420,17 @@
            </template>
         </el-table-column>
 
+        <el-table-column label="透析液流量(ml/h)" align="center" v-if="isShow('透析液流量1')">
+           <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                      {{item.dialysate_flow_one? item.dialysate_flow_one: "/"}}
+                  </td>
+               </tr>
+
+           </template>
+        </el-table-column>
+
         <el-table-column label="肝素用量余量(ml)" align="center" v-if="isShow('肝素用量余量')">
           <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
@@ -1236,6 +1442,17 @@
            </template>
         </el-table-column>
 
+        <el-table-column label="剩余肝素(ml)" align="center" v-if="isShow('剩余肝素')">
+          <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                      {{item.heparin_one? item.heparin_one: "/"}}
+                  </td>
+               </tr>
+
+           </template>
+        </el-table-column>
+
 
 
         <el-table-column label="血压监测部位" align="center" v-if="isShow('血压监测部位')">
@@ -1298,6 +1515,19 @@
            </template>
           </el-table-column>
 
+          
+        <el-table-column label="血容量" align="center"  v-if="isShow('血容量1')">
+
+          <template slot-scope="scope">
+              <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                <td style="border-right: none; border-inline-end: none;text-align: center">
+                  {{item.accumulated_blood_volume_one?item.accumulated_blood_volume_one:"/"}}
+                </td>
+              </tr>
+
+          </template>
+        </el-table-column>
+
         <el-table-column label="血温监测" align="center" v-if="isShow('血温监测')">
           <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
@@ -1309,6 +1539,17 @@
            </template>
         </el-table-column>
 
+        <el-table-column label="血温监测" align="center" v-if="isShow('血温监测1')">
+          <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{item.blood_temperature_one?item.blood_temperature_one:"/"}}
+                  </td>
+               </tr>
+
+           </template>
+        </el-table-column>
+
         <el-table-column label="尿素监测" align="center" v-if="isShow('尿素监测')" >
            <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
@@ -1320,6 +1561,17 @@
            </template>
         </el-table-column>
 
+        <el-table-column label="尿素监测" align="center" v-if="isShow('尿素监测1')" >
+           <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{item.urea_monitoring_one?item.urea_monitoring_one:"/"}}
+                  </td>
+               </tr>
+
+           </template>
+        </el-table-column>
+
         <el-table-column label="血压监测" align="center" v-if="isShow('血压监测')">
           <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
@@ -1366,6 +1618,19 @@
 
            </template>
         </el-table-column>
+
+        <el-table-column label="KT/V" align="center"
+          v-if="isShow('kt/v1')"
+         >
+          <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.monitoring_record" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{item.ktv_one?item.ktv_one:"/"}}
+                  </td>
+               </tr>
+
+           </template>
+        </el-table-column>
       </el-table>
 
       <el-pagination

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

@@ -83,15 +83,17 @@
             v-if="isShow('血压1')"
           >
             <template slot-scope="scope">
-              {{
+               {{
                 scope.row.monitor_systolic_blood_pressure_one
                   ? scope.row.monitor_systolic_blood_pressure_one
                   : "未测"
-              }}/{{
+              }}
+              <span v-if="scope.row.monitor_diastolic_blood_pressure_one!=''&& scope.row.monitor_diastolic_blood_pressure_one>0">/{{
                 scope.row.monitor_diastolic_blood_pressure_one
                   ? scope.row.monitor_diastolic_blood_pressure_one
                   : "未测"
               }}
+              </span>
             </template>
           </el-table-column>
 
@@ -205,7 +207,7 @@
           </el-table-column>
 
           <el-table-column
-            v-if="monitors[0] && monitors[0]['venous_pressure_type'] == 2&&org_id ==10693"
+            v-if="monitors[0] && monitors[0]['venous_pressure_type'] != 2&&org_id ==10693"
             prop="venous_pressure"
             align="center"
             label="静脉压/动脉压(mmHg)"
@@ -216,9 +218,10 @@
                 >{{
                   scope.row.venous_pressure_one ? scope.row.venous_pressure_one : ""
                 }}/
-                {{
+               <span v-if="scope.row.arterial_pressure_one!=''&&scope.row.arterial_pressure_one>0">{{
                   scope.row.arterial_pressure_one ? scope.row. arterial_pressure_one : ""
-                }}</span
+                }}</span> 
+                </span
               >
             </template>
           </el-table-column>
@@ -259,7 +262,7 @@
             v-if="
               isShow('跨膜压') &&
               monitors[0] &&
-              monitors[0]['transmembrane_pressure_type'] == 2 && org_id!=10673
+              monitors[0]['transmembrane_pressure_type'] == 2 && org_id!=10693
             "
           >
             <template slot-scope="scope">
@@ -277,11 +280,7 @@
             align="center"
             label="跨膜压(kpa)"
             width="120"
-            v-if="
-              isShow('跨膜压1') &&
-              monitors[0] &&
-              monitors[0]['transmembrane_pressure_type'] == 2 && org_id ==10673
-            "
+            v-if="isShow('跨膜压1') &&monitors[0] &&monitors[0]['transmembrane_pressure_type'] == 2 && org_id ==10693"
           >
             <template slot-scope="scope">
               {{
@@ -297,11 +296,7 @@
             align="center"
             label="跨膜压(mmHg)"
             width="120"
-            v-if="
-              isShow('跨膜压') &&
-              monitors[0] &&
-              monitors[0]['transmembrane_pressure_type'] != 2 && org_id!=10673
-            "
+            v-if="isShow('跨膜压') &&monitors[0] &&monitors[0]['transmembrane_pressure_type'] != 2 && org_id!=10693"
           >
             <template slot-scope="scope">
               {{
@@ -318,9 +313,7 @@
             label="跨膜压(mmHg)"
             width="120"
             v-if="
-              isShow('跨膜压1') &&
-              monitors[0] &&
-              monitors[0]['transmembrane_pressure_type'] != 2 && org_id == 10673
+              isShow('跨膜压1') &&monitors[0] &&monitors[0]['transmembrane_pressure_type'] != 2 && org_id == 10693
             "
           >
             <template slot-scope="scope">
@@ -482,7 +475,7 @@
             align="center"
             label="超滤量(ml)"
             width="100"
-            v-if="isShow('超量1')">
+            v-if="isShow('超滤量1')">
             <template slot-scope="scope">
               {{
                 scope.row.ultrafiltration_volume_one
@@ -1486,7 +1479,7 @@
               :rules="isCheckmust('静脉压')">
               <el-input
                 style="width: 140px"
-                v-model="form.venous_pressure"
+                v-model="form.venous_pressure_one"
               ></el-input>
               <el-button
                 size="mini"
@@ -1746,7 +1739,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col  :span="8" v-if="isShow('超滤率1')">
+          <el-col  :span="8" v-if="isShow('超滤率2')">
             <el-form-item label="超滤率(ml/min)" :prop="isName('超滤率')"
               :rules="isCheckmust('超滤率')">
               <el-input v-model="form.ultrafiltration_rate_one" style="width:200px"></el-input>
@@ -3009,6 +3002,7 @@ export default {
             this.form.dialysate_temperature = 36.5
 
          }
+         
       });
     },
 
@@ -3213,6 +3207,38 @@ export default {
         this.form.replacement_speed = monitor.replacement_speed?monitor.replacement_speed:""
         this.form.dicarbonate = monitor.dicarbonate?monitor.dicarbonate:""
         this.form.is_pressure = monitor.is_pressure
+
+
+        this.form.ultrafiltration_rate_one = monitor.ultrafiltration_rate_one?monitor.ultrafiltration_rate_one:""
+        this.form.heparin_one = monitor.heparin_one?monitor.heparin_one:""
+        this.form.monitor_systolic_blood_pressure_one = monitor.monitor_systolic_blood_pressure_one?monitor.monitor_systolic_blood_pressure_one:""
+        this.form.monitor_diastolic_blood_pressure_one = monitor.monitor_diastolic_blood_pressure_one?monitor.monitor_diastolic_blood_pressure_one:""
+        this.form.monitor_pulse_frequency_one = monitor.monitor_pulse_frequency_one? monitor.monitor_pulse_frequency_one:""
+        this.form.blood_flow_volume_one = monitor.blood_flow_volume_one?monitor.blood_flow_volume_one:"",
+        this.form.venous_pressure_one = monitor.venous_pressure_one?monitor.venous_pressure_one:""
+        this.form.arterial_pressure_one =monitor.arterial_pressure_one?monitor.arterial_pressure_one:""
+        this.form.transmembrane_pressure_one =monitor.transmembrane_pressure_one?monitor.transmembrane_pressure_one:""
+        this.form.ultrafiltration_volume_one = monitor.ultrafiltration_volume_one?monitor.ultrafiltration_volume_one:""
+        this.form.sodium_concentration_one =monitor.sodium_concentration_one?monitor.sodium_concentration_one:""
+        this.form.dialysate_temperature_one= monitor.dialysate_temperature_one?monitor.dialysate_temperature_one:""
+        this.form.replacement_rate_one  = monitor.replacement_rate_one?monitor.replacement_rate_one:""
+        this.form.displacement_quantity_one =monitor.displacement_quantity_one?monitor.displacement_quantity_one:""
+        this.form.ktv_one =monitor.ktv_one?monitor.ktv_one:""
+        this.form.urr_one = monitor.urr_one?monitor.urr_one:""
+        this.form.conductivity_one= monitor.conductivity_one?monitor.conductivity_one:""
+        this.form.displacement_flow_quantity_one?monitor.displacement_flow_quantity_one:""
+        this.form.blood_oxygen_saturation_one =monitor.blood_oxygen_saturation_one?monitor.blood_oxygen_saturation_one:""
+        this.form.dialysate_flow_one  = monitor.dialysate_flow_one ? monitor.dialysate_flow_one:""
+        this.form.blood_sugar_one = monitor.blood_sugar_one? monitor.blood_sugar_one:""
+        this.form.monitor_temperature_one = monitor.monitor_temperature_one?monitor.monitor_temperature_one:""
+        this.form.pulse_frequency_one = monitor.pulse_frequency_one?monitor.pulse_frequency_one:""
+        this.form.blood_temperature_one = monitor.blood_temperature_one?monitor.blood_temperature_one:""
+        this.form.urea_monitoring_one = monitor.urea_monitoring_one?monitor.urea_monitoring_one:""
+        this.form.blood_thickness_one = monitor.blood_thickness_one?monitor.blood_thickness_one:""
+        this.form.blood_monitor_one = monitor.blood_monitor_one?monitor.blood_monitor_one:""
+        this.form.replacement_speed_one= monitor.replacement_speed_one?monitor.replacement_speed_one:""
+        this.form.dicarbonate_one  = monitor.dicarbonate_one?monitor.dicarbonate_one:""
+        this.form.accumulated_blood_volume_one = monitor.accumulated_blood_volume_one?monitor.accumulated_blood_volume_one:""
         // 设置三个下拉框的值，直接调用事件偷懒
         this.symptomTextareaBlur();
         this.disposeTextareaBlur();

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -19,9 +19,10 @@
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('血流量1')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
+          <th v-if="isShow('跨膜压1')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
           <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
-          <th v-if=" isShow('超滤量')"  width="76px"> 超滤量(ml) </th>
+          <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </th>
           <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
           <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
@@ -82,11 +83,11 @@
           <td v-if="isShow('血压1')"> {{ monitor.monitor_systolic_blood_pressure_one ? monitor.monitor_systolic_blood_pressure_one : "未测" }}/{{ monitor.  monitor_diastolic_blood_pressure_one ? monitor.  monitor_diastolic_blood_pressure_one : "未测" }} </td>
           <th v-if="isShow('拒测血压')" width="72px">{{ monitor.is_pressure }}</th>
           <td v-if="isShow('脉搏')"> {{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }} </td>
-          <td v-if="isShow('脉搏1')"> {{ monitor. monitor_pulse_frequency_one ? monitor. monitor_pulse_frequency_one : "/" }} </td>
+          <td v-if="isShow('脉搏1')"> {{ monitor.monitor_pulse_frequency_one ? monitor.monitor_pulse_frequency_one : "/" }} </td>
           <td v-if="isShow('呼吸频率')"> {{ monitor.breathing_rate ? monitor.breathing_rate : "/" }} </td>
           <td v-if="org_id!=10693"> {{ monitor.venous_pressure ? monitor.venous_pressure : "" }} /{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}  </td>
           <td v-if="org_id==10693"> {{ monitor.venous_pressure_one ? monitor.venous_pressure_one : "/" }}
-            <span v-if="monitor.arterial_pressure_one!=''">/{{ monitor.arterial_pressure_one ? monitor.arterial_pressure_one : "/" }} </span>  </td>
+            <span v-if="monitor.arterial_pressure_one!=''&&monitor.arterial_pressure_one>0">/{{ monitor.arterial_pressure_one ? monitor.arterial_pressure_one : "/" }} </span>  </td>
 
           <td v-if="isShow('血流量')"> {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }} </td>
           <td v-if="isShow('血流量1')"> {{ monitor. blood_flow_volume_one ? monitor. blood_flow_volume_one : "/" }} </td>
@@ -100,7 +101,7 @@
             {{ monitor.ultrafiltration_volume_one ? monitor.ultrafiltration_volume_one : "/" }}
           </td>
           <td v-if="isShow('超滤率')" >{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:''}}</td>
-          <td v-if="isShow('超滤率2')" >{{monitor.ultrafiltration_rate_one?monitor.ultrafiltration_rate_one:''}}</td>
+          <td v-if="isShow('超滤率2')" >{{monitor.ultrafiltration_rate_one?monitor.ultrafiltration_rate_one:'/'}}</td>
           <td v-if="isShow('钠浓度')"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }} </td>
           <td v-if="isShow('钠浓度1')"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "/" }} </td>
           <td v-if="isShow('透析液温度')"> {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }} </td>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -917,11 +917,13 @@
                         }}
                         </span>
 
-                        <span v-if="org_id ==10510 "> {{
-                          afterdialysis.displace_liqui_value
+                        <span v-if="org_id ==10510 "> 
+                          <span v-if="prescription.mode_id!=2&&prescription.mode_id!=5&&presciption.mode_id!=12">{{
+                            afterdialysis.displace_liqui_value
                             ? afterdialysis.displace_liqui_value
                             : "/"
-                        }}
+                           }}
+                        </span>
                         </span>
                         <span v-if="org_id!=10206&& org_id!=10510"> {{
                           prescription.displace_liqui_value
@@ -2162,7 +2164,7 @@
 
 
                       <tr
-                      v-if="org_id == 0 || org_id ==10206 || org_id == 10478"
+                      v-if="org_id == 0 || org_id ==10206"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
@@ -2381,7 +2383,7 @@
 
 
                       <tr
-                      v-if="org_id == 0 || org_id ==10206 || org_id ==10489 || org_id ==10633 || org_id ==10644 || org_id ==10478"
+                      v-if="org_id == 0 || org_id ==10206 || org_id ==10489 || org_id ==10633 || org_id ==10644"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
@@ -3609,7 +3611,7 @@
                         />
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 1">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10579">
                        下机护士：
                       <div
                         class="under_line"
@@ -3648,6 +3650,16 @@
                         />
                       </div>
                     </div>
+                    <div class="inline_block" style="flex: 1" v-if="org_id==10579">
+                       患者签名
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                      >
+                        
+                       
+                      </div>
+                    </div>
                     <div class="inline_block" style="flex: 1">
                       治疗医生：
                       <div
@@ -4794,7 +4806,7 @@ export default {
 
         console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices)
 
-        if(this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 0 || this.org_id==10478){
+        if(this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);
@@ -4832,7 +4844,7 @@ export default {
         }
 
         //HIS客户显示临时医嘱的地方
-        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489|| this.org_id == 10644 || this.org_id ==0 || this.org_id ==10478){
+        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489|| this.org_id == 10644){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
 
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -560,7 +560,7 @@
                   <span v-else>未测</span> -->
 
                   <span>{{ monitor.monitor_systolic_blood_pressure_one ? monitor.monitor_systolic_blood_pressure_one : "未测" }}</span>
-                  <span v-if="monitor.monitor_diastolic_blood_pressure_one!=''">{{ monitor.monitor_diastolic_blood_pressure_one ? monitor.monitor_diastolic_blood_pressure_one : "未测" }}</span>
+                  <span v-if="monitor.monitor_diastolic_blood_pressure_one!=''&&monitor.monitor_diastolic_blood_pressure_one>0">/{{ monitor.monitor_diastolic_blood_pressure_one ? monitor.monitor_diastolic_blood_pressure_one : "未测" }}</span>
                 </td>
                 <td width="50">{{ monitor.pulse_frequency_one ? monitor.pulse_frequency_one : "未测" }}</td>
                 <td width="50">{{monitor.arterial_pressure_one ? monitor.arterial_pressure_one: "/"}}</td>