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

src/router/index_路由未分离前.js

@@ -638,14 +638,7 @@ export const xt_asyncRouterMap = [
         name: 'Inspection',
         meta: { title: 'inspection', noCache: true }
       },
-      {
-        path: '/patients/newinspection',
-        component: () => import('@/xt_pages/user/newInspection'),
-        hidden: true,
-        is_menu: false,
-        name: 'newInspection',
-        meta: { title: 'newInspection', noCache: true }
-      },
+      
       {
         path: '/',
         component: () => import('@/xt_pages/user/courseOfDisease'),

src/router/modules/patient.js

@@ -139,6 +139,14 @@ export default {
       noCache: true
     }
   },
+  {
+    path: '/patients/newInspection',
+    component: () => import('@/xt_pages/user/lapsoInspection'),
+    hidden: true,
+    is_menu: false,
+    name: 'newInspection',
+    meta: { title: 'newInspection', noCache: true }
+  },
   {
     path: '/patients/patients/:id/inspectionInfectious',
     component: () => import('@/xt_pages/user/inspectionInfectious'),

src/xt_pages/dialysis/batch_print/batch_print_order_seventynine.vue

@@ -143,6 +143,46 @@
                     </td>
                   </tr>
 
+                  <tr>
+                    <td colspan="3">
+                      <div style="display: flex;">
+                        <div style="flex: 1;">
+                          上次透后体重:{{ record.lastafterweight.weight_after ? 
+                          parseFloat( record.lastafterweight.weight_after).toFixed(1)
+                          : '未称重'}}kg
+                        </div>
+                        <div style="flex: 1;">
+                          本次透前体重:
+                          {{ record.assessment_before_dislysis.weight_before ? record.assessment_before_dislysis.weight_before : '0'  }}kg
+                        </div>
+                        <div style="flex: 1;">
+                          体重增加量:
+                          {{(record.assessment_before_dislysis.weight_before - record.lastafterweight.weight_after).toFixed(1) }}kg
+                        </div>
+                      </div>
+                    </td>
+                  </tr>
+
+                  <tr>
+                    <td colspan="3">
+                      <div style="display: flex;flex-wrap: wrap;">
+                        <div style="flex: 1;">
+                          干体重(DW):
+                          {{ record.assessment_before_dislysis.dry_weight ? record.assessment_before_dislysis.dry_weight : "0"}}kg
+                        </div>
+                        <div style="flex: 1;">
+                          本次透后体重:
+                          {{record.assessment_after_dislysis.weight_after ? record.assessment_after_dislysis.weight_after :'0' }}kg
+                        </div>
+                        <div style="flex: 1;">
+                          本次透析体重下降量:
+                          {{record.assessment_after_dislysis.weight_after == 0 || record.assessment_before_dislysis.weight_before == 0 ?
+                        0 : ( record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after ).toFixed(2)}}kg
+                        </div>
+                      </div>
+                    </td>
+                  </tr>
+
                   <tr>
                     <td colspan="2">
                       <div style="line-height:30px;">
@@ -162,6 +202,15 @@
                     </td>
                   </tr>
 
+                  <tr>
+                    <td colspan="3">
+                      <div>
+                        <span>透析液流量:{{ record.prescription.dialysate_flow ? record.prescription.dialysate_flow : "" }}</span>ml/h &nbsp;&nbsp;
+                        <span>血流量:{{ record.prescription.blood_flow_volume ? record.prescription.blood_flow_volume : "" }} </span>ml/min &nbsp;&nbsp;
+                      </div>
+                    </td>
+                  </tr>
+
                 </tbody>
               </table>
 
@@ -289,7 +338,7 @@
                       <td style="width:10%;height:25px">
                         <p style="height:30px;line-height:30px">核对</p>
                       </td>
-                      <td style="width:15%;height:27px">
+                      <!-- <td style="width:15%;height:27px">
                         <p style="height:30px;line-height:30px">上次透后体重</p>
                       </td>
                       <td style="width:10%;line-height:30px">
@@ -299,7 +348,7 @@
                           ).toFixed(1)
                           : '未称重'
                           }}kg
-                      </td>
+                      </td> -->
                     </tr>
 
                     <tr v-for="(advice, advice_index) in record.advices" :key="advice_index">
