Merge branch 'develop' into lmm

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -668,6 +668,7 @@ export class HushijiandanComponent implements OnInit {
 			pagePermissionConfig: {
         hosId: this.currentHospital.id,
         active: 1,
+        taskTypeDeptId: this.loginUser.dept.id,
       },
 		};
 		this.mainService