Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

src/app/views/fuwutai/fuwutai.component.ts

@@ -2454,7 +2454,7 @@ export class FuwutaiComponent implements OnInit {
       sum: 1,
       hospitalConfig: {
         hosId: this.checkedHos,
-        key: "transDeptTypeId",
+        key: "rebackPatientTypeId",
       },
     };
     this.getConfigTasktypeLoading = true;
@@ -4621,7 +4621,7 @@ export class FuwutaiComponent implements OnInit {
 			}else{
 				this.isEndFixedType = false
 			}
-			
+
       // 预约start
       this.currentTasktype = data.taskType;
       this.isYyInspect = false;

src/app/views/new-statistics/distribution-inspection-statistics/distribution-inspection-statistics-routing.module.ts

@@ -14,7 +14,7 @@ const routes: Routes = [
         loadChildren: () => import('./distribution-synthesize-statistics/distribution-synthesize-statistics.module').then(m => m.DistributionSynthesizeStatisticsModule),
         data: {
           reuse: true,
-          title: '综合统计'
+          title: '配-综合统计'
         }
       },
       {
@@ -23,7 +23,7 @@ const routes: Routes = [
         loadChildren: () => import('./date-business-statistics/date-business-statistics.module').then(m => m.DateBusinessStatisticsModule),
         data: {
           reuse: true,
-          title: '日期业务统计'
+          title: '配-日期业务统计'
         }
       },
       {
@@ -32,7 +32,7 @@ const routes: Routes = [
         loadChildren: () => import('./date-quality-control-statistics/date-quality-control-statistics.module').then(m => m.DateQualityControlStatisticsModule),
         data: {
           reuse: true,
-          title: '日期质控统计'
+          title: '配-日期质控统计'
         }
       },
       {
@@ -41,7 +41,7 @@ const routes: Routes = [
         loadChildren: () => import('./department-business-statistics/department-business-statistics.module').then(m => m.DepartmentBusinessStatisticsModule),
         data: {
           reuse: true,
-          title: '科室业务统计'
+          title: '配-科室业务统计'
         }
       },
       {
@@ -50,7 +50,7 @@ const routes: Routes = [
         loadChildren: () => import('./department-quality-control-statistics/department-quality-control-statistics.module').then(m => m.DepartmentQualityControlStatisticsModule),
         data: {
           reuse: true,
-          title: '科室质控统计'
+          title: '配-科室质控统计'
         }
       },
       {
@@ -59,7 +59,7 @@ const routes: Routes = [
         loadChildren: () => import('./distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.module').then(m => m.DistributionDepartmentEvaluateStatisticsModule),
         data: {
           reuse: true,
-          title: '科室评价统计'
+          title: '配-科室评价统计'
         }
       },
       {
@@ -68,7 +68,7 @@ const routes: Routes = [
         loadChildren: () => import('./distribution-department-source-statistics/distribution-department-source-statistics.module').then(m => m.DistributionDepartmentSourceStatisticsModule),
         data: {
           reuse: true,
-          title: '科室来源统计'
+          title: '配-科室来源统计'
         }
       },
       {
@@ -77,7 +77,7 @@ const routes: Routes = [
         loadChildren: () => import('./user-business-statistics/user-business-statistics.module').then(m => m.UserBusinessStatisticsModule),
         data: {
           reuse: true,
-          title: '人员业务统计'
+          title: '配-人员业务统计'
         }
       },
       {
@@ -86,7 +86,7 @@ const routes: Routes = [
         loadChildren: () => import('./user-quality-control-statistics/user-quality-control-statistics.module').then(m => m.UserQualityControlStatisticsModule),
         data: {
           reuse: true,
-          title: '人员质控统计'
+          title: '配-人员质控统计'
         }
       },
       {
@@ -95,7 +95,7 @@ const routes: Routes = [
         loadChildren: () => import('./source-statistics/source-statistics.module').then(m => m.SourceStatisticsModule),
         data: {
           reuse: true,
-          title: '来源统计'
+          title: '配-来源统计'
         }
       },
     ]

src/app/views/new-statistics/maintenance-statistics/maintenance-statistics-routing.module.ts

@@ -14,7 +14,7 @@ const routes: Routes = [
 			  loadChildren: () => import('./synthesize-statistics/synthesize-statistics.module').then(m => m.SynthesizeStatisticsModule),
 			  data: {
 			    reuse: true,
-			    title: '综合统计'
+			    title: '修-综合统计'
 			  }
 			},
       {
@@ -23,7 +23,7 @@ const routes: Routes = [
         loadChildren: () => import('./incident-statistics/incident-statistics.module').then(m => m.IncidentStatisticsModule),
         data: {
           reuse: true,
-          title: '故障工单统计'
+          title: '修-故障工单统计'
         }
       },
       {
@@ -32,7 +32,7 @@ const routes: Routes = [
         loadChildren: () => import('./category-one-statistics/category-one-statistics.module').then(m => m.CategoryOneStatisticsModule),
         data: {
           reuse: true,
-          title: '一级故障现象'
+          title: '修-一级故障现象'
         }
       },
       {
@@ -41,7 +41,7 @@ const routes: Routes = [
         loadChildren: () => import('./category-two-statistics/category-two-statistics.module').then(m => m.CategoryTwoStatisticsModule),
         data: {
           reuse: true,
-          title: '二级故障现象'
+          title: '修-二级故障现象'
         }
       },
       {
@@ -50,7 +50,7 @@ const routes: Routes = [
         loadChildren: () => import('./category-three-statistics/category-three-statistics.module').then(m => m.CategoryThreeStatisticsModule),
         data: {
           reuse: true,
-          title: '三级故障现象'
+          title: '修-三级故障现象'
         }
       },
       {
@@ -59,7 +59,7 @@ const routes: Routes = [
         loadChildren: () => import('./group-statistics/group-statistics.module').then(m => m.GroupStatisticsModule),
         data: {
           reuse: true,
-          title: '维修组统计'
+          title: '修-维修组统计'
         }
       },
       {
@@ -68,7 +68,7 @@ const routes: Routes = [
         loadChildren: () => import('./user-statistics/user-statistics.module').then(m => m.UserStatisticsModule),
         data: {
           reuse: true,
-          title: '维修人统计'
+          title: '修-维修人统计'
         }
       },
       {
@@ -77,7 +77,7 @@ const routes: Routes = [
         loadChildren: () => import('./tripartite-company-statistics/tripartite-company-statistics.module').then(m => m.TripartiteCompanyStatisticsModule),
         data: {
           reuse: true,
-          title: '三方公司统计'
+          title: '修-三方公司统计'
         }
       },
       {
@@ -86,7 +86,7 @@ const routes: Routes = [
         loadChildren: () => import('./building-statistics/building-statistics.module').then(m => m.BuildingStatisticsModule),
         data: {
           reuse: true,
-          title: '楼栋统计'
+          title: '修-楼栋统计'
         }
       },
       {
@@ -95,7 +95,7 @@ const routes: Routes = [
         loadChildren: () => import('./floor-statistics/floor-statistics.module').then(m => m.FloorStatisticsModule),
         data: {
           reuse: true,
-          title: '楼层统计'
+          title: '修-楼层统计'
         }
       },
       {
@@ -104,7 +104,7 @@ const routes: Routes = [
         loadChildren: () => import('./department-incident-statistics/department-incident-statistics.module').then(m => m.DepartmentIncidentStatisticsModule),
         data: {
           reuse: true,
-          title: '科室工单统计'
+          title: '修-科室工单统计'
         }
       },
       {
@@ -113,7 +113,7 @@ const routes: Routes = [
         loadChildren: () => import('./department-evaluate-statistics/department-evaluate-statistics.module').then(m => m.DepartmentEvaluateStatisticsModule),
         data: {
           reuse: true,
-          title: '科室评价统计'
+          title: '修-科室评价统计'
         }
       },
       {
@@ -122,7 +122,7 @@ const routes: Routes = [
         loadChildren: () => import('./department-source-statistics/department-source-statistics.module').then(m => m.DepartmentSourceStatisticsModule),
         data: {
           reuse: true,
-          title: '科室来源统计'
+          title: '修-科室来源统计'
         }
       },
       {
@@ -131,7 +131,7 @@ const routes: Routes = [
         loadChildren: () => import('./category-source-statistics/category-source-statistics.module').then(m => m.CategorySourceStatisticsModule),
         data: {
           reuse: true,
-          title: '故障来源统计'
+          title: '修-故障来源统计'
         }
       },
       {
@@ -140,7 +140,7 @@ const routes: Routes = [
         loadChildren: () => import('./consumable-statistics/consumable-statistics.module').then(m => m.ConsumableStatisticsModule),
         data: {
           reuse: true,
-          title: '耗材统计'
+          title: '修-耗材统计'
         }
       },
       {
@@ -149,7 +149,7 @@ const routes: Routes = [
         loadChildren: () => import('./work-hour-statistics/work-hour-statistics.module').then(m => m.WorkHourStatisticsModule),
         data: {
           reuse: true,
-          title: '工时统计'
+          title: '修-工时统计'
         }
       },
     ]