@@ -336,12 +385,12 @@
                           style="height: 30px;"
                         />
                       </td>
-                      <td v-if="advice_index === 0">透前体重:</td>
+                      <!-- <td v-if="advice_index === 0">透前体重:</td>
                       <td v-if="advice_index === 0">{{ record.assessment_before_dislysis.weight_before ? record.assessment_before_dislysis.weight_before : '0' }}kg</td>
                       <td v-if="advice_index === 1">体重增加量:</td>
                       <td v-if="advice_index === 1">{{(record.assessment_before_dislysis.weight_before - record.lastafterweight.weight_after).toFixed(1) }}kg</td>
                       <td v-if="advice_index === 2">干体重(DW):</td>
-                      <td v-if="advice_index === 2">{{record.assessment_before_dislysis.dry_weight ? record.assessment_before_dislysis.dry_weight : "0"}}kg</td>
+                      <td v-if="advice_index === 2">{{record.assessment_before_dislysis.dry_weight ? record.assessment_before_dislysis.dry_weight : "0"}}kg</td> -->
                       <!-- <td v-if="advice_index === 3">较干体重增加量:</td>
                       <td v-if="advice_index === 3">
                         {{(record.assessment_before_dislysis.weight_before - record.assessment_before_dislysis.dry_weight -
@@ -349,13 +398,13 @@
                       </td>
                       <td v-if="advice_index === 4">净脱水量:</td>
                       <td v-if="advice_index === 4">{{record.assessment_after_dislysis.actual_ultrafiltration}}L</td> -->
-                      <td v-if="advice_index === 3">透后体重:</td>
+                      <!-- <td v-if="advice_index === 3">透后体重:</td>
                       <td v-if="advice_index === 3">{{record.assessment_after_dislysis.weight_after}}kg</td>
                       <td v-if="advice_index === 4">本次透析体重下降量:</td>
                       <td v-if="advice_index === 4">
                         {{record.assessment_after_dislysis.weight_after == 0 || record.assessment_before_dislysis.weight_before == 0 ?
                         0 : ( record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after ).toFixed(2)
-                      }}kg</td>
+                      }}kg</td> -->
                     </tr>
                   </tbody>
                 </table>

src/xt_pages/dialysis/batch_print/batch_print_order_seventytwo.vue

@@ -1189,7 +1189,7 @@
                           <div style="flex: 0.9;border-right: 1px solid black;">跨膜压<br/>(mmHg)</div>
                           <div style="flex: 0.9;border-right: 1px solid black;">钠浓度<br/>(mmol/L)</div>
                           <div style="flex: 0.9;border-right: 1px solid black;">超滤量<br/>(ml)</div>
-                          <div style="flex: 1;border-right: 1px solid black;" v-if="record.prescription.mode_id == 2">置换液速度<br/>(ml/h)</div>
+                          <div style="flex: 1;border-right: 1px solid black;" v-if="record.prescription.mode_id == 2">置换液流量<br/>(ml/h)</div>
                           <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7 && record.prescription.anticoagulant != ''">肝素剩余量度(ml)</div>
                           <div style="flex: 2;">病情变化及处理</div>
                         </div>
@@ -1224,7 +1224,7 @@
                         {{ monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: ""}}
                       </div>
                       <div style="flex: 1;border-right: 1px solid black;" v-if="record.prescription.mode_id == 2">
-                        {{ monitor_record.replacement_speed ? monitor_record.replacement_speed : "" }}
+                        {{ monitor_record.displacement_flow_quantity ? monitor_record.displacement_flow_quantity : "" }}
                       </div>
                       <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7 && record.prescription.anticoagulant != ''">
 

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -3048,7 +3048,7 @@
             <div class="under_line" style="width: 120px;">
               <img
                 v-if="record.dialysis_order.url!=''"
-                style="height: 30px"
+                style="height: 40px"
                 :src="record.dialysis_order == null? 0: record.dialysis_order.url"
                 alt=""
                 srcset=""

src/xt_pages/dialysis/doctorAdviceStaticPrint.vue

@@ -29,7 +29,7 @@
                 <td width="100">药品名称</td>
                 <td width="100">规格</td>
                 <td width="100">数量</td>
-                <td width="100" v-if="org_id == 0 || org_id==10644">数量</td>
+                <td width="100" v-if="org_id == 0 || org_id==10644">厂家</td>
               </tr>
               </thead>
               <tbody>

src/xt_pages/dialysis/template/DialysisPrintOrderFiftySeven.vue

@@ -311,7 +311,7 @@
                         <div
                           style="
                             display: flex;
-                            min-width: 180px;
+                            min-width: 150px;
                             border-right: 1px solid;
                           "
                         >
@@ -327,15 +327,10 @@
                             }}
                           </span>
                         </div>
