Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' 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/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/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{