-                        <div
-                          style="
-                            display: flex;
-                            border-right: 1px solid;
-                            padding: 0 10px;
-                            min-width: 180px;
-                          "
+                        <div style=" display: flex; border-right: 1px solid;
+                            padding-left: 10px; min-width: 180px;white-space: normal;"
                         >
-                          透析（滤）器：{{
+                          透析(滤)器：{{
                             prescription.dialyzer_perfusion_apparatus
                               ? prescription.dialyzer_perfusion_apparatus
                               : ""

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyTwo.vue

@@ -1118,7 +1118,7 @@
                       <div style="flex: 0.9;border-right: 1px solid black;">跨膜压<br/>(mmHg)</div>
                       <div style="flex: 0.9;border-right: 1px solid black;">钠浓度<br/>(mmol/L)</div>
                       <div style="flex: 0.9;border-right: 1px solid black;">超滤量<br/>(ml)</div>
-                      <div style="flex: 1;border-right: 1px solid black;" v-if="prescription.mode_id == 2">置换液速度<br/>(ml/h)</div>
+                      <div style="flex: 1;border-right: 1px solid black;" v-if="prescription.mode_id == 2">置换液流量<br/>(ml/h)</div>
                       <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name=='低分子肝素钠'">肝素剩余量度(ml)
                       </div>
                       <div style="flex: 2;">病情变化及处理</div>
@@ -1171,7 +1171,7 @@
                       {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}
                     </div>
                     <div style="flex: 1;border-right: 1px solid black;" v-if="prescription.mode_id == 2">
-                      {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}
+                      {{ monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : "" }}
                     </div>
                     <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name=='低分子肝素钠'">
 

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

@@ -122,12 +122,46 @@
               </td>
             </tr>
 
+            <tr>
+              <td colspan="3">
+                <div style="display: flex;flex-wrap: wrap;">
+                  <div style="flex: 1;">
+                    上次透后体重:{{ assessmentafter.weight_after ? assessmentafter.weight_after : "0" }}kg
+                  </div>
+                  <div style="flex: 1;">
+                    本次透前体重:{{ predialysis.weight_before ? predialysis.weight_before : '0' }}kg
+                  </div>
+                  <div style="flex: 1;">
+                    体重增加量:{{ (predialysis.weight_before - assessmentafter.weight_after).toFixed(1) }}kg
+                  </div>
+                 
+                </div>
+              </td>
+            </tr>
+            
+            <tr>
+              <td colspan="3">
+                <div style="display: flex;flex-wrap: wrap;">
+                  <div style="flex: 1;">
+                    干体重(DW):{{ predialysis.dry_weight ? predialysis.dry_weight :'0' }}kg
+                  </div>
+                  <div style="flex: 1;">
+                    本次透后体重:{{ afterdialysis.weight_after ? afterdialysis.weight_after :'0' }}kg
+                  </div>
+                  <div style="flex: 1;">
+                    本次透析体重下降量:
+                    {{  afterdialysis.weight_after == 0 || predialysis.weight_before == 0? '0.00'
+                      : (predialysis.weight_before - afterdialysis.weight_after).toFixed(2) }}kg
+                  </div>
+                </div>
+              </td>
+            </tr>
+
             <tr>
               <td colspan="2">
                 <div style="line-height:30px;">
                  <span>目标脱水量: {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }} </span>L &nbsp;&nbsp;
                  <span>处方脱水量: {{ prescription.prescription_water  ? prescription.prescription_water : "" }} </span>L &nbsp;&nbsp;
-                 <span>透析液流量: {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} </span>ml/h
                 </div>
               </td>
               <td >
@@ -141,6 +175,15 @@
               </td>
             </tr>
 
+            <tr>
+              <td colspan="3">
+                <div>
+                  <span>透析液流量: {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} </span>ml/h &nbsp;&nbsp;
+                  <span>血流量:{{ prescription.blood_flow_volume ? prescription.blood_flow_volume : "" }} </span>ml/min &nbsp;&nbsp;
+                </div>
+              </td>
+            </tr>
+
           </tbody>
         </table>
         <table border="1" class="table-box" style="border-collapse: collapse;width: 99%;font-size: 16px;">
@@ -239,13 +282,10 @@
               </td>
               <td>
                 <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
-                  {{
-                  getAdminUser(monitor.monitoring_nurse)
-                  }}
+                  {{ getAdminUser(monitor.monitoring_nurse) }}
                 </span>
-                <span
-                  v-else
-                  style="display:flex;align-items:center;justify-content:space-around;height:36px;"
+                <span v-else
+                  style="display:flex;align-items:center;justify-content:space-around;height:30px;"
                 >
                   <img style="height:30px;" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset />
                 </span>
@@ -274,12 +314,6 @@
                 <td style="width:10%;height:25px">
                   <p style="height:30px;line-height:30px">核对</p>
                 </td>
-                <td style="width:15%;height:27px">
-                  <p style="height:30px;line-height:30px">上次透后体重</p>
-                </td>
-                <td style="width:10%;line-height:30px">
-                  {{ assessmentafter.weight_after ? assessmentafter.weight_after : "0" }}kg
-                </td>
               </tr>
 
               <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index">
@@ -301,25 +335,18 @@
                   <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker) }}</span>
                   <img style="height:40px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else />
                 </td>
-                <td v-if="advice_index === 0">透前体重:</td>
+                <!-- <td v-if="advice_index === 0">透前体重:</td>
                 <td v-if="advice_index === 0">{{ predialysis.weight_before }}kg</td>
                 <td v-if="advice_index === 1">体重增加量:</td>
                 <td v-if="advice_index === 1">{{ (predialysis.weight_before - assessmentafter.weight_after).toFixed(1) }}kg</td>
                 <td v-if="advice_index === 2">干体重(DW):</td>
-                <td v-if="advice_index === 2">{{ predialysis.dry_weight }}kg</td>
-                <!-- <td v-if="advice_index === 3">较干体重增加量:</td>
-                <td v-if="advice_index === 3">
-                  {{ afterdialysis.weight_after != 0 && predialysis.dry_weight !=0
-                    ? (afterdialysis.weight_after - predialysis.dry_weight).toFixed(2): 0 }}kg
-                </td>
-                <td v-if="advice_index === 4">净脱水量:</td>
-                <td v-if="advice_index === 4">{{ afterdialysis.actual_ultrafiltration }}L</td> -->
-                <td v-if="advice_index === 3">透后体重:</td>
+                <td v-if="advice_index === 2">{{ predialysis.dry_weight }}kg</td> -->
+                <!-- <td v-if="advice_index === 3">透后体重:</td>
                 <td v-if="advice_index === 3">{{ afterdialysis.weight_after }}kg</td>
                 <td v-if="advice_index === 4">本次透析体重下降量:</td>
                 <td v-if="advice_index === 4">
                   {{  afterdialysis.weight_after == 0 || predialysis.weight_before == 0? '0.00'
-                      : (predialysis.weight_before - afterdialysis.weight_after).toFixed(2) }}kg</td>
+                      : (predialysis.weight_before - afterdialysis.weight_after).toFixed(2) }}kg</td> -->
               </tr>
             </tbody>
           </table>
@@ -970,6 +997,8 @@ export default {
           }
 
           this.advices = response.data.data.advices;
+
+          
           this.monitors = response.data.data.monitors;
           console.log("透析监测", this.monitors);
           this.summary = response.data.data.summary;
@@ -1148,9 +1177,23 @@ export default {
           console.log(this.advice_groups);
           
           var advices = response.data.data.advices;
+         
+          var newDocArr= []
+          for(let i=0;i<advices.length;i++){
+            console.log("hhahahahh",advices[i].advice_name.indexOf("0.9%氯化钠注射液"))
+            console.log("jjjjjjjjj",advices[i].delivery_way.indexOf("管路预冲"))
+           if(advices[i].advice_name.indexOf("0.9%氯化钠注射液") ==-1 && advices[i].delivery_way.indexOf("管路预冲")==-1){
+              newDocArr.push(advices[i])
+           }
+          }
+          console.log("newDocArr----------------------",newDocArr)
+        
           var doctorAdevieInfo = response.data.data.doctorAdevieInfo
-          var tableAdvice = advices.concat(doctorAdevieInfo);
-          console.log('tableAdvice',tableAdvice);
+        
+         
+       
+          var tableAdvice = newDocArr.concat(doctorAdevieInfo);
+        
           console.log('response.data.data', response.data.data)
           if (tableAdvice.length === 0) {
             console.log('1111111',tableAdvice.length);

src/xt_pages/dialysis/template/DialysisPrintOrderSeventysix.vue

@@ -71,7 +71,7 @@
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : "/"
               }}</span>
-              
+
             </div>
           </div>
           <div class="inline_block" v-if="org_id!=10460">
@@ -393,7 +393,7 @@
                         }}
                       </div>
                     </div>
-                  
+
                   </div>
                   <div  class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                     <div
@@ -772,9 +772,8 @@
                             ? prescription.dialysis_dialyszers
                             : ""
                         }} &nbsp;&nbsp;
-                          {{prescription.dialysis_strainer ? prescription.dialysis_strainer :''}}
                         </span>
-
+                        {{prescription.dialysis_strainer ? prescription.dialysis_strainer :''}}
                         <!-- {{dialysisOrder.dialysis_dialyszers  }} -->
                       </div>
                       <!--  透析(滤)器合并取值 -->
@@ -860,7 +859,7 @@
                         }}
                        </span>
 
-                      
+
                       </div>
                       <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">ml</span>
                       <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">L</span>
@@ -982,7 +981,7 @@
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
-                     
+
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px" v-if="prescription.anticoagulant != 1">
@@ -1010,7 +1009,7 @@
                           <span v-if="prescription.anticoagulant == 10">iu/h</span>
                           <span v-if="prescription.anticoagulant == 11">iu/h</span>
                           <span v-if="prescription.anticoagulant == 13">iu/h</span>
-                          
+
                       </span>
                     </div>
                     <div
@@ -1077,7 +1076,7 @@
                        <span v-if="prescription.anticoagulant == 10">iu</span>
                       <span v-if="prescription.anticoagulant == 11">iu</span>
                       <span v-if="prescription.anticoagulant == 13">iu</span>
-                      
+
                     </span>
                     </div>
 
@@ -1198,7 +1197,7 @@
                           </span>
                         </td>
                         <td>{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : '' }}</td>
-                        
+
                         <td style="line-height: 16px; padding: 0px">
                           <div
                             style="
@@ -1265,9 +1264,9 @@
                         <td style="font-size: 16px" colspan="2" width="45%">
                           医嘱内容
                         </td>
-                        
+
                         <td style="font-size: 16px" width="10%">医生签名</td>
-                      
+
                         <td style="font-size: 16px" width="10%">执行人签名</td>
                         <td style="font-size: 16px" width="10%">时间</td>
 
@@ -1429,7 +1428,7 @@
                     ? patientInfo.DialysisSchedule.device_zone.name
                     : "/"
                 }}</span>
-                
+
               </div>
             </div>
             <div class="inline_block" >
@@ -1520,7 +1519,7 @@
                     医嘱内容
                   </td>
                   <td style="font-size: 15px" width="10%">医生签名</td>
-                 
+
                   <td style="font-size: 15px" width="10%">执行人签名</td>
                   <td style="font-size: 15px" width="10%">时间</td>
                 </tr>
@@ -1583,7 +1582,7 @@
                     />
                   </td>
 
-                  
+
                   <td height="32px">
                     <span
                       v-if="setAdminUserES(advice.execution_staff) == ''"

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -287,48 +287,42 @@
                     </div>
                   </div>
                   <div class="row" style="padding: 2px 0; line-height: 23px;display: flex;">
-                    <div
-                      class="inline_block"
-                      style="flex: 1"
-                    >
+                    <div class="inline_block" style="width: 19%;">
                       穿刺方式：
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 80px; text-align: center"
                         v-if="predialysis.puncture_way == ''"
                       >
                         /
                       </div>
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 80px; text-align: center"
                         v-if="predialysis.puncture_way.indexOf('绳梯') > -1"
                       >
                         绳梯
                       </div>
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 80px; text-align: center"
                         v-if="predialysis.puncture_way.indexOf('扣眼') > -1"
                       >
                         扣眼
                       </div>
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 80px; text-align: center"
                         v-if="predialysis.puncture_way.indexOf('区域') > -1"
                       >
                         区域
                       </div>
                     </div>
-                    <div
-                      class="inline_block"
-                      style="margin-left: 10px; flex: 1"
-                    >
+                    <div class="inline_block" style="width: 19%;">
                       穿刺针：
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 80px; text-align: center"
                       >
                         {{
                           predialysis.puncture_needle
@@ -337,7 +331,7 @@
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="margin-left: 1px; flex: 1">
+                    <div class="inline_block" style="width: 20%;">
                       透析时间：
                       <div
                         class="under_line"
@@ -362,7 +356,7 @@
                       </div>
                       min
                     </div>
-                    <div class="inline_block" style="flex: 1;margin-left: 10px;">
+                    <div class="inline_block" style="width: 15%;">
                       透析机号：
                       <div
                         class="under_line"
@@ -377,14 +371,11 @@
                         }}
                       </div>
                     </div>
-                    <div
-                      class="inline_block"
-                      style="flex: 1"
-                    >
+                    <div class="inline_block" style="width: 25%;">
                       透析机型：
                       <div
                         class="under_line"
-                        style="width: 50px; text-align: center"
+                        style="width: 100px; text-align: center"
                       >
                        {{predialysis.machine_type ? predialysis.machine_type : ""}}
                       </div>
@@ -830,8 +821,10 @@
                             : ""
                         }}
                         </span>
-
-                        {{dialysisOrder.dialysis_dialyszers  }}
+                        <span v-if="dialysisOrder != null">
+                          {{dialysisOrder.dialysis_dialyszers  }}
+                        </span>
+                        
                       </div>
                       <!--  透析(滤)器合并取值 -->
                        <div v-if="org_id==10414"
@@ -860,8 +853,10 @@
                             : "/"
                         }}
                          </span>
-                         {{dialysisOrder.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}
-
+                         <span v-if="dialysisOrder != null">
+                          {{dialysisOrder.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}
+                         </span>
+                         
                       </div>
                     </div>
 
@@ -2609,12 +2604,12 @@
         </div>
 
          <!-- 患者签名 -->
-         <div style="position: relative; left: 70%;top: 50px;width: 288px;">
+         <div style="position: relative; left: 70%;top: 50px;">
           患者签名：
           <div class="under_line" style="width: 120px;">
             <img
               v-if="dialysisOrder.url!=''"
-              style="height: 30px"
+              style="height: 40px"
               :src="dialysisOrder == null? 0: dialysisOrder.url"
               alt=""
               srcset=""

src/xt_pages/user/components/PatientSidebar.vue

@@ -180,11 +180,6 @@ export default {
               name: '1-10',
               label: '出院小结'
             },
-            // {
-            //   name: '1-12',
-            //   label: '转归记录'
-            // }
-
           ]
         },
         {
@@ -195,6 +190,10 @@ export default {
               name: '1-3',
               label: '肾科检验'
             },
+            {
+              name: '4-12',
+              label: '新版肾科检验'
+            },
             {
               name: '4-1',
               label: '肾科检查'
@@ -348,6 +347,8 @@ export default {
         this.$router.push({path:'/patients/inspection_check?id='+this.id})
       } else if(name == '4-3'){
         this.$router.push({path:'/patients/ktv?id='+this.id})
+      }else if(name == '4-12'){
+        this.$router.push({path:'/patients/newInspection?id='+this.id})
       }
       else if (name == '5-1') {
         this.$router.push({
@@ -554,6 +555,8 @@ export default {
         this.$router.push({ path: '/patients/sickhistory?id=' + this.id })
       }else if(patientKey == '7'){
         this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
+      }else if(patientKey == '4-12'){
+        this.$router.push({path:'/patients/newInspection?id='+this.id})
       }
 
      }else{

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))