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

angular.json

@@ -30,6 +30,11 @@
                 "glob": "**/*",
                 "input": "./node_modules/@ant-design/icons-angular/src/inline-svg/",
                 "output": "/assets/"
+              },
+              {
+                "glob": "login.html",
+                "input": "src",
+                "output": "/"
               }
             ],
             "styles": [

package-lock.json

@@ -29,6 +29,7 @@
         "echarts": "^4.6.0",
         "lodash-es": "^4.17.21",
         "ng-zorro-antd": "^8.5.2",
+        "ngx-color": "^4.1.1",
         "ngx-echarts": "^4.2.2",
         "ngx-markdown": "^8.2.2",
         "ngx-print": "~1.2.1",
@@ -716,6 +717,14 @@
         "node": ">=0.1.90"
       }
     },
+    "node_modules/@ctrl/tinycolor": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-2.6.1.tgz",
+      "integrity": "sha512-xKN3lAA+xbNhP+JX3sLhzA65IGiKqun/Yf9jBlZX7Og0SxlCrrqKxqTd6ccn20fv3Cgcvq6KnjPhnmS+v7uAwQ==",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/@dabh/diagnostics": {
       "version": "2.0.3",
       "resolved": "https://registry.npmmirror.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz",
@@ -7173,6 +7182,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/material-colors": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmmirror.com/material-colors/-/material-colors-1.2.6.tgz",
+      "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg=="
+    },
     "node_modules/md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmmirror.com/md5.js/-/md5.js-1.3.5.tgz",
@@ -7655,6 +7669,20 @@
       "resolved": "https://registry.npmmirror.com/date-fns/-/date-fns-1.30.1.tgz",
       "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="
     },
+    "node_modules/ngx-color": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmmirror.com/ngx-color/-/ngx-color-4.1.1.tgz",
+      "integrity": "sha512-eWqhqc6iW7RmBF4nWRIpOCFJwoDOJm/rrdp8RJpxqcYmiuN3ZXXIcHLXK6ut2+yDb/wkI9bMdTXwC0AAgZcX/Q==",
+      "dependencies": {
+        "@ctrl/tinycolor": "^2.6.0",
+        "material-colors": "^1.2.6",
+        "tslib": "^1.9.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=8.0.0",
+        "@angular/core": ">=8.0.0"
+      }
+    },
     "node_modules/ngx-echarts": {
       "version": "4.2.2",
       "resolved": "https://registry.npmmirror.com/ngx-echarts/-/ngx-echarts-4.2.2.tgz",

package.json

@@ -38,6 +38,7 @@
     "echarts": "^4.6.0",
     "lodash-es": "^4.17.21",
     "ng-zorro-antd": "^8.5.2",
+    "ngx-color": "^4.1.1",
     "ngx-echarts": "^4.2.2",
     "ngx-markdown": "^8.2.2",
     "ngx-print": "~1.2.1",

src/app/app-routing.module.ts

@@ -23,11 +23,15 @@ import { IncidentConfigGuard } from './guard/IncidentConfig.guard';
 import { OtherConfigGuard } from './guard/OtherConfig.guard';
 //业务页面控制查看权限
 import { PageConfigGuard } from './guard/PageConfig.guard';
+// 护士端控制查看权限
 import { NurseConfigGuard } from './guard/nurseConfig.guard';
+// 数据生成查看权限
+import { DataGenerateGuard } from './guard/DataGenerate.guard';
 //系统配置查看权限
 import { SystemConfigGuard } from './guard/SystemConfig.guard';
 // 故障实时播报权限
 import { RealtimeBroadcastGuard } from './guard/realtimeBroadcast.guard';
+import { InspectClosedLoopViewGuard } from './guard/inspectClosedLoopView.guard';
 const routes: Routes = [
   // 默认
   {
@@ -149,6 +153,12 @@ const routes: Routes = [
     loadChildren: () => import('./views/nurse-config/nurse-config.module').then(m => m.NurseConfigModule),
     canActivate: [NurseConfigGuard]
   },
+	// 数据生成查看
+	{
+	  path: 'dataGenerate',
+	  loadChildren: () => import('./views/data-generate/data-generate.module').then(m => m.DataGenerateModule),
+	  canActivate: [DataGenerateGuard]
+	},
   // 问卷预览
   {
     path: "preview",
@@ -185,6 +195,22 @@ const routes: Routes = [
     path: "newStatistics",
     loadChildren: () => import("./views/new-statistics/new-statistics.module").then((m) => m.NewStatisticsModule),
   },
+  // 批量发起陪检
+  {
+    path: 'batchInspection',
+    loadChildren: () => import('./views/batch-inspection/batch-inspection.module').then(m => m.BatchInspectionModule),
+  },
+  // 陪检闭环视图
+  {
+    path: 'inspectClosedLoopView',
+    loadChildren: () => import('./views/inspect-closed-loop-view/inspect-closed-loop-view.module').then(m => m.InspectClosedLoopViewModule),
+    canActivate: [InspectClosedLoopViewGuard]
+  },
+  // 标本打包
+  {
+    path: 'batchSpecimen',
+    loadChildren: () => import('./views/batch-specimen/batch-specimen.module').then(m => m.BatchSpecimenModule),
+  },
   // 临时路由
   {
     path: "redirect",

src/app/app.module.ts

@@ -13,6 +13,7 @@ import { NZ_I18N, zh_CN, NzConfig, NZ_CONFIG } from 'ng-zorro-antd';
 import { RouteReuseStrategy } from '@angular/router';
 import { SimpleReuseStrategy } from './SimpleReuseStrategy';
 import { MarkdownModule } from 'ngx-markdown';
+// import { ColorSketchModule   } from 'ngx-color/sketch';
 const ngZorroConfig: NzConfig = {
   // 注意组件名称没有 nz 前缀
   notification: { nzTop: 100 }
@@ -29,7 +30,8 @@ registerLocaleData(zh);
     AppRoutingModule,
     HttpClientModule,
     ShareModule,
-		MarkdownModule.forRoot()
+		MarkdownModule.forRoot(),
+		// ColorSketchModule
   ],
   providers: [
     { provide: NZ_I18N, useValue: zh_CN },

src/app/components/configurationCenter/configuration-closedData/configuration-closedData.component.html

@@ -0,0 +1,357 @@
+<div class="content specimen" id="dictionary">
+  <div class="contentInner">
+		<div class="address">
+		  <overlay-scrollbars #osComponentRef1 class="contentBody">
+		    <div class="contentItem" [title]="item.name" [ngClass]="{ active: item.key == activeDictionaryKey }" (click)="clickDictionaryKey(item)" *ngFor="let item of dictionaryKeyList">{{ item.name }}</div>
+		  </overlay-scrollbars>
+		</div>
+    <div class="addressAssign">
+      <div class="contentBody2">
+        <div class="TaskTypeManagement" *ngIf="activeDictionaryKey=='specimen'">
+          <div class="taskTypeInfo">
+            <div class="top">
+              <div class="item" (click)="tabModal('course')" [ngClass]="{'items':tabModalName=='course'}">
+                过程数据
+              </div>
+            </div>
+            <div class="list" #scrollContainer *ngIf="!loading">
+              <!-- 过程数据 -->
+								<div class="top-style">
+									<div class="sign"></div>
+									<div>查询范围</div>
+								</div>
+								
+								<!-- 采集开始时间 -->
+								<div class="display_flex align-items_center mb8">
+								  <nz-form-label class="label" nzRequired>采集开始时间</nz-form-label>
+								  <nz-range-picker nzShowTime (nzOnCalendarChange)="onCalendarChangeDate($event)" [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
+								</div>
+								
+                <!-- 标本状态 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label" nzRequired>标本状态</nz-form-label>
+                  <nz-select class="w320px" [nzDropdownMatchSelectWidth]="false" nzAllowClear
+										nzPlaceHolder="请选择标本状态" [(ngModel)]="transState">
+                    <ng-container *ngFor="let option of drugStatusList">
+                      <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+                    </ng-container>
+                  </nz-select>
+                </div>
+								
+								<div class="display_flex align-items_center mb8">
+									<nz-form-label class="label" nzRequired>是否关联工单</nz-form-label>
+									<nz-radio-group type="active" [(ngModel)]="bindOrder">
+										<label nz-radio [nzValue]="1">是</label>
+										<label nz-radio [nzValue]="0">否</label>
+									</nz-radio-group>
+								</div>
+								
+								<div class="display_flex align-items_center mb8">
+									<nz-form-label class="label">编码</nz-form-label>
+									<input nz-input [(ngModel)]="code" class="w350px"/>
+								</div>
+							<div class="interval"></div>
+							<div class="top-style">
+								<div class="sign"></div>
+								<div>生成规则</div>
+							</div>
+							<!-- 收取时间间隔区间 -->
+							<div class="display_flex align-items_center mb8">
+								<nz-form-label class="label max" nzRequired>收取时间间隔区间</nz-form-label>
+								<input nz-input [(ngModel)]="arriveStartMinute" class="min-input"/>
+								<span class="span"> ~	</span>
+								<input nz-input [(ngModel)]="arriveEndMinute" class="min-input"/>
+								&nbsp;&nbsp;<span>分钟</span>
+							</div>
+							<!-- 送达时间间隔区间 -->
+							<div class="display_flex align-items_center mb8">
+								<nz-form-label class="label max" nzRequired>送达时间间隔区间</nz-form-label>
+								<input nz-input [(ngModel)]="sendStartMinute" class="min-input"/>
+								<span class="span">~</span>
+								<input nz-input [(ngModel)]="sendEndMinute" class="min-input"/>
+								&nbsp;&nbsp;<span>分钟</span>
+							</div>
+							<!-- 目标状态 -->
+							<div class="display_flex align-items_center mb8">
+								<nz-form-label class="label max" nzRequired>目标状态</nz-form-label>
+								<nz-radio-group type="active" [(ngModel)]="completeState">
+									<label nz-radio [nzValue]="1">到达</label>
+									<label nz-radio [nzValue]="2">送达</label>
+								</nz-radio-group>
+							</div>
+							<!-- 配送人员 -->
+							<div class="display_flex align-items_center mb8">
+							  <nz-form-label class="label max" nzRequired>配送人员</nz-form-label>
+								<nz-select nzMode="multiple" class="w320px" [nzDropdownMatchSelectWidth]="false" nzAllowClear
+									nzPlaceHolder="请选择配送人员" [(ngModel)]="userIds" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changeUser($event)" nzAllowClear>
+								  <ng-container *ngFor="let option of distributionList">
+								    <nz-option *ngIf="!isLoading" [nzLabel]="option.name +' ('+ option.account +')'" [nzValue]="option.id"></nz-option>
+								  </ng-container>
+								  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+								    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+								  </nz-option>
+								</nz-select>
+							</div>
+              <div class="bottom">
+                <button class="login-form-button" nzType="primary" nz-button (click)="generateForm()">生成数据</button>
+								<button class="login-form-button" nzType="primary" [nzLoading]="btnLoading2" nz-button (click)="submitForm()">查询</button>
+								<button class="login-form-button" nzType="default" [nzLoading]="btnLoading3" nz-button (click)="resetForm()">重置</button>
+              </div>
+							<div class="tip" *ngIf="showNum">共查询数据 <span class="weight">{{queryNum}}</span> 条</div>
+							<div class="tip" *ngIf="showGenerate">共修改数据 <span class="weight">{{generateObj.count}}</span> 条，生成日志 <span class="weight">{{generateObj.logCount || 0}}</span> 条</div>
+						</div>
+            <div class="list" *ngIf="loading">
+              <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+                <div class="loadingFullInner">
+                  <img src="../../../assets/images/loading.gif" alt="">
+                  <div>加载中...</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+				<div class="TaskTypeManagement" *ngIf="activeDictionaryKey=='drugsBag'">
+					<div class="taskTypeInfo">
+					  <div class="top">
+					    <div class="item" (click)="tabModal('course')" [ngClass]="{'items':tabModalName=='course'}">
+					      过程数据
+					    </div>
+					  </div>
+					  <div class="list"  #scrollContainer *ngIf="!loading">
+					    <!-- 过程数据 -->
+								<div class="top-style">
+									<div class="sign"></div>
+									<div>查询范围</div>
+								</div>
+								
+								<!-- 同步开始时间 -->
+								<div class="display_flex align-items_center mb8">
+								  <nz-form-label class="label" nzRequired>同步开始时间</nz-form-label>
+								  <nz-range-picker nzShowTime (nzOnCalendarChange)="onCalendarChangeDate($event)" [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
+								</div>
+								
+					      <!-- 药品状态 -->
+					      <div class="display_flex align-items_center mb8">
+					        <nz-form-label class="label" nzRequired>药品状态</nz-form-label>
+					        <nz-select class="w320px" [nzDropdownMatchSelectWidth]="false" nzAllowClear
+										nzPlaceHolder="请选择药品状态" [(ngModel)]="transState">
+					          <ng-container *ngFor="let option of drugStatusList">
+					            <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+					          </ng-container>
+					        </nz-select>
+					      </div>
+								
+								<div class="display_flex align-items_center mb8">
+									<nz-form-label class="label" nzRequired>是否关联工单</nz-form-label>
+									<nz-radio-group type="active" [(ngModel)]="bindOrder">
+										<label nz-radio [nzValue]="1">是</label>
+										<label nz-radio [nzValue]="0">否</label>
+									</nz-radio-group>
+								</div>
+								
+								<div class="display_flex align-items_center mb8">
+									<nz-form-label class="label">编码</nz-form-label>
+									<input nz-input [(ngModel)]="code" class="w350px"/>
+								</div>
+							<div class="interval"></div>
+							<div class="top-style">
+								<div class="sign"></div>
+								<div>生成规则</div>
+							</div>
+							<!-- 收取时间间隔区间 -->
+							<div class="display_flex align-items_center mb8">
+								<nz-form-label class="label max" nzRequired>收取时间间隔区间</nz-form-label>
+								<input nz-input [(ngModel)]="arriveStartMinute" class="min-input"/>
+								<span class="span"> ~	</span>
+								<input nz-input [(ngModel)]="arriveEndMinute" class="min-input"/>
+								&nbsp;&nbsp;<span>分钟</span>
+							</div>
+							<!-- 送达时间间隔区间 -->
+							<div class="display_flex align-items_center mb8">
+								<nz-form-label class="label max" nzRequired>送达时间间隔区间</nz-form-label>
+								<input nz-input [(ngModel)]="sendStartMinute" class="min-input"/>
+								<span class="span">~</span>
+								<input nz-input [(ngModel)]="sendEndMinute" class="min-input"/>
+								&nbsp;&nbsp;<span>分钟</span>
+							</div>
+							<!-- 目标状态 -->
+							<div class="display_flex align-items_center mb8">
+								<nz-form-label class="label max" nzRequired>目标状态</nz-form-label>
+								<nz-radio-group type="active" [(ngModel)]="completeState">
+									<label nz-radio [nzValue]="1">到达</label>
+									<label nz-radio [nzValue]="2">送达</label>
+								</nz-radio-group>
+							</div>
+							<!-- 配送人员 -->
+							<div class="display_flex align-items_center mb8">
+							  <nz-form-label class="label max" nzRequired>配送人员</nz-form-label>
+								<nz-select nzMode="multiple" class="w320px" [nzDropdownMatchSelectWidth]="false" nzAllowClear
+									nzPlaceHolder="请选择配送人员" [(ngModel)]="userIds" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changeUser($event)" nzAllowClear>
+								  <ng-container *ngFor="let option of distributionList">
+								    <nz-option *ngIf="!isLoading" [nzLabel]="option.name +' ('+ option.account +')'" [nzValue]="option.id"></nz-option>
+								  </ng-container>
+								  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+								    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+								  </nz-option>
+								</nz-select>
+							</div>
+							<!-- 接收人员 -->
+							<div class="display_flex align-items_center mb8">
+							  <nz-form-label class="label max" nzRequired>接收人员</nz-form-label>
+								<nz-select nzMode="multiple" class="w320px" [nzDropdownMatchSelectWidth]="false" nzAllowClear
+									nzPlaceHolder="请选择接收人员" [(ngModel)]="receiverUserIds" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changeReceptionUser($event)" nzAllowClear>
+								  <ng-container *ngFor="let option of receptionList">
+								    <nz-option *ngIf="!isLoading" [nzLabel]="option.name +' ('+ option.account +')'" [nzValue]="option.id"></nz-option>
+								  </ng-container>
+								  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+								    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+								  </nz-option>
+								</nz-select>
+							</div>
+					    <div class="bottom">
+					      <button class="login-form-button" nzType="primary" nz-button (click)="generateForm()">生成数据</button>
+								<button class="login-form-button" nzType="primary" [nzLoading]="btnLoading2" nz-button (click)="submitForm()">查询</button>
+								<button class="login-form-button" nzType="default" [nzLoading]="btnLoading3" nz-button (click)="resetForm()">重置</button>
+					    </div>
+							<div class="tip" *ngIf="showNum">共查询数据 <span class="weight">{{queryNum}}</span> 条</div>
+							<div class="tip" *ngIf="showGenerate">共修改数据 <span class="weight">{{generateObj.count}}</span> 条，生成日志 <span class="weight">{{generateObj.logCount || 0}}</span> 条</div>
+					  </div>
+					  <div class="list" *ngIf="loading">
+					    <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+					      <div class="loadingFullInner">
+					        <img src="../../../assets/images/loading.gif" alt="">
+					        <div>加载中...</div>
+					      </div>
+					    </div>
+					  </div>
+					</div>
+				</div>
+				<div class="TaskTypeManagement" *ngIf="activeDictionaryKey=='blood'">
+					<div class="taskTypeInfo">
+					  <div class="top">
+					    <div class="item" (click)="tabModal('course')" [ngClass]="{'items':tabModalName=='course'}">
+					      过程数据
+					    </div>
+					  </div>
+					  <div class="list" #scrollContainer *ngIf="!loading">
+					    <!-- 过程数据 -->
+								<div class="top-style">
+									<div class="sign"></div>
+									<div>查询范围</div>
+								</div>
+								
+								<!-- 发血开始时间 -->
+								<div class="display_flex align-items_center mb8">
+								  <nz-form-label class="label" nzRequired>发血开始时间</nz-form-label>
+								  <nz-range-picker nzShowTime (nzOnCalendarChange)="onCalendarChangeDate($event)" [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
+								</div>
+								
+					      <!-- 血制品状态 -->
+					      <div class="display_flex align-items_center mb8">
+					        <nz-form-label class="label" nzRequired>血制品状态</nz-form-label>
+					        <nz-select class="w320px" [nzDropdownMatchSelectWidth]="false" nzAllowClear
+										nzPlaceHolder="请选择血制品状态" [(ngModel)]="transState">
+					          <ng-container *ngFor="let option of drugStatusList">
+					            <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+					          </ng-container>
+					        </nz-select>
+					      </div>
+								
+								<div class="display_flex align-items_center mb8">
+									<nz-form-label class="label" nzRequired>是否关联工单</nz-form-label>
+									<nz-radio-group type="active" [(ngModel)]="bindOrder">
+										<label nz-radio [nzValue]="1">是</label>
+										<label nz-radio [nzValue]="0">否</label>
+									</nz-radio-group>
+								</div>
+								
+								<div class="display_flex align-items_center mb8">
+									<nz-form-label class="label">编码</nz-form-label>
+									<input nz-input [(ngModel)]="code" class="w350px"/>
+								</div>
+							<div class="interval"></div>
+							<div class="top-style">
+								<div class="sign"></div>
+								<div>生成规则</div>
+							</div>
+							<!-- 收取时间间隔区间 -->
+							<div class="display_flex align-items_center mb8">
+								<nz-form-label class="label max" nzRequired>收取时间间隔区间</nz-form-label>
+								<input nz-input [(ngModel)]="arriveStartMinute" class="min-input"/>
+								<span class="span"> ~	</span>
+								<input nz-input [(ngModel)]="arriveEndMinute" class="min-input"/>
+								&nbsp;&nbsp;<span>分钟</span>
+							</div>
+							<!-- 送达时间间隔区间 -->
+							<div class="display_flex align-items_center mb8">
+								<nz-form-label class="label max" nzRequired>送达时间间隔区间</nz-form-label>
+								<input nz-input [(ngModel)]="sendStartMinute" class="min-input"/>
+								<span class="span">~</span>
+								<input nz-input [(ngModel)]="sendEndMinute" class="min-input"/>
+								&nbsp;&nbsp;<span>分钟</span>
+							</div>
+							<!-- 目标状态 -->
+							<div class="display_flex align-items_center mb8">
+								<nz-form-label class="label max" nzRequired>目标状态</nz-form-label>
+								<nz-radio-group type="active" [(ngModel)]="completeState">
+									<label nz-radio [nzValue]="1">到达</label>
+									<label nz-radio [nzValue]="2">送达</label>
+								</nz-radio-group>
+							</div>
+							<!-- 配送人员 -->
+							<div class="display_flex align-items_center mb8">
+							  <nz-form-label class="label max" nzRequired>配送人员</nz-form-label>
+								<nz-select nzMode="multiple" class="w320px" [nzDropdownMatchSelectWidth]="false" nzAllowClear
+									nzPlaceHolder="请选择配送人员" [(ngModel)]="userIds" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changeUser($event)" nzAllowClear>
+								  <ng-container *ngFor="let option of distributionList">
+								    <nz-option *ngIf="!isLoading" [nzLabel]="option.name +' ('+ option.account +')'" [nzValue]="option.id"></nz-option>
+								  </ng-container>
+								  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+								    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+								  </nz-option>
+								</nz-select>
+							</div>
+							<!-- 接收人员 -->
+							<div class="display_flex align-items_center mb8">
+							  <nz-form-label class="label max" nzRequired>接收人员</nz-form-label>
+								<nz-select nzMode="multiple" class="w320px" [nzDropdownMatchSelectWidth]="false" nzAllowClear
+									nzPlaceHolder="请选择接收人员" [(ngModel)]="receiverUserIds" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changeReceptionUser($event)" nzAllowClear>
+								  <ng-container *ngFor="let option of receptionList">
+								    <nz-option *ngIf="!isLoading" [nzLabel]="option.name +' ('+ option.account +')'" [nzValue]="option.id"></nz-option>
+								  </ng-container>
+								  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+								    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+								  </nz-option>
+								</nz-select>
+							</div>
+					    <div class="bottom">
+					      <button class="login-form-button" nzType="primary" nz-button (click)="generateForm()">生成数据</button>
+								<button class="login-form-button" nzType="primary" [nzLoading]="btnLoading2" nz-button (click)="submitForm()">查询</button>
+								<button class="login-form-button" nzType="default" [nzLoading]="btnLoading3" nz-button (click)="resetForm()">重置</button>
+					    </div>
+							<div class="tip" *ngIf="showNum">共查询数据 <span class="weight">{{queryNum}}</span> 条</div>
+							<div class="tip" *ngIf="showGenerate">共修改数据 <span class="weight">{{generateObj.count}}</span> 条，生成日志 <span class="weight">{{generateObj.logCount || 0}}</span> 条</div>
+					  </div>
+					  <div class="list" *ngIf="loading">
+					    <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+					      <div class="loadingFullInner">
+					        <img src="../../../assets/images/loading.gif" alt="">
+					        <div>加载中...</div>
+					      </div>
+					    </div>
+					  </div>
+					</div>
+				</div>
+      </div>
+    </div>
+  </div>
+	
+	<app-dialog-delete [delModal]="generateModal" (hideDelModalEvent)="hideGenerateModal()" [btnLoading]="btnLoading1"
+	  (confirmDelEvent)="confirmGenerate()" content="你确认要执行数据生成吗？"></app-dialog-delete>
+		
+</div>

src/app/components/configurationCenter/configuration-closedData/configuration-closedData.component.less

@@ -0,0 +1,893 @@
+@import "../../../../../src/theme.less";
+:host {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  background-color: #F0F2F5;
+  .list-template__nzTable,
+  .list-template__bottom{
+    padding: 0!important;
+    border: none!important;
+    background: #fff!important;
+  }
+  .list-template{
+    width: 100%!important;
+    height: 100%!important;
+  }
+  #dictionary{
+    margin: 24px 16px;
+    .addressAssign{
+      flex: 7;
+    }
+    .contentItem{
+      margin: 0 16px;
+      padding: 8px;
+      text-align: center;
+      &.active{
+        background-color: @primary-color;
+        color: #fff;
+        border-radius: 4px;
+      }
+    }
+    .contentBody{
+      padding: 16px;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+    }
+    .contentBody2{
+      flex: 1;
+    }
+    ::ng-deep .ant-form-item{
+      margin-bottom: 0;
+    }
+    .dictionaryRow{
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 16px;
+      .orders{
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+      }
+      .name{
+        width: 100px;
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+      }
+      .value{
+        flex: 3;
+        display: flex;
+        align-items: center;
+        .valueInput{
+          width: 600px;
+        }
+        .icon_transport{
+          font-size: 20px;
+          color: #8a8a8a;
+          cursor: pointer;
+        }
+      }
+
+    }
+  }
+  .content{
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    border: 1px solid #EEF3F9;
+    &.priority{
+      margin: 24px 118px 0;
+      background-color: #fff;
+      .contentInner{
+        padding: 48px 206px;
+        border: 1px solid #E8EBEF;
+      }
+    }
+    .contentItem{
+      padding: 4px 16px;
+      cursor: pointer;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      &.active{
+        color: @primary-color;
+        background-color: #F0F6ED;
+        border-radius: 4px;
+      }
+    }
+    .contentInner{
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 16px;
+      gap: 16px;
+      .contentHead{
+        height: 45px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 16px;
+        padding: 0 16px;
+        font-size: 16px;
+        font-weight: bold;
+        border-bottom: 1px solid #D9D9D9;
+        .title{
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        .btns{
+          flex-shrink: 0;
+        }
+      }
+      .contentBody{
+        padding: 0 8px;
+        margin: 4px 0;
+        flex: 1;
+      }
+      .address{
+        flex: 1;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .addressAssign{
+        flex: 3;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .list-template__searchItem {
+        margin-bottom: 16px;
+        .label {
+          color: #333;
+          display: inline-block;
+          width: 70px;
+          text-align-last: justify;
+          text-align: justify;
+          &.label--big {
+            width: 100px;
+          }
+        }
+        .formItem {
+          width: 135px;
+        }
+      }
+    }
+    .contentBtns{
+      margin-bottom: 16px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+  .TaskTypeManagement {
+    height: calc(100vh - 136px);
+    background: #f9fafb;
+    overflow: hidden;
+    padding: 16px 20px;
+
+    .pagination {
+      margin-top: 14px;
+      margin-bottom: 14px;
+      bottom: 12px;
+      right: 5px;
+    }
+
+    .taskType {
+      float: left;
+      width: 24%;
+      height: 100%;
+      border: 1px solid #e5e9ed;
+      background: #fff;
+      color: #333;
+      font-size: 14px;
+      position: relative;
+      overflow: hidden;
+
+      .title {
+        width: 100%;
+        height: 40px;
+        line-height: 40px;
+        padding-left: 16px;
+        border-bottom: 1px solid #e5e9ed;
+        position: relative;
+        background: #fff;
+        z-index: 2;
+      }
+
+      .operate {
+        width: 100%;
+        border-bottom: 1px solid #e5e9ed;
+        position: relative;
+        background: #fff;
+        z-index: 2;
+        display: flex;
+
+        .item {
+          flex: 1;
+          height: 34px;
+          line-height: 34px;
+          border-right: 1px solid #e5e9ed;
+          text-align: center;
+          color: #666; // cursor: default;
+          cursor: pointer;
+
+          &:hover {
+            color: @primary-color;
+            background: #f0f6ed;
+          }
+
+          &:nth-last-child(1) {
+            border: none;
+          }
+        }
+      }
+
+      .taskTypes {
+        // width: 110%;
+        width: 100%;
+        height: 92%;
+        // padding-right: 10%;
+        overflow-y: auto;
+        z-index: 1;
+        padding-bottom: 30px;
+
+        .itemChoice {
+          color: @primary-color;
+          background: #f0f6ed;
+        }
+
+        .item {
+          width: 100%;
+          height: 34px;
+          line-height: 34px;
+          text-align: center;
+          cursor: pointer;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+
+          &:hover {
+            color: @primary-color;
+            background: #f0f6ed;
+          }
+
+          &.checked {
+            color: @primary-color;
+            background: #f0f6ed;
+          }
+        }
+      }
+    }
+
+    //任务类型管理-主体
+    .taskTypeInfo {
+      height: 100%;
+      border: 1px solid #e5e9ed;
+      background: #fff;
+      color: #333;
+      position: relative;
+
+      .top {
+        height: 61px;
+        line-height: 60px;
+        display: flex;
+        align-items: center;
+        border-bottom: 1px solid #e5e9ed;
+        position: relative;
+        z-index: 2;
+
+        .items {
+          background: #f0f6ed;
+        }
+
+        & > div {
+          border-right: 1px solid #e5e9ed;
+          width: 30%;
+          text-align: center; // display: flex;
+          // align-items: center;
+          cursor: pointer;
+
+          &:hover {
+            background: #f0f6ed;
+          }
+        }
+
+        &:nth-last-child(4) {
+          border: none;
+        }
+      }
+
+      .list {
+        width: 100%; // height: 100%;
+        padding: 16px; // position: absolute;
+        // top: 0;
+        // padding-top: 90px;
+        background: #fff;
+        height: 89%;
+        overflow: auto;
+				.interval{
+					height: 40px;
+				}
+				.top-style{
+					display: flex;
+					align-items: center;
+					height: 40px;
+					.sign{
+						width: 8px;
+						height: 8px;
+						border-radius: 50%;
+						background: #49B856;
+						margin-right: 6px;
+					}
+				}
+				
+        nz-form-label {
+          margin-left: 0px !important;
+        }
+				
+				.ant-select{
+					width: 350px;
+				}
+				
+        .label {
+          margin-left: 16px !important;
+          font-size: 14px;
+          color: #333;
+					width: 110px;
+					text-align: left;
+        }
+				
+				.w350px{
+					width: 350px;
+				}
+				
+				.span{
+					margin: 0 5px;
+				}
+				
+				.max{
+					width: 150px !important;
+				}
+				
+				.min-input{
+					width: 80px;
+				}
+				
+        // 规则信息
+        .ruleList {
+          padding: 15px 15px 0px 15px;
+          background: #fff;
+
+          .table {
+            width: 100%;
+            height: 100%;
+
+            .box {
+              // background: #f9fafb;
+              // border: 1px solid #e5e9ed;
+              border-radius: 5px;
+              position: relative;
+
+              .table_title {
+                font-size: 18px;
+                margin: 14px 0px;
+                text-align: center;
+              }
+
+              .thead {
+                background-image: linear-gradient(to right, @bg-start, @bg-end);
+
+                th {
+                  background: transparent;
+                  color: #fff;
+                  text-align: center;
+                  font-size: 14px;
+                }
+              }
+
+              .ant-table-body {
+                border-bottom: 1px solid #e5e9ed;
+                background: #f9fafb;
+              }
+
+              .ant-table-tbody {
+                background: #f9fafb;
+                border: 1px solid #e5e9ed;
+
+                .zzBontton {
+                  & > td {
+                    border-bottom: 1px solid #e5e9ed;
+                  }
+                }
+
+                tr {
+                  text-align: center;
+                  font-size: 14px;
+                  border: none;
+                  color: #333;
+                  overflow: hidden;
+
+                  .lin {
+                    width: 68.2%;
+                    height: 2rem;
+                    border-bottom: 0.1rem solid #e5e9ed;
+                    position: absolute;
+                    text-align: center;
+                    margin-left: 0%;
+                    margin-top: -0.8%;
+                    transform: rotate(6.5deg);
+                  }
+
+                  td {
+                    border: none;
+
+                    nz-input-number {
+                      width: 50px;
+                    }
+
+                    .coop {
+                      .line {
+                        margin: 10px;
+                      }
+
+                      span:nth-child(2n-1) {
+                        cursor: pointer;
+
+                        &:hover {
+                          color: @primary-color;
+                        }
+
+                        &:active {
+                          color: @primary-color;
+                        }
+                      }
+                    }
+                  }
+                }
+
+                tr:nth-child(even) {
+                  background: #fff;
+                }
+              }
+            }
+          }
+        }
+
+        //运送过程
+        .ysgcItem {
+          padding: 0px 0px 0px 0px; // background: #fff;
+
+          .ysgc_top {
+            height: 88px;
+            background: #fff;
+            border-radius: 10px 10px 0px 0px;
+            padding: 15px 22px 0px 22px;
+
+            .title {
+              span {
+                font-size: 18px;
+              }
+            }
+
+            .carrItems {
+              color: @primary-color;
+              border-color: @primary-color !important;
+            }
+
+            .process {
+              width: 80%;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              margin: 5px auto;
+              font-size: 14px;
+
+              .carrItem {
+                height: 40px;
+                line-height: 28px;
+                cursor: pointer;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+
+                .carrItem_icon {
+                  width: 35px;
+                  height: 35px;
+                  border: 1px solid #e5e9ed;
+                  border-radius: 50%;
+                  text-align: center;
+                  line-height: 35px;
+                  margin-right: 10px;
+
+                  i {
+                    font-size: 18px;
+                  }
+                }
+              }
+
+              .carrItem1 {
+                float: left;
+                width: 45%;
+                height: 40px;
+                line-height: 28px;
+                padding-left: 10%;
+                cursor: pointer;
+
+                .carrItem_icon {
+                  width: 35px;
+                  height: 35px;
+                  border: 1px solid #e5e9ed;
+                  border-radius: 50%;
+                  text-align: center;
+                  line-height: 35px;
+                  float: left;
+                  margin-right: 10px;
+
+                  i {
+                    font-size: 18px;
+                  }
+                }
+              }
+            }
+          }
+
+          .ysgc_cont {
+            padding: 0px 240px 24px 240px;
+
+            textarea {
+              padding-right: 10%;
+            }
+
+            .icon_btn {
+              cursor: pointer;
+              font-size: 18px;
+            }
+
+            .icon_text {
+              display: block;
+              cursor: pointer;
+              position: relative;
+              right: 5px;
+            }
+
+            .item_type_cont {
+              height: 70px;
+              padding-top: 4px;
+
+              & > div {
+                height: 65px;
+                border: 1px solid #e5e9ed;
+                border-radius: 5px;
+                background: #fff;
+
+                .item_type_cont_L {
+                  height: 100%;
+                  width: 90%;
+                  float: left;
+                  padding: 2px 12px;
+                  overflow: auto;
+
+                  .item_yq {
+                    width: 24%;
+                    height: 28px;
+                    display: inline-block;
+                    border: 1px solid #e5e9ed;
+                    border-radius: 20px;
+                    text-align: center;
+                    line-height: 26px;
+                    background: #f9fafb;
+                    margin-right: 1%;
+                    margin-bottom: 2px;
+                    font-size: 12px;
+                    padding-left: 8px;
+
+                    span {
+                      width: 75%;
+                      float: left;
+                      overflow: hidden;
+                      text-overflow: ellipsis;
+                      white-space: nowrap;
+                    }
+
+                    i {
+                      font-size: 14px;
+                      color: #999;
+                      cursor: pointer;
+                    }
+                  }
+                }
+
+                .item_type_cont_R {
+                  height: 100%;
+                  width: 10%;
+                  float: right;
+                  text-align: center;
+                  padding-top: 15px;
+                  border-left: 1px solid #e5e9ed;
+                  cursor: pointer;
+
+                  i {
+                    display: block;
+                    font-size: 16px;
+                  }
+
+                  i:hover {
+                    color: @primary-color;
+                  }
+
+                  .icon_text {
+                    right: 1px;
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        //关联信息
+        .glxxItem {
+          padding: 10px 15px 0px 15px;
+          background: #fff;
+
+          .tab_btn {
+            cursor: pointer;
+          }
+
+          .tab_btn:hover {
+            color: @primary-color;
+          }
+
+          .table_title {
+            font-size: 18px;
+            margin: 14px 0px;
+            text-align: center;
+          }
+
+          .thead {
+            background-image: linear-gradient(to right, @bg-start, @bg-end);
+
+            th {
+              background: transparent;
+              color: #fff;
+              text-align: center;
+              font-size: 14px;
+            }
+          }
+
+          .ant-table-body {
+            // border-bottom: 1px solid #e5e9ed;
+            background: #f9fafb;
+          }
+
+          .ant-table-tbody {
+            background: #f9fafb;
+            border: 1px solid #e5e9ed;
+
+            tr {
+              text-align: center;
+              font-size: 14px;
+              border: none;
+              color: #333;
+
+              td {
+                border: none; // font-size: 14px;
+
+                nz-input-number {
+                  width: 40px;
+                }
+
+                .coop {
+                  .line {
+                    margin: 10px;
+                  }
+
+                  span:nth-child(2n-1) {
+                    cursor: pointer;
+
+                    &:hover {
+                      color: @primary-color;
+                    }
+
+                    &:active {
+                      color: @primary-color;
+                    }
+                  }
+                }
+              }
+            }
+
+            tr:nth-child(even) {
+              background: #fff;
+            }
+          }
+        }
+
+        // 开通科室
+        .ktksItem {
+          padding: 0px 0px 0px 0px;
+          background: #fff;
+
+          .top {
+            width: 100%; // padding-bottom: 7px;
+            // border-bottom: 1px solid #e5e9ed;
+            position: relative;
+            overflow: hidden;
+            z-index: 2;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            .top_L {
+              width: 70%;
+              text-align: left;
+              display: flex;
+              flex-wrap: wrap;
+              align-items: center;
+              padding: 0 4px;
+              .top_L_item {
+                margin-left: 4px;
+              }
+
+              .label {
+                font-size: 14px;
+                color: #333;
+                margin-left: 0;
+              }
+
+              nz-select {
+                font-size: 12px;
+                width: 100px;
+              }
+
+              input {
+                font-size: 12px;
+                width: 100px;
+              }
+            }
+
+            .top_R {
+              border: 0px;
+
+              .btn {
+                margin-left: 10px;
+              }
+            }
+          }
+
+          .ktksItemList {
+            padding: 10px 15px 0px 15px;
+            .table {
+              min-height: 528px;
+            }
+
+            .operate {
+              float: right;
+              margin-bottom: 5px;
+
+              span {
+                font-size: 14px;
+              }
+
+              .num {
+                font-size: 18px;
+                color: @primary-color;
+              }
+            }
+
+            .thead {
+              background-image: linear-gradient(to right, @bg-start, @bg-end);
+
+              th {
+                background: transparent;
+                color: #fff;
+                text-align: center;
+                font-size: 14px;
+              }
+            }
+
+            .ant-table-body {
+              border-bottom: 1px solid #e5e9ed;
+              background: #f9fafb;
+            }
+
+            .ant-table-tbody {
+              background: #f9fafb;
+              border: 1px solid #e5e9ed;
+
+              .zzBontton {
+                & > td {
+                  border-bottom: 1px solid #e5e9ed;
+                }
+              }
+
+              tr {
+                text-align: center;
+                font-size: 14px;
+                border: none;
+                color: #333;
+
+                td {
+                  border: none; // font-size: 14px;
+
+                  nz-input-number {
+                    width: 40px;
+                  }
+
+                  .coop {
+                    .line {
+                      margin: 10px;
+                    }
+
+                    span:nth-child(2n-1) {
+                      cursor: pointer;
+
+                      &:hover {
+                        color: @primary-color;
+                      }
+
+                      &:active {
+                        color: @primary-color;
+                      }
+                    }
+                  }
+                }
+              }
+
+              tr:nth-child(even) {
+                background: #fff;
+              }
+            }
+          }
+
+          .pagination {
+            margin-top: 25px;
+            margin-bottom: 14px;
+            bottom: 12px;
+            right: 5px;
+            position: relative;
+            height: 30px;
+            .page {
+              position: absolute;
+              right: 5px;
+            }
+          }
+        }
+
+        .bottom {
+          height: 60px;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+          button {
+            margin: 0 5px;
+          }
+        }
+				.tip{
+					text-align: center;
+					font-weight: 600;
+					padding: 20px 0;
+				}
+				.weight{
+					font-size: 18px;
+					font-weight: bold;
+				}
+      }
+    }
+  }
+}

src/app/components/configurationCenter/configuration-closedData/configuration-closedData.component.ts

@@ -0,0 +1,399 @@
+import { Component, OnInit, ElementRef, ViewChild } from "@angular/core";
+import { MainService } from "../../../services/main.service";
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { format } from 'date-fns';
+
+@Component({
+  selector: "app-configuration-closedData",
+  templateUrl: "./configuration-closedData.component.html",
+  styleUrls: ["./configuration-closedData.component.less"],
+})
+export class ConfigurationClosedDataComponent implements OnInit {
+	@ViewChild('scrollContainer', {static: false}) scrollContainer: ElementRef;
+	
+  loading:boolean = false; //页面加载的loading
+  btnLoading:boolean = false; //提交按钮的loading
+  tabModalName:string = 'course'; //当前选中的tab
+  hosId = this.tool.getCurrentHospital().id; //当前院区
+	
+	// tab类型
+	dictionaryKeyList:any[] = [
+		{
+			name:'检验标本',key:'specimen'
+		},
+		{
+			name:'病理申请单',key:'pathology'
+		},
+		{
+			name:'药品',key:'drugsBag'
+		},
+		{
+			name:'血制品',key:'blood'
+		},
+		{
+			name:'预约检查',key:'subscribe'
+		}
+	];
+	btnLoading1:boolean = false;
+	btnLoading2:boolean = false;
+	btnLoading3:boolean = false;
+	// 是否关联工单
+	bindOrder:any = 0;
+	// 同步开始时间
+	dateRange:any = [];
+	// 业务状态
+	 transState:any;
+	// 目标状态
+	completeState:any = 2;
+	// 收取时间间隔区间
+	arriveStartMinute:any;
+	// 收取时间间隔区间
+	arriveEndMinute:any;
+	// 送达时间间隔区间
+	sendStartMinute:any;
+	// 送达时间间隔区间
+	sendEndMinute:any;
+	code:any;
+  // 配置
+  configs:any = {};
+  // 任务类型
+  tasktype:any = {};
+  searchTimerSubject = new Subject();
+  constructor(private mainService: MainService,private tool: ToolService,private msg: NzMessageService) {}
+
+  ngOnInit():void {
+    // todo
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.getSpeDic();
+		this.getUsers();
+		this.getReceptionUsers();
+  }
+	
+	// 点击数据字典key
+	activeDictionaryKey:any = 'specimen';
+	clickDictionaryKey(item){
+	  this.activeDictionaryKey = item.key;
+		this.getSpeDic();
+		this.resetForm();
+	}
+	
+	onCalendarChangeDate(dateArr){
+	  console.log(dateArr)
+	  if(dateArr.length == 2){
+	    let dateStart = new Date(dateArr[0]);
+	    let dateEnd = new Date(dateArr[1]);
+	    dateStart.setHours(0,0,0);
+	    dateEnd.setHours(23,59,59);
+	    this.dateRange = [dateStart,dateEnd];
+	  }
+	}
+	
+	// 日期选择
+	startDate: string; //发起时间开始
+	endDate: string; //发起时间结束
+	changeDate(result?): void {
+	  if (!result) {
+	    this.startDate = this.endDate = "";
+	    return;
+	  }
+		console.log(1111,result)
+	  this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+	  this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+	}
+	
+  // 切换tab
+  tabModal(tabModalName:string){
+    this.tabModalName = tabModalName;
+  }
+	
+	// 生成数据
+	queryNum:any;
+	generateModal:boolean = false;
+	generateForm(){
+		if(this.activeDictionaryKey == 'specimen'){
+			if(!this.startDate || !this.endDate){
+				this.msg.error("采集开始时间不能为空");
+				return
+			}
+			if(!this.transState){
+				this.msg.error("标本状态不能为空");
+				return
+			}
+			
+		}else if (this.activeDictionaryKey == 'drugsBag'){
+			if(!this.startDate || !this.endDate){
+				this.msg.error("同步开始时间不能为空");
+				return
+			}
+			if(!this.transState){
+				this.msg.error("药品状态不能为空");
+				return
+			}
+		}else if (this.activeDictionaryKey == 'blood'){
+			if(!this.startDate || !this.endDate){
+				this.msg.error("发血开始时间不能为空");
+				return
+			}
+			if(!this.transState){
+				this.msg.error("血制品状态不能为空");
+				return
+			}
+		}
+
+		if(!this.arriveStartMinute || !this.arriveEndMinute){
+			this.msg.error("收取时间间隔区间不能为空");
+			return
+		}
+		if(!this.sendStartMinute || !this.sendEndMinute){
+			this.msg.error("送达时间间隔区间不能为空");
+			return
+		}
+		if(this.userIds.length==0){
+			this.msg.error("配送人员不能为空");
+			return
+		}
+		if (this.activeDictionaryKey != 'specimen'){
+			if(this.receiverUserIds.length==0){
+				this.msg.error("接收人员不能为空");
+				return
+			}
+		}
+		this.generateModal = true
+	}
+	
+	hideGenerateModal() {
+	  this.generateModal = false;
+		this.btnLoading1 = false;
+	}
+	
+	showGenerate:boolean = false;
+	generateObj:any;
+	confirmGenerate() {
+	  var that = this;
+	  let list = this.drugStatusList.find(i=> i.id == this.transState)
+	  let postData:any = {
+	  	patchDataConfig:{
+	  		hosId: this.hosId,
+	  		bindOrder: this.bindOrder,
+	  		transStartTime: this.startDate || undefined,
+	  		transEndTime: this.endDate || undefined,
+	  		transState: list || undefined,
+	  		transType: {
+	  			value: this.activeDictionaryKey || undefined
+	  		},
+				code: this.code || undefined,
+	  		completeState: this.completeState,
+	  		arriveStartMinute: this.arriveStartMinute || undefined,
+	  		arriveEndMinute: this.arriveEndMinute || undefined,
+	  		sendStartMinute: this.sendStartMinute || undefined,
+	  		sendEndMinute: this.sendEndMinute || undefined,
+	  		userIds: this.userIds.length>0 ? this.userIds.join(',') : undefined,
+				receiverUserIds: this.receiverUserIds.length>0 ? this.receiverUserIds.join(',') : undefined
+			}
+	  };
+	  this.btnLoading1 = true;
+	  this.mainService
+	    .generateData( postData).subscribe((result:any) => {
+	      this.btnLoading1 = false;
+	      if (result.state == 200) {
+					this.hideGenerateModal()
+					this.showNum = false
+	        this.showGenerate = true
+	        this.generateObj = result.data
+					setTimeout(_=>{
+						this.scrollContainer.nativeElement.scrollTop = this.scrollContainer.nativeElement.scrollHeight;
+					},100)
+	      }else{
+					this.hideGenerateModal()
+					this.msg.error(result.msg);
+				}
+	    });
+	}
+	
+  // 查询
+	showNum:boolean = false;
+  submitForm() {
+		if(this.activeDictionaryKey == 'specimen'){
+			if(!this.startDate || !this.endDate){
+				this.msg.error("采集开始时间不能为空");
+				return
+			}
+			if(!this.transState){
+				this.msg.error("标本状态不能为空");
+				return
+			}
+			
+		}else if (this.activeDictionaryKey == 'drugsBag'){
+			if(!this.startDate || !this.endDate){
+				this.msg.error("同步开始时间不能为空");
+				return
+			}
+			if(!this.transState){
+				this.msg.error("药品状态不能为空");
+				return
+			}
+		}else if (this.activeDictionaryKey == 'blood'){
+			if(!this.startDate || !this.endDate){
+				this.msg.error("发血开始时间不能为空");
+				return
+			}
+			if(!this.transState){
+				this.msg.error("血制品状态不能为空");
+				return
+			}
+		}
+		if(!this.arriveStartMinute || !this.arriveEndMinute){
+			this.msg.error("收取时间间隔区间不能为空");
+			return
+		}
+		if(!this.sendStartMinute || !this.sendEndMinute){
+			this.msg.error("送达时间间隔区间不能为空");
+			return
+		}
+		if(this.userIds.length==0){
+			this.msg.error("配送人员不能为空");
+			return
+		}
+		if (this.activeDictionaryKey != 'specimen'){
+			if(this.receiverUserIds.length==0){
+				this.msg.error("接收人员不能为空");
+				return
+			}
+		}
+    let list = this.drugStatusList.find(i=> i.id == this.transState)
+    let postData:any = {
+    	patchDataConfig:{
+    		hosId: this.hosId,
+    		bindOrder: this.bindOrder,
+    		transStartTime: this.startDate || undefined,
+    		transEndTime: this.endDate || undefined,
+    		transState: list || undefined,
+    		transType: {
+    			value: this.activeDictionaryKey || undefined
+    		},
+				code: this.code || undefined,
+    		completeState: this.completeState,
+    		arriveStartMinute: this.arriveStartMinute || undefined,
+    		arriveEndMinute: this.arriveEndMinute || undefined,
+    		sendStartMinute: this.sendStartMinute || undefined,
+    		sendEndMinute: this.sendEndMinute || undefined,
+    		userIds: this.userIds.length>0 ? this.userIds.join(',') : undefined,
+				receiverUserIds: this.receiverUserIds.length>0 ? this.receiverUserIds.join(',') : undefined
+			}
+    };
+    this.btnLoading2 = true;
+    this.mainService
+      .queryCount( postData).subscribe((result:any) => {
+        this.btnLoading2 = false;
+        if (result.state == 200) {
+					this.showNum = true
+					this.showGenerate = false
+          this.queryNum = result.data
+					setTimeout(_=>{
+						this.scrollContainer.nativeElement.scrollTop = this.scrollContainer.nativeElement.scrollHeight;
+					},100)
+        }else{
+					this.msg.error(result.msg);
+				}
+      });
+  }
+	
+	// 重置
+	resetForm(){
+		this.showNum = false;
+		this.showGenerate = false;
+		this.bindOrder = 0;
+		this.startDate = "";
+		this.endDate = "";
+		this.dateRange = [];
+		this.code = undefined;
+		this.transState = undefined;
+		this.completeState = 2;
+		this.arriveStartMinute = undefined;
+		this.arriveEndMinute = undefined;
+		this.sendStartMinute = undefined;
+		this.sendEndMinute = undefined;
+		this.userIds = [];
+		this.receiverUserIds = [];
+	}
+	
+	// 获取字典
+	drugStatusList:any = [];
+	getSpeDic(){
+		let key = null;
+		if(this.activeDictionaryKey=='specimen'){
+			key = 'speState'
+		}else if (this.activeDictionaryKey=='drugsBag'){
+			key = 'drug_state'
+		}else{
+			key = 'blood_trans_state'
+		}
+		this.mainService.getDictionary("list", key).subscribe((data) => {
+			this.drugStatusList = data
+		});
+	}
+	
+	// 人员边输边搜节流阀
+	changeUser(e) {
+	  this.searchTimer(this.getUsers, e);
+	}
+	
+	changeReceptionUser(e){
+		this.searchTimer(this.getReceptionUsers, e);
+	}
+	
+	// 边输入边搜索节流阀
+	searchTimer(fun, e) {
+	  this.isLoading = true;
+	  this.searchTimerSubject.next([fun, e]);
+	}
+	
+	// 配送人员
+	userIds:any = [];
+	distributionList:any;
+	isLoading:boolean = false;
+	getUsers(e?) {
+	  let postData = {
+	    user: {
+	      name: e,
+	      hospital: { id: this.hosId },
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+	  this.isLoading = true;
+	  this.mainService
+	    .getFetchDataList("data", "user", postData)
+	    .subscribe((data) => {
+	      this.isLoading = false;
+	      this.distributionList = data.list;
+	    });
+	}
+	
+	// 接收人员
+	receiverUserIds:any = [];
+	receptionList:any;
+	getReceptionUsers(e?) {
+	  let postData = {
+	    user: {
+	      name: e,
+	      hospital: { id: this.hosId },
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+	  this.isLoading = true;
+	  this.mainService
+	    .getFetchDataList("data", "user", postData)
+	    .subscribe((data) => {
+	      this.isLoading = false;
+	      this.receptionList = data.list;
+	    });
+	}
+}

src/app/components/configurationCenter/configuration-distribution-hospital/configuration-distribution-hospital.component.html

@@ -0,0 +1,68 @@
+<div class="content" id="dictionary">
+  <div class="contentInner">
+    <div class="address">
+      <overlay-scrollbars #osComponentRef1 class="contentBody">
+        <div class="contentItem" [title]="item.name" [ngClass]="{ active: item.id === activeDictionaryKey.id }" (click)="clickDictionaryKey(item)" *ngFor="let item of hospitalTabList">{{ item.name }}</div>
+      </overlay-scrollbars>
+    </div>
+		<div class="addressAssign" *ngIf="activeDictionaryKey.key=='evaluate'">
+			<div class="hos-title">{{currentHospital.hosName}}</div>
+		  <overlay-scrollbars #osComponentRef2 class="contentBody2">
+		    <div class="contentBody">
+		      <div class="classList" *ngFor="let item of hospitalList">
+						
+						<div class="mar-10" *ngIf="item.value2 == 'evaluation' && item.key=='hsmsEvaluationTime'">
+							<span class="w100px">{{ item.desc }}：</span>
+							<input nz-input class="w220px" [(ngModel)]="item.value" [placeholder]="'请输入'+item.desc" />
+						</div>
+						
+						<div class="mar-10" *ngIf="item.value2 == 'evaluation' && item.key=='hsmsUserEvaluation'">
+							<span class="w100px">{{ item.desc }}：</span>
+							<nz-select class="w220px" nzShowSearch nzAllowClear
+								[nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
+							  <ng-container *ngFor="let option of dicData">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+						</div>
+						<div class="mar-10" *ngIf="item.value2 == 'evaluation' && item.key=='hsmsCallbackEvaluation'">
+							<span class="w100px">{{ item.desc }}：</span>
+							<nz-select class="w220px" nzShowSearch nzAllowClear
+								[nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
+							  <ng-container *ngFor="let option of dicData">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+						</div>
+						<div class="mar-10" *ngIf="item.value2 == 'evaluation' && item.key=='hsmsUserBadEvaluationRange'">
+							<span class="w100px">{{ item.desc }}：</span>
+							<nz-select class="w220px" nzMode="multiple" nzShowSearch nzAllowClear
+								[nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
+							  <ng-container *ngFor="let option of dicData">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+						</div>
+						<div class="mar-10" *ngIf="item.value2 == 'evaluation' && item.key=='hsmsCallbackBadEvaluationRange'">
+							<span class="w100px">{{ item.desc }}：</span>
+							<nz-select class="w220px" nzMode="multiple" nzShowSearch nzAllowClear
+								[nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
+							  <ng-container *ngFor="let option of dicData">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+						</div>
+		      </div>
+		    </div>
+		  	<div class="contentBtns">
+		  	  <button nz-button nzType="primary" [nzLoading]="btnLoading" (click)="submitMessageForm()">确定</button>
+		  	</div>
+		  </overlay-scrollbars>
+		</div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>

src/app/components/configurationCenter/configuration-distribution-hospital/configuration-distribution-hospital.component.less

@@ -0,0 +1,213 @@
+@import "../../../../../src/theme.less";
+:host {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  background-color: #F0F2F5;
+	.w220px{
+		width: 220px;
+	}
+	.w100px{
+			width: 100px !important;
+		}
+  .list-template__nzTable,
+  .list-template__bottom{
+    padding: 0!important;
+    border: none!important;
+    background: #fff!important;
+  }
+  .list-template{
+    width: 100%!important;
+    height: 100%!important;
+  }
+	
+	#dictionary{
+	  margin: 24px 16px;
+	  .addressAssign{
+	    flex: 7;
+			.hos-title{
+				margin-top: 10px;
+				text-align: center;
+			}
+	  }
+	  .contentItem{
+	    margin: 0 16px;
+	    padding: 8px;
+	    text-align: center;
+	    &.active{
+	      background-color: @primary-color;
+	      color: #fff;
+	      border-radius: 4px;
+	    }
+	  }
+	  .contentBody{
+	    padding: 16px;
+	    min-height: 0;
+	    display: flex;
+	    flex-direction: column;
+	  }
+	  .contentBody2{
+	    flex: 1;
+	  }
+	  ::ng-deep .ant-form-item{
+	    margin-bottom: 0;
+	  }
+	  .dictionaryRow{
+	    display: flex;
+	    align-items: center;
+	    justify-content: center;
+	    gap: 16px;
+	    .orders{
+	      flex: 1;
+	      display: flex;
+	      justify-content: flex-end;
+	      align-items: center;
+	    }
+	    .name{
+	      width: 100px;
+	      display: flex;
+	      justify-content: flex-end;
+	      align-items: center;
+	    }
+	    .value{
+	      flex: 3;
+	      display: flex;
+	      align-items: center;
+	      .valueInput{
+	        width: 600px;
+	      }
+	      .icon_transport{
+	        font-size: 20px;
+	        color: #8a8a8a;
+	        cursor: pointer;
+	      }
+	    }
+	
+	  }
+	}
+	
+	.content{
+	  flex: 1;
+	  min-height: 0;
+	  display: flex;
+	  flex-direction: column;
+	  justify-content: space-between;
+	  border: 1px solid #EEF3F9;
+	  &.priority{
+	    margin: 24px 118px 0;
+	    background-color: #fff;
+	    .contentInner{
+	      padding: 48px 206px;
+	      border: 1px solid #E8EBEF;
+	    }
+	  }
+	  .contentItem{
+	    padding: 4px 16px;
+	    cursor: pointer;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+	    &.active{
+	      color: @primary-color;
+	      background-color: #F0F6ED;
+	      border-radius: 4px;
+	    }
+	  }
+	  .contentInner{
+	    flex: 1;
+	    display: flex;
+	    justify-content: space-between;
+	    align-items: center;
+	    padding: 0 16px;
+	    gap: 16px;
+			.hos-title{
+				font-weight: 600;
+				font-size: 16px;
+			}
+
+			.hospital{
+			  width: 100%;
+			  text-align: left;
+			}
+			.classList{
+				// padding: 5px 0;
+				.mar-10{
+					margin: 8px 0;
+				}
+			  .select{
+			    width: 313px;
+			  }
+			  span{
+			    display: inline-block;
+			    width: 11em;
+			  }
+			}
+			
+	    .contentHead{
+	      height: 45px;
+	      display: flex;
+	      justify-content: space-between;
+	      align-items: center;
+	      gap: 16px;
+	      padding: 0 16px;
+	      font-size: 16px;
+	      font-weight: bold;
+	      border-bottom: 1px solid #D9D9D9;
+	      .title{
+	        overflow: hidden;
+	        text-overflow: ellipsis;
+	        white-space: nowrap;
+	      }
+	      .btns{
+	        flex-shrink: 0;
+	      }
+	    }
+	    .contentBody{
+	      padding: 0 8px;
+	      margin: 4px 0;
+	      flex: 1;
+	    }
+	    .address{
+	      flex: 1;
+	      height: 100%;
+	      background: #FFFFFF;
+	      border: 1px solid #E8EBEF;
+	      display: flex;
+	      flex-direction: column;
+	      width: 0;
+	    }
+	    .addressAssign{
+	      flex: 3;
+	      height: 100%;
+	      background: #FFFFFF;
+	      border: 1px solid #E8EBEF;
+	      display: flex;
+	      flex-direction: column;
+	      width: 0;
+	    }
+	    .list-template__searchItem {
+	      margin-bottom: 16px;
+	      .label {
+	        color: #333;
+	        display: inline-block;
+	        width: 70px;
+	        text-align-last: justify;
+	        text-align: justify;
+	        &.label--big {
+	          width: 100px;
+	        }
+	      }
+	      .formItem {
+	        width: 135px;
+	      }
+	    }
+	  }
+	  .contentBtns{
+	    padding-bottom: 16px;
+	    display: flex;
+	    justify-content: center;
+	    align-items: center;
+	  }
+	}
+}

src/app/components/configurationCenter/configuration-distribution-hospital/configuration-distribution-hospital.component.ts

@@ -0,0 +1,127 @@
+import { Component, OnInit, Input } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { MainService } from "../../../services/main.service";
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+
+@Component({
+  selector: "app-configuration-distribution-hospital",
+  templateUrl: "./configuration-distribution-hospital.component.html",
+  styleUrls: ["./configuration-distribution-hospital.component.less"],
+})
+export class ConfigurationDistributionHospitalComponent implements OnInit {
+  constructor(
+    private route: ActivatedRoute,
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  coopData: any = {}; //当前操作列
+  currentHospital; //当前院区
+	maintainDept:any=[];
+	@Input() hospitalTabList: any[] = [];
+	
+  ngOnInit() {
+		this.activeDictionaryKey = this.hospitalTabList[0];
+		this.maintainDept = this.tool.getUserInfoPermission().dutyList
+    this.currentHospital = this.tool.getCurrentHospital();
+		this.getDicType();
+  }
+	
+	activeDictionaryKey:any;
+	clickDictionaryKey(item){
+	  this.activeDictionaryKey = item;
+	  this.getList();
+	}
+	
+	// 获取评价字典
+	dicData:any=[];
+	getDicType(){
+		this.mainService.getDictionary("list", "workorderEvaluation").subscribe((data) => {
+			this.dicData = data
+			this.getList();
+		});
+	}
+	
+  // 新增/编辑表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitMessageForm(): void {
+    this.btnLoading = true;
+		for(let i of this.hospitalList){
+			if(i.key=='hsmsUserBadEvaluationRange' || i.key=='hsmsCallbackBadEvaluationRange'){
+				i.value = i.value.join(',')
+			}
+		}
+		setTimeout(_=>{
+			this.mainService
+			  .simplePost("addListData", "hospitalConfig", this.hospitalList)
+			  .subscribe((result) => {
+			    this.btnLoading = false;
+			    let msg = "保存";
+			    if (result.status == 200) {
+			      this.showPromptModal(msg, true, '');
+			    } else {
+			      this.showPromptModal(msg, false, result.msg);
+			    }
+			  });
+		},50)
+  }
+
+  // 获取列表
+  loading1:boolean = false;
+  hospitalList:any[] = [];
+  getList() {
+    let data = {
+      idx: 0,
+      sum: 9999,
+      hospitalConfig: {
+        hosId: this.currentHospital.id,
+        model: 'hsms',
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "hospitalConfig", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+					data.list.forEach(i =>{
+					  i.show = false
+					})
+					let newData = data.list
+					for(let i of newData){
+						if(i.key=='hsmsUserEvaluation' || i.key=='hsmsCallbackEvaluation'){
+							i.value = Number(i.value)
+						}
+						
+						if(i.key=='hsmsUserBadEvaluationRange' || i.key=='hsmsCallbackBadEvaluationRange'){
+							let arr = i.value.split(',')
+							arr = arr.map(i=>i = parseInt(i))
+							i.value = arr
+						}
+					}
+
+          this.hospitalList = newData || [];
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList();
+  }
+}

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.html

@@ -82,16 +82,42 @@
                         <nz-option *ngFor="let item of drugsManualList" [nzLabel]="item.label" [nzValue]="item.value"></nz-option>
                       </nz-select>
                     </div>
-                    <!-- 支持拍照留存 -->
-                    <div class="display_flex align-items_center mb8">
-                      <nz-form-label class="label">支持拍照留存</nz-form-label>
-                      <nz-checkbox-group [(ngModel)]="item.postData.drugsEndPhoto"></nz-checkbox-group>
-                    </div>
+										<!-- 支持拍照留存 -->
+										<div class="display_flex align-items_center mb8">
+										  <nz-form-label class="label">支持拍照留存</nz-form-label>
+										  <nz-checkbox-group [(ngModel)]="item.postData.drugsEndPhoto"></nz-checkbox-group>
+										</div>
                   </ng-container>
+									<!-- 药单显示患者 -->
+									<div class="display_flex align-items_center mb8">
+									  <nz-form-label class="label">药单显示患者</nz-form-label>
+									  <nz-checkbox-group [(ngModel)]="item.postData.showPatientInfo"></nz-checkbox-group>
+									</div>
+                  <!-- 是否显示药品数、种类数 -->
+									<div class="display_flex align-items_center mb8">
+									  <nz-form-label class="label">是否显示药品数、种类数</nz-form-label>
+									  <nz-checkbox-group [(ngModel)]="item.postData.showDrugsBagTypeCount"></nz-checkbox-group>
+									</div>
+                  <!-- 是否支持查看药品详情信息 -->
+									<div class="display_flex align-items_center mb8">
+									  <nz-form-label class="label">是否支持查看药品详情信息</nz-form-label>
+									  <nz-checkbox-group [(ngModel)]="item.postData.showDrugsBagDetails"></nz-checkbox-group>
+									</div>
                 </div>
                 <!-- 自动建单配置 -->
                 <div *ngIf="tabModalName=='automaticOrderCreation'">
                   <!-- 自动建单 -->
+									<div class="display_flex align-items_center mb8">
+									  <nz-form-label class="label">是否自动建单</nz-form-label>
+									  <nz-checkbox-group [(ngModel)]="item.postData.autoCreate"></nz-checkbox-group>
+									</div>
+									<!-- 药品自动建单状态 -->
+									<div class="display_flex align-items_center mb8" *ngIf="item.postData.autoCreate[0].checked">
+									  <nz-form-label class="label">药品自动建单状态</nz-form-label>
+										<nz-select class="w320px" nzPlaceHolder="请选择" [(ngModel)]="item.postData.autoCreateState" nzAllowClear>
+										  <nz-option *ngFor="let item of drugStateData" [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
+										</nz-select>
+									</div>
                 </div>
                 <div class="bottom">
                   <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.ts

@@ -32,6 +32,7 @@ export class ConfigurationDrugComponent implements OnInit {
   ngOnInit():void {
     this.activeDictionary = this.dictionaryKeyList[0];
     this.init();
+		this.getDrugState();
   }
 
   // 工单模式
@@ -58,9 +59,14 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsStartPhoto: [{ label:'是否开启', value: 0 }],//起点科室支持拍照留存
         drugsEndCheck: [{ label:'是否开启', value: 0 }],//终点科室支持核对
         drugsEndCheckScanIds: [],//终点核对方式
+				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
-      }
+				showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
+				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
+				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
+				autoCreateState: undefined // 药品自动建单状态
+			}
     },
     {
       name: '西药',
@@ -75,9 +81,14 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsStartPhoto: [{ label:'是否开启', value: 0 }],//起点科室支持拍照留存
         drugsEndCheck: [{ label:'是否开启', value: 0 }],//终点科室支持核对
         drugsEndCheckScanIds: [],//终点核对方式
+				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
-      }
+        showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
+				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
+				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
+				autoCreateState: undefined // 药品自动建单状态
+			}
     },
     {
       name: '退药',
@@ -92,9 +103,14 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsStartPhoto: [{ label:'是否开启', value: 0 }],//起点科室支持拍照留存
         drugsEndCheck: [{ label:'是否开启', value: 0 }],//终点科室支持核对
         drugsEndCheckScanIds: [],//终点核对方式
+				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
-      }
+        showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
+				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
+				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
+				autoCreateState: undefined // 药品自动建单状态
+			}
     },
     {
       name: '毒麻',
@@ -109,9 +125,14 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsStartPhoto: [{ label:'是否开启', value: 0 }],//起点科室支持拍照留存
         drugsEndCheck: [{ label:'是否开启', value: 0 }],//终点科室支持核对
         drugsEndCheckScanIds: [],//终点核对方式
+				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
-      }
+        showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
+				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
+				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
+				autoCreateState: undefined // 药品自动建单状态
+			}
     },
     {
       name: '中草药',
@@ -126,12 +147,26 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsStartPhoto: [{ label:'是否开启', value: 0 }],//起点科室支持拍照留存
         drugsEndCheck: [{ label:'是否开启', value: 0 }],//终点科室支持核对
         drugsEndCheckScanIds: [],//终点核对方式
+				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
-      }
+        showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
+				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
+				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
+				autoCreateState: undefined // 药品自动建单状态
+			}
     },
   ];
-
+	
+	
+	// 获取药品状态
+	drugStateData:any = []
+	getDrugState(){
+		this.mainService.getDictionary("list", "drug_state").subscribe((data) => {
+			this.drugStateData = data
+		});
+	}
+	
   // 点击数据字典key
   activeDictionary:any;
   clickDictionaryKey(item){
@@ -200,7 +235,14 @@ export class ConfigurationDrugComponent implements OnInit {
       drugsEndCheckScanIds: this.activeDictionary.postData.drugsEndCheckScanIds.filter(v => v.checked).map(v => v.value).toString() || undefined,
       drugsEndManual: this.activeDictionary.postData.drugsEndManual ? { id: this.activeDictionary.postData.drugsEndManual } : undefined,
       drugsEndPhoto: this.activeDictionary.postData.drugsEndPhoto[0].checked ? 1 : 0,
-    };
+			showPatientInfo: this.activeDictionary.postData.showPatientInfo[0].checked ? 1 : 0,
+			showDrugsBagTypeCount: this.activeDictionary.postData.showDrugsBagTypeCount[0].checked ? 1 : 0,
+			showDrugsBagDetails: this.activeDictionary.postData.showDrugsBagDetails[0].checked ? 1 : 0,
+			autoCreate: this.activeDictionary.postData.autoCreate[0].checked ? 1 : 0,
+			autoCreateState:{
+				id:this.activeDictionary.postData.autoCreateState || undefined
+			}
+		};
     this.btnLoading = true;
     this.mainService
       .simplePost("addData", "taskTypeConfig", postData)
@@ -294,7 +336,12 @@ export class ConfigurationDrugComponent implements OnInit {
           this.activeDictionary.postData.drugsEndCheckScanIds = this.activeDictionary.postData.drugsEndCheckScanIds.map(v => ({...v, checked: (this.configs.drugsEndCheckScanIds || '').split(',').includes(v.value.toString())}));
           this.activeDictionary.postData.drugsEndManual = this.configs.drugsEndManual ? this.configs.drugsEndManual.id : undefined;
           this.activeDictionary.postData.drugsEndPhoto[0].checked = this.configs.drugsEndPhoto == 1;
-        }
+					this.activeDictionary.postData.showPatientInfo[0].checked = this.configs.showPatientInfo == 1;
+					this.activeDictionary.postData.showDrugsBagTypeCount[0].checked = this.configs.showDrugsBagTypeCount == 1;
+					this.activeDictionary.postData.showDrugsBagDetails[0].checked = this.configs.showDrugsBagDetails == 1;
+					this.activeDictionary.postData.autoCreate[0].checked = this.configs.autoCreate == 1;
+					this.activeDictionary.postData.autoCreateState = this.configs.autoCreateState && this.configs.autoCreateState.id || undefined;
+				}
       });
   }
 }

src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component.html

@@ -1,46 +1,111 @@
-<div class="content priority">
+<div class="content" id="dictionary">
   <div class="contentInner">
-		<div class="hos-title">{{currentHospital.hosName}}</div>
-    <div class="addressAssign">
-      <div class="contentBody2">
+    <div class="address">
+      <overlay-scrollbars #osComponentRef1 class="contentBody">
+        <div class="contentItem" [title]="item.name" [ngClass]="{ active: item.id === activeDictionaryKey.id }" (click)="clickDictionaryKey(item)" *ngFor="let item of hospitalTabList">{{ item.name }}</div>
+      </overlay-scrollbars>
+    </div>
+    <div class="addressAssign" *ngIf="activeDictionaryKey.key=='property'">
+			<div class="hos-title">{{currentHospital.hosName}}</div>
+      <overlay-scrollbars #osComponentRef2 class="contentBody2">
         <div class="contentBody">
           <div class="classList" *ngFor="let item of hospitalList">
-						<div class="mar-10" *ngIf="item.key!='itsmWorkHourQuoteDept' && item.key!='itsmConsumableQuoteDept' && !item.show">
-							<span>{{ item.desc }}：</span>
-							<nz-radio-group [(ngModel)]="item.value" (ngModelChange)="radioChange(item)">
-							  <label nz-radio nzValue="1">是</label>
-							  <label nz-radio nzValue="0">否</label>
-							</nz-radio-group>
-						</div>
+      			<div class="mar-10" *ngIf="item.key!='itsmWorkHourQuoteDept' && 
+						item.key!='itsmConsumableQuoteDept' &&
+						item.key!='itsmEvaluationTime' &&
+						item.key!='itsmUserEvaluation' && 
+						item.key!='itsmCallbackEvaluation' && 
+						item.key!='itsmUserBadEvaluationRange' && 
+						item.key!='itsmCallbackBadEvaluationRange'
+						&& !item.show && item.value2=='asset_consumables'">
+      				<span>{{ item.desc }}：</span>
+      				<nz-radio-group [(ngModel)]="item.value" (ngModelChange)="radioChange(item)">
+      				  <label nz-radio nzValue="1">是</label>
+      				  <label nz-radio nzValue="0">否</label>
+      				</nz-radio-group>
+      			</div>
             
-						<div class="mar-10" *ngIf="item.key=='itsmWorkHourQuoteDept' && itsmQuoteOtherDeptWorkHourType">
+      			<div class="mar-10" *ngIf="item.key=='itsmWorkHourQuoteDept' && itsmQuoteOtherDeptWorkHourType && item.value2=='asset_consumables'">
+      				<span class="w100px">{{ item.desc }}：</span>
+      				<nz-select class="w220px" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear
+      					[nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
+      				  <ng-container *ngFor="let option of maintainDept">
+      				    <nz-option [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+      				  </ng-container>
+      				</nz-select>
+      			</div>
+      			
+      			<div class="mar-10" *ngIf="item.key=='itsmConsumableQuoteDept' && itsmQuoteOtherDeptConsumableType && item.value2=='asset_consumables'">
+      				<span class="w100px">{{ item.desc }}：</span>
+      				<nz-select class="w220px" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear
+      					[nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
+      				  <ng-container *ngFor="let option of maintainDept">
+      				    <nz-option [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+      				  </ng-container>
+      				</nz-select>
+      			</div>
+      			
+          </div>
+        </div>
+      	<div class="contentBtns">
+      	  <button nz-button nzType="primary" [nzLoading]="btnLoading" (click)="submitMessageForm()">确定</button>
+      	</div>
+      </overlay-scrollbars>
+    </div>
+		<div class="addressAssign" *ngIf="activeDictionaryKey.key=='evaluate'">
+			<div class="hos-title">{{currentHospital.hosName}}</div>
+		  <overlay-scrollbars #osComponentRef2 class="contentBody2">
+		    <div class="contentBody">
+		      <div class="classList" *ngFor="let item of hospitalList">
+						
+						<div class="mar-10" *ngIf="item.value2 == 'evaluation' && item.key=='itsmEvaluationTime'">
 							<span class="w100px">{{ item.desc }}：</span>
-							<nz-select class="w220px" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear
+							<input nz-input class="w220px" [(ngModel)]="item.value" [placeholder]="'请输入'+item.desc" />
+						</div>
+						
+						<div class="mar-10" *ngIf="item.value2 == 'evaluation' && item.key=='itsmUserEvaluation'">
+							<span class="w100px">{{ item.desc }}：</span>
+							<nz-select class="w220px" nzShowSearch nzAllowClear
 								[nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
-							  <ng-container *ngFor="let option of maintainDept">
-							    <nz-option [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+							  <ng-container *ngFor="let option of dicData">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 							  </ng-container>
 							</nz-select>
 						</div>
-						
-						<div class="mar-10" *ngIf="item.key=='itsmConsumableQuoteDept' && itsmQuoteOtherDeptConsumableType">
+						<div class="mar-10" *ngIf="item.value2 == 'evaluation' && item.key=='itsmCallbackEvaluation'">
 							<span class="w100px">{{ item.desc }}：</span>
-							<nz-select class="w220px" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear
+							<nz-select class="w220px" nzShowSearch nzAllowClear
 								[nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
-							  <ng-container *ngFor="let option of maintainDept">
-							    <nz-option [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+							  <ng-container *ngFor="let option of dicData">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 							  </ng-container>
 							</nz-select>
 						</div>
-						
-          </div>
-        </div>
-				<div class="contentBtns">
-				  <button nz-button nzType="primary" [nzLoading]="btnLoading" (click)="submitMessageForm()">确定</button>
-				</div>
-      </div>
-      
-    </div>
+						<div class="mar-10" *ngIf="item.value2 == 'evaluation' && item.key=='itsmUserBadEvaluationRange'">
+							<span class="w100px">{{ item.desc }}：</span>
+							<nz-select class="w220px" nzMode="multiple" nzShowSearch nzAllowClear
+								[nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
+							  <ng-container *ngFor="let option of dicData">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+						</div>
+						<div class="mar-10" *ngIf="item.value2 == 'evaluation' && item.key=='itsmCallbackBadEvaluationRange'">
+							<span class="w100px">{{ item.desc }}：</span>
+							<nz-select class="w220px" nzMode="multiple" nzShowSearch nzAllowClear
+								[nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
+							  <ng-container *ngFor="let option of dicData">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+						</div>
+		      </div>
+		    </div>
+		  	<div class="contentBtns">
+		  	  <button nz-button nzType="primary" [nzLoading]="btnLoading" (click)="submitMessageForm()">确定</button>
+		  	</div>
+		  </overlay-scrollbars>
+		</div>
   </div>
 </div>
 

src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component.less

@@ -21,139 +21,193 @@
     width: 100%!important;
     height: 100%!important;
   }
-  .content{
-    flex: 1;
-    min-height: 0;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    border: 1px solid #EEF3F9;
-    &.priority{
-      margin: 24px 275px;
-      background-color: #fff;
-      .contentInner{
-        // padding: 90px 158px 72px;
-        // border: 1px solid #E8EBEF;
-				.hos-title{
-					font-weight: 600;
-					font-size: 16px;
+	
+	#dictionary{
+	  margin: 24px 16px;
+	  .addressAssign{
+	    flex: 7;
+			.hos-title{
+				margin-top: 10px;
+				text-align: center;
+			}
+	  }
+	  .contentItem{
+	    margin: 0 16px;
+	    padding: 8px;
+	    text-align: center;
+	    &.active{
+	      background-color: @primary-color;
+	      color: #fff;
+	      border-radius: 4px;
+	    }
+	  }
+	  .contentBody{
+	    padding: 16px;
+	    min-height: 0;
+	    display: flex;
+	    flex-direction: column;
+	  }
+	  .contentBody2{
+	    flex: 1;
+	  }
+	  ::ng-deep .ant-form-item{
+	    margin-bottom: 0;
+	  }
+	  .dictionaryRow{
+	    display: flex;
+	    align-items: center;
+	    justify-content: center;
+	    gap: 16px;
+	    .orders{
+	      flex: 1;
+	      display: flex;
+	      justify-content: flex-end;
+	      align-items: center;
+	    }
+	    .name{
+	      width: 100px;
+	      display: flex;
+	      justify-content: flex-end;
+	      align-items: center;
+	    }
+	    .value{
+	      flex: 3;
+	      display: flex;
+	      align-items: center;
+	      .valueInput{
+	        width: 600px;
+	      }
+	      .icon_transport{
+	        font-size: 20px;
+	        color: #8a8a8a;
+	        cursor: pointer;
+	      }
+	    }
+	
+	  }
+	}
+	
+	.content{
+	  flex: 1;
+	  min-height: 0;
+	  display: flex;
+	  flex-direction: column;
+	  justify-content: space-between;
+	  border: 1px solid #EEF3F9;
+	  &.priority{
+	    margin: 24px 118px 0;
+	    background-color: #fff;
+	    .contentInner{
+	      padding: 48px 206px;
+	      border: 1px solid #E8EBEF;
+	    }
+	  }
+	  .contentItem{
+	    padding: 4px 16px;
+	    cursor: pointer;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+	    &.active{
+	      color: @primary-color;
+	      background-color: #F0F6ED;
+	      border-radius: 4px;
+	    }
+	  }
+	  .contentInner{
+	    flex: 1;
+	    display: flex;
+	    justify-content: space-between;
+	    align-items: center;
+	    padding: 0 16px;
+	    gap: 16px;
+			.hos-title{
+				font-weight: 600;
+				font-size: 16px;
+			}
+
+			.hospital{
+			  width: 100%;
+			  text-align: left;
+			}
+			.classList{
+				// padding: 5px 0;
+				.mar-10{
+					margin: 8px 0;
 				}
-        .addressAssign{
-          width: 100%;
-          border: none;
-        }
-        .contentBody{
-          flex: 1;
-          display: flex;
-          flex-direction: column;
-          // align-items: center;
-          padding: 0 16px;
-          // gap: 32px;
-        }
-        .hospital{
-          width: 100%;
-          text-align: left;
-        }
-        .classList{
-					// padding: 5px 0;
-					.mar-10{
-						margin: 8px 0;
-					}
-          .select{
-            width: 313px;
-          }
-          span{
-            display: inline-block;
-            width: 11em;
-          }
-        }
-      }
-    }
-    .contentItem{
-      padding: 4px 16px;
-      cursor: pointer;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      &.active{
-        color: @primary-color;
-        background-color: #F0F6ED;
-        border-radius: 4px;
-      }
-    }
-    .contentInner{
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      padding: 0 16px;
-      gap: 32px;
-      .contentHead{
-        height: 45px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        gap: 16px;
-        padding: 0 16px;
-        font-size: 16px;
-        font-weight: bold;
-        border-bottom: 1px solid #D9D9D9;
-        .title{
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
-        .btns{
-          flex-shrink: 0;
-        }
-      }
-      .contentBody{
-        padding: 0 8px 16px;
-        margin: 4px 0;
-        flex: 1;
-      }
-      .contentBody2{
-        flex: 1;
-        margin-bottom: 16px;
-      }
-      .address{
-        flex: 1;
-        height: 100%;
-        background: #FFFFFF;
-        border: 1px solid #E8EBEF;
-        display: flex;
-        flex-direction: column;
-        width: 0;
-      }
-      .addressAssign{
-        flex: 3;
-        height: 100%;
-        // background: #FFFFFF;
-        border: 1px solid #E8EBEF;
-        display: flex;
-        flex-direction: column;
-        width: 0;
-      }
-      .list-template__searchItem {
-        margin-bottom: 16px;
-        .label {
-          color: #333;
-          display: inline-block;
-          width: 70px;
-          text-align-last: justify;
-          text-align: justify;
-          &.label--big {
-            width: 100px;
-          }
-        }
-        .formItem {
-          width: 135px;
-        }
-      }
-    }
-    .contentBtns{
-      margin-top: 20px;
-      text-align: center;
-    }
-  }
+			  .select{
+			    width: 313px;
+			  }
+			  span{
+			    display: inline-block;
+			    width: 11em;
+			  }
+			}
+			
+	    .contentHead{
+	      height: 45px;
+	      display: flex;
+	      justify-content: space-between;
+	      align-items: center;
+	      gap: 16px;
+	      padding: 0 16px;
+	      font-size: 16px;
+	      font-weight: bold;
+	      border-bottom: 1px solid #D9D9D9;
+	      .title{
+	        overflow: hidden;
+	        text-overflow: ellipsis;
+	        white-space: nowrap;
+	      }
+	      .btns{
+	        flex-shrink: 0;
+	      }
+	    }
+	    .contentBody{
+	      padding: 0 8px;
+	      margin: 4px 0;
+	      flex: 1;
+	    }
+	    .address{
+	      flex: 1;
+	      height: 100%;
+	      background: #FFFFFF;
+	      border: 1px solid #E8EBEF;
+	      display: flex;
+	      flex-direction: column;
+	      width: 0;
+	    }
+	    .addressAssign{
+	      flex: 3;
+	      height: 100%;
+	      background: #FFFFFF;
+	      border: 1px solid #E8EBEF;
+	      display: flex;
+	      flex-direction: column;
+	      width: 0;
+	    }
+	    .list-template__searchItem {
+	      margin-bottom: 16px;
+	      .label {
+	        color: #333;
+	        display: inline-block;
+	        width: 70px;
+	        text-align-last: justify;
+	        text-align: justify;
+	        &.label--big {
+	          width: 100px;
+	        }
+	      }
+	      .formItem {
+	        width: 135px;
+	      }
+	    }
+	  }
+	  .contentBtns{
+	    padding-bottom: 16px;
+	    display: flex;
+	    justify-content: center;
+	    align-items: center;
+	  }
+	}
 }

src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, Input } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { MainService } from "../../../services/main.service";
 import { ToolService } from 'src/app/services/tool.service';
@@ -20,13 +20,30 @@ export class ConfigurationHospitalComponent implements OnInit {
   coopData: any = {}; //当前操作列
   currentHospital; //当前院区
 	maintainDept:any=[];
+	@Input() hospitalTabList: any[] = [];
 	
   ngOnInit() {
+		this.activeDictionaryKey = this.hospitalTabList[0];
 		this.maintainDept = this.tool.getUserInfoPermission().dutyList
     this.currentHospital = this.tool.getCurrentHospital();
-    this.getList();
+		this.getDicType();
   }
 	
+	activeDictionaryKey:any;
+	clickDictionaryKey(item){
+	  this.activeDictionaryKey = item;
+	  this.getList();
+	}
+	
+	// 获取评价字典
+	dicData:any=[];
+	getDicType(){
+		this.mainService.getDictionary("list", "incident_degree").subscribe((data) => {
+			this.dicData = data
+			this.getList();
+		});
+	}
+	
 	itsmQuoteOtherDeptWorkHourType:any;
 	itsmQuoteOtherDeptConsumableType:any;
 	radioChange(data){
@@ -69,17 +86,24 @@ export class ConfigurationHospitalComponent implements OnInit {
   btnLoading: boolean = false; //提交按钮loading状态
   submitMessageForm(): void {
     this.btnLoading = true;
-    this.mainService
-      .simplePost("addListData", "hospitalConfig", this.hospitalList)
-      .subscribe((result) => {
-        this.btnLoading = false;
-        let msg = "保存";
-        if (result.status == 200) {
-          this.showPromptModal(msg, true, '');
-        } else {
-          this.showPromptModal(msg, false, result.msg);
-        }
-      });
+		for(let i of this.hospitalList){
+			if(i.key=='itsmUserBadEvaluationRange' || i.key=='itsmCallbackBadEvaluationRange'){
+				i.value = i.value.join(',')
+			}
+		}
+		setTimeout(_=>{
+			this.mainService
+			  .simplePost("addListData", "hospitalConfig", this.hospitalList)
+			  .subscribe((result) => {
+			    this.btnLoading = false;
+			    let msg = "保存";
+			    if (result.status == 200) {
+			      this.showPromptModal(msg, true, '');
+			    } else {
+			      this.showPromptModal(msg, false, result.msg);
+			    }
+			  });
+		},50)
   }
 
   // 获取列表
@@ -132,6 +156,16 @@ export class ConfigurationHospitalComponent implements OnInit {
 						}else if(i.key=='itsmQuoteOtherDeptConsumable' && i.value==0){
 							this.itsmQuoteOtherDeptConsumableType = false
 						}
+						
+						if(i.key=='itsmUserEvaluation' || i.key=='itsmCallbackEvaluation'){
+							i.value = Number(i.value)
+						}
+						
+						if(i.key=='itsmUserBadEvaluationRange' || i.key=='itsmCallbackBadEvaluationRange'){
+							let arr = i.value.split(',')
+							arr = arr.map(i=>i = parseInt(i))
+							i.value = arr
+						}
 					}
 
           this.hospitalList = newData || [];

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-batch/configuration-inspect-batch.component.html

@@ -0,0 +1,89 @@
+<div class="TaskTypeManagement">
+  <div class="taskTypeInfo">
+    <div class="top">
+      <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
+        特性配置
+      </div>
+      <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
+        自动建单配置
+      </div>
+    </div>
+    <ng-container *ngFor="let item of dictionaryKeyList">
+      <div class="list" *ngIf="!loading && activeDictionaryKey.id === item.id">
+        <!-- 特性配置 -->
+        <div *ngIf="tabModalName=='characteristics'">
+          <div class="timeRange">
+            <div class="timeRangeTitle green">默认时间区间1</div>
+            <div class="timeRangeActive">
+              有效时间范围：
+              <span>
+                <nz-time-picker [(ngModel)]="item.postData.ibActiveStartTime1" nzFormat="HH:mm" nzPlaceHolder="开始时间1"></nz-time-picker>
+                ~
+                <nz-time-picker [(ngModel)]="item.postData.ibActiveEndTime1" nzFormat="HH:mm" nzPlaceHolder="结束时间1"></nz-time-picker>
+              </span>
+              <span class="ml16">
+                <nz-time-picker [(ngModel)]="item.postData.ibActiveStartTime2" nzFormat="HH:mm" nzPlaceHolder="开始时间2"></nz-time-picker>
+                ~
+                <nz-time-picker [(ngModel)]="item.postData.ibActiveEndTime2" nzFormat="HH:mm" nzPlaceHolder="结束时间2"></nz-time-picker>
+              </span>
+            </div>
+            <div class="timeRangeDefault">
+              默认时间：
+              <span style="visibility: hidden;">囧囧</span>
+              <span>
+                <nz-time-picker [(ngModel)]="item.postData.ibDefaultStartTime" nzFormat="HH:mm" nzPlaceHolder="开始时间"></nz-time-picker>
+                <nz-checkbox-group class="timeRangeCheckbox" [(ngModel)]="item.postData.ibDefaultDayStart"></nz-checkbox-group>
+                ~
+                <nz-time-picker class="ml8" [(ngModel)]="item.postData.ibDefaultEndTime" nzFormat="HH:mm" nzPlaceHolder="结束时间"></nz-time-picker>
+                <nz-checkbox-group class="timeRangeCheckbox" [(ngModel)]="item.postData.ibDefaultDayEnd"></nz-checkbox-group>
+              </span>
+            </div>
+          </div>
+
+          <div class="timeRange">
+            <div class="timeRangeTitle green">默认时间区间2</div>
+            <div class="timeRangeActive">
+              有效时间范围：
+              <span>
+                <nz-time-picker [(ngModel)]="item.postData.ib2ActiveStartTime1" nzFormat="HH:mm" nzPlaceHolder="开始时间1"></nz-time-picker>
+                ~
+                <nz-time-picker [(ngModel)]="item.postData.ib2ActiveEndTime1" nzFormat="HH:mm" nzPlaceHolder="结束时间1"></nz-time-picker>
+              </span>
+              <span class="ml16">
+                <nz-time-picker [(ngModel)]="item.postData.ib2ActiveStartTime2" nzFormat="HH:mm" nzPlaceHolder="开始时间2"></nz-time-picker>
+                ~
+                <nz-time-picker [(ngModel)]="item.postData.ib2ActiveEndTime2" nzFormat="HH:mm" nzPlaceHolder="结束时间2"></nz-time-picker>
+              </span>
+            </div>
+            <div class="timeRangeDefault">
+              默认时间：
+              <span style="visibility: hidden;">囧囧</span>
+              <span>
+                <nz-time-picker [(ngModel)]="item.postData.ib2DefaultStartTime" nzFormat="HH:mm" nzPlaceHolder="开始时间"></nz-time-picker>
+                <nz-checkbox-group class="timeRangeCheckbox" [(ngModel)]="item.postData.ib2DefaultDayStart"></nz-checkbox-group>
+                ~
+                <nz-time-picker class="ml8" [(ngModel)]="item.postData.ib2DefaultEndTime" nzFormat="HH:mm" nzPlaceHolder="结束时间"></nz-time-picker>
+                <nz-checkbox-group class="timeRangeCheckbox" [(ngModel)]="item.postData.ib2DefaultDayEnd"></nz-checkbox-group>
+              </span>
+            </div>
+          </div>
+        </div>
+        <!-- 自动建单配置 -->
+        <div *ngIf="tabModalName=='automaticOrderCreation'">
+          <!-- 自动建单 -->
+        </div>
+        <div class="bottom">
+          <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>
+        </div>
+      </div>
+    </ng-container>
+    <div class="list" *ngIf="loading">
+      <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+        <div class="loadingFullInner">
+          <img src="../../../assets/images/loading.gif" alt="">
+          <div>加载中...</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-batch/configuration-inspect-batch.component.less

@@ -0,0 +1,700 @@
+@import "../../../../../../src/theme.less";
+:host {
+  .TaskTypeManagement {
+    height: calc(100vh - 136px);
+    background: #f9fafb;
+    overflow: hidden;
+    padding: 16px 20px;
+
+    .pagination {
+      margin-top: 14px;
+      margin-bottom: 14px;
+      bottom: 12px;
+      right: 5px;
+    }
+
+    .taskType {
+      float: left;
+      width: 24%;
+      height: 100%;
+      border: 1px solid #e5e9ed;
+      background: #fff;
+      color: #333;
+      font-size: 14px;
+      position: relative;
+      overflow: hidden;
+
+      .title {
+        width: 100%;
+        height: 40px;
+        line-height: 40px;
+        padding-left: 16px;
+        border-bottom: 1px solid #e5e9ed;
+        position: relative;
+        background: #fff;
+        z-index: 2;
+      }
+
+      .operate {
+        width: 100%;
+        border-bottom: 1px solid #e5e9ed;
+        position: relative;
+        background: #fff;
+        z-index: 2;
+        display: flex;
+
+        .item {
+          flex: 1;
+          height: 34px;
+          line-height: 34px;
+          border-right: 1px solid #e5e9ed;
+          text-align: center;
+          color: #666; // cursor: default;
+          cursor: pointer;
+
+          &:hover {
+            color: @primary-color;
+            background: #f0f6ed;
+          }
+
+          &:nth-last-child(1) {
+            border: none;
+          }
+        }
+      }
+
+      .taskTypes {
+        // width: 110%;
+        width: 100%;
+        height: 92%;
+        // padding-right: 10%;
+        overflow-y: auto;
+        z-index: 1;
+        padding-bottom: 30px;
+
+        .itemChoice {
+          color: @primary-color;
+          background: #f0f6ed;
+        }
+
+        .item {
+          width: 100%;
+          height: 34px;
+          line-height: 34px;
+          text-align: center;
+          cursor: pointer;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+
+          &:hover {
+            color: @primary-color;
+            background: #f0f6ed;
+          }
+
+          &.checked {
+            color: @primary-color;
+            background: #f0f6ed;
+          }
+        }
+      }
+    }
+
+    //任务类型管理-主体
+    .taskTypeInfo {
+      height: 100%;
+      border: 1px solid #e5e9ed;
+      background: #fff;
+      color: #333;
+      position: relative;
+
+      .top {
+        height: 61px;
+        line-height: 60px;
+        display: flex;
+        align-items: center;
+        border-bottom: 1px solid #e5e9ed;
+        position: relative;
+        z-index: 2;
+
+        .items {
+          background: #f0f6ed;
+        }
+
+        & > div {
+          border-right: 1px solid #e5e9ed;
+          width: 30%;
+          text-align: center; // display: flex;
+          // align-items: center;
+          cursor: pointer;
+
+          &:hover {
+            background: #f0f6ed;
+          }
+        }
+
+        &:nth-last-child(4) {
+          border: none;
+        }
+      }
+
+      .list {
+        width: 100%; // height: 100%;
+        padding: 16px; // position: absolute;
+        // top: 0;
+        // padding-top: 90px;
+        background: #fff;
+        height: 89%;
+        overflow: auto;
+
+        nz-form-label {
+          margin-left: 0px !important;
+        }
+
+        & > div {
+          background: #f9fafb;
+          border: 1px solid #e5e9ed;
+          border-radius: 10px 10px 0px 0px;
+          padding: 24px 120px;
+
+          .label {
+            margin-left: 16px;
+            font-size: 14px;
+            color: #333;
+          }
+        }
+
+        // 规则信息
+        .ruleList {
+          padding: 15px 15px 0px 15px;
+          background: #fff;
+
+          .table {
+            width: 100%;
+            height: 100%;
+
+            .box {
+              // background: #f9fafb;
+              // border: 1px solid #e5e9ed;
+              border-radius: 5px;
+              position: relative;
+
+              .table_title {
+                font-size: 18px;
+                margin: 14px 0px;
+                text-align: center;
+              }
+
+              .thead {
+                background-image: linear-gradient(to right, @bg-start, @bg-end);
+
+                th {
+                  background: transparent;
+                  color: #fff;
+                  text-align: center;
+                  font-size: 14px;
+                }
+              }
+
+              .ant-table-body {
+                border-bottom: 1px solid #e5e9ed;
+                background: #f9fafb;
+              }
+
+              .ant-table-tbody {
+                background: #f9fafb;
+                border: 1px solid #e5e9ed;
+
+                .zzBontton {
+                  & > td {
+                    border-bottom: 1px solid #e5e9ed;
+                  }
+                }
+
+                tr {
+                  text-align: center;
+                  font-size: 14px;
+                  border: none;
+                  color: #333;
+                  overflow: hidden;
+
+                  .lin {
+                    width: 68.2%;
+                    height: 2rem;
+                    border-bottom: 0.1rem solid #e5e9ed;
+                    position: absolute;
+                    text-align: center;
+                    margin-left: 0%;
+                    margin-top: -0.8%;
+                    transform: rotate(6.5deg);
+                  }
+
+                  td {
+                    border: none;
+
+                    nz-input-number {
+                      width: 50px;
+                    }
+
+                    .coop {
+                      .line {
+                        margin: 10px;
+                      }
+
+                      span:nth-child(2n-1) {
+                        cursor: pointer;
+
+                        &:hover {
+                          color: @primary-color;
+                        }
+
+                        &:active {
+                          color: @primary-color;
+                        }
+                      }
+                    }
+                  }
+                }
+
+                tr:nth-child(even) {
+                  background: #fff;
+                }
+              }
+            }
+          }
+        }
+
+        //运送过程
+        .ysgcItem {
+          padding: 0px 0px 0px 0px; // background: #fff;
+
+          .ysgc_top {
+            height: 88px;
+            background: #fff;
+            border-radius: 10px 10px 0px 0px;
+            padding: 15px 22px 0px 22px;
+
+            .title {
+              span {
+                font-size: 18px;
+              }
+            }
+
+            .carrItems {
+              color: @primary-color;
+              border-color: @primary-color !important;
+            }
+
+            .process {
+              width: 80%;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              margin: 5px auto;
+              font-size: 14px;
+
+              .carrItem {
+                height: 40px;
+                line-height: 28px;
+                cursor: pointer;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+
+                .carrItem_icon {
+                  width: 35px;
+                  height: 35px;
+                  border: 1px solid #e5e9ed;
+                  border-radius: 50%;
+                  text-align: center;
+                  line-height: 35px;
+                  margin-right: 10px;
+
+                  i {
+                    font-size: 18px;
+                  }
+                }
+              }
+
+              .carrItem1 {
+                float: left;
+                width: 45%;
+                height: 40px;
+                line-height: 28px;
+                padding-left: 10%;
+                cursor: pointer;
+
+                .carrItem_icon {
+                  width: 35px;
+                  height: 35px;
+                  border: 1px solid #e5e9ed;
+                  border-radius: 50%;
+                  text-align: center;
+                  line-height: 35px;
+                  float: left;
+                  margin-right: 10px;
+
+                  i {
+                    font-size: 18px;
+                  }
+                }
+              }
+            }
+          }
+
+          .ysgc_cont {
+            padding: 0px 240px 24px 240px;
+
+            textarea {
+              padding-right: 10%;
+            }
+
+            .icon_btn {
+              cursor: pointer;
+              font-size: 18px;
+            }
+
+            .icon_text {
+              display: block;
+              cursor: pointer;
+              position: relative;
+              right: 5px;
+            }
+
+            .item_type_cont {
+              height: 70px;
+              padding-top: 4px;
+
+              & > div {
+                height: 65px;
+                border: 1px solid #e5e9ed;
+                border-radius: 5px;
+                background: #fff;
+
+                .item_type_cont_L {
+                  height: 100%;
+                  width: 90%;
+                  float: left;
+                  padding: 2px 12px;
+                  overflow: auto;
+
+                  .item_yq {
+                    width: 24%;
+                    height: 28px;
+                    display: inline-block;
+                    border: 1px solid #e5e9ed;
+                    border-radius: 20px;
+                    text-align: center;
+                    line-height: 26px;
+                    background: #f9fafb;
+                    margin-right: 1%;
+                    margin-bottom: 2px;
+                    font-size: 12px;
+                    padding-left: 8px;
+
+                    span {
+                      width: 75%;
+                      float: left;
+                      overflow: hidden;
+                      text-overflow: ellipsis;
+                      white-space: nowrap;
+                    }
+
+                    i {
+                      font-size: 14px;
+                      color: #999;
+                      cursor: pointer;
+                    }
+                  }
+                }
+
+                .item_type_cont_R {
+                  height: 100%;
+                  width: 10%;
+                  float: right;
+                  text-align: center;
+                  padding-top: 15px;
+                  border-left: 1px solid #e5e9ed;
+                  cursor: pointer;
+
+                  i {
+                    display: block;
+                    font-size: 16px;
+                  }
+
+                  i:hover {
+                    color: @primary-color;
+                  }
+
+                  .icon_text {
+                    right: 1px;
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        //关联信息
+        .glxxItem {
+          padding: 10px 15px 0px 15px;
+          background: #fff;
+
+          .tab_btn {
+            cursor: pointer;
+          }
+
+          .tab_btn:hover {
+            color: @primary-color;
+          }
+
+          .table_title {
+            font-size: 18px;
+            margin: 14px 0px;
+            text-align: center;
+          }
+
+          .thead {
+            background-image: linear-gradient(to right, @bg-start, @bg-end);
+
+            th {
+              background: transparent;
+              color: #fff;
+              text-align: center;
+              font-size: 14px;
+            }
+          }
+
+          .ant-table-body {
+            // border-bottom: 1px solid #e5e9ed;
+            background: #f9fafb;
+          }
+
+          .ant-table-tbody {
+            background: #f9fafb;
+            border: 1px solid #e5e9ed;
+
+            tr {
+              text-align: center;
+              font-size: 14px;
+              border: none;
+              color: #333;
+
+              td {
+                border: none; // font-size: 14px;
+
+                nz-input-number {
+                  width: 40px;
+                }
+
+                .coop {
+                  .line {
+                    margin: 10px;
+                  }
+
+                  span:nth-child(2n-1) {
+                    cursor: pointer;
+
+                    &:hover {
+                      color: @primary-color;
+                    }
+
+                    &:active {
+                      color: @primary-color;
+                    }
+                  }
+                }
+              }
+            }
+
+            tr:nth-child(even) {
+              background: #fff;
+            }
+          }
+        }
+
+        // 开通科室
+        .ktksItem {
+          padding: 0px 0px 0px 0px;
+          background: #fff;
+
+          .top {
+            width: 100%; // padding-bottom: 7px;
+            // border-bottom: 1px solid #e5e9ed;
+            position: relative;
+            overflow: hidden;
+            z-index: 2;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            .top_L {
+              width: 70%;
+              text-align: left;
+              display: flex;
+              flex-wrap: wrap;
+              align-items: center;
+              padding: 0 4px;
+              .top_L_item {
+                margin-left: 4px;
+              }
+
+              .label {
+                font-size: 14px;
+                color: #333;
+                margin-left: 0;
+              }
+
+              nz-select {
+                font-size: 12px;
+                width: 100px;
+              }
+
+              input {
+                font-size: 12px;
+                width: 100px;
+              }
+            }
+
+            .top_R {
+              border: 0px;
+
+              .btn {
+                margin-left: 10px;
+              }
+            }
+          }
+
+          .ktksItemList {
+            padding: 10px 15px 0px 15px;
+            .table {
+              min-height: 528px;
+            }
+
+            .operate {
+              float: right;
+              margin-bottom: 5px;
+
+              span {
+                font-size: 14px;
+              }
+
+              .num {
+                font-size: 18px;
+                color: @primary-color;
+              }
+            }
+
+            .thead {
+              background-image: linear-gradient(to right, @bg-start, @bg-end);
+
+              th {
+                background: transparent;
+                color: #fff;
+                text-align: center;
+                font-size: 14px;
+              }
+            }
+
+            .ant-table-body {
+              border-bottom: 1px solid #e5e9ed;
+              background: #f9fafb;
+            }
+
+            .ant-table-tbody {
+              background: #f9fafb;
+              border: 1px solid #e5e9ed;
+
+              .zzBontton {
+                & > td {
+                  border-bottom: 1px solid #e5e9ed;
+                }
+              }
+
+              tr {
+                text-align: center;
+                font-size: 14px;
+                border: none;
+                color: #333;
+
+                td {
+                  border: none; // font-size: 14px;
+
+                  nz-input-number {
+                    width: 40px;
+                  }
+
+                  .coop {
+                    .line {
+                      margin: 10px;
+                    }
+
+                    span:nth-child(2n-1) {
+                      cursor: pointer;
+
+                      &:hover {
+                        color: @primary-color;
+                      }
+
+                      &:active {
+                        color: @primary-color;
+                      }
+                    }
+                  }
+                }
+              }
+
+              tr:nth-child(even) {
+                background: #fff;
+              }
+            }
+          }
+
+          .pagination {
+            margin-top: 25px;
+            margin-bottom: 14px;
+            bottom: 12px;
+            right: 5px;
+            position: relative;
+            height: 30px;
+            .page {
+              position: absolute;
+              right: 5px;
+            }
+          }
+        }
+
+        .bottom {
+          height: 60px;
+          border-radius: 0px 0px 10px 10px;
+          padding: 10px 240px 0px 240px;
+          border-top: 0px;
+
+          button {
+            width: 80px;
+            height: 34px;
+            display: block;
+            margin: 0 auto;
+          }
+        }
+      }
+    }
+  }
+  .timeRange{
+    margin-bottom: 56px;
+    &:last-of-type{
+      margin-bottom: 0;
+    }
+    .timeRangeActive{
+      margin-top: 16px;
+      padding-left: 60px;
+    }
+    .timeRangeDefault{
+      margin-top: 16px;
+      padding-left: 60px;
+    }
+    .timeRangeCheckbox{
+      margin-left: 16px;
+    }
+  }
+}

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-batch/configuration-inspect-batch.component.ts

@@ -0,0 +1,226 @@
+import { Component, OnInit, ViewChild, Input } from "@angular/core";
+import { ToolService } from 'src/app/services/tool.service';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { NzMessageService } from 'ng-zorro-antd';
+import { v4 as uuidv4, validate as uuidValidate } from 'uuid';
+import { addDays, startOfMinute, endOfMinute, set, getYear, getMonth, getDate, format } from 'date-fns';
+import { MainService } from 'src/app/services/main.service';
+
+@Component({
+  selector: "app-configuration-inspect-batch",
+  templateUrl: "./configuration-inspect-batch.component.html",
+  styleUrls: ["./configuration-inspect-batch.component.less"],
+})
+export class ConfigurationInspectBatchComponent implements OnInit {
+  @Input() activeDictionaryKey: any;
+  @Input() dictionaryKeyList: any;
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  ngOnInit() {
+    this.tabModal('characteristics');
+    this.init();
+  }
+
+ tabModalName:string = 'characteristics'; //当前选中的tab
+ loading:boolean = false; //页面加载的loading
+ hosId = this.tool.getCurrentHospital().id; //当前院区
+ tasktype:any = {};// 任务类型
+ configs:any = {};// 配置
+ // 切换tab
+ tabModal(tabModalName:string){
+   this.tabModalName = tabModalName;
+ }
+ // 保存
+ btnLoading: boolean = false; //提交按钮loading状态
+ submitForm() {
+   if(!this.tasktype.id){
+     this.message.create("warning", "请先配置任务类型！");
+     return;
+   }
+
+   // 默认时间区间1
+
+   if(
+     (this.activeDictionaryKey.postData.ibActiveStartTime1 && !this.activeDictionaryKey.postData.ibActiveEndTime1) ||
+     (!this.activeDictionaryKey.postData.ibActiveStartTime1 && this.activeDictionaryKey.postData.ibActiveEndTime1) ||
+     (this.activeDictionaryKey.postData.ibActiveStartTime2 && !this.activeDictionaryKey.postData.ibActiveEndTime2) ||
+     (!this.activeDictionaryKey.postData.ibActiveStartTime2 && this.activeDictionaryKey.postData.ibActiveEndTime2)
+   ){
+     this.message.create("warning", "【默认时间区间1】的【有效时间范围】请完整填写开始时间与结束时间！");
+     return;
+   }else if(
+     (this.activeDictionaryKey.postData.ibActiveStartTime1 && this.activeDictionaryKey.postData.ibActiveEndTime1 && +this.activeDictionaryKey.postData.ibActiveStartTime1 > +this.activeDictionaryKey.postData.ibActiveEndTime1) ||
+     (this.activeDictionaryKey.postData.ibActiveStartTime2 && this.activeDictionaryKey.postData.ibActiveEndTime2 && +this.activeDictionaryKey.postData.ibActiveStartTime2 > +this.activeDictionaryKey.postData.ibActiveEndTime2)
+   ){
+    // 王满测试说有问题，要求去掉校验
+    // 开发无法复现问题，暂时注释
+    //  this.message.create("warning", "【默认时间区间1】的【有效时间范围】开始时间不能大于结束时间！");
+    //  return;
+   }
+
+   if(
+     (this.activeDictionaryKey.postData.ibDefaultStartTime && !this.activeDictionaryKey.postData.ibDefaultEndTime) ||
+     (!this.activeDictionaryKey.postData.ibDefaultStartTime && this.activeDictionaryKey.postData.ibDefaultEndTime)
+   ){
+     this.message.create("warning", "【默认时间区间1】的【默认时间】请完整填写开始时间与结束时间！");
+     return;
+   }else if(
+     this.activeDictionaryKey.postData.ibDefaultStartTime &&
+     this.activeDictionaryKey.postData.ibDefaultEndTime &&
+     (this.activeDictionaryKey.postData.ibDefaultDayStart[0].checked ? +addDays(this.activeDictionaryKey.postData.ibDefaultStartTime, 1) : +this.activeDictionaryKey.postData.ibDefaultStartTime) > (this.activeDictionaryKey.postData.ibDefaultDayEnd[0].checked ? +addDays(this.activeDictionaryKey.postData.ibDefaultEndTime, 1) : +this.activeDictionaryKey.postData.ibDefaultEndTime)
+   ){
+     this.message.create("warning", "【默认时间区间1】的【默认时间】开始时间不能大于结束时间！");
+     return;
+   }
+
+   // 默认时间区间2
+
+   if(
+     (this.activeDictionaryKey.postData.ib2ActiveStartTime1 && !this.activeDictionaryKey.postData.ib2ActiveEndTime1) ||
+     (!this.activeDictionaryKey.postData.ib2ActiveStartTime1 && this.activeDictionaryKey.postData.ib2ActiveEndTime1) ||
+     (this.activeDictionaryKey.postData.ib2ActiveStartTime2 && !this.activeDictionaryKey.postData.ib2ActiveEndTime2) ||
+     (!this.activeDictionaryKey.postData.ib2ActiveStartTime2 && this.activeDictionaryKey.postData.ib2ActiveEndTime2)
+   ){
+     this.message.create("warning", "【默认时间区间1】的【有效时间范围】请完整填写开始时间与结束时间！");
+     return;
+   }else if(
+     (this.activeDictionaryKey.postData.ib2ActiveStartTime1 && this.activeDictionaryKey.postData.ib2ActiveEndTime1 && +this.activeDictionaryKey.postData.ib2ActiveStartTime1 > +this.activeDictionaryKey.postData.ib2ActiveEndTime1) ||
+     (this.activeDictionaryKey.postData.ib2ActiveStartTime2 && this.activeDictionaryKey.postData.ib2ActiveEndTime2 && +this.activeDictionaryKey.postData.ib2ActiveStartTime2 > +this.activeDictionaryKey.postData.ib2ActiveEndTime2)
+   ){
+    // 王满测试说有问题，要求去掉校验
+    // 开发无法复现问题，暂时注释
+    //  this.message.create("warning", "【默认时间区间1】的【有效时间范围】开始时间不能大于结束时间！");
+    //  return;
+   }
+
+   if(
+     (this.activeDictionaryKey.postData.ib2DefaultStartTime && !this.activeDictionaryKey.postData.ib2DefaultEndTime) ||
+     (!this.activeDictionaryKey.postData.ib2DefaultStartTime && this.activeDictionaryKey.postData.ib2DefaultEndTime)
+   ){
+     this.message.create("warning", "【默认时间区间1】的【默认时间】请完整填写开始时间与结束时间！");
+     return;
+   }else if(
+     this.activeDictionaryKey.postData.ib2DefaultStartTime &&
+     this.activeDictionaryKey.postData.ib2DefaultEndTime &&
+     (this.activeDictionaryKey.postData.ib2DefaultDayStart[0].checked ? +addDays(this.activeDictionaryKey.postData.ib2DefaultStartTime, 1) : +this.activeDictionaryKey.postData.ib2DefaultStartTime) > (this.activeDictionaryKey.postData.ib2DefaultDayEnd[0].checked ? +addDays(this.activeDictionaryKey.postData.ib2DefaultEndTime, 1) : +this.activeDictionaryKey.postData.ib2DefaultEndTime)
+   ){
+     this.message.create("warning", "【默认时间区间1】的【默认时间】开始时间不能大于结束时间！");
+     return;
+   }
+
+   let postData:any = {
+     ...this.configs,
+     taskType: this.tasktype.id,
+     hosId: this.hosId,
+     ibActiveStartTime1: this.activeDictionaryKey.postData.ibActiveStartTime1 ? format(startOfMinute(this.activeDictionaryKey.postData.ibActiveStartTime1), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ibActiveEndTime1: this.activeDictionaryKey.postData.ibActiveEndTime1 ? format(endOfMinute(this.activeDictionaryKey.postData.ibActiveEndTime1), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ibActiveStartTime2: this.activeDictionaryKey.postData.ibActiveStartTime2 ? format(startOfMinute(this.activeDictionaryKey.postData.ibActiveStartTime2), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ibActiveEndTime2: this.activeDictionaryKey.postData.ibActiveEndTime2 ? format(endOfMinute(this.activeDictionaryKey.postData.ibActiveEndTime2), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ibDefaultStartTime: this.activeDictionaryKey.postData.ibDefaultStartTime ? format(startOfMinute(this.activeDictionaryKey.postData.ibDefaultStartTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ibDefaultEndTime: this.activeDictionaryKey.postData.ibDefaultEndTime ? format(endOfMinute(this.activeDictionaryKey.postData.ibDefaultEndTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ibDefaultDayStart: this.activeDictionaryKey.postData.ibDefaultDayStart[0].checked ? 1 : 0,
+     ibDefaultDayEnd: this.activeDictionaryKey.postData.ibDefaultDayEnd[0].checked ? 1 : 0,
+     ib2ActiveStartTime1: this.activeDictionaryKey.postData.ib2ActiveStartTime1 ? format(startOfMinute(this.activeDictionaryKey.postData.ib2ActiveStartTime1), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ib2ActiveEndTime1: this.activeDictionaryKey.postData.ib2ActiveEndTime1 ? format(endOfMinute(this.activeDictionaryKey.postData.ib2ActiveEndTime1), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ib2ActiveStartTime2: this.activeDictionaryKey.postData.ib2ActiveStartTime2 ? format(startOfMinute(this.activeDictionaryKey.postData.ib2ActiveStartTime2), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ib2ActiveEndTime2: this.activeDictionaryKey.postData.ib2ActiveEndTime2 ? format(endOfMinute(this.activeDictionaryKey.postData.ib2ActiveEndTime2), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ib2DefaultStartTime: this.activeDictionaryKey.postData.ib2DefaultStartTime ? format(startOfMinute(this.activeDictionaryKey.postData.ib2DefaultStartTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ib2DefaultEndTime: this.activeDictionaryKey.postData.ib2DefaultEndTime ? format(endOfMinute(this.activeDictionaryKey.postData.ib2DefaultEndTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ib2DefaultDayStart: this.activeDictionaryKey.postData.ib2DefaultDayStart[0].checked ? 1 : 0,
+     ib2DefaultDayEnd: this.activeDictionaryKey.postData.ib2DefaultDayEnd[0].checked ? 1 : 0,
+   };
+   console.log(postData);
+   this.btnLoading = true;
+   this.mainService
+     .simplePost("addData", "taskTypeConfig", postData)
+     .subscribe((result) => {
+       this.btnLoading = false;
+       if (result.status == 200) {
+         this.message.success("保存成功！");
+         this.getConfig();
+       }else{
+         this.message.success("保存失败！");
+       }
+     });
+ }
+
+ //初始化
+ init() {
+   this.loading = true;
+   this.getTaskType();
+ }
+
+ //获取任务类型
+ getTaskType() {
+   this.loading = true;
+   let postData = {
+     idx: 0,
+     sum: 1,
+     taskType: {
+       simpleQuery: true,
+       hosId: {
+         id: this.hosId
+       },
+       associationType: {
+         key: 'association_types',
+         value: 'inspect',
+       }
+     }
+   };
+   this.mainService
+     .getFetchDataList("simple/data", "taskType", postData)
+     .subscribe((result) => {
+       this.loading = false;
+       if (result.status == 200) {
+         this.tasktype = result.list[0] || {};
+         this.getConfig();
+       }
+     });
+ }
+
+ // 获取配置
+ getConfig() {
+   this.loading = true;
+   let postData = {
+     idx: 0,
+     sum: 1,
+     taskTypeConfig: {
+       taskTypeDTO: {
+         hosId: {
+           id: this.hosId
+         },
+         associationType: this.tasktype.associationType,
+       }
+     }
+   };
+   this.mainService
+     .getFetchDataList("simple/data", "taskTypeConfig", postData)
+     .subscribe((result) => {
+       this.loading = false;
+       if (result.status == 200) {
+         this.configs = result.list[0] || {};
+         this.activeDictionaryKey.postData.ibActiveStartTime1 = this.configs.ibActiveStartTime1 ? new Date(this.configs.ibActiveStartTime1) : undefined;
+         this.activeDictionaryKey.postData.ibActiveEndTime1 = this.configs.ibActiveEndTime1 ? new Date(this.configs.ibActiveEndTime1) : undefined;
+         this.activeDictionaryKey.postData.ibActiveStartTime2 = this.configs.ibActiveStartTime2 ? new Date(this.configs.ibActiveStartTime2) : undefined;
+         this.activeDictionaryKey.postData.ibActiveEndTime2 = this.configs.ibActiveEndTime2 ? new Date(this.configs.ibActiveEndTime2) : undefined;
+         this.activeDictionaryKey.postData.ibDefaultStartTime = this.configs.ibDefaultStartTime ? new Date(this.configs.ibDefaultStartTime) : undefined;
+         this.activeDictionaryKey.postData.ibDefaultEndTime = this.configs.ibDefaultEndTime ? new Date(this.configs.ibDefaultEndTime) : undefined;
+         this.activeDictionaryKey.postData.ibDefaultDayStart[0].checked = this.configs.ibDefaultDayStart == 1;
+         this.activeDictionaryKey.postData.ibDefaultDayEnd[0].checked = this.configs.ibDefaultDayEnd == 1;
+
+         this.activeDictionaryKey.postData.ib2ActiveStartTime1 = this.configs.ib2ActiveStartTime1 ? new Date(this.configs.ib2ActiveStartTime1) : undefined;
+         this.activeDictionaryKey.postData.ib2ActiveEndTime1 = this.configs.ib2ActiveEndTime1 ? new Date(this.configs.ib2ActiveEndTime1) : undefined;
+         this.activeDictionaryKey.postData.ib2ActiveStartTime2 = this.configs.ib2ActiveStartTime2 ? new Date(this.configs.ib2ActiveStartTime2) : undefined;
+         this.activeDictionaryKey.postData.ib2ActiveEndTime2 = this.configs.ib2ActiveEndTime2 ? new Date(this.configs.ib2ActiveEndTime2) : undefined;
+         this.activeDictionaryKey.postData.ib2DefaultStartTime = this.configs.ib2DefaultStartTime ? new Date(this.configs.ib2DefaultStartTime) : undefined;
+         this.activeDictionaryKey.postData.ib2DefaultEndTime = this.configs.ib2DefaultEndTime ? new Date(this.configs.ib2DefaultEndTime) : undefined;
+         this.activeDictionaryKey.postData.ib2DefaultDayStart[0].checked = this.configs.ib2DefaultDayStart == 1;
+         this.activeDictionaryKey.postData.ib2DefaultDayEnd[0].checked = this.configs.ib2DefaultDayEnd == 1;
+       }
+     });
+ }
+}

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-batch/configuration-inspect-batch.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ConfigurationInspectBatchComponent } from './configuration-inspect-batch.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    ConfigurationInspectBatchComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    ConfigurationInspectBatchComponent,
+  ]
+})
+export class ConfigurationInspectBatchModule { }

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.html

@@ -0,0 +1,132 @@
+<div class="content priority">
+  <div class="contentInner">
+    <div class="list-template" id="wechatTable">
+      <div class="list-template__content">
+        <div class="list-template__bottom">
+          <div class="list-template__top" nz-row>
+            <div nz-col nzXl='17' class="list-template__searchBox">
+              <div class="list-template__searchItem">
+                <span class="label">检查类型</span>：
+                <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择检查类型" [(ngModel)]="queryData.extra5" nzAllowClear nzServerSearch>
+                  <nz-option *ngFor="let option of typeList" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+                </nz-select>
+              </div>
+              <div class="list-template__searchItem">
+                <span class="label">检查科室</span>：
+                <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择检查科室" [(ngModel)]="queryData.extra4" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
+                  <ng-container *ngFor="let option of deptList">
+                    <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+                  </ng-container>
+                  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                  </nz-option>
+                </nz-select>
+              </div>
+              <div class="list-template__searchItem">
+                <span class="label">项目名称</span>：
+                <input nz-input class="formItem" placeholder="请输入项目名称" [(ngModel)]="queryData.name" />
+              </div>
+            </div>
+            <div nz-col nzXl="7" class="list-template__btns">
+              <button nz-button class="btn default" (click)="addWechatModal()">新增</button>
+              <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
+              <button nz-button class="btn default ml8" (click)='getList()'>搜索</button>
+            </div>
+          </div>
+          <nz-table class="list-template__nzTable" [nzData]="dataList" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="loading1" [nzScroll]="{ y: tableWechatHeight + 'px' }">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="20%">排序号</th>
+                <th nzWidth="20%">项目名称</th>
+                <th nzWidth="20%">检查科室</th>
+                <th nzWidth="20%">检查类型</th>
+                <th nzWidth="20%">操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of dataList;let i = index">
+                <td>{{data.orders}}</td>
+                <td>{{data.name}}</td>
+                <td>{{data.extra4DTO?.dept}}</td>
+                <td>{{data.extra5DTO?.name}}</td>
+                <td>
+                  <div class="coop">
+                    <span (click)="showDelModal(data,'您确认要删除吗？','删除','del')">删除</span>
+                    <span (click)="editWechat(data)">编辑</span>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 新增/编辑模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalWechat">
+  <div class="modalBody">
+    <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideWechatModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm">
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="orders">排序号</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入排序号!">
+            <nz-input-group>
+              <nz-input-number class="w100" formControlName="orders" nzPlaceHolder="请输入排序号" [nzMin]="0" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="name">项目名称</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入项目名称!">
+            <nz-input-group>
+              <input formControlName="name" nz-input placeholder="请输入项目名称">
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="extra4">检查科室</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择检查科室!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra4" nzPlaceHolder="请选择检查科室" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
+              <ng-container *ngFor="let option of deptList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="extra5">检查项目</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择检查项目!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra5" nzPlaceHolder="请选择检查项目" nzServerSearch>
+              <ng-container *ngFor="let data of typeList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitWechatForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideWechatModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.less

@@ -0,0 +1,288 @@
+@import "../../../../../../src/theme.less";
+:host {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  background-color: #F0F2F5;
+  .list-template__nzTable,
+  .list-template__bottom{
+    padding: 0!important;
+    border: none!important;
+    background: #fff!important;
+  }
+  .list-template{
+    width: 100%!important;
+    height: 100%!important;
+    padding: 0!important;
+  }
+  .content{
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    border: 1px solid #EEF3F9;
+    &.priority{
+      background-color: #fff;
+      .contentInner{
+        padding: 0 16px 16px;
+        border: 1px solid #E8EBEF;
+      }
+    }
+    .contentItem{
+      padding: 4px 16px;
+      cursor: pointer;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      &.active{
+        color: @primary-color;
+        background-color: #F0F6ED;
+        border-radius: 4px;
+      }
+    }
+    .contentInner{
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 16px;
+      gap: 16px;
+      .contentHead{
+        height: 45px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 16px;
+        padding: 0 16px;
+        font-size: 16px;
+        font-weight: bold;
+        border-bottom: 1px solid #D9D9D9;
+        .title{
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        .btns{
+          flex-shrink: 0;
+        }
+      }
+      .contentBody{
+        padding: 0 8px;
+        margin: 4px 0;
+        flex: 1;
+      }
+      .address{
+        flex: 1;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .addressAssign{
+        flex: 3;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .list-template__searchItem {
+        .label {
+          color: #333;
+          display: inline-block;
+          width: 70px;
+          text-align-last: justify;
+          text-align: justify;
+          &.label--big {
+            width: 100px;
+          }
+        }
+        .formItem {
+          width: 135px;
+        }
+      }
+    }
+    .contentBtns{
+      margin-bottom: 16px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+
+  .save {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .tips{
+      margin-bottom: 16px!important;
+    }
+
+    .modalBody {
+      width: 350px;
+      background: #fff;
+      border-radius: 5px;
+      padding: 10px 20px;
+      color: #333;
+
+      .title {
+        width: 100%;
+        text-align: center;
+        font-size: 18px;
+        position: relative;
+
+        i {
+          position: absolute;
+          right: 0;
+          top: 0;
+          font-size: 20px;
+          color: #666;
+          cursor: pointer;
+          padding: 0 5px;
+        }
+      }
+
+      .content {
+        width: 310px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+        padding: 16px 0;
+
+        .busyList{
+          display: flex;
+          margin-bottom: 8px;
+          .busyContent{
+            margin-right: 8px;
+            flex: 1;
+          }
+        }
+
+        & > div {
+          text-align: center;
+          margin: 0;
+
+          &.icon {
+            // margin-top: 17px;
+
+            i {
+              color: #34b349;
+              font-size: 30px !important;
+
+              &.transport-wenhao {
+                color: #f5a523;
+              }
+
+              &.transport-shibai {
+                color: #ff3a52;
+              }
+            }
+          }
+
+          &.defeat {
+            color: #333;
+            font-size: 14px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+        .workAssignmentTips {
+          font-size: 12px;
+        }
+      }
+
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    // 新增
+    &.add {
+      .modalBody {
+        width: 480px;
+        height: auto;
+
+        .content {
+          width: 100%;
+          height: auto;
+          padding: 16px;
+          max-height: 497px;
+          overflow-y: auto;
+
+          .addForm {
+            .ant-form-item {
+              margin-bottom: 0;
+
+              .ant-form-item-label {
+                text-align: left;
+              }
+
+              .desc {
+                margin-top: 5px;
+              }
+            }
+
+            .datesControl {
+              margin-top: -16px;
+
+              .ant-form-item-label {
+                line-height: 40px;
+              }
+            }
+
+            .timer {
+              .ant-form-item-label {
+                width: 100%;
+                text-align: left;
+              }
+
+              .numInp {
+                margin-right: 5px;
+              }
+
+              .line {
+                margin-right: 5px;
+              }
+            }
+
+            .timer2 {
+              .ant-form-item-label {
+                line-height: 20px;
+              }
+            }
+          }
+
+          .editForm {
+            .ant-form-item {
+              margin-bottom: 15px;
+
+              .ant-form-item-label {
+                line-height: 14px;
+                text-align: left;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.ts

@@ -0,0 +1,309 @@
+import { Component, OnInit, Input } from "@angular/core";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { Validators, FormGroup, FormBuilder } from '@angular/forms';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { MainService } from 'src/app/services/main.service';
+
+@Component({
+  selector: "app-configuration-inspect-inspects",
+  templateUrl: "./configuration-inspect-inspects.component.html",
+  styleUrls: ["./configuration-inspect-inspects.component.less"],
+})
+export class ConfigurationInspectInspectsComponent implements OnInit {
+  constructor(
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  coopData: any = {}; //当前操作列
+  hosId: any = this.tool.getCurrentHospital().id;
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    setTimeout(() => {
+      this.tableWechatHeight = document.querySelector('#wechatTable').clientHeight - document.querySelector('#wechatTable .list-template__top').clientHeight - 8 - document.querySelector('#wechatTable .thead').clientHeight;
+    }, 0)
+    this.getTypes();
+    this.getList();
+  }
+
+  // 新增弹框
+  modelName = ""; //模态框名称
+  modalWechat: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  addWechatModal() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modalWechat = true;
+    this.initWechatForm();
+  }
+  //关闭新增/编辑弹框
+  hideWechatModal() {
+    this.modalWechat = false;
+  }
+
+  // 编辑
+  editWechat(data) {
+    console.log(data);
+    this.modelName = "编辑";
+    this.add = false;
+    this.modalWechat = true;
+    this.initWechatForm();
+    this.coopData = data;
+    this.validateForm.controls.orders.setValue(data.orders);
+    this.validateForm.controls.name.setValue(data.name);
+    this.validateForm.controls.extra4.setValue(data.extra4DTO ? data.extra4DTO.id : null);
+    this.validateForm.controls.extra5.setValue(data.extra5DTO ? data.extra5DTO.id : null);
+
+    data.extra4DTO && (this.deptList = [data.extra4DTO]);
+  }
+
+  // 新增/编辑表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitWechatForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+    console.log(this.validateForm.value);
+    this.btnLoading = true;
+    let postData:any = {};
+
+    let arr = this.dataList.filter(
+      (item) => item.name == this.validateForm.value.name && item.id != this.coopData.id
+    );
+
+    //有重复名称
+    if (arr.length > 0) {
+      this.btnLoading = false;
+      this.showPromptModal(
+        this.add ? "新增" : "编辑",
+        false,
+        `存在重复的检查项目名称【${this.validateForm.value.name}】请修改后再保存！`
+      );
+      return;
+    }
+
+    if (this.add) {
+      //增加
+      let n = 0;
+      if (this.dataList.length > 0) {
+        let sortArr = this.dataList.map((item) => Number(item.value));
+        n = Math.max.apply(null, sortArr);
+      } else {
+        n = 0;
+      }
+      postData = {
+        // dictionary: {
+          key: "inspect_check_type",
+          value: n + 1,
+          desc: "检查项目",
+          orders: this.validateForm.value.orders,
+          name: this.validateForm.value.name,
+          extra4: this.validateForm.value.extra4,
+          extra5: this.validateForm.value.extra5,
+        // }
+      };
+    } else {
+      //编辑
+      postData = {
+        // dictionary: {
+          ...this.coopData,
+          ...{
+            orders: this.validateForm.value.orders,
+            name: this.validateForm.value.name,
+            extra4: this.validateForm.value.extra4,
+            extra5: this.validateForm.value.extra5,
+          }
+        // }
+      };
+    }
+    this.mainService
+      .simplePost("addData", "dictionary", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hideWechatModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, '');
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 初始化新增form表单
+  validateForm: FormGroup; //新增/编辑表单
+  initWechatForm() {
+    this.validateForm = this.fb.group({
+      orders: [null, [Validators.required]],
+      name: [null, [Validators.required]],
+      extra4: [null, [Validators.required]],
+      extra5: [null, [Validators.required]],
+    });
+  }
+
+  // 重置
+  queryData: any = {}
+  reset(){
+    this.queryData = {};
+    this.getList();
+  }
+
+  // 获取列表
+  loading1:boolean = false;
+  dataList: any[] = []; //表格数据
+  tableWechatHeight:number = 0;
+  getList() {
+    let data = {
+      idx: 0,
+      sum: 9999,
+      dictionary: {
+        key: "inspect_check_type",
+        name: this.queryData.name,
+        extra4: this.queryData.extra4,
+        extra5: this.queryData.extra5,
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "dictionary", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.dataList = data.list || [];
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 防抖
+  isLoading = false;
+  isSelecting:boolean = false; // 是否在选中状态
+  searchTimer(fun, e) {
+    if (this.isSelecting) {
+      this.isSelecting = false; // 重置标志
+      return; // 跳过处理
+    }
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 设置标志
+  setIsSelecting(flag){
+    this.isSelecting = flag; // 设置标志
+  }
+
+  openChangeDept(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getDeptList();
+  }
+
+  // 科室搜索
+  changeDeptInp(e) {
+    this.searchTimer(this.getDeptList, e);
+  }
+
+  // 获取检查科室
+  deptList: any = [];
+  getDeptList(e = undefined) {
+    let postData = {
+      idx: 0,
+      sum: 20,
+      department: {
+        searchType: 1,// 简单查询
+        cascadeHosId: this.hosId,
+        dept: e,
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "department", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.deptList = data.list || [];
+      });
+  }
+
+  // 获取检查类型
+  typeList: any = [];
+  getTypes() {
+    this.mainService.getDictionary('list', 'inspect_check_item').subscribe((data) => {
+      this.isLoading = false;
+      this.typeList = data || [];
+    });
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "del") {
+      //删除
+      this.mainService
+        .simplePost("rmvData", "dictionary", [this.coopData.id])
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList();
+  }
+}

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ConfigurationInspectInspectsComponent } from './configuration-inspect-inspects.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    ConfigurationInspectInspectsComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    ConfigurationInspectInspectsComponent,
+  ]
+})
+export class ConfigurationInspectInspectsModule { }

src/app/components/configurationCenter/configuration-inspect/configuration-inspect.component.html

@@ -6,7 +6,8 @@
       </overlay-scrollbars>
     </div>
     <div class="addressAssign">
-      <div class="contentBody">
+      <!-- 注意事项 -->
+      <div class="contentBody" [hidden]="activeDictionaryKey.id != 1">
         <div class="dictionaryRow">
           <div class="orders">排序号</div>
           <div class="name">注意事项</div>
@@ -48,9 +49,21 @@
           </form>
         </overlay-scrollbars>
       </div>
-      <div class="contentBtns">
+      <div class="contentBtns" [hidden]="activeDictionaryKey.id != 1">
         <button nz-button nzType="primary" class="ml8" (click)="saveDictionary()">保存</button>
       </div>
+      <!-- 批量建单设置 -->
+      <ng-container *ngIf="activeDictionaryKey.id == 2">
+        <div class="contentBody2">
+          <app-configuration-inspect-batch [activeDictionaryKey]="activeDictionaryKey" [dictionaryKeyList]="dictionaryKeyList"></app-configuration-inspect-batch>
+        </div>
+      </ng-container>
+      <!-- 检查项目 -->
+      <ng-container *ngIf="activeDictionaryKey.id == 3">
+        <div class="contentBody2">
+          <app-configuration-inspect-inspects></app-configuration-inspect-inspects>
+        </div>
+      </ng-container>
     </div>
   </div>
 </div>

src/app/components/configurationCenter/configuration-inspect/configuration-inspect.component.less

@@ -175,4 +175,6 @@
       align-items: center;
     }
   }
+
+
 }

src/app/components/configurationCenter/configuration-inspect/configuration-inspect.component.ts

@@ -6,6 +6,7 @@ import { ToolService } from 'src/app/services/tool.service';
 import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
 import { NzMessageService } from 'ng-zorro-antd';
 import { v4 as uuidv4, validate as uuidValidate } from 'uuid';
+import { addDays, startOfMinute, endOfMinute, set, getYear, getMonth, getDate, format } from 'date-fns';
 
 @Component({
   selector: "app-configuration-inspect",
@@ -41,13 +42,35 @@ export class ConfigurationInspectComponent implements OnInit {
   // 数据字典key列表
   dictionaryKeyList:any[] = [
     { id: 1, name: '注意事项', key: "inspect_notes"},
+    { id: 2, name: '批量建单配置', key: "", postData: {
+      ibActiveStartTime1: undefined,
+      ibActiveEndTime1: undefined,
+      ibActiveStartTime2: undefined,
+      ibActiveEndTime2: undefined,
+      ibDefaultStartTime: undefined,
+      ibDefaultEndTime: undefined,
+      ibDefaultDayStart: [{ label:'+1天', value: 0 }],
+      ibDefaultDayEnd: [{ label:'+1天', value: 0 }],
+      ib2ActiveStartTime1: undefined,
+      ib2ActiveEndTime1: undefined,
+      ib2ActiveStartTime2: undefined,
+      ib2ActiveEndTime2: undefined,
+      ib2DefaultStartTime: undefined,
+      ib2DefaultEndTime: undefined,
+      ib2DefaultDayStart: [{ label:'+1天', value: 0 }],
+      ib2DefaultDayEnd: [{ label:'+1天', value: 0 }],
+    }},
+    { id: 3, name: '检查项目', key: ""},
   ]
 
   // 点击数据字典key
   activeDictionaryKey:any;
   clickDictionaryKey(item){
     this.activeDictionaryKey = item;
-    this.getDictionaryList();
+    if(this.activeDictionaryKey.id == 1){
+      this.getDictionaryList();
+      this.initDictionaryForm();
+    }
   }
 
   btnLoading: boolean = false; //提交按钮loading状态
@@ -254,4 +277,7 @@ export class ConfigurationInspectComponent implements OnInit {
         }
       });
   }
+
+
+
 }

src/app/components/configurationCenter/configuration-inspect/configuration-inspect.module.ts

@@ -3,6 +3,8 @@ import { CommonModule } from '@angular/common';
 
 import { ConfigurationInspectComponent } from './configuration-inspect.component';
 import { ShareModule } from '../../../share/share.module';
+import { ConfigurationInspectBatchModule } from './configuration-inspect-batch/configuration-inspect-batch.module';
+import { ConfigurationInspectInspectsModule } from './configuration-inspect-inspects/configuration-inspect-inspects.module';
 
 
 @NgModule({
@@ -12,6 +14,8 @@ import { ShareModule } from '../../../share/share.module';
   imports: [
     CommonModule,
     ShareModule,
+    ConfigurationInspectBatchModule,
+    ConfigurationInspectInspectsModule,
   ],
   exports: [
     ConfigurationInspectComponent,

src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.html

@@ -4,6 +4,8 @@
     <div class="address">
       <div class="contentHead">工时大类
 				<div>
+					<button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="operation(1)">{{activeCategory1.disableType==1?'停用':'启用'}}</button>
+					<button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="addLogModal(1)">日志</button>
 					<button nz-button class="mar-rig-10 btn cancel" nzType="default" nzSize="small" *ngIf="activeCategory1.id && categoryList1.length" (click)="delCategoryModal(1)">删除</button>
           <button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory1.id && categoryList1.length" (click)="editCategoryModal(1)">编辑</button>
 					<button nz-button nzType="primary" nzSize="small" (click)="addCategoryModal(1)">新增</button>
@@ -11,12 +13,14 @@
 			</div>
       <overlay-scrollbars #osComponentRef1 class="contentBody">
         <nz-spin nzSimple [nzSpinning]="categoryLoading1" class="mt8 text_align_center"></nz-spin>
-        <div [hidden]="categoryLoading1" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory1.id }" (click)="clickCategory(item, 1)" *ngFor="let item of categoryList1">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral.value}}分</div>
+        <div [hidden]="categoryLoading1" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory1.id }" (click)="clickCategory(item, 1)" *ngFor="let item of categoryList1">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral?item.integral.value:''}}分 - {{item.disableType==0?'停用':'启用'}}</div>
       </overlay-scrollbars>
     </div>
     <div class="address">
       <div class="contentHead">工时小类
 				<div>
+					<button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory2.id && activeCategory1.disableType==1 && activeCategory1.id" (click)="operation(2)">{{activeCategory2.disableType==1?'停用':'启用'}}</button>
+					<button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory2.id && activeCategory1.id" (click)="addLogModal(2)">日志</button>
 					<button nz-button class="mar-rig-10 btn cancel" *ngIf="activeCategory2.id && activeCategory1.id" nzType="default" nzSize="small" (click)="delCategoryModal(2)">删除</button>
           <button nz-button class="mar-rig-10 btn" *ngIf="activeCategory2.id && activeCategory1.id" nzType="primary" nzSize="small" (click)="editCategoryModal(2)">编辑</button>
 					<button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="addCategoryModal(2)">新增</button>
@@ -24,7 +28,7 @@
 			</div>
       <overlay-scrollbars #osComponentRef2 class="contentBody">
         <nz-spin nzSimple [nzSpinning]="categoryLoading2" class="mt8 text_align_center"></nz-spin>
-        <div [hidden]="categoryLoading2" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory2.id }" (click)="clickCategory(item, 2)" *ngFor="let item of categoryList2">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral.value}}分</div>
+        <div [hidden]="categoryLoading2" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory2.id }" (click)="clickCategory(item, 2)" *ngFor="let item of categoryList2">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral?item.integral.value:''}}分 - {{item.disableType==0?'停用':'启用'}}</div>
       </overlay-scrollbars>
     </div>
   </div>
@@ -121,3 +125,49 @@
 <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
   (confirmDelEvent)="confirmDel()" (cancelDelEvent)="cancelDel()" [content]="delContent" confirmTxt="是" cancelTxt="否">
 </app-dialog-delete>
+
+<!-- 启用/停用模态框 -->
+<app-dialog-delete [delModal]="operationModal" (hideDelModalEvent)="hideOperationModal()" [btnLoading]="btnLoading"
+  (confirmDelEvent)="confirmOperation()" (cancelDelEvent)="cancelOperation()" [content]="operationContent" confirmTxt="是" cancelTxt="否">
+</app-dialog-delete>
+
+<!-- 日志查看模态框 -->
+	<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="logModal">
+	  <div class="modalBody modalLogBody">
+	    <div class="title">日志查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+	    </div>
+	    <div class="content">
+	      <div class="list-template__bottom">
+	        <nz-table class="list-template__nzTable" [nzData]="listLogOfData" nzSize="middle" [nzShowPagination]="false"
+	          [nzLoading]="loading2">
+	          <thead>
+	            <tr class="thead">
+								<th>事件单号</th>
+								<th>动作</th>
+	              <th>操作时间</th>
+	              <th>操作人</th>
+	              <th>调整记录</th>
+	            </tr>
+	          </thead>
+	          <tbody>
+	            <tr *ngFor="let data of listLogOfData">
+								<td>{{ data.incidentDTO ? data.incidentDTO.incidentsign : '-' }}</td>
+	            	<td>{{ data.operationType ? data.operationType.name : '-' }}</td>
+	            	<td>{{ data.operationTime|date:'yyyy-MM-dd HH:mm'}}</td>
+	            	<td>{{ data.operationUserDTO ? data.operationUserDTO.name : '-' }}</td>
+	            	<td>{{ data.logRemark ? data.logRemark : '-' }} <span *ngIf="data.operationType.value==6">单价:{{ data.currentPrice }} &nbsp;&nbsp;积分:{{ data.currentScore?data.currentScore.value:'' }}</span></td>
+	            </tr>
+	          </tbody>
+	        </nz-table>
+	      </div>
+				<div class="list-template__pagination">
+				  <nz-pagination [(nzPageIndex)]="pageLogIndex" [(nzTotal)]="listLogLength" nzShowSizeChanger [(nzPageSize)]="pageLogSize"
+				    (nzPageIndexChange)="getLogList()" (nzPageSizeChange)="getLogList()">
+				  </nz-pagination>
+				</div>
+	    </div>
+	    <div class="display_flex justify-content_flex-center">
+	      <button class="btn" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+	    </div>
+	  </div>
+	</div>

src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.less

@@ -298,6 +298,123 @@
           }
         }
       }
+			
+			.modalLogBody {
+			  width: 80%;
+			  height: auto;
+			
+			  .content {
+			    width: 100%;
+			    height: auto;
+			    padding: 19px 14px 0 14px;
+			    max-height: 500px;
+			    overflow-y: auto;
+					
+					.list-template__bottom {
+					  background: #f9fafb;
+					  border: 1px solid #e5e9ed;
+					  border-radius: 8px;
+					  // padding-bottom: 56px;
+					  position: relative;
+					  .list-template__nzTable {
+					    padding: 16px 16px 0;
+					
+					    .thead {
+					      background-image: linear-gradient(to right, @bg-start, @bg-end);
+					
+					      th {
+					        background: transparent;
+					        color: #fff;
+					        text-align: center;
+					      }
+					    }
+					
+					    .ant-table-body {
+					      border-bottom: 1px solid #e5e9ed;
+					    }
+					
+					    .ant-table-tbody {
+					      tr {
+					        text-align: center;
+					        color: #333;
+					
+					        td {
+					          border: none;
+					
+					          &.tab_hover:hover{
+					            text-decoration: underline;
+					            cursor: pointer;
+					          }
+					
+					          .coop {
+					            button{
+					              color: #333;
+					            }
+					            span,button {
+					              display: inline-block;
+					              padding: 0 8px;
+					              cursor: pointer;
+					              position: relative;
+					
+					              &::after {
+					                content: "|";
+					                position: absolute;
+					                top: 0;
+					                right: 0;
+					              }
+					
+					              &:hover,
+					              &:active {
+					                color: @primary-color;
+					              }
+					
+					              &:nth-last-child(1) {
+					                &::after {
+					                  content: "";
+					                }
+					              }
+					            }
+					          }
+					        }
+					      }
+					    }
+					  }
+					}
+										
+			    .addForm {
+			      .ant-form-item {
+			        margin-bottom: 14px;
+			
+			        .ant-form-item-label {
+			          line-height: 14px;
+			          text-align: left;
+			        }
+			      }
+			    }
+			
+			    .editForm {
+			      .ant-form-item {
+			        margin-bottom: 14px;
+			
+			        .ant-form-item-label {
+			          line-height: 0;
+			          text-align: left;
+			        }
+			      }
+			    }
+					.list-template__pagination {
+						text-align: right;
+						padding: 20px 0;
+					}
+			  }
+				
+				
+			  button {
+			    &:nth-child(1) {
+			      margin-right: 20px;
+			    }
+			  }
+			}
     }
   }
 }

src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.ts

@@ -161,7 +161,119 @@ export class ConfigurationManHourComponent implements OnInit {
 	hideDelModal() {
 	  this.delModal = false;
 	}
-
+	
+	// 日志列表
+	listLogOfData: any[] = []; //日志数据
+	pageLogIndex: number = 1; //日志当前页码
+	pageLogSize: number = 10; //日志每页展示条数
+	listLogLength: number = 10; //日志总数据量
+	loading2:boolean = false;
+	getLogList(type) {
+	  if (type == 1) {
+	    this.pageLogIndex = 1;
+	  }
+	  let postData = {
+	  	idx: this.pageLogIndex - 1,
+	  	sum: this.pageLogSize,
+	  	workHourManagementLog: {
+	  		workHourId: this.itemData.id,
+	  	},
+	  };
+	  this.loading2 = true;
+	  this.mainService
+	    .getFetchDataList("simple/data", "workHourManagementLog", postData)
+	    .subscribe((data) => {
+	      this.loading2 = false;
+	      if (data.status == 200) {
+					this.logModal = true
+	        this.listLogOfData = data.list;
+	        this.listLogLength = data.totalNum;
+	      }else{
+	        this.message.error(data.msg || "请求数据失败");
+	      }
+	    });
+	}
+	
+	// 启用/停用工时
+	operationModal: boolean = false; 
+	operationContent: string = null; 
+	operation(type:number){
+		if(type==1){
+			let msg = this.activeCategory1.disableType==1?'停用':'启用'
+			if(this.activeCategory1.disableType==1){
+				this.operationContent = `您确认${msg}大类工时吗？${msg}后所有小类同时${msg}`
+			}else{
+				this.operationContent = `您确认${msg}大类工时吗？`
+			}
+		}else{
+			let msg = this.activeCategory2.disableType==1?'停用':'启用'
+			this.operationContent = `您确认${msg}小类工时吗？`
+		}
+		this.coopType = type;
+		this.operationModal = true
+	}
+	
+	hideOperationModal(){
+		this.operationModal = false
+	}
+	
+	// 取消启用/停用弹框
+	cancelOperation(){
+		this.hideOperationModal();
+	}
+	
+	// 确认启用/停用
+	confirmOperation() {
+	  let that = this;
+		let disableType = null
+	  that.btnLoading = true;
+		if(this['activeCategory' + this.coopType].disableType==1){
+			disableType = 0
+		}else{
+			disableType = 1
+		}
+		let postData = {
+		  workHourManagement: {
+				...this['activeCategory' + this.coopType],
+				disableType:disableType,
+				upType: 'disable'
+		  }
+		}
+	  that.mainService
+	    .coopData('updData', 'workHourManagement', postData)
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+				if(disableType==1){
+					this['activeCategory' + this.coopType].disableType = 1
+				}else{
+					this['activeCategory' + this.coopType].disableType = 0
+				}
+	      that.hideOperationModal();
+				if(this.coopType==1){
+					this.categoryList2 = []
+				}
+	      if (data["status"] == 200) {
+	        that.showPromptModal("操作", true, "");
+	      } else {
+	        that.showPromptModal("操作", false, data["msg"]);
+	      }
+	    });
+	}
+	
+	// 查看日志
+	itemData:any = {};
+	logModal:boolean = false;
+	addLogModal(type){
+		this.itemData = this['activeCategory' + type];
+		console.log(this['activeCategory' + type])
+		this.getLogList(1)
+	}
+	
+	// 关闭日志
+	hideModal() {
+	  this.logModal = false;
+	}
+	
   // 获取工时
   loading1:boolean = false;
   tableCategoryHeight:number = 0;

src/app/components/configurationCenter/configuration-quick/configuration-quick.component.html

@@ -125,6 +125,19 @@
 						</nz-select>
           </nz-form-control>
         </nz-form-item>
+        <nz-form-item *ngIf="validatePriorityForm.value.bussType === 'inspect'">
+          <nz-form-label nzFor="taskTypeInspectIds" nzRequired [nzSpan]="6">任务类型</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择任务类型!">
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择任务类型" formControlName="taskTypeInspectIds" (nzOnSearch)="changeCommonInp('taskTypeInspect', $event)">
+						  <ng-container *ngFor="let option of malfunctionInspectData">
+						    <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [nzValue]="option.id"></nz-option>
+						  </ng-container>
+						  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+						    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+						  </nz-option>
+						</nz-select>
+          </nz-form-control>
+        </nz-form-item>
         <nz-form-item *ngIf="validatePriorityForm.value.bussType === 'goods' && hasSpecimen">
           <nz-form-label nzFor="urgentIds" [nzSpan]="8">是否显示标本数量</nz-form-label>
           <nz-form-control [nzSpan]="16" nzErrorTip="请选择是否显示标本数量!">

src/app/components/configurationCenter/configuration-quick/configuration-quick.component.ts

@@ -28,6 +28,7 @@ export class ConfigurationQuickComponent implements OnInit {
 
 	currentHospital:any;
 	malfunctionData:any = [];
+	malfunctionInspectData:any = [];
 	allUserGroup:any = [];
 	userData:any = [];
 
@@ -37,6 +38,8 @@ export class ConfigurationQuickComponent implements OnInit {
 		this.changeCommonInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       if(v[0] === 'taskType'){
         this.getTaskTypeList(v[1]);
+      }else if(v[0] === 'taskTypeInspect'){
+        this.getTaskTypeInspectList(v[1]);
       }
     });
 
@@ -48,6 +51,7 @@ export class ConfigurationQuickComponent implements OnInit {
 		this.currentHospital = this.tool.getCurrentHospital();
     this.getCommonFaultsList();
 		this.getTaskTypeList();
+		this.getTaskTypeInspectList();
     this.getPagePermissionIcon();
     this.getPagePermissionBussType();
     this.getPagePermissionQuickOperation();
@@ -72,7 +76,7 @@ export class ConfigurationQuickComponent implements OnInit {
     this.changeCommonInpSubject.next([type, e]);
   }
 
-	// 获取故障现象数据
+	// 获取任务类型数据-标本，其他，万能
   isLoading:boolean = false;
 	getTaskTypeList(keyWord?){
 		let postData = {
@@ -94,6 +98,27 @@ export class ConfigurationQuickComponent implements OnInit {
 		})
 	}
 
+	// 获取任务类型数据-陪检
+	getTaskTypeInspectList(keyWord?){
+		let postData = {
+      idx: 0,
+      sum: 9999,
+		  taskType: {
+        taskName: keyWord,
+        hosIds: this.hosId,
+        assTypeValues: 'inspect',
+        simpleQuery: true,
+		  },
+		};
+    this.isLoading = true;
+		this.mainService.getFetchDataList('configuration', "taskType", postData).subscribe(data => {
+		  this.isLoading = false;
+      if (data.status == 200) {
+        this.malfunctionInspectData = data.list || [];
+      }
+		})
+	}
+
   // 获取字典数据-图标名称
   pagePermissionIconList: any[] = [];
   getPagePermissionIcon() {
@@ -135,15 +160,23 @@ export class ConfigurationQuickComponent implements OnInit {
     console.log(e);
     this.validatePriorityForm.controls.quickOperation.setValue(null);
     this.validatePriorityForm.controls.taskTypeIds.setValue([]);
+    this.validatePriorityForm.controls.taskTypeInspectIds.setValue(null);
     this.validatePriorityForm.controls.urgentIds.setValue(this.gdEmergencyList.map(v => {v.checked = false;return v;}));
 
     if(e === 'service'){
       this.requiredChange('quickOperation', true);
       this.requiredChange('taskTypeIds', false);
+      this.requiredChange('taskTypeInspectIds', false);
       this.requiredChange('urgentIds', false);
     }else if(e === 'goods'){
       this.requiredChange('quickOperation', false);
       this.requiredChange('taskTypeIds', true);
+      this.requiredChange('taskTypeInspectIds', false);
+      this.requiredChange('urgentIds', false);
+    }else if(e === 'inspect'){
+      this.requiredChange('quickOperation', false);
+      this.requiredChange('taskTypeIds', false);
+      this.requiredChange('taskTypeInspectIds', true);
       this.requiredChange('urgentIds', false);
     }
   }
@@ -180,14 +213,20 @@ export class ConfigurationQuickComponent implements OnInit {
     this.coopData = data;
 
     this.changeBussType(data.bussType.value);
-    data.taskTypeIds && this.changeTaskTypeIds(data.taskTypeIds.split(',').map(v => +v));
+    if(data.bussType.value === 'goods'){
+      data.taskTypeIds && this.changeTaskTypeIds(data.taskTypeIds.split(',').map(v => +v));
+    }
 
     this.validatePriorityForm.controls.orders.setValue(data.orders);
     this.validatePriorityForm.controls.icon.setValue(data.icon.id);
     this.validatePriorityForm.controls.name.setValue(data.name);
     this.validatePriorityForm.controls.bussType.setValue(data.bussType.value);
     data.quickOperation && this.validatePriorityForm.controls.quickOperation.setValue(data.quickOperation.id);
-    data.taskTypeIds && this.validatePriorityForm.controls.taskTypeIds.setValue(data.taskTypeIds.split(',').map(v => +v));
+    if(data.bussType.value === 'goods'){
+      data.taskTypeIds && this.validatePriorityForm.controls.taskTypeIds.setValue(data.taskTypeIds.split(',').map(v => +v));
+    }else if(data.bussType.value === 'inspect'){
+      data.taskTypeIds && this.validatePriorityForm.controls.taskTypeInspectIds.setValue(+data.taskTypeIds);
+    }
     if(data.urgentIds){
       let ids = data.urgentIds.split(',').map(v => +v);
       let urgentIds = this.gdEmergencyList.map(v => {
@@ -212,6 +251,12 @@ export class ConfigurationQuickComponent implements OnInit {
     console.log(this.validatePriorityForm.value);
     this.btnLoading = true;
     let postData:any = {};
+    let taskTypeIds;
+    if(this.validatePriorityForm.value.bussType === 'goods'){
+      taskTypeIds = this.validatePriorityForm.value.taskTypeIds.length ? this.validatePriorityForm.value.taskTypeIds.toString() : undefined
+    }else if(this.validatePriorityForm.value.bussType === 'inspect'){
+      taskTypeIds = this.validatePriorityForm.value.taskTypeInspectIds ? this.validatePriorityForm.value.taskTypeInspectIds.toString() : undefined
+    }
     if (this.add) {
       //增加
       postData = {
@@ -221,7 +266,7 @@ export class ConfigurationQuickComponent implements OnInit {
         name: this.validatePriorityForm.value.name,
         bussType: this.validatePriorityForm.value.bussType ? this.pagePermissionBussTypeList.find(v => v.value === this.validatePriorityForm.value.bussType) : undefined,
         quickOperation: this.validatePriorityForm.value.quickOperation ? { id: this.validatePriorityForm.value.quickOperation } : undefined,
-        taskTypeIds: this.validatePriorityForm.value.taskTypeIds.length ? this.validatePriorityForm.value.taskTypeIds.toString() : undefined,
+        taskTypeIds,
         urgentIds: this.validatePriorityForm.value.urgentIds.length ? this.validatePriorityForm.value.urgentIds.filter(v => v.checked).map(v => v.value).toString() : undefined,
         active: this.validatePriorityForm.value.active,
       };
@@ -234,7 +279,7 @@ export class ConfigurationQuickComponent implements OnInit {
         name: this.validatePriorityForm.value.name,
         bussType: this.validatePriorityForm.value.bussType ? this.pagePermissionBussTypeList.find(v => v.value === this.validatePriorityForm.value.bussType) : undefined,
         quickOperation: this.validatePriorityForm.value.quickOperation ? { id: this.validatePriorityForm.value.quickOperation } : undefined,
-        taskTypeIds: this.validatePriorityForm.value.taskTypeIds.length ? this.validatePriorityForm.value.taskTypeIds.toString() : undefined,
+        taskTypeIds,
         urgentIds: this.validatePriorityForm.value.urgentIds.length ? this.validatePriorityForm.value.urgentIds.filter(v => v.checked).map(v => v.value).toString() : undefined,
         active: this.validatePriorityForm.value.active,
       };
@@ -268,7 +313,8 @@ export class ConfigurationQuickComponent implements OnInit {
       name: [null, [Validators.required]],//按钮名称
       bussType: [null, [Validators.required]],//关联业务
       quickOperation: [null, [Validators.required]],//快捷操作
-      taskTypeIds: [[], [Validators.required]],//关联任务类型
+      taskTypeIds: [[], [Validators.required]],//关联任务类型-标本，其他，万能
+      taskTypeInspectIds: [null, [Validators.required]],//关联任务类型-陪检
       urgentIds: [this.gdEmergencyList.map(v => {v.checked = false;return v;}), [Validators.required]],//是否显示标本数量
       active: [0, [Validators.required]],//是否启用
     });

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.html

@@ -49,13 +49,13 @@
                   <nz-form-label class="label">必须扫描动态二维码</nz-form-label>
                   <nz-checkbox-group [(ngModel)]="arriveScanDynamicCode"></nz-checkbox-group>
                 </div>
-								
+
 								<!-- 输入动态数字密钥 -->
 								<div class="display_flex align-items_center mb8" *ngIf="arriveScanCode[0].checked">
 								  <nz-form-label class="label">输入动态数字密钥</nz-form-label>
 								  <nz-checkbox-group [(ngModel)]="enterDynamicDigitalKey"></nz-checkbox-group>
 								</div>
-								
+
                 <!-- 退回标本是否填写交接人 -->
                 <div class="display_flex align-items_center mb8">
                   <nz-form-label class="label">退回标本是否填写交接人</nz-form-label>
@@ -85,6 +85,75 @@
                   <nz-form-label class="label">默认扫描标本进入标本扫描页</nz-form-label>
                   <nz-checkbox-group [(ngModel)]="defaultScanSpe"></nz-checkbox-group>
                 </div>
+								
+								<!-- 是否开通收取限制 -->
+								<div class="display_flex align-items_center mb8">
+								  <nz-form-label class="label">是否开通收取限制</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="speCollectLimit" (ngModelChange)="changeSpeCollect($event)"></nz-checkbox-group>
+								</div>
+								
+								<!-- 是否支持非起点科室收取 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+								  <nz-form-label class="label">是否支持非起点科室收取</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="speCollectSupportNotStartDept"></nz-checkbox-group>
+								</div>
+								
+								<!-- 限制标本状态收取 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+									<nz-form-label class="label">限制标本状态收取</nz-form-label>
+									<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear nzPlaceHolder="请选择限制标本状态收取" [(ngModel)]="speCollectLimitState">
+										<ng-container *ngFor="let option of specimenStateData">
+											<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+										</ng-container>
+									</nz-select>
+								</div>
+								
+								<!-- 限制终点科室收取 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+									<nz-form-label class="label">限制终点科室收取</nz-form-label>
+									<nz-select nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear
+									  (nzOnSearch)="changeEndDept($event)" nzPlaceHolder="请选择限制终点科室收取" [(ngModel)]="speCollectLimitEndDept">
+									  <ng-container *ngFor="let option of endDeptData">
+									    <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+									  </ng-container>
+									  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+									    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+									  </nz-option>
+									</nz-select>
+								</div>
+								
+								<!-- 限制普通或紧急收取 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+									<nz-form-label class="label">限制普通或紧急收取</nz-form-label>
+									<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择限制普通或紧急收取" [(ngModel)]="speCollectLimitUrgent">
+										<ng-container *ngFor="let option of astrictData">
+											<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+										</ng-container>
+									</nz-select>
+								</div>
+								
+								<!-- 是否限制重复收取标本 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+								  <nz-form-label class="label">是否限制重复收取标本</nz-form-label>
+									<nz-checkbox-group [(ngModel)]="speCollectLimitRepeat"></nz-checkbox-group>
+								</div>
+								
+								<!-- 是否限制试管类型收取标本 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+								  <nz-form-label class="label">是否限制试管类型收取标本</nz-form-label>
+									<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择是否限制重复收取标本" [(ngModel)]="speCollectLimitTubeType">
+										<ng-container *ngFor="let option of repetitionData">
+											<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+										</ng-container>
+									</nz-select>
+								</div>
+								
+								<!-- 是否开始收取前进入配置页 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+								  <nz-form-label class="label">是否开始收取前进入配置页</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="speStartCollectShowConfig"></nz-checkbox-group>
+								</div>
+								
               </div>
               <!-- 自动建单配置 -->
               <div *ngIf="tabModalName=='automaticOrderCreation'">
@@ -140,7 +209,7 @@
 										</ng-container>
 									</nz-select>
 								</div>
-								
+
 								<!-- 手术病理标签样式 -->
 								<div class="display_flex align-items_center mb8">
 									<nz-form-label class="label">手术病理标签样式</nz-form-label>
@@ -150,6 +219,23 @@
 										</ng-container>
 									</nz-select>
 								</div>
+
+								<!-- 速冻标本数量控制 -->
+								<div class="display_flex align-items_center mb8">
+									<nz-form-label class="label">速冻标本数量控制</nz-form-label>
+									<nz-radio-group type="active" [(ngModel)]="pathologyFrozenSpecimenNum">
+										<label nz-radio [nzValue]="1">单只</label>
+										<label nz-radio [nzValue]="0">多只</label>
+									</nz-radio-group>
+								</div>
+
+								<!-- 提示语 -->
+								<div class="display_flex align-items_center mb8" *ngIf="pathologyFrozenSpecimenNum==1">
+									<nz-form-label class="label">提示语</nz-form-label>
+									<nz-input-group>
+										<input class="width-200" type="text" nz-input [(ngModel)]="prompt" />
+									</nz-input-group>
+								</div>
 							</div>
 							<div class="bottom">
 								<button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitPathologyForm()">保存</button>
@@ -165,6 +251,167 @@
 						</div>
 					</div>
 				</div>
+        <div class="TaskTypeManagement" *ngIf="activeDictionaryKey=='specimenPackage'">
+					<div class="taskTypeInfo">
+            <div class="top">
+              <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
+                特性配置
+              </div>
+              <div class="item" (click)="tabModal('nursePackage')" [ngClass]="{'items':tabModalName=='nursePackage'}">
+                护士打包配置
+              </div>
+              <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
+                自动建单配置
+              </div>
+            </div>
+            <div class="list" *ngIf="!loading">
+              <!-- 特性配置 -->
+              <div *ngIf="tabModalName=='characteristics'">
+                <!-- 是否联合标本收取 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">是否联合标本收取</nz-form-label>
+                  <nz-radio-group [(ngModel)]="spePackageUnionReceive">
+                    <label nz-radio [nzValue]="1">是</label>
+                    <label nz-radio [nzValue]="0">否</label>
+                  </nz-radio-group>
+                </div>
+                <!-- 关联任务类型 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">关联任务类型</nz-form-label>
+                  {{tasktype.taskName}}
+                </div>
+                <!-- 工单模式 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label" nzRequired>工单模式</nz-form-label>
+                  <nz-radio-group [(ngModel)]="spePackageModel">
+                    <label nz-radio [nzValue]="item.value" *ngFor="let item of spePackageModelList">{{ item.label }}</label>
+                  </nz-radio-group>
+                </div>
+                <!-- 支持建单并签到 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">支持建单并签到</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="drugsCreateSign"></nz-checkbox-group>
+                </div>
+                <!-- 支持接单并签到 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">支持接单并签到</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="drugsReceiveSign"></nz-checkbox-group>
+                </div>
+
+                <!-- 起点科室支持核对 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">起点科室支持核对</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="drugsStartCheck" (ngModelChange)="changeDrugsStartCheck($event)"></nz-checkbox-group>
+                </div>
+                <ng-container *ngIf="drugsStartCheck[0].checked">
+                  <!-- 核对方式 -->
+                  <div class="display_flex align-items_center mb8">
+                    <nz-form-label class="label" nzRequired>核对方式</nz-form-label>
+                    <nz-checkbox-group [(ngModel)]="drugsStartCheckScanIds"></nz-checkbox-group>
+                  </div>
+                  <!-- 手动填写 -->
+                  <div class="display_flex align-items_center mb8">
+                    <nz-form-label class="label">手动填写</nz-form-label>
+                    <nz-select class="w320px" nzPlaceHolder="请选择手动填写" [(ngModel)]="drugsStartManual" nzAllowClear>
+                      <nz-option *ngFor="let item of drugsManualList" [nzLabel]="item.label" [nzValue]="item.value"></nz-option>
+                    </nz-select>
+                  </div>
+                </ng-container>
+
+                <!-- 终点科室支持核对 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">终点科室支持核对</nz-form-label>
+                  <nz-checkbox-group [nzDisabled]="true" [(ngModel)]="drugsEndCheck" (ngModelChange)="changeDrugsEndCheck($event)"></nz-checkbox-group>
+                </div>
+                <ng-container *ngIf="drugsEndCheck[0].checked">
+                  <!-- 核对方式 -->
+                  <div class="display_flex align-items_center mb8">
+                    <nz-form-label class="label" nzRequired>核对方式</nz-form-label>
+                    <nz-checkbox-group [(ngModel)]="drugsEndCheckScanIds"></nz-checkbox-group>
+                  </div>
+                  <!-- 手动填写 -->
+                  <div class="display_flex align-items_center mb8">
+                    <nz-form-label class="label">手动填写</nz-form-label>
+                    <nz-select class="w320px" nzPlaceHolder="请选择手动填写" [(ngModel)]="drugsEndManual" nzAllowClear>
+                      <nz-option *ngFor="let item of drugsManualList" [nzLabel]="item.label" [nzValue]="item.value"></nz-option>
+                    </nz-select>
+                  </div>
+                </ng-container>
+              </div>
+              <!-- 护士打包配置 -->
+              <div *ngIf="tabModalName=='nursePackage'">
+                <!-- 是否自动打包 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">自动打包</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="spePackageAutoPack" (ngModelChange)="changeSpePackageAutoPack($event)"></nz-checkbox-group>
+                </div>
+
+                <ng-container *ngIf="spePackageAutoPack[0].checked">
+                  <!-- 自动关联普标急标 -->
+                  <div class="display_flex align-items_center mb8">
+                    <nz-form-label class="label">自动关联普标急标</nz-form-label>
+                    <nz-checkbox-group [(ngModel)]="spePackageUrgents"></nz-checkbox-group>
+                  </div>
+                  <!-- 自动关联科室 -->
+                  <div class="display_flex align-items_center mb8">
+                    <nz-form-label class="label">自动关联科室</nz-form-label>
+                    <nz-select nzMode="multiple" style="width: 500px;" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear
+                    (nzOnSearch)="changeDept($event)" nzPlaceHolder="请选择自动关联科室" [(ngModel)]="spePackageDeptIds" (nzOpenChange)="openDeptList($event)">
+                      <ng-container *ngFor="let option of deptList">
+                        <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+                      </ng-container>
+                      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                      </nz-option>
+                    </nz-select>
+                  </div>
+                  <!-- 自动关联试管类型 -->
+                  <div class="display_flex align-items_center mb8">
+                    <nz-form-label class="label">自动关联试管类型</nz-form-label>
+                    <nz-select nzMode="multiple" style="width: 500px;" nzPlaceHolder="请选择自动关联试管类型" [(ngModel)]="spePackageTubeIds" nzAllowClear>
+                      <nz-option *ngFor="let item of spePackageTubeList" [nzLabel]="item.label" [nzValue]="item.value"></nz-option>
+                    </nz-select>
+                  </div>
+                </ng-container>
+
+                <!-- 清点方式 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">清点方式</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="spePackageInventoryTypes"></nz-checkbox-group>
+                </div>
+
+                <!-- 是否生成配送工单 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">生成配送工单</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="spePackageCreateOrder"></nz-checkbox-group>
+                </div>
+
+                <!-- 条码打印尺寸 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">条码打印尺寸</nz-form-label>
+                  <nz-select class="w320px" nzPlaceHolder="请选择条码打印尺寸" [(ngModel)]="spePackageCodeSize" nzAllowClear>
+                    <nz-option nzLabel="80*80" [nzValue]="1"></nz-option>
+                  </nz-select>
+                </div>
+              </div>
+              <!-- 自动建单配置 -->
+              <div *ngIf="tabModalName=='automaticOrderCreation'">
+                <!-- 自动建单 -->
+              </div>
+              <div class="bottom">
+                <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitSpecimenPackageForm()">保存</button>
+              </div>
+            </div>
+            <div class="list" *ngIf="loading">
+              <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+                <div class="loadingFullInner">
+                  <img src="../../../assets/images/loading.gif" alt="">
+                  <div>加载中...</div>
+                </div>
+              </div>
+            </div>
+          </div>
+				</div>
       </div>
     </div>
   </div>

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.less

@@ -330,6 +330,10 @@
 					width: 200px;
 				}
 				
+				.width-200{
+					width: 275px;
+				}
+				
         & > div {
           background: #f9fafb;
           border: 1px solid #e5e9ed;

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from "@angular/core";
 import { MainService } from "../../../services/main.service";
 import { ToolService } from 'src/app/services/tool.service';
 import { NzMessageService } from 'ng-zorro-antd';
-import { Subject } from 'rxjs';
+import { Subject, forkJoin } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 
 @Component({
@@ -15,22 +15,51 @@ export class ConfigurationSpecimenComponent implements OnInit {
   btnLoading:boolean = false; //提交按钮的loading
   tabModalName:string = 'characteristics'; //当前选中的tab
   hosId = this.tool.getCurrentHospital().id; //当前院区
-	
+
 	// tab类型
 	dictionaryKeyList:any[] = [
 		{
-			name:'检查标本',key:'examine'
+			name:'检验标本',key:'examine'
 		},
 		{
 			name:'病理标本',key:'pathology'
-		}
+		},
+    {
+      name:'标本打包',key:'specimenPackage'
+    }
 	];
-	
+
+  spePackageUnionReceive:any = undefined;//是否联合标本收取
+  spePackageModel:any = undefined;//工单模式
+  drugsCreateSign:any = [{ label:'是否开启', value: 0 }];//支持建单并签到
+  drugsReceiveSign:any = [{ label:'是否开启', value: 0 }];//支持接单并签到
+  drugsStartCheck:any = [{ label:'是否开启', value: 0 }];//起点科室支持核对
+  drugsStartCheckScanIds:any = [];//起点核对方式
+  drugsStartManual:any = undefined;//起点科室手动填写
+  drugsEndCheck:any = [{ label:'是否开启', value: 1 }];//终点科室支持核对
+  drugsEndCheckScanIds:any = [];//终点核对方式
+  drugsEndManual:any = undefined;//终点科室手动填写
+  spePackageAutoPack:any = [{ label:'是否开启', value: 0 }];//自动打包
+  spePackageUrgents:any[] = [{label: '急标', value: 1}, {label: '普标', value: 0}];//自动关联急标普标急标
+  spePackageTubeIds:any[] = [];// 自动关联试管类型
+  spePackageTubeList:any[] = [];// 自动关联试管类型列表
+  spePackageInventoryTypes:any[] = [{label: '患者', value: 1, disabled: true, checked: true}, {label: '试管', value: 2}];//清点方式
+  spePackageCreateOrder:any = [{ label:'是否开启', value: 0 }];//生成配送工单
+  spePackageCodeSize:any = undefined;//条码打印尺寸
+
+  // 工单模式
+  spePackageModelList:any[] = [
+    { label: '一单一包', value: 1 },
+  ];
+
+  // 手动填写
+  drugsManualList:any[] = [];
+
 	// 是否支持根据手术新建申请单
 	autoCreate:any[] = [
 	  {label:'是否开启',value: 0}
 	];
-	
+
 	// 是否是否支持门诊新增申请单
 	outpatientCreatePathologyForm:any[] = [
 	  {label:'是否开启',value: 0}
@@ -41,7 +70,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 	outpatientInVitroFixation:any[] = [
 	  {label:'是否开启',value: 0}
 	];
-	
+
   // 扫描时指定科室不提醒勾选项
   deptNotAlert:any[] = [
     {label:'是否开启',value: 0}
@@ -56,12 +85,12 @@ export class ConfigurationSpecimenComponent implements OnInit {
   arriveScanDynamicCode:any[] = [
     {label:'是否开启',value: 0}
   ];
-	
+
 	// 必须扫描动态二维码
 	enterDynamicDigitalKey:any[] = [
 	  {label:'是否开启',value: 0}
 	];
-	
+
   // 退回标本是否填写交接人
   returnSpecimenWhetherHandover:any[] = [
     {label:'是否开启',value: 0}
@@ -86,14 +115,59 @@ export class ConfigurationSpecimenComponent implements OnInit {
   defaultScanSpe:any[] = [
     {label:'是否开启',value: 0}
   ];
-	
+
+	// 是否开通收取限制
+	speCollectLimit:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+
+	// 是否支持非起点科室收取
+	speCollectSupportNotStartDept:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+
+	// 限制标本状态收取
+	speCollectLimitState:any = [];
+
+	// 限制终点科室收取
+	speCollectLimitEndDept:any = [];
+
+	// 限制普通或紧急收取
+	speCollectLimitUrgent:any = [];
+
+	// 是否限制重复收取标本
+	speCollectLimitRepeat:any[]= [
+	  {label:'是否开启',value: 0}
+	];
+
+	// 是否限制试管类型收取标本
+	speCollectLimitTubeType:any[];
+
+	// 是否开始收取前进入配置页
+	speStartCollectShowConfig:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+
+	// 速冻标本数量控制
+	pathologyFrozenSpecimenNum:any = '0';
+
+	// 提示语
+	prompt:any;
+
 	//申请单条码设置
 	pathologyBarCode:any;
-	
+
   // 配置
   configs:any = {};
   // 任务类型
   tasktype:any = {};
+	specimenStateData:any = [];
+	endDeptData:any = [];
+	repetitionData:any = [];
+	astrictData:any = [
+		{name:'普通',id:'0'},
+		{name:'紧急',id:'1'},
+	]
   searchTimerSubject = new Subject();
   constructor(private mainService: MainService,private tool: ToolService,private msg: NzMessageService) {}
 
@@ -103,23 +177,102 @@ export class ConfigurationSpecimenComponent implements OnInit {
       let fun = v[0];
       fun.call(this, v[1]);
     });
+		this.getDeptDic();
     this.getDeptList();
     this.getTaskType();
   }
-	
+
+
+	// 获取科室类型
+	deptItem:any;
+	getDeptDic(e:string = ''){
+		this.mainService.getDictionary("list", "speState").subscribe((res) => {
+			this.specimenStateData = res
+		})
+		this.mainService.getDictionary("list", "specimen_tube_type").subscribe((res) => {
+			this.repetitionData = res
+		})
+		this.mainService.getDictionary("list", "dept_type").subscribe((res2) => {
+			this.deptItem = res2.find(i=>i.name=='检验科室')
+			let data1 = {
+			  idx: 0,
+			  sum: 9999,
+			  department: {
+			    hospital: { id: this.hosId || "" },
+			    type: { id: this.deptItem.id || "" },
+					dept: e,
+			  },
+			};
+			this.mainService
+			  .getFetchDataList("data", "department", data1)
+			  .subscribe((res) => {
+			    this.endDeptData = res.list;
+			  });
+		})
+	}
+
+	getEndDeptData(e){
+		let data1 = {
+		  idx: 0,
+		  sum: 9999,
+		  department: {
+		    hospital: { id: this.hosId || "" },
+		    type: { id: this.deptItem.id || "" },
+				dept: e,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("data", "department", data1)
+		  .subscribe((res) => {
+				 this.isLoading = false;
+		    this.endDeptData = res.list;
+		  });
+	}
+
+	// 搜索起点科室
+	changeEndDept(e){
+		this.searchTimer(this.getEndDeptData, e);
+	}
+
 	// 点击数据字典key
 	activeDictionaryKey:any = 'examine';
 	clickDictionaryKey(item){
 	  this.activeDictionaryKey = item.key;
+    this.tabModal('characteristics');
 		if(item.key=='examine'){
 			this.getDeptList();
 			this.getTaskType();
-		}else{
+		}else if(item.key=='pathology'){
 			this.getLabelDic()
 			this.getTaskTypesId()
+		}else if(item.key=='specimenPackage'){
+      this.getDeptList();
+      this.loading = true;
+      let drugs_bag_check_scan_type$ = this.mainService.getDictionary('list', 'drugs_bag_check_scan_type', true);
+      let drugs_bag_manual_type$ = this.mainService.getDictionary('list', 'drugs_bag_manual_type', true);
+      let specimen_tube_type$ = this.mainService.getDictionary('list', 'specimen_tube_type', true);
+      forkJoin(drugs_bag_check_scan_type$, drugs_bag_manual_type$, specimen_tube_type$).subscribe((data:any[]) => {
+        let drugs_bag_check_scan_type = data[0] || [];
+        let drugs_bag_manual_type = data[1] || [];
+        let specimen_tube_type = data[2] || [];
+
+        this.drugsStartCheckScanIds = drugs_bag_check_scan_type.map(v => ({ label:v.name, value: v.id }));
+        this.drugsEndCheckScanIds = drugs_bag_check_scan_type.map(v => ({ label:v.name, value: v.id }));
+        this.drugsManualList = drugs_bag_manual_type.map(v => ({ label:v.name, value: v.id }));
+
+        this.spePackageTubeList = specimen_tube_type.map(v => ({ label:v.name, value: v.id }));
+
+        this.getTaskTypeByOrdinary('specimenPackage')
+      })
 		}
 	}
-	
+
+	changeSpeCollect(e){
+		if(!e[0].checked){
+
+		}
+	}
+
   // 扫描时指定科室不提醒勾选项
   changeDeptNotAlert(e){
     console.log(e);
@@ -138,6 +291,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
   // 用户输入搜索
   isLoading: boolean = false;
   deptNotAlertIds:any[] = [];
+  spePackageDeptIds:any[] = [];
   deptList:any[] = [];
   changeDept(e) {
     this.searchTimer(this.getDeptList, e);
@@ -177,7 +331,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
   tabModal(tabModalName:string){
     this.tabModalName = tabModalName;
   }
-	
+
 	//病理标本保存
 	submitPathologyForm(){
 		let postData:any = {
@@ -188,12 +342,14 @@ export class ConfigurationSpecimenComponent implements OnInit {
 			outpatientCreatePathologyForm: this.outpatientCreatePathologyForm[0].checked ? 1 : 0,
 			outpatientInVitroFixation: this.outpatientInVitroFixation[0].checked ? 1 : 0,
 			pathologyBarCode : this.pathologyBarCode,
+			pathologyFrozenSpecimenNum : this.pathologyFrozenSpecimenNum,
+			prompt : this.prompt?this.prompt:undefined,
 			outpatientPathologyLabelSize:{
 				id:this.outpatientPathologyLabelSize
 			},
 			surgeryPathologyLabelSize:{
 				id:this.surgeryPathologyLabelSize
-			}, 
+			},
 		};
 		this.btnLoading = true;
 		this.mainService
@@ -205,8 +361,8 @@ export class ConfigurationSpecimenComponent implements OnInit {
 		    }
 		  });
 	}
-	
-  // 检查标本保存
+
+  // 检验标本保存
   submitForm() {
     if(!this.tasktype.id){
       this.msg.create("warning", "请先配置患者陪检任务类型！");
@@ -229,7 +385,86 @@ export class ConfigurationSpecimenComponent implements OnInit {
       bigScanArriveNotOwner: this.bigScanArriveNotOwner[0].checked ? 1 : 0,
       bigScanShowCreateBtn: this.bigScanShowCreateBtn[0].checked ? 1 : 0,
       defaultScanSpe: this.defaultScanSpe[0].checked ? 1 : 0,
-      deptNotAlertIds: this.deptNotAlertIds.length ? this.deptNotAlertIds.toString() : undefined,
+      deptNotAlertIds: this.deptNotAlertIds && this.deptNotAlertIds.length>0 ? this.deptNotAlertIds.toString() : undefined,
+			speCollectLimit: this.speCollectLimit[0].checked ? 1 : 0,
+			speCollectSupportNotStartDept: null,
+			speCollectLimitRepeat: null,
+			speCollectLimitTubeType: null,
+			speStartCollectShowConfig: null,
+			speCollectLimitState: null,
+			speCollectLimitEndDept: null,
+			speCollectLimitUrgent: null,
+		};
+		if(this.speCollectLimit[0].checked){
+			postData.speCollectSupportNotStartDept = this.speCollectSupportNotStartDept[0].checked ? 1 : 0;
+			postData.speCollectLimitRepeat = this.speCollectLimitRepeat[0].checked ? 1 : 0;
+			postData.speCollectLimitTubeType = this.speCollectLimitTubeType && this.speCollectLimitTubeType.length>0 ? this.speCollectLimitTubeType.toString() : undefined;
+			postData.speStartCollectShowConfig = this.speStartCollectShowConfig[0].checked ? 1 : 0;
+			postData.speCollectLimitState = this.speCollectLimitState && this.speCollectLimitState.length>0 ? this.speCollectLimitState.toString() : undefined;
+			postData.speCollectLimitEndDept = this.speCollectLimitEndDept && this.speCollectLimitEndDept.length>0 ? this.speCollectLimitEndDept.toString() : undefined;
+			postData.speCollectLimitUrgent = this.speCollectLimitUrgent && this.speCollectLimitUrgent.length>0 ? this.speCollectLimitUrgent.toString() : undefined;
+		}else{
+			postData.speCollectSupportNotStartDept = undefined;
+			postData.speCollectLimitRepeat = undefined;
+			postData.speCollectLimitTubeType = undefined;
+			postData.speStartCollectShowConfig = undefined;
+			postData.speCollectLimitState = undefined;
+			postData.speCollectLimitEndDept = undefined;
+			postData.speCollectLimitUrgent = undefined;
+		}
+    this.btnLoading = true;
+    this.mainService
+      .simplePost("addData", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        if (result.status == 200) {
+          this.getConfig();
+        }
+      });
+  }
+
+  // 标本打包保存
+  submitSpecimenPackageForm() {
+    if(!this.tasktype.id){
+      this.msg.create("warning", "请先配置关联任务类型！");
+      return;
+    }
+    if(!this.spePackageModel){
+      this.msg.create("warning", "请选择工单模式！");
+      return;
+    }
+
+    if(this.drugsStartCheck[0].checked && !this.drugsStartCheckScanIds.filter(v => v.checked).length){
+      this.msg.create("warning", "请选择起点科室的核对方式！");
+      return;
+    }
+
+    if(this.drugsEndCheck[0].checked && !this.drugsEndCheckScanIds.filter(v => v.checked).length){
+      this.msg.create("warning", "请选择终点科室的核对方式！");
+      return;
+    }
+
+    let postData:any = {
+      id: this.configs.id,
+      taskType: this.tasktype.id,
+      hosId: this.hosId,
+      spePackageUnionReceive: this.spePackageUnionReceive,
+      spePackageModel: this.spePackageModel || undefined,
+      drugsCreateSign: this.drugsCreateSign[0].checked ? 1 : 0,
+      drugsReceiveSign: this.drugsReceiveSign[0].checked ? 1 : 0,
+      drugsStartCheck: this.drugsStartCheck[0].checked ? 1 : 0,
+      drugsStartCheckScanIds: this.drugsStartCheckScanIds.filter(v => v.checked).map(v => v.value).toString() || undefined,
+      drugsStartManual: this.drugsStartManual ? { id: this.drugsStartManual } : undefined,
+      drugsEndCheck: this.drugsEndCheck[0].checked ? 1 : 0,
+      drugsEndCheckScanIds: this.drugsEndCheckScanIds.filter(v => v.checked).map(v => v.value).toString() || undefined,
+      drugsEndManual: this.drugsEndManual ? { id: this.drugsEndManual } : undefined,
+      spePackageAutoPack: this.spePackageAutoPack[0].checked ? 1 : 0,
+      spePackageUrgents: this.spePackageUrgents.filter(v => v.checked).map(v => v.value).toString() || undefined,
+      spePackageDeptIds: this.spePackageDeptIds.length ? this.spePackageDeptIds.toString() : undefined,
+      spePackageTubeIds: this.spePackageTubeIds.length ? this.spePackageTubeIds.toString() : undefined,
+      spePackageInventoryTypes: this.spePackageInventoryTypes.filter(v => v.checked).map(v => v.value).toString() || undefined,
+      spePackageCreateOrder: this.spePackageCreateOrder[0].checked ? 1 : 0,
+      spePackageCodeSize: this.spePackageCodeSize || undefined,
     };
     this.btnLoading = true;
     this.mainService
@@ -241,7 +476,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
         }
       });
   }
-	
+
 	// 获取标本字典
 	labelData:any = [];
 	getLabelDic(){
@@ -249,7 +484,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 			this.labelData = data
 		});
 	}
-	
+
 	// 获取任务类型（病理标本）
 	taskTypeData:any;
 	getTaskTypesId() {
@@ -258,7 +493,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 			this.getConfig();
 		});
 	}
-	
+
   //获取任务类型
   getTaskType() {
     this.loading = true;
@@ -287,6 +522,34 @@ export class ConfigurationSpecimenComponent implements OnInit {
       });
   }
 
+  //获取任务类型
+  getTaskTypeByOrdinary(key) {
+    this.loading = true;
+    let postData = {
+      idx: 0,
+      sum: 10,
+      taskType: {
+        simpleQuery: true,
+        hosId: {
+          id: this.hosId
+        },
+        ordinaryField: {
+          key:"ordinary_field",
+          value: key
+        }
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "taskType", postData)
+      .subscribe((result) => {
+        this.loading = false;
+        if (result.status == 200) {
+          this.tasktype = result.list[0] || {};
+          this.getConfig();
+        }
+      });
+  }
+
   // 获取配置
   getConfig() {
     this.loading = true;
@@ -304,7 +567,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 			    }
 			  }
 			};
-		}else{
+		}else if(this.activeDictionaryKey=='pathology'){
 			postData = {
 			  idx: 0,
 			  sum: 10,
@@ -313,8 +576,21 @@ export class ConfigurationSpecimenComponent implements OnInit {
 					taskType:this.taskTypeData.id
 			  }
 			};
+		}else if(this.activeDictionaryKey=='specimenPackage'){
+			postData = {
+			  idx: 0,
+			  sum: 10,
+			  taskTypeConfig: {
+			    taskTypeDTO: {
+			      hosId: {
+			        id: this.hosId
+			      },
+			      ordinaryField: this.tasktype.ordinaryField
+			    }
+			  }
+			};
 		}
-    
+
     this.mainService
       .getFetchDataList("simple/data", "taskTypeConfig", postData)
       .subscribe((result) => {
@@ -322,7 +598,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
         if (result.status == 200) {
           this.configs = result.list[0] || {};
 					if(this.activeDictionaryKey=='examine'){
-						// 检查标本
+						// 检验标本
 						this.deptNotAlert[0].checked = this.configs.deptNotAlert == 1;
 						this.arriveScanCode[0].checked = this.configs.arriveScanCode == 1;
 						this.arriveScanDynamicCode[0].checked = this.configs.arriveScanDynamicCode == 1;
@@ -334,16 +610,79 @@ export class ConfigurationSpecimenComponent implements OnInit {
 						this.defaultScanSpe[0].checked = this.configs.defaultScanSpe == 1;
 						this.deptNotAlertIds = this.configs.deptNotAlertIds ? this.configs.deptNotAlertIds.split(',').map(v => +v) : [];
 						this.deptList = this.configs.deptNotAlertList || [];
-					}else{
-						// 病理标本
+            this.speCollectLimit[0].checked = this.configs.speCollectLimit == 1;
+						if(this.configs.speCollectLimit == 1){
+							this.speCollectSupportNotStartDept[0].checked = this.configs.speCollectSupportNotStartDept == 1;
+							this.speCollectLimitRepeat[0].checked  = this.configs.speCollectLimitRepeat == 1;
+							this.speCollectLimitTubeType = this.configs.speCollectLimitTubeType ? this.configs.speCollectLimitTubeType.split(',').map(v => +v) : [];
+							this.speStartCollectShowConfig[0].checked = this.configs.speStartCollectShowConfig == 1;
+							this.speCollectLimitState = this.configs.speCollectLimitState ? this.configs.speCollectLimitState.split(',').map(v => +v) : [];
+							this.speCollectLimitEndDept = this.configs.speCollectLimitEndDept ? this.configs.speCollectLimitEndDept.split(',').map(v => +v) : [];
+							this.speCollectLimitUrgent = this.configs.speCollectLimitUrgent ? this.configs.speCollectLimitUrgent.split(',').map(v => v) : [];
+						}
+					}else if(this.activeDictionaryKey=='pathology'){
+            // 病理标本
 						this.autoCreate[0].checked = this.configs.autoCreate == 1;
 						this.outpatientCreatePathologyForm[0].checked = this.configs.outpatientCreatePathologyForm == 1;
 						this.outpatientInVitroFixation[0].checked = this.configs.outpatientInVitroFixation == 1;
 						this.pathologyBarCode = this.configs.pathologyBarCode;
-						this.outpatientPathologyLabelSize = this.configs.outpatientPathologyLabelSize.id; //门诊病理标签样式
+						this.pathologyFrozenSpecimenNum = this.configs.pathologyFrozenSpecimenNum;
+						this.prompt = this.configs.prompt || '';
+            this.outpatientPathologyLabelSize = this.configs.outpatientPathologyLabelSize.id; //门诊病理标签样式
 						this.surgeryPathologyLabelSize = this.configs.surgeryPathologyLabelSize.id //手术病理标签样式
+					}else if(this.activeDictionaryKey=='specimenPackage'){
+						// 标本打包
+						this.spePackageUnionReceive = this.configs.spePackageUnionReceive || 0;
+						this.spePackageModel = this.configs.spePackageModel || undefined;
+            this.drugsCreateSign[0].checked = this.configs.drugsCreateSign == 1;
+            this.drugsReceiveSign[0].checked = this.configs.drugsReceiveSign == 1;
+
+            this.drugsStartCheck[0].checked = this.configs.drugsStartCheck == 1;
+            this.drugsStartCheckScanIds = this.drugsStartCheckScanIds.map(v => ({...v, checked: (this.configs.drugsStartCheckScanIds || '').split(',').includes(v.value.toString())}));
+            this.drugsStartManual = this.configs.drugsStartManual ? this.configs.drugsStartManual.id : undefined;
+
+            this.drugsEndCheck[0].checked = true;
+            this.drugsEndCheckScanIds = this.drugsEndCheckScanIds.map(v => ({...v, checked: (this.configs.drugsEndCheckScanIds || '').split(',').includes(v.value.toString())}));
+            this.drugsEndManual = this.configs.drugsEndManual ? this.configs.drugsEndManual.id : undefined;
+
+            this.spePackageAutoPack[0].checked = this.configs.spePackageAutoPack == 1;
+            this.spePackageUrgents = this.spePackageUrgents.map(v => ({...v, checked: (this.configs.spePackageUrgents || '').split(',').includes(v.value.toString())}));
+            this.spePackageDeptIds = this.configs.spePackageDeptIds ? this.configs.spePackageDeptIds.split(',').map(v => +v) : [];
+            this.deptList = this.configs.spePackageDeptList || [];
+            this.spePackageTubeIds = this.configs.spePackageTubeIds ? this.configs.spePackageTubeIds.split(',').map(v => +v) : [];
+            this.spePackageInventoryTypes = this.spePackageInventoryTypes.map(v => ({...v, checked: (this.configs.spePackageInventoryTypes || '').split(',').includes(v.value.toString())}));
+            this.spePackageCreateOrder[0].checked = this.configs.spePackageCreateOrder == 1;
+            this.spePackageCodeSize = this.configs.spePackageCodeSize || undefined;
 					}
         }
       });
   }
+
+  // 修改起点科室支持核对
+  changeDrugsStartCheck(e){
+    console.log(e);
+    if(!e[0].checked){
+      this.drugsStartCheckScanIds = this.drugsStartCheckScanIds.map(v => ({...v, checked: false}));
+      this.drugsStartManual = undefined;
+    }
+  }
+
+  // 修改终点科室支持核对
+  changeDrugsEndCheck(e){
+    console.log(e);
+    if(!e[0].checked){
+      this.drugsEndCheckScanIds = this.drugsEndCheckScanIds.map(v => ({...v, checked: false}));
+      this.drugsEndManual = undefined;
+    }
+  }
+
+  // 修改自动打包
+  changeSpePackageAutoPack(e){
+    console.log(e);
+    if(!e[0].checked){
+      this.spePackageUrgents = this.spePackageUrgents.map(v => ({...v, checked: false}));
+      this.spePackageDeptIds = [];
+      this.spePackageTubeIds = [];
+    }
+  }
 }

src/app/components/incidentManagement/incident-create/incident-create.component.html

@@ -178,8 +178,8 @@
                     </nz-select>
                   </div>
                   <div class="col">
-                    <span class="name">事件来源：</span>
-                    <nz-select class="w100" [(ngModel)]="incidentModel.source" nzAllowClear nzPlaceHolder="请选择事件来源">
+                    <span class="name">报修来源：</span>
+                    <nz-select class="w100" [(ngModel)]="incidentModel.source" nzAllowClear nzPlaceHolder="请选择报修来源">
                       <nz-option [nzValue]="item.id" [nzLabel]="item.name" *ngFor="let item of applicationSourceList"></nz-option>
                     </nz-select>
                   </div>

src/app/components/incidentManagement/incident-create/incident-create.component.ts

@@ -589,7 +589,7 @@ export class IncidentCreateComponent implements OnInit {
         this.isLoading = false;
         if (data.status == 200) {
           this.applicationPriorityList = data.list;
-          // 回显事件来源
+          // 回显报修来源
           let source = this.applicationSourceList.find(v => v.value === 'phone');
           if(!this.incidentModel.source && source){
             this.incidentModel.source = source.id;
@@ -597,7 +597,7 @@ export class IncidentCreateComponent implements OnInit {
         }
       });
   }
-  // 事件来源列表
+  // 报修来源列表
   applicationSourceList:any[] = [];
   searchApplicationSource(keyWord?) {
     this.mainService.getDictionary("list", "incident_source").subscribe((data) => {

src/app/components/incidentManagement/incident-detail/incident-detail.component.html

@@ -16,7 +16,8 @@
             </div>
             <div class="row">
               <div class="col">报修类型：{{incidentData.repairIncidentType?.name}}</div>
-              <div class="col display_flex flex2">报修录音：<audio class="audio" controls style="outline: none;" *ngIf="incidentData.reqRecord && audioRequireSrc"><source [src]="audioRequireSrc" type="audio/mp3"></audio></div>
+              <div class="col display_flex">报修录音：<audio class="audio" controls style="outline: none;" *ngIf="incidentData.reqRecord && audioRequireSrc"><source [src]="audioRequireSrc" type="audio/mp3"></audio></div>
+              <div class="col">报修来源：{{incidentData.source?.name}}</div>
             </div>
             <div class="row">
               <div class="col">故障现象：{{incidentData.category?.mutiCategory}}</div>
@@ -39,7 +40,7 @@
             </div>
             <div class="row">
               <div class="col">来电电话：{{incidentData.incomingPhone}}</div>
-              <div class="col"><audio class="audio" controls style="outline: none;" *ngIf="incidentData.callID && audioSrc"><source [src]="audioSrc" type="audio/wav"></audio></div>
+              <div class="col display_flex">来电录音：<audio class="audio" controls style="outline: none;" *ngIf="incidentData.callID && audioSrc"><source [src]="audioSrc" type="audio/wav"></audio></div>
               <div class="col"><ng-container *ngIf="incidentData.assetDTO">关联资产：{{incidentData.assetDTO?.name}}</ng-container></div>
             </div>
             <div class="row">

src/app/components/incidentManagement/incident-detail/incident-detail.component.less

@@ -318,7 +318,7 @@
     }
   }
   .audio{
-    width: 264px;
+    width: 220px;
     height: 1.5em;
   }
 }

src/app/components/incidentManagement/incident-detail/incident-detail.component.ts

@@ -88,12 +88,14 @@ export class IncidentDetailComponent implements OnInit {
         this.message.remove(this.maskFlag);
         this.maskFlag = false;
         this.incidentData = result.data || {};
-
+				if(this.incidentData.wxdegree){
+					this.incidentData.wxdegree.value = Number(this.incidentData.wxdegree.value)
+				}
         this.clickTbab(this.tabs[0]);
 
         let logs = this.incidentData.logs || [];
         this.resolveLogs = logs.filter(v => v.logType.value == 'resolve').slice(0, 1);
-        this.callbackLogs = logs.filter(v => v.logType.value == 'callback').slice(0, 1);
+				this.callbackLogs = logs.filter(v => v.logType.value == 'callback').slice(0, 1);
 
         this.getHospitalConfig();
       });

src/app/components/incidentManagement/incident-handle-order/incident-handle-order.component.html

@@ -9,7 +9,8 @@
           <div class="value">
             <span class="unitPrice">单价：{{ item.consumableEndPrice }}元</span>
             <button nz-button class="btn default ml8" (click)="editConsumable(item)">编辑</button>
-          </div>
+						<button nz-button class="btn default ml8" (click)="logView(1,item)">日志</button>
+					</div>
         </div>
 
         <div class="row">
@@ -39,7 +40,8 @@
           <div class="value">
             <span class="unitPrice">单价：{{ item.wage }}元</span>
             <button nz-button class="btn default ml8" (click)="editWorkHourManagement(item)">编辑</button>
-          </div>
+						<button nz-button class="btn default ml8" (click)="logView(2,item)">日志</button>
+					</div>
         </div>
 
         <div class="row">
@@ -137,3 +139,44 @@
 <!-- 删除模态框 -->
 <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
 (confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 日志查看模态框 -->
+	<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="logModal">
+	  <div class="modalBody modalLogBody">
+	    <div class="title">日志查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+	    </div>
+	    <div class="content">
+	      <div class="list-template__bottom">
+	        <nz-table class="list-template__nzTable" [nzData]="listLogOfData" nzSize="middle" [nzShowPagination]="false"
+	          [nzLoading]="loading2">
+	          <thead>
+	            <tr class="thead">
+								<th>动作</th>
+	              <th>操作时间</th>
+	              <th>操作人</th>
+	              <th>调整记录</th>
+	            </tr>
+	          </thead>
+	          <tbody>
+	            <tr *ngFor="let data of listLogOfData">
+								<td>{{ data.operationType ? data.operationType.name : '-' }}</td>
+								<td *ngIf="operationType==1">{{ data.time|date:'yyyy-MM-dd HH:mm'}}</td>
+								<td *ngIf="operationType==2">{{ data.operationTime|date:'yyyy-MM-dd HH:mm'}}</td>
+								<td *ngIf="operationType==1">{{ data.operator ? data.operator.name : '-' }}</td>
+								<td *ngIf="operationType==2">{{ data.operationUserDTO ? data.operationUserDTO.name : '-' }}</td>
+								<td>{{ data.logRemark ? data.logRemark : '-' }} <span *ngIf="data.operationType.value==6">单价:{{ data.currentPrice }} &nbsp;&nbsp;积分:{{ data.currentScore.value }}</span></td>
+	            </tr>
+	          </tbody>
+	        </nz-table>
+	      </div>
+			<!-- 	<div class="list-template__pagination">
+				  <nz-pagination [(nzPageIndex)]="pageLogIndex" [(nzTotal)]="listLogLength" nzShowSizeChanger [(nzPageSize)]="pageLogSize"
+				    (nzPageIndexChange)="getLogList()" (nzPageSizeChange)="getLogList()">
+				  </nz-pagination>
+				</div> -->
+	    </div>
+	    <div class="display_flex justify-content_flex-center">
+	      <button class="btn" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+	    </div>
+	  </div>
+	</div>

src/app/components/incidentManagement/incident-handle-order/incident-handle-order.component.less

@@ -333,6 +333,124 @@
           }
         }
       }
+			
+			
+			.modalLogBody {
+			  width: 80%;
+			  height: auto;
+			
+			  .content {
+			    width: 100%;
+			    height: auto;
+			    padding: 19px 14px 20px 14px;
+			    max-height: 500px;
+			    overflow-y: auto;
+					
+					.list-template__bottom {
+					  background: #f9fafb;
+					  border: 1px solid #e5e9ed;
+					  border-radius: 8px;
+					  // padding-bottom: 56px;
+					  position: relative;
+					  .list-template__nzTable {
+					    padding: 16px 16px 0;
+					
+					    .thead {
+					      background-image: linear-gradient(to right, @bg-start, @bg-end);
+					
+					      th {
+					        background: transparent;
+					        color: #fff;
+					        text-align: center;
+					      }
+					    }
+					
+					    .ant-table-body {
+					      border-bottom: 1px solid #e5e9ed;
+					    }
+					
+					    .ant-table-tbody {
+					      tr {
+					        text-align: center;
+					        color: #333;
+					
+					        td {
+					          border: none;
+					
+					          &.tab_hover:hover{
+					            text-decoration: underline;
+					            cursor: pointer;
+					          }
+					
+					          .coop {
+					            button{
+					              color: #333;
+					            }
+					            span,button {
+					              display: inline-block;
+					              padding: 0 8px;
+					              cursor: pointer;
+					              position: relative;
+					
+					              &::after {
+					                content: "|";
+					                position: absolute;
+					                top: 0;
+					                right: 0;
+					              }
+					
+					              &:hover,
+					              &:active {
+					                color: @primary-color;
+					              }
+					
+					              &:nth-last-child(1) {
+					                &::after {
+					                  content: "";
+					                }
+					              }
+					            }
+					          }
+					        }
+					      }
+					    }
+					  }
+					}
+										
+			    .addForm {
+			      .ant-form-item {
+			        margin-bottom: 14px;
+			
+			        .ant-form-item-label {
+			          line-height: 14px;
+			          text-align: left;
+			        }
+			      }
+			    }
+			
+			    .editForm {
+			      .ant-form-item {
+			        margin-bottom: 14px;
+			
+			        .ant-form-item-label {
+			          line-height: 0;
+			          text-align: left;
+			        }
+			      }
+			    }
+					.list-template__pagination {
+						text-align: right;
+						padding: 20px 0;
+					}
+			  }
+				
+				
+			  button {
+			    &:nth-child(1) {
+			      margin-right: 20px;
+			    }
+			  }
+			}
     }
   }
 }

src/app/components/incidentManagement/incident-handle-order/incident-handle-order.component.ts

@@ -38,7 +38,81 @@ export class IncidentHandleOrderComponent implements OnInit {
     this.getHospitalConfig();
     this.getWorkHourManagementList();
   }
-
+	
+	// 工时日志列表
+	listLogOfData: any[] = []; //日志数据
+	pageLogIndex: number = 1; //日志当前页码
+	pageLogSize: number = 10; //日志每页展示条数
+	listLogLength: number = 10; //日志总数据量
+	loading2:boolean = false;
+	getHourLogList() {
+	  let data = {
+	    idx: 0,
+	    sum: 99999,
+	    workHourManagementLog: {
+				workHourId: this.itemData.id,
+				repairSummaryId: this.summaryId
+	    },
+	  };
+	  this.loading2 = true;
+	  this.mainService
+	    .getFetchDataList("simple/data", "workHourManagementLog", data)
+	    .subscribe((data) => {
+	      this.loading2 = false;
+	      if (data.status == 200) {
+					this.logModal = true
+	        this.listLogOfData = data.list;
+	        // this.listLogLength = data.totalNum;
+	      }else{
+	        this.message.error(data.msg || "请求数据失败");
+	      }
+	    });
+	}
+	
+	// 耗材日志列表
+	getConsumableLogList() {
+	  let data = {
+	    idx: 0,
+	    sum: 99999,
+			assetConsumablesHistory: {
+			  assetConsumablesId: this.itemData.consumableId,
+				repairSummaryId: this.summaryId
+			},
+	  };
+	  this.loading2 = true;
+	  this.mainService
+	    .getFetchDataList("simple/data", "assetConsumablesHistory", data)
+	    .subscribe((data) => {
+	      this.loading2 = false;
+	      if (data.status == 200) {
+					this.logModal = true
+	        this.listLogOfData = data.list;
+	        // this.listLogLength = data.totalNum;
+	      }else{
+	        this.message.error(data.msg || "请求数据失败");
+	      }
+	    });
+	}
+	
+	// 查看日志
+	itemData:any = {};
+	logModal:boolean = false;
+	operationType:any;
+	logView(type, data){
+		this.operationType = type;
+		this.itemData = data;
+		if(type==1){ //耗材
+			this.getConsumableLogList()
+		}else{ //日志
+			this.getHourLogList()
+		}
+	}
+	
+	// 关闭日志
+	hideModal() {
+	  this.logModal = false;
+	}
+	
   // ============耗材start=================
 
   // 新增耗材/工时弹框
@@ -312,6 +386,7 @@ export class IncidentHandleOrderComponent implements OnInit {
       workHourManagement: {
         hosId: this.hosId,
         showSecond: 1,
+				disableType:1
       },
       idx: 0,
       sum: 9999,

src/app/components/order-scope/order-scope.component.html

@@ -49,6 +49,15 @@
             </nz-radio-group>
           </div>
         </div>
+				<div nz-row>
+				  <div nz-col nzSpan="5">是否展示重新指派：</div>
+				  <div nz-col nzSpan="19">
+				    <nz-radio-group class="w100" [(ngModel)]="showReassign" [nzDisabled]="!activeScopeTab.checked">
+				      <label nz-radio [nzValue]="1">是</label>
+				      <label nz-radio [nzValue]="0">否</label>
+				    </nz-radio-group>
+				  </div>
+				</div>
       </div>
       <!-- 配送 -->
       <div class="conditions" *ngIf="scopeTabs.length>0 && activeScopeTab.value == 2">

src/app/components/order-scope/order-scope.component.ts

@@ -3,7 +3,7 @@ import { EventEmitter } from '@angular/core';
 import { MainService } from 'src/app/services/main.service';
 import { ToolService } from 'src/app/services/tool.service';
 import { NzMessageService } from 'ng-zorro-antd';
-import { Router } from "@angular/router";
+import { Router, ActivatedRoute } from "@angular/router";
 
 @Component({
   selector: 'app-order-scope',
@@ -22,14 +22,15 @@ export class OrderScopeComponent implements OnInit {
     orderScopeRadio: undefined,
   }
 	@Input() coopBtns:any;
-	
+
   @Output() confirmModal = new EventEmitter();
   @Output() cancelModal = new EventEmitter();
   constructor(
     private mainService: MainService,
     private tool: ToolService,
     private message: NzMessageService,
-		public router: Router
+		public router: Router,
+		public route: ActivatedRoute
   ) { }
 
   user = JSON.parse(localStorage.getItem("user")); //用户信息
@@ -45,9 +46,12 @@ export class OrderScopeComponent implements OnInit {
 	activeScopeTab:any;
 	//#region 工单范围-运维start
 	allDuty:number = 1;
+	showReassign:any = 0;
 	menuList:any;
-	
+
   ngOnInit() {
+		let btn = this.tool.initCoopBtns(this.route)
+		console.log(77777,btn)
 		let menuItem = JSON.parse(localStorage.getItem("menuItem"))
 		this.menuList = menuItem.find(i=>i.link=='gongdanfanwei')
     this.initItsm();
@@ -76,7 +80,7 @@ export class OrderScopeComponent implements OnInit {
 				}
 			}
 		}
-		
+
 		if(this.scopeTabs.length>0){
 			this.activeScopeTab = this.scopeTabs[0]
 		}
@@ -99,7 +103,8 @@ export class OrderScopeComponent implements OnInit {
     itsmGetOrderScope() {
       // 是否不限制部门
       this.allDuty = this.itsmData.allDuty === undefined ? 1 : this.itsmData.allDuty;
-      // 权限内的院区和组
+      this.showReassign = this.itsmData.showReassign || 0;
+			// 权限内的院区和组
       let hosList = this.user.infoPermission.dutyList || [];
       let groups = this.user.infoPermission.dutyGroupList || [];
 
@@ -383,6 +388,7 @@ export class OrderScopeComponent implements OnInit {
 
       if(itsm && itsm.checked){
         postData.workerOrderScope.allDuty = this.allDuty;
+				postData.workerOrderScope.showReassign = this.showReassign;
         postData.workerOrderScope.dutyIds = this.itsmCheckedHos.filter(v => v.checked).map(v => v.value).toString() || undefined;
         postData.workerOrderScope.dutyGroupIds = this.itsmCheckedGroup.filter(v => v.checked).map(v => v.value).toString() || undefined;
         postData.workerOrderScope.dutyRange = this.itsmOrderScopeRadio - 0;

src/app/components/select-menu/select-menu.component.ts

@@ -36,6 +36,9 @@ export class SelectMenuComponent implements OnInit {
     let nurseConfig = menus.find(item => item.link == 'nurseConfig');
     nurseConfig && configurationCenterMenus.push(nurseConfig);
     this.configurationCenterMenus = configurationCenterMenus;
+		// 数据生成
+		let dataGenerate = menus.find(item => item.link == 'dataGenerate');
+		dataGenerate && configurationCenterMenus.push(dataGenerate);
   }
   clickHandle(item){
     this.router.navigateByUrl(item.link);

src/app/guard/DataGenerate.guard.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class DataGenerateGuard implements CanActivate  {
+  constructor(public router: Router) { }
+
+  canActivate(): boolean {
+    const menus = JSON.parse(localStorage.getItem('menu'));
+    let can = false;
+    if (menus) {
+      can = menus.some(e => e.link == 'dataGenerate');
+    }
+    if (!can) {
+      this.router.navigate(['login']);
+      return false
+    }
+    return true;
+  }
+}

src/app/guard/inspectClosedLoopView.guard.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class InspectClosedLoopViewGuard implements CanActivate  {
+  constructor(public router: Router) { }
+
+  canActivate(): boolean {
+    const menus = JSON.parse(localStorage.getItem('menu'));
+    let can = false;
+    if (menus) {
+      can = menus.some(e => e.link == 'inspectClosedLoopView');
+    }
+    if (!can) {
+      this.router.navigate(['login']);
+      return false
+    }
+    return true;
+  }
+}

src/app/services/date.service.ts

@@ -10,6 +10,8 @@ import {
   addYears,
   endOfYear,
   endOfWeek,
+  endOfDay,
+  format,
 } from "date-fns";
 
 @Injectable({
@@ -17,10 +19,66 @@ import {
 })
 export class DateService {
   constructor() {}
+  // 获取日期快捷类型
+  getDateType(dateRange){
+    console.log('dateRange:', dateRange)
+    let [startDate, endDate] = dateRange;
+    if(startDate == format(this.date().yesterdayStartDate, 'yyyy-MM-dd HH:mm:ss') && endDate == format(this.date().yesterdayEndDate, 'yyyy-MM-dd HH:mm:ss')){
+      return 1;
+    }else if(startDate == format(this.date().thisWeekStartDate, 'yyyy-MM-dd HH:mm:ss') && endDate == format(this.date().thisWeekEndDate, 'yyyy-MM-dd HH:mm:ss')){
+      return 2;
+    }else if(startDate == format(this.date().thisMonthStartDate, 'yyyy-MM-dd HH:mm:ss') && endDate == format(this.date().thisMonthEndDate, 'yyyy-MM-dd HH:mm:ss')){
+      return 3;
+    }else if(startDate == format(this.date().thisYearStartDate, 'yyyy-MM-dd HH:mm:ss') && endDate == format(this.date().thisYearEndDate, 'yyyy-MM-dd HH:mm:ss')){
+      return 4;
+    }else if(startDate == format(this.date().lastWeekStartDate, 'yyyy-MM-dd HH:mm:ss') && endDate == format(this.date().lastWeekEndDate, 'yyyy-MM-dd HH:mm:ss')){
+      return 5;
+    }else if(startDate == format(this.date().lastMonthStartDate, 'yyyy-MM-dd HH:mm:ss') && endDate == format(this.date().lastMonthEndDate, 'yyyy-MM-dd HH:mm:ss')){
+      return 6;
+    }else if(startDate == format(this.date().lastYearStartDate, 'yyyy-MM-dd HH:mm:ss') && endDate == format(this.date().lastYearEndDate, 'yyyy-MM-dd HH:mm:ss')){
+      return 7;
+    }
+  }
   /**
    * 日期操作
    */
   date() {
+    //获得昨日的开始日期(昨日 00:00:00)
+    function getYesterdayStartDate() {
+      return addDays(startOfDay(new Date()), -1);
+    }
+    //获得昨日的结束日期(昨日 23:59:59)
+    function getYesterdayEndDate() {
+      return addDays(endOfDay(new Date()), -1);
+    }
+
+    //获得本周的开始日期(本周一 00:00:00)
+    function getThisWeekStartDate() {
+      return startOfWeek(new Date(), { weekStartsOn: 1 });
+    }
+    //获得本周的结束日期(本周日 23:59:59)
+    function getThisWeekEndDate() {
+      return endOfWeek(new Date(), { weekStartsOn: 1 });
+    }
+
+    //获得本月开始时间(本月1号 00：00：00)
+    function getThisMonthStartDate() {
+      return startOfMonth(new Date());
+    }
+    //获得本月结束时间(本月底 23:59:59)
+    function getThisMonthEndDate() {
+      return endOfMonth(new Date());
+    }
+
+    //获得本年的开始日期(本年1月1日 00：00：00)
+    function getThisYearStartDate() {
+      return startOfYear(new Date());
+    }
+    //获得本年的结束日期(本年12月31日 23:59:59)
+    function getThisYearEndDate() {
+      return endOfYear(new Date());
+    }
+
     //获得上周的开始日期(上周一 00:00:00)
     function getLastWeekStartDate() {
       return addDays(startOfWeek(new Date()), -6);
@@ -29,6 +87,7 @@ export class DateService {
     function getLastWeekEndDate() {
       return addDays(endOfWeek(new Date()), -6);
     }
+
     //获得上月开始时间(上月1号 00：00：00)
     function getLastMonthStartDate() {
       return startOfMonth(addMonths(new Date(), -1));
@@ -37,6 +96,7 @@ export class DateService {
     function getLastMonthEndDate() {
       return endOfMonth(addMonths(new Date(), -1));
     }
+
     //获得上年的开始日期(去年1月1日 00：00：00)
     function getLastYearStartDate() {
       return startOfYear(addYears(new Date(), -1));
@@ -45,7 +105,16 @@ export class DateService {
     function getLastYearEndDate() {
       return endOfYear(addYears(new Date(), -1));
     }
+
     return {
+      yesterdayStartDate: getYesterdayStartDate(),
+      yesterdayEndDate: getYesterdayEndDate(),
+      thisWeekStartDate: getThisWeekStartDate(),
+      thisWeekEndDate: getThisWeekEndDate(),
+      thisMonthStartDate: getThisMonthStartDate(),
+      thisMonthEndDate: getThisMonthEndDate(),
+      thisYearStartDate: getThisYearStartDate(),
+      thisYearEndDate: getThisYearEndDate(),
       lastWeekStartDate: getLastWeekStartDate(),
       lastWeekEndDate: getLastWeekEndDate(),
       lastMonthStartDate: getLastMonthStartDate(),

src/app/services/main.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from "@angular/core";
 import { HttpClient, HttpHeaders } from "@angular/common/http";
 
 import host from "../../assets/js/http";
-import { Observable } from "rxjs";
+import { Observable, of } from "rxjs";
 import { AES, mode, pad, enc } from "crypto-js";
 import { MarkingService } from './marking.service';
 
@@ -1107,5 +1107,115 @@ export class MainService {
 			responseType: "arraybuffer",
 		});
 	}
-	
+	// 恢复删除的用户
+	recoveryUser(data){
+		return this.http.post(host.host + `/user/data/recoveryUser`, data, {
+		  headers: this.headers,
+		});
+	}
+	// 闭环数据生成-生成数据
+	generateData(data){
+		return this.http.post(host.host + `/api/patchData/execute`, data, {
+		  headers: this.headers,
+		});
+	}
+
+	// 闭环数据生成-查询数据
+	queryCount(data){
+		return this.http.post(host.host + `/api/patchData/queryCount`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 根据当前日期查询陪检批量建单设置中的默认时间
+	getPatientInspectTime(data = {}){
+		return this.http.post(host.host + `/nurse/patientInspect/getPatientInspectTime`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 根据当前日期查询陪检批量建单设置中的默认时间
+	bindPatientInspect(data = {}){
+		return this.http.post(host.host + `/nurse/patientInspect/bindPatientInspect`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 根据当患者查检查
+	getPatientInspectList(data = {}){
+		return this.http.post(host.host + `/nurse/patientInspect/getPatientInspectList`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 批量-检查项目转检验项目
+	addPatientInspectList(data = {}){
+		return this.http.post(host.host + `/nurse/patientInspect/addPatientInspectList`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 护士端-批量陪检图标下两个数字
+	getPatientInspectCount(data = {}){
+		return this.http.post(host.host + `/nurse/patientInspect/getPatientInspectCount`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 标本打包-获取患者、试管类型列表、标本总数
+	querySaveSpePackage(data = {}){
+		return this.http.post(host.host + `/nurse/specimen/querySaveSpePackage`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 标本打包-新增标本
+	addPackageSpe(data = {}){
+		return this.http.post(host.host + `/nurse/specimen/addPackageSpe`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 标本打包-移除标本
+	removePackageSpe(data = {}){
+		return this.http.post(host.host + `/nurse/specimen/removePackageSpe`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 标本打包-重置
+	resetPackageSpe(data = {}){
+		return this.http.post(host.host + `/nurse/specimen/resetPackageSpe`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 标本打包-建单
+	createOrTakeOrderSpecimen(data = {}){
+		return this.http.post(host.host + `/transflow/createOrTakeOrder`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 标本打包-打印
+	makeQrCode(data = {}, code){
+		return this.http.post(host.host + `/workerOrder/makeQrCode/specimenPackage/${code}`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 护士端-标本打包图标下两个数字
+	getSpePackageCount(data = {}){
+		return this.http.post(host.host + `/nurse/specimen/getSpePackageCount`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 标本打包-标本包里的标本的所有终点科室列表
+	getSpePackageEndDeptList(data = {}){
+		return this.http.post(host.host + `/nurse/specimen/getSpePackageEndDeptList`, data, {
+		  headers: this.headers,
+		});
+	}
+
 }

src/app/services/tool.service.ts

@@ -312,6 +312,12 @@ export class ToolService {
 				case "callCenter":
 				  coopBtns.callCenter = true; //呼叫中心
 				  break;
+				case "log":
+				  coopBtns.log = true; //日志
+					break
+				case "viewGd":
+				  coopBtns.viewGd = true; //查看工单
+				  break;
       }
     });
     console.log(coopBtns);

src/app/share/add-inspect-modal/add-inspect-modal.component.html

@@ -0,0 +1,72 @@
+<div class="modal display_flex justify-content_flex-center align-items_center">
+  <div class="modalBody" style="width: 1200px;">
+    <div class="title">追加项目<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <div class="patient">
+        <span>患者姓名：{{patientInspectLogDTO.patientName}}</span>
+        <span *ngIf="patientInspectLogDTO.patientType && patientInspectLogDTO.patientType.value == 'I'">住院号：{{patientInspectLogDTO.patientCode}}（{{patientInspectLogDTO.bedNum}}）</span>
+        <span *ngIf="patientInspectLogDTO.patientType && patientInspectLogDTO.patientType.value == 'O'">门诊号：{{patientInspectLogDTO.patientCode}}</span>
+        <span *ngIf="patientInspectLogDTO.patientType && patientInspectLogDTO.patientType.value == 'E'">急诊号：{{patientInspectLogDTO.patientCode}}</span>
+        <span>护理级别：{{patientInspectLogDTO.careLevel?.name}}</span>
+        <span>危重等级：{{patientInspectLogDTO.illnessState?.name}}</span>
+      </div>
+      <div class="tabs">
+        <div class="tab" [ngClass]="{ active: activeTabId == item.id }" *ngFor="let item of tabList" (click)="selectTab(item.id)">{{item.name}}</div>
+      </div>
+      <div class="tableWrap">
+        <ng-container *ngIf="activeTabId == 1">
+          <nz-table class="hospitalTable" [nzData]="data1List" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="hsLoading" (nzCurrentPageDataChange)="currentPageData1Change($event)" [nzScroll]="{ y: '385px' }">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="4%" nzShowCheckbox [(nzChecked)]="isAllDisplayData1Checked" [nzIndeterminate]="isIndeterminateData1"
+                  (nzCheckedChange)="checkAllData1($event)"></th>
+                <th nzWidth="32%">检查项目</th>
+                <th nzWidth="32%">检查地点</th>
+                <th nzWidth="32%">预约时间</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of data1List;let i = index;" (click)="selectedListData1(data.id)">
+                <td nzShowCheckbox [(nzChecked)]="mapOfCheckedData1Id[data.id]" (nzCheckedChange)="refreshData1Status()"></td>
+                <td>{{ data.inspectName}}</td>
+                <td>{{ deptDisplay == 2 ? data.execDept?.deptalias : data.execDept?.dept }}</td>
+                <td>{{ data.yyTime | date:"yyyy-MM-dd HH:mm" }}</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </ng-container>
+
+        <ng-container *ngIf="activeTabId == 2">
+          <div class="inspectType">
+            检查类型：<u *ngFor="let item of inspectCheckItemList" (click)="clickInspectCheckItem(item.id)" [ngClass]="{ active: activeInspectCheckItemId == item.id }">{{item.name}}</u>
+          </div>
+          <nz-table class="hospitalTable" [nzData]="data2List" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="hsLoading" (nzCurrentPageDataChange)="currentPageData2Change($event)" [nzScroll]="{ y: '385px' }">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="4%" nzShowCheckbox [(nzChecked)]="isAllDisplayData2Checked" [nzIndeterminate]="isIndeterminateData2"
+                  (nzCheckedChange)="checkAllData2($event)"></th>
+                <th nzWidth="32%">检查项目</th>
+                <th nzWidth="32%">检查地点</th>
+                <th nzWidth="32%">检查类型</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of data2List;let i = index;" (click)="selectedListData2(data.id)">
+                <td nzShowCheckbox [(nzChecked)]="mapOfCheckedData2Id[data.id]" (nzCheckedChange)="refreshData2Status()"></td>
+                <td>{{ data.name}}</td>
+                <td>{{ deptDisplay == 2 ? data.extra4DTO?.deptalias : data.extra4DTO?.dept }}</td>
+                <td>{{ data.extra5DTO?.name }}</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </ng-container>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn" nz-button nzType="primary" (click)="confirmModal()">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/share/add-inspect-modal/add-inspect-modal.component.less

@@ -0,0 +1,194 @@
+@import "../../../../src/theme.less";
+.patient{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 56px;
+  font-size: 18px;
+  padding: 0 24px;
+}
+.tabs{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 45px;
+  font-size: 14px;
+  border-top: 1px solid #e5e9ed;
+  border-bottom: 1px solid #e5e9ed;
+  .tab{
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    cursor: pointer;
+    &.active{
+      background-color: #F0F6ED;
+    }
+  }
+}
+.tableWrap{
+  padding: 16px;
+  .inspectType{
+    padding-bottom: 16px;
+    text-align: left!important;
+    u{
+      margin-right: 8px;
+      cursor: pointer;
+      &.active{
+        color: @primary-color;
+      }
+    }
+  }
+}
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+      position: relative;
+      word-break: break-all;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .ji {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    width: 30px;
+  }
+
+  .list-template__top{
+    div{
+      text-align: left!important;
+    }
+  }
+
+  .modalBody {
+    width: 700px;
+    min-height: 220px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      height: 603px;
+      min-height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
+        }
+
+        &.pagination {
+          font-size: 14px;
+          color: #666;
+          padding-top: 16px;
+          padding-bottom: 16px;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/share/add-inspect-modal/add-inspect-modal.component.ts

@@ -0,0 +1,192 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { MainService } from '../../services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+import { startOfDay, format } from 'date-fns';
+import { NzMessageService } from 'ng-zorro-antd';
+@Component({
+  selector: 'app-add-inspect-modal',
+  templateUrl: './add-inspect-modal.component.html',
+  styleUrls: ['./add-inspect-modal.component.less']
+})
+export class AddInspectModalComponent implements OnInit {
+  // 切换科室，切换弹窗
+  isAllDisplayData1Checked = false;
+  isAllDisplayData2Checked = false;
+  listOfDisplayData1: any[] = [];
+  listOfDisplayData2: any[] = [];
+  mapOfCheckedData1Id: { [key: string]: boolean } = {};
+  mapOfCheckedData2Id: { [key: string]: boolean } = {};
+  isIndeterminateData1 = false;
+  isIndeterminateData2 = false;
+  currentDept; //当前科室
+
+  hosId;
+  hsLoading = false;
+  data1List: any = [];// 列表
+  data2List: any = [];// 列表
+
+  tabList:any[] = [
+    {id: 1, name: '检查项目'},
+    {id: 2, name: '手动添加'},
+  ]
+  activeTabId: number = 1;
+  @Input() patientInspectLogDTO: any;
+  @Input() deptDisplay: any;
+
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) { }
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.currentDept = this.tool.getCurrentUserDept();
+    this.getList();
+  }
+
+  // 选择tab
+  selectTab(id){
+    this.activeTabId = id;
+    this.getList();
+  }
+
+  currentPageData1Change($event: any[]): void {
+    this.listOfDisplayData1 = this.data1List; //改变页数，长度也要变
+    this.refreshData1Status();
+  }
+
+  currentPageData2Change($event: any[]): void {
+    this.listOfDisplayData2 = this.data2List; //改变页数，长度也要变
+    this.refreshData2Status();
+  }
+
+  refreshData1Status(): void {
+    this.isAllDisplayData1Checked = this.listOfDisplayData1.length ? this.listOfDisplayData1.every(
+      (item) => this.mapOfCheckedData1Id[item.id]
+    ) : false;
+    this.isIndeterminateData1 = this.listOfDisplayData1.some((item) => this.mapOfCheckedData1Id[item.id]) && !this.isAllDisplayData1Checked;
+  }
+
+  refreshData2Status(): void {
+    this.isAllDisplayData2Checked = this.listOfDisplayData2.length ? this.listOfDisplayData2.every(
+      (item) => this.mapOfCheckedData2Id[item.id]
+    ) : false;
+    this.isIndeterminateData2 = this.listOfDisplayData2.some((item) => this.mapOfCheckedData2Id[item.id]) && !this.isAllDisplayData2Checked;
+  }
+
+  // 开通科室选择整行
+  selectedListData1(id) {
+    this.mapOfCheckedData1Id[id] = !this.mapOfCheckedData1Id[id];
+    this.refreshData1Status();
+  }
+
+  // 开通科室选择整行
+  selectedListData2(id) {
+    this.mapOfCheckedData2Id[id] = !this.mapOfCheckedData2Id[id];
+    this.refreshData2Status();
+  }
+
+  checkAllData1(value: boolean): void {
+    this.listOfDisplayData1.forEach(
+      (item) => (this.mapOfCheckedData1Id[item.id] = value)
+    );
+    this.refreshData1Status();
+  }
+
+  checkAllData2(value: boolean): void {
+    this.listOfDisplayData2.forEach(
+      (item) => (this.mapOfCheckedData2Id[item.id] = value)
+    );
+    this.refreshData2Status();
+  }
+
+  // 确认弹窗
+  confirmModal() {
+    console.log(this[`mapOfCheckedData${this.activeTabId}Id`]);
+    let list = [];
+    for (const key in this[`mapOfCheckedData${this.activeTabId}Id`]) {
+      if (this[`mapOfCheckedData${this.activeTabId}Id`][key]) {
+        list.push({id: key});
+      }
+    }
+    if(list.length == 0){
+      this.message.warning('请选择数据');
+      return;
+    }
+    this.confirmModelHs.emit(JSON.stringify({ show: false, list, type: this.activeTabId }));//emits(向上弹射)事件
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  getList(){
+    if(this.activeTabId == 1){
+      this.getList1();
+    }else if(this.activeTabId == 2){
+      this.getInspectCheckItem();
+      this.getList2();
+    }
+  }
+
+  // 获取列表数据
+  getList1() {
+    let postData = {
+      startTime: format(startOfDay(new Date()), 'yyyy-MM-dd HH:mm:ss'),
+      patientCodes: this.patientInspectLogDTO.patientCode,
+      inspectStateValue: 1,//待陪检
+      noneGdid: 1,//未绑定工单
+      nonePilId: 1,//未绑定患者闭环
+      deptId: this.currentDept.id,
+    }
+    this.hsLoading = true;
+    this.mainService.getPatientInspectList(postData).subscribe((data: any) => {
+      this.hsLoading = false;
+      this.data1List = data.list || [];
+    })
+  }
+
+  // 获取列表数据
+  getList2() {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      dictionary: {
+        key: 'inspect_check_type',
+        extra5: this.activeInspectCheckItemId,
+      }
+    }
+    this.hsLoading = true;
+    this.mainService.getFetchDataList('simple/data','dictionary',postData).subscribe(data => {
+      this.hsLoading = false;
+      this.data2List = data.list || [];
+    })
+  }
+
+  // 获取检查项目
+  inspectCheckItemList:any[] = [];
+  activeInspectCheckItemId;
+  getInspectCheckItem() {
+    this.mainService.getDictionary("list", "inspect_check_item").subscribe((data) => {
+			this.inspectCheckItemList = data || [];
+		});
+  }
+
+  clickInspectCheckItem(id){
+    if(this.activeInspectCheckItemId == id){
+      this.activeInspectCheckItemId = undefined;
+    }else{
+      this.activeInspectCheckItemId = id;
+    }
+    this.getList2();
+  }
+
+}
+
+
+

src/app/share/appraise-detail/appraise-detail.component.html

@@ -1,437 +1,449 @@
 <!-- 药品/静配 -->
 <div class="detail" *ngIf="!maskFlag">
-  <div class="title">差评查看<i class="icon_transport transport-guanbi" (click)="close()"></i></div>
-  <div class="box">
-    <div class="tab display_flex">
-      <div [ngClass]="{'item':true, 'flex_1':true, 'checked':tabType==1}" (click)="checkTab(1)">工单信息</div>
-      <div [ngClass]="{'item':true, 'flex_1':true, 'checked':tabType==2}" (click)="checkTab(2)">评价内容</div>
-      <div [ngClass]="{'item':true, 'flex_1':true, 'checked':tabType==3}" (click)="checkTab(3)">调解</div>
-    </div>
-    <!-- 其他类型工单信息 -->
-    <div *ngIf="(tabType==1)&&(orderInfo.workOrderObj.taskType.associationType.value=='other')" class="content orders">
-      <div class="top">
-        <div class="num">
-          <span class="left">单号：{{orderInfo.workOrderObj.gdcode}}</span>
-          <span class="right">{{orderInfo.workOrderObj.gdState?orderInfo.workOrderObj.gdState.name:''}}</span>
-        </div>
-        <div class="info" nz-row>
-          <div nz-col nzSpan="6">工单日期：{{orderInfo.workOrderObj.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
-          <div nz-col nzSpan="6">总耗时：{{orderInfo.workOrderObj.showTimeNum}}</div>
-          <div nz-col nzSpan="8">申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}<ng-container *ngIf="orderInfo.workOrderObj.goodsRemark">-{{orderInfo.workOrderObj.goodsRemark}}</ng-container>
-          </div>
-          <div nz-col nzSpan="4">配送人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
-        </div>
-        <div class="info" nz-row>
-          <div nz-col nzSpan="6">
-            申请科室：{{orderInfo.workOrderObj.createDeptDTO?orderInfo.workOrderObj.createDeptDTO.dept:''}}
-          </div>
-          <div nz-col nzSpan="6">
-            目标科室：{{(orderInfo.workOrderObj.endDepts&&orderInfo.workOrderObj.endDepts[0])?orderInfo.workOrderObj.endDepts[0].dept:''}}
-          </div>
-          <div nz-col nzSpan="8" *ngIf="orderInfo.workOrderObj.urgentDetails">
-            加急状态：{{orderInfo.workOrderObj.urgentDetails.checkStatus.name}}</div>
-        </div>
-        <div class="info" nz-row *ngIf="orderInfo.workOrderObj.urgentDetails">
-          <div nz-col nzSpan="24" class="jiaji">加急原因：{{orderInfo.workOrderObj.urgentDetails.urgentReason}}</div>
-        </div>
-      </div>
-      <div class="center">
-        <div class="box">
-          <div class="steps" *ngFor="let step of logList">
-            <div class="step">
-              <div class="info">
-                <i
-                  [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
-                <p>{{step.operationName}}</p>
-                <p>{{step.record?step.record.operationtime:''}}</p>
-                <p *ngIf="step.record&&step.record.length&&step.record[0].dept"><span
-                    *ngFor="let dept of step.record">{{dept.dept}},</span></p>
-                <p *ngIf="step.record&&step.record.length&&step.operationName!='申请'">耗时{{filterTime(step.record)}}</p>
-              </div>
-              <div class="line"></div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <!-- 标本类型工单信息 -->
-    <div
-      *ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.value=='specimen'||orderInfo.workOrderObj.taskType.associationType.value=='specimenPlan')"
-      class="content orders">
-      <div class="top">
-        <div class="num">
-          <span class="left">单号：{{orderInfo.workOrderObj.gdcode}}</span>
-          <span class="right">{{orderInfo.workOrderObj.gdState?orderInfo.workOrderObj.gdState.name:''}}</span>
-        </div>
-        <div class="info" nz-row>
-          <div nz-col nzSpan="6">工单日期：{{orderInfo.workOrderObj.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
-          <div nz-col nzSpan="6">总耗时：{{orderInfo.workOrderObj.showTimeNum}}</div>
-          <div nz-col nzSpan="8">申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}<ng-container *ngIf="orderInfo.workOrderObj.goodsRemark">-{{orderInfo.workOrderObj.goodsRemark}}</ng-container>
-          </div>
-          <div nz-col nzSpan="4">配送人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
-        </div>
-        <div class="info" nz-row>
-          <div nz-col nzSpan="6">
-            申请科室：{{orderInfo.workOrderObj.createDeptDTO?orderInfo.workOrderObj.createDeptDTO.dept:''}}
-          </div>
-          <div nz-col nzSpan="6">
-            目标科室：{{(orderInfo.workOrderObj.endDepts&&orderInfo.workOrderObj.endDepts[0])?orderInfo.workOrderObj.endDepts[0].dept:''}}
-          </div>
-          <div nz-col nzSpan="4">预计接收：{{orderInfo.workOrderObj.expectReceiveNum}}</div>
-          <div nz-col nzSpan="4">送达：{{orderInfo.workOrderObj.deliveryNum}}</div>
-          <div nz-col nzSpan="4">实际接收：{{orderInfo.workOrderObj.actualReceiveNum}}</div>
-        </div>
-        <div class="info" nz-row *ngIf="orderInfo.workOrderObj.urgentDetails">
-          <div nz-col nzSpan="8">
-            加急状态：{{orderInfo.workOrderObj.urgentDetails.checkStatus.name}}</div>
-          <div nz-col nzSpan="24" class="jiaji">加急原因：{{orderInfo.workOrderObj.urgentDetails.urgentReason}}</div>
-        </div>
-      </div>
-      <div class="center">
-        <div class="box">
-          <div class="steps" *ngFor="let step of logList">
-            <div class="step">
-              <div class="info">
-                <i
-                  [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
-                <p>{{step.operationName}}</p>
-                <p>{{step.record?step.record.operationtime:''}}</p>
-                <p *ngIf="step.record&&step.record.length&&step.record[0].dept"><span
-                    *ngFor="let dept of step.record">{{dept.dept}},</span></p>
-                <p *ngIf="step.record&&step.record.length&&step.operationName!='申请'">耗时{{filterTime(step.record)}}</p>
-              </div>
-              <div class="line"></div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="bottom">
-        <div class="table">
-          <nz-table class="" [nzData]="orderInfo.workOrderObj.specimenSet" nzSize="small"
-            [nzScroll]="{ y: (orderInfo.workOrderObj.urgentDetails?'124px':'153px') }" [nzShowPagination]="null">
-            <thead>
-              <tr class="thead">
-                <th nzWidth="50px">序号</th>
-                <th nzWidth="95px">检验项目</th>
-                <th nzWidth="95px">标本类型</th>
-                <th nzWidth="110px">标本编码</th>
-                <th nzWidth="88px">患者姓名</th>
-                <th nzWidth="88px">住院号</th>
-                <th nzWidth="50px">床号</th>
-                <th nzWidth="88px">目标科室</th>
-                <!-- <th nzWidth="75px">是否接收</th> -->
-                <!-- <th nzWidth="75px">是否送达</th> -->
-                <th nzWidth="123px">接收扫描时间</th>
-                <!-- <th nzWidth="123px">送达扫描时间</th> -->
-              </tr>
-            </thead>
-            <tbody *ngIf="orderInfo.workOrderObj.specimenSet">
-              <tr *ngFor="let data of orderInfo.workOrderObj.specimenSet;let i =index;">
-                <td>{{i+1}}</td>
-                <td>{{data.specimenDesc}}</td>
-                <td>{{data.stype?data.stype.name:''}}</td>
-                <td>{{data.scode}}</td>
-                <td>{{data.patientName}}</td>
-                <td>{{data.residenceNo}}</td>
-                <td>{{data.bedNum}}</td>
-                <td>{{data.checkDept.dept}}</td>
-                <!-- <td>{{data.received?"是":"否"}}</td> -->
-                <!-- <td>{{data.arrived?"是":"否"}}</td> -->
-                <td>{{data.arriveTime|date:'MM-dd HH:mm'}}</td>
-                <!-- <td>{{data.sendTime|date:'yyyy-MM-dd HH:mm'}}</td> -->
-              </tr>
-            </tbody>
-          </nz-table>
-        </div>
-      </div>
-    </div>
-    <!-- 药品/静配配送类型工单信息 -->
-    <div
-      *ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.value=='drugsBag'||orderInfo.workOrderObj.taskType.associationType.value=='jPBag')"
-      class="content orders">
-      <div class="top">
-        <div class="num">
-          <span class="left">单号：{{orderInfo.workOrderObj.gdcode}}</span>
-          <span class="right">{{orderInfo.workOrderObj.gdState?orderInfo.workOrderObj.gdState.name:''}}</span>
-        </div>
-        <div class="info" nz-row>
-          <div nz-col nzSpan="6">工单日期：{{orderInfo.workOrderObj.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
-          <div nz-col nzSpan="6">总耗时：{{orderInfo.workOrderObj.showTimeNum}}</div>
-          <div nz-col nzSpan="8">申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}<ng-container *ngIf="orderInfo.workOrderObj.goodsRemark">-{{orderInfo.workOrderObj.goodsRemark}}</ng-container>
-          </div>
-          <div nz-col nzSpan="4">配送人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
-        </div>
-        <div class="info" nz-row>
-          <div nz-col nzSpan="6">
-            申请科室：{{orderInfo.workOrderObj.createDeptDTO?orderInfo.workOrderObj.createDeptDTO.dept:''}}
-          </div>
-          <div nz-col nzSpan="6">
-            目标科室：{{(orderInfo.workOrderObj.endDepts&&orderInfo.workOrderObj.endDepts[0])?orderInfo.workOrderObj.endDepts[0].dept:''}}
-          </div>
-          <div nz-col nzSpan="8" *ngIf="orderInfo.workOrderObj.urgentDetails">
-            加急状态：{{orderInfo.workOrderObj.urgentDetails.checkStatus.name}}</div>
-        </div>
-        <div class="info" nz-row *ngIf="orderInfo.workOrderObj.urgentDetails">
-          <div nz-col nzSpan="24" class="jiaji">加急原因：{{orderInfo.workOrderObj.urgentDetails.urgentReason}}</div>
-        </div>
-      </div>
-      <div class="center">
-        <div class="box">
-          <div class="steps" *ngFor="let step of logList">
-            <div class="step">
-              <div class="info">
-                <i
-                  [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
-                <p>{{step.operationName}}</p>
-                <p>{{step.record?step.record.operationtime:''}}</p>
-                <p *ngIf="step.record&&step.record.length&&step.record[0].dept"><span
-                    *ngFor="let dept of step.record">{{dept.dept}},</span></p>
-                <p *ngIf="step.record&&step.record.length&&step.operationName!='申请'">耗时{{filterTime(step.record)}}</p>
-              </div>
-              <div class="line"></div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="bottom">
-        <div class="table">
-          <!-- 静配 -->
-          <nz-table *ngIf="orderInfo.workOrderObj.staticDistri" class="detailDrugTable"
-            [nzData]="orderInfo.workOrderObj.staticDistri.jpdetailsFormat" nzSize="small" [nzScroll]="{ y: '125px' }"
-            [nzShowPagination]="null">
-            <thead>
-              <tr class="thead">
-                <th nzWidth="15%">患者信息</th>
-                <th nzWidth="30%">药品</th>
-                <th nzWidth="5%">数量</th>
-                <th nzWidth="15%">患者信息</th>
-                <th nzWidth="30%">药品</th>
-                <th nzWidth="5%">数量</th>
-              </tr>
-            </thead>
-            <tbody *ngIf="orderInfo.workOrderObj.staticDistri">
-              <tr *ngFor="let data of orderInfo.workOrderObj.staticDistri.jpdetailsFormat">
-                <td>{{data[0].bedNum}}床：{{data[0].patientInfo}}</td>
-                <td>{{data[0].jpInfo}}</td>
-                <td>{{data[0].jpNum}}</td>
-                <td>{{data[1]?data[1].bedNum+"床："+data[1].patientInfo:''}}</td>
-                <td>{{data[1]?data[1].jpInfo:''}}</td>
-                <td>{{data[1]?data[1].jpNum:''}}</td>
-              </tr>
-            </tbody>
-          </nz-table>
-          <!-- 药品 -->
-          <nz-table *ngIf="orderInfo.workOrderObj.drugs" class="detailDrugTable"
-            [nzData]="orderInfo.workOrderObj.drugs.drugsFormat" nzSize="small" [nzScroll]="{ y: '125px' }"
-            [nzShowPagination]="null">
-            <thead>
-              <tr class="thead">
-                <th nzWidth="15%">患者信息</th>
-                <th nzWidth="30%">药品</th>
-                <th nzWidth="5%">数量</th>
-                <th nzWidth="15%">患者信息</th>
-                <th nzWidth="30%">药品</th>
-                <th nzWidth="5%">数量</th>
-              </tr>
-            </thead>
-            <tbody *ngIf="orderInfo.workOrderObj.drugs">
-              <tr *ngFor="let data of orderInfo.workOrderObj.drugs.drugsFormat">
-                <td>{{data[0].bedNum}}床：{{data[0].patientInfo}}</td>
-                <td>{{data[0].drugsInfo}}</td>
-                <td>{{data[0].drugsNum}}</td>
-                <td>{{data[1]?data[1].bedNum+"床："+data[1].patientInfo:''}}</td>
-                <td>{{data[1]?data[1].drugsInfo:''}}</td>
-                <td>{{data[1]?data[1].drugsNum:''}}</td>
-              </tr>
-            </tbody>
-          </nz-table>
-        </div>
-      </div>
-    </div>
-    <!-- 患者陪检/患者转运类型工单信息 -->
-    <div
-      *ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.value=='inspect'||orderInfo.workOrderObj.taskType.associationType.value=='patientTransport')"
-      class="content orders">
-      <div class="top">
-        <div class="num">
-          <span class="left">单号：{{orderInfo.workOrderObj.gdcode}}</span>
-          <span class="right">{{orderInfo.workOrderObj.gdState?orderInfo.workOrderObj.gdState.name:''}}</span>
-        </div>
-        <div class="info" nz-row>
-          <div nz-col nzSpan="6">工单日期：{{orderInfo.workOrderObj.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
-          <div nz-col nzSpan="6">总耗时：{{orderInfo.workOrderObj.showTimeNum}}</div>
-          <div nz-col nzSpan="8">申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}<ng-container *ngIf="orderInfo.workOrderObj.goodsRemark">-{{orderInfo.workOrderObj.goodsRemark}}</ng-container>
-          </div>
-          <div nz-col nzSpan="4">配送人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
-        </div>
-        <div class="info" nz-row>
-          <div nz-col nzSpan="6">
-            申请科室：{{orderInfo.workOrderObj.createDeptDTO?orderInfo.workOrderObj.createDeptDTO.dept:''}}
-          </div>
-          <div nz-col nzSpan="6">
-            目标科室：{{(orderInfo.workOrderObj.endDepts&&orderInfo.workOrderObj.endDepts[0])?orderInfo.workOrderObj.endDepts[0].dept:''}}
-          </div>
-          <div nz-col nzSpan="8" *ngIf="orderInfo.workOrderObj.urgentDetails">
-            加急状态：{{orderInfo.workOrderObj.urgentDetails.checkStatus.name}}</div>
-        </div>
-        <div class="info" nz-row *ngIf="orderInfo.workOrderObj.urgentDetails">
-          <div nz-col nzSpan="24" class="jiaji">加急原因：{{orderInfo.workOrderObj.urgentDetails.urgentReason}}</div>
-        </div>
-      </div>
-      <div class="center">
-        <div class="box">
-          <div class="steps" *ngFor="let step of logList">
-            <div class="step">
-              <div class="info">
-                <i
-                  [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
-                <p>{{step.operationName}}</p>
-                <p>{{step.record?step.record.operationtime:''}}</p>
-                <p *ngIf="step.record&&step.record.length&&step.record[0].dept"><span
-                    *ngFor="let dept of step.record">{{dept.dept}},</span></p>
-                <p *ngIf="step.record&&step.record.length&&step.operationName!='申请'">耗时{{filterTime(step.record)}}</p>
-              </div>
-              <div class="line"></div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="bottom">
-        <div class="info">
-          <div nz-row class="top">
-            <div class="left" nz-col nzSpan="12">
-              <p>
-                <span class="label">患者姓名</span>
-                <span>{{orderInfo.workOrderObj.patient.patientName}}</span>
-              </p>
-              <p>
-                <span class="label">床位</span>
-                <span>{{orderInfo.workOrderObj.patient.bedNum}}</span>
-              </p>
-              <p *ngIf="orderInfo.workOrderObj.taskType.associationType.value=='inspect'">
-                <span class="label">检查项目</span>
-                <span>
-                  <span *ngFor="let item of orderInfo.workOrderObj.checkList;let i = index;">
-                    <span *ngIf="i!=orderInfo.workOrderObj.checkList.length-1">{{item.inspectName}},</span>
-                    <span *ngIf="i==orderInfo.workOrderObj.checkList.length-1">{{item.inspectName}}</span>
-                  </span>
-                </span>
-              </p>
-            </div>
-            <div class="right" nz-col nzSpan="12">
-              <p>
-                <span class="label">住院号</span>
-                <span>{{orderInfo.workOrderObj.patient.residenceNo}}</span>
-              </p>
-              <p>
-                <span class="label">携带设备</span>
-                <span>{{orderInfo.workOrderObj.goods}}</span>
-              </p>
-              <p *ngIf="orderInfo.workOrderObj.taskType.associationType.value=='inspect'">
-                <span class="label">预约时间</span>
-                <span>{{orderInfo.workOrderObj.yyTime?orderInfo.workOrderObj.yyTime:''}}</span>
-              </p>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <!-- 评价内容 -->
-    <div *ngIf="tabType==2" class="content pingjia">
-      <div class="msg">
-        <div>评价等级：{{orderInfo.evaluationDetails.serviceEvaluation.name}}</div>
-        <div>评价人：{{orderInfo.evaluationDetails.evalutationUser.name}}</div>
-      </div>
-      <div class="con">
-        意见内容：{{orderInfo.evaluationDetails.remark}}
-      </div>
-    </div>
-    <!-- 调解(未调解) -->
-    <div *ngIf="tabType==3&&orderInfo.handleStatus.id==286" class="content">
-      <div class="form">
-        <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
-          <nz-form-item>
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="reason">原因及事件过程</nz-form-label>
-            <nz-form-control nzErrorTip="请输入原因及事件过程!">
-              <nz-input-group>
-                <textarea rows="3" maxlength="500" nz-input type="reason" formControlName="reason"
-                  placeholder="请输入原因及事件过程"></textarea>
-              </nz-input-group>
-            </nz-form-control>
-          </nz-form-item>
-          <nz-form-item>
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="process">调解过程</nz-form-label>
-            <nz-form-control nzErrorTip="请输入调解过程!">
-              <nz-input-group>
-                <textarea rows="3" maxlength="500" nz-input type="process" formControlName="process"
-                  placeholder="请输入调解过程"></textarea>
-              </nz-input-group>
-            </nz-form-control>
-          </nz-form-item>
-          <nz-form-item>
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="handleType">解决方式</nz-form-label>
-            <nz-form-control nzErrorTip="请选择解决方式!">
-              <nz-select [nzDropdownMatchSelectWidth]="false" type="handleType" nzShowSearch nzAllowClear
-                formControlName="handleType" nzPlaceHolder="请选择解决方式">
-                <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of allHandleType">
-                </nz-option>
-              </nz-select>
-            </nz-form-control>
-          </nz-form-item>
-          <nz-form-item>
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="improve">改进意见</nz-form-label>
-            <nz-form-control nzErrorTip="请输入改进意见!">
-              <nz-input-group>
-                <textarea rows="3" maxlength="500" nz-input type="improve" formControlName="improve"
-                  placeholder="请输入改进意见"></textarea>
-              </nz-input-group>
-            </nz-form-control>
-          </nz-form-item>
-        </form>
-      </div>
-    </div>
-    <!-- 调解(已调解) -->
-    <div *ngIf="tabType==3&&orderInfo.handleStatus.id==287" class="content">
-      <div class="mediation">
-        <div class="item">
-          <div class="label">原因及事件过程：</div>
-          <div class="info">{{orderInfo.reasonAndEventProcess}}</div>
-        </div>
-        <div class="item">
-          <div class="label">调解过程：</div>
-          <div class="info">{{orderInfo.mediationProcess}}</div>
-        </div>
-        <div class="item display_flex align-items_center justify-content_space-between">
-          <div class="block">
-            <div class="label">解决方式：</div>
-            <div class="info">{{orderInfo.handleType.name}}</div>
-          </div>
-          <div class="block">
-            <div class="label">调解人：</div>
-            <div class="info">{{orderInfo.mediationUser?orderInfo.mediationUser.name:''}}</div>
-          </div>
-          <div class="block">
-            <div class="label">调解时间：</div>
-            <div class="info">{{orderInfo.mediationTime?date(orderInfo.mediationTime):''}}</div>
-          </div>
-        </div>
-        <div class="item">
-          <div class="label">改进意见：</div>
-          <div class="info">{{orderInfo.advice}}</div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="btns">
-    <button *ngIf="tabType==3&&orderInfo.handleStatus.id==286" class="candelBtn btn" nz-button nzType="primary"
-      [nzLoading]="btnLoading" (click)="submitForm()">调解记录保存</button>
-    <button class="candelBtn btn cancel" nz-button nzType="default" (click)="close()">关闭</button>
-  </div>
+	<div class="title">{{orderInfo.handleStatus.value==1 ? '调解' : '查看'}}<i class="icon_transport transport-guanbi" (click)="close()"></i></div>
+	<div class="box">
+		<div class="tab display_flex" *ngIf="!allShow">
+			<div [ngClass]="{'item':true, 'flex_1':true, 'checked':tabType==1}" (click)="checkTab(1)">工单信息</div>
+			<div [ngClass]="{'item':true, 'flex_1':true, 'checked':tabType==2}" (click)="checkTab(2)">评价内容</div>
+			<div [ngClass]="{'item':true, 'flex_1':true, 'checked':tabType==3}" (click)="checkTab(3)">调解</div>
+		</div>
+		<div *ngIf="!allShow">
+			<!-- 其他类型工单信息 -->
+			<div *ngIf="(tabType==1)&&(orderInfo.workOrderObj.taskType.associationType.value=='other')"
+				class="content orders">
+				<div class="top">
+					<div class="num">
+						<span class="left">单号：{{orderInfo.workOrderObj.gdcode}}</span>
+						<span class="right">{{orderInfo.workOrderObj.gdState?orderInfo.workOrderObj.gdState.name:''}}</span>
+					</div>
+					<div class="info" nz-row>
+						<div nz-col nzSpan="6">工单日期：{{orderInfo.workOrderObj.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
+						<div nz-col nzSpan="6">总耗时：{{orderInfo.workOrderObj.showTimeNum}}</div>
+						<div nz-col nzSpan="8">
+							申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}<ng-container
+								*ngIf="orderInfo.workOrderObj.goodsRemark">-{{orderInfo.workOrderObj.goodsRemark}}</ng-container>
+						</div>
+						<div nz-col nzSpan="4">配送人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
+					</div>
+					<div class="info" nz-row>
+						<div nz-col nzSpan="6">
+							申请科室：{{orderInfo.workOrderObj.createDeptDTO?orderInfo.workOrderObj.createDeptDTO.dept:''}}
+						</div>
+						<div nz-col nzSpan="6">
+							目标科室：{{(orderInfo.workOrderObj.endDepts&&orderInfo.workOrderObj.endDepts[0])?orderInfo.workOrderObj.endDepts[0].dept:''}}
+						</div>
+						<div nz-col nzSpan="8" *ngIf="orderInfo.workOrderObj.urgentDetails">
+							加急状态：{{orderInfo.workOrderObj.urgentDetails.checkStatus.name}}</div>
+					</div>
+					<div class="info" nz-row *ngIf="orderInfo.workOrderObj.urgentDetails">
+						<div nz-col nzSpan="24" class="jiaji">加急原因：{{orderInfo.workOrderObj.urgentDetails.urgentReason}}</div>
+					</div>
+				</div>
+				<div class="center">
+					<div class="box">
+						<div class="steps" *ngFor="let step of logList">
+							<div class="step">
+								<div class="info">
+									<i
+										[ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
+									<p>{{step.operationName}}</p>
+									<p>{{step.record?step.record.operationtime:''}}</p>
+									<p *ngIf="step.record&&step.record.length&&step.record[0].dept"><span
+											*ngFor="let dept of step.record">{{dept.dept}},</span></p>
+									<p *ngIf="step.record&&step.record.length&&step.operationName!='申请'">耗时{{filterTime(step.record)}}</p>
+								</div>
+								<div class="line"></div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<!-- 标本类型工单信息 -->
+			<div
+				*ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.value=='specimen'||orderInfo.workOrderObj.taskType.associationType.value=='specimenPlan')"
+				class="content orders">
+				<div class="top">
+					<div class="num">
+						<span class="left">单号：{{orderInfo.workOrderObj.gdcode}}</span>
+						<span class="right">{{orderInfo.workOrderObj.gdState?orderInfo.workOrderObj.gdState.name:''}}</span>
+					</div>
+					<div class="info" nz-row>
+						<div nz-col nzSpan="6">工单日期：{{orderInfo.workOrderObj.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
+						<div nz-col nzSpan="6">总耗时：{{orderInfo.workOrderObj.showTimeNum}}</div>
+						<div nz-col nzSpan="8">
+							申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}<ng-container
+								*ngIf="orderInfo.workOrderObj.goodsRemark">-{{orderInfo.workOrderObj.goodsRemark}}</ng-container>
+						</div>
+						<div nz-col nzSpan="4">配送人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
+					</div>
+					<div class="info" nz-row>
+						<div nz-col nzSpan="6">
+							申请科室：{{orderInfo.workOrderObj.createDeptDTO?orderInfo.workOrderObj.createDeptDTO.dept:''}}
+						</div>
+						<div nz-col nzSpan="6">
+							目标科室：{{(orderInfo.workOrderObj.endDepts&&orderInfo.workOrderObj.endDepts[0])?orderInfo.workOrderObj.endDepts[0].dept:''}}
+						</div>
+						<div nz-col nzSpan="4">预计接收：{{orderInfo.workOrderObj.expectReceiveNum}}</div>
+						<div nz-col nzSpan="4">送达：{{orderInfo.workOrderObj.deliveryNum}}</div>
+						<div nz-col nzSpan="4">实际接收：{{orderInfo.workOrderObj.actualReceiveNum}}</div>
+					</div>
+					<div class="info" nz-row *ngIf="orderInfo.workOrderObj.urgentDetails">
+						<div nz-col nzSpan="8">
+							加急状态：{{orderInfo.workOrderObj.urgentDetails.checkStatus.name}}</div>
+						<div nz-col nzSpan="24" class="jiaji">加急原因：{{orderInfo.workOrderObj.urgentDetails.urgentReason}}</div>
+					</div>
+				</div>
+				<div class="center">
+					<div class="box">
+						<div class="steps" *ngFor="let step of logList">
+							<div class="step">
+								<div class="info">
+									<i
+										[ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
+									<p>{{step.operationName}}</p>
+									<p>{{step.record?step.record.operationtime:''}}</p>
+									<p *ngIf="step.record&&step.record.length&&step.record[0].dept"><span
+											*ngFor="let dept of step.record">{{dept.dept}},</span></p>
+									<p *ngIf="step.record&&step.record.length&&step.operationName!='申请'">耗时{{filterTime(step.record)}}</p>
+								</div>
+								<div class="line"></div>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="bottom">
+					<div class="table">
+						<nz-table class="" [nzData]="orderInfo.workOrderObj.specimenSet" nzSize="small"
+							[nzScroll]="{ y: (orderInfo.workOrderObj.urgentDetails?'124px':'153px') }" [nzShowPagination]="null">
+							<thead>
+								<tr class="thead">
+									<th nzWidth="50px">序号</th>
+									<th nzWidth="95px">检验项目</th>
+									<th nzWidth="95px">标本类型</th>
+									<th nzWidth="110px">标本编码</th>
+									<th nzWidth="88px">患者姓名</th>
+									<th nzWidth="88px">住院号</th>
+									<th nzWidth="50px">床号</th>
+									<th nzWidth="88px">目标科室</th>
+									<!-- <th nzWidth="75px">是否接收</th> -->
+									<!-- <th nzWidth="75px">是否送达</th> -->
+									<th nzWidth="123px">接收扫描时间</th>
+									<!-- <th nzWidth="123px">送达扫描时间</th> -->
+								</tr>
+							</thead>
+							<tbody *ngIf="orderInfo.workOrderObj.specimenSet">
+								<tr *ngFor="let data of orderInfo.workOrderObj.specimenSet;let i =index;">
+									<td>{{i+1}}</td>
+									<td>{{data.specimenDesc}}</td>
+									<td>{{data.stype?data.stype.name:''}}</td>
+									<td>{{data.scode}}</td>
+									<td>{{data.patientName}}</td>
+									<td>{{data.residenceNo}}</td>
+									<td>{{data.bedNum}}</td>
+									<td>{{data.checkDept.dept}}</td>
+									<!-- <td>{{data.received?"是":"否"}}</td> -->
+									<!-- <td>{{data.arrived?"是":"否"}}</td> -->
+									<td>{{data.arriveTime|date:'MM-dd HH:mm'}}</td>
+									<!-- <td>{{data.sendTime|date:'yyyy-MM-dd HH:mm'}}</td> -->
+								</tr>
+							</tbody>
+						</nz-table>
+					</div>
+				</div>
+			</div>
+			<!-- 药品/静配配送类型工单信息 -->
+			<div
+				*ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.value=='drugsBag'||orderInfo.workOrderObj.taskType.associationType.value=='jPBag')"
+				class="content orders">
+				<div class="top">
+					<div class="num">
+						<span class="left">单号：{{orderInfo.workOrderObj.gdcode}}</span>
+						<span class="right">{{orderInfo.workOrderObj.gdState?orderInfo.workOrderObj.gdState.name:''}}</span>
+					</div>
+					<div class="info" nz-row>
+						<div nz-col nzSpan="6">工单日期：{{orderInfo.workOrderObj.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
+						<div nz-col nzSpan="6">总耗时：{{orderInfo.workOrderObj.showTimeNum}}</div>
+						<div nz-col nzSpan="8">
+							申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}<ng-container
+								*ngIf="orderInfo.workOrderObj.goodsRemark">-{{orderInfo.workOrderObj.goodsRemark}}</ng-container>
+						</div>
+						<div nz-col nzSpan="4">配送人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
+					</div>
+					<div class="info" nz-row>
+						<div nz-col nzSpan="6">
+							申请科室：{{orderInfo.workOrderObj.createDeptDTO?orderInfo.workOrderObj.createDeptDTO.dept:''}}
+						</div>
+						<div nz-col nzSpan="6">
+							目标科室：{{(orderInfo.workOrderObj.endDepts&&orderInfo.workOrderObj.endDepts[0])?orderInfo.workOrderObj.endDepts[0].dept:''}}
+						</div>
+						<div nz-col nzSpan="8" *ngIf="orderInfo.workOrderObj.urgentDetails">
+							加急状态：{{orderInfo.workOrderObj.urgentDetails.checkStatus.name}}</div>
+					</div>
+					<div class="info" nz-row *ngIf="orderInfo.workOrderObj.urgentDetails">
+						<div nz-col nzSpan="24" class="jiaji">加急原因：{{orderInfo.workOrderObj.urgentDetails.urgentReason}}</div>
+					</div>
+				</div>
+				<div class="center">
+					<div class="box">
+						<div class="steps" *ngFor="let step of logList">
+							<div class="step">
+								<div class="info">
+									<i
+										[ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
+									<p>{{step.operationName}}</p>
+									<p>{{step.record?step.record.operationtime:''}}</p>
+									<p *ngIf="step.record&&step.record.length&&step.record[0].dept"><span
+											*ngFor="let dept of step.record">{{dept.dept}},</span></p>
+									<p *ngIf="step.record&&step.record.length&&step.operationName!='申请'">耗时{{filterTime(step.record)}}</p>
+								</div>
+								<div class="line"></div>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="bottom">
+					<div class="table">
+						<!-- 静配 -->
+						<nz-table *ngIf="orderInfo.workOrderObj.staticDistri" class="detailDrugTable"
+							[nzData]="orderInfo.workOrderObj.staticDistri.jpdetailsFormat" nzSize="small" [nzScroll]="{ y: '125px' }"
+							[nzShowPagination]="null">
+							<thead>
+								<tr class="thead">
+									<th nzWidth="15%">患者信息</th>
+									<th nzWidth="30%">药品</th>
+									<th nzWidth="5%">数量</th>
+									<th nzWidth="15%">患者信息</th>
+									<th nzWidth="30%">药品</th>
+									<th nzWidth="5%">数量</th>
+								</tr>
+							</thead>
+							<tbody *ngIf="orderInfo.workOrderObj.staticDistri">
+								<tr *ngFor="let data of orderInfo.workOrderObj.staticDistri.jpdetailsFormat">
+									<td>{{data[0].bedNum}}床：{{data[0].patientInfo}}</td>
+									<td>{{data[0].jpInfo}}</td>
+									<td>{{data[0].jpNum}}</td>
+									<td>{{data[1]?data[1].bedNum+"床："+data[1].patientInfo:''}}</td>
+									<td>{{data[1]?data[1].jpInfo:''}}</td>
+									<td>{{data[1]?data[1].jpNum:''}}</td>
+								</tr>
+							</tbody>
+						</nz-table>
+						<!-- 药品 -->
+						<nz-table *ngIf="orderInfo.workOrderObj.drugs" class="detailDrugTable"
+							[nzData]="orderInfo.workOrderObj.drugs.drugsFormat" nzSize="small" [nzScroll]="{ y: '125px' }"
+							[nzShowPagination]="null">
+							<thead>
+								<tr class="thead">
+									<th nzWidth="15%">患者信息</th>
+									<th nzWidth="30%">药品</th>
+									<th nzWidth="5%">数量</th>
+									<th nzWidth="15%">患者信息</th>
+									<th nzWidth="30%">药品</th>
+									<th nzWidth="5%">数量</th>
+								</tr>
+							</thead>
+							<tbody *ngIf="orderInfo.workOrderObj.drugs">
+								<tr *ngFor="let data of orderInfo.workOrderObj.drugs.drugsFormat">
+									<td>{{data[0].bedNum}}床：{{data[0].patientInfo}}</td>
+									<td>{{data[0].drugsInfo}}</td>
+									<td>{{data[0].drugsNum}}</td>
+									<td>{{data[1]?data[1].bedNum+"床："+data[1].patientInfo:''}}</td>
+									<td>{{data[1]?data[1].drugsInfo:''}}</td>
+									<td>{{data[1]?data[1].drugsNum:''}}</td>
+								</tr>
+							</tbody>
+						</nz-table>
+					</div>
+				</div>
+			</div>
+			<!-- 患者陪检/患者转运类型工单信息 -->
+			<div
+				*ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.value=='inspect'||orderInfo.workOrderObj.taskType.associationType.value=='patientTransport')"
+				class="content orders">
+				<div class="top">
+					<div class="num">
+						<span class="left">单号：{{orderInfo.workOrderObj.gdcode}}</span>
+						<span class="right">{{orderInfo.workOrderObj.gdState?orderInfo.workOrderObj.gdState.name:''}}</span>
+					</div>
+					<div class="info" nz-row>
+						<div nz-col nzSpan="6">工单日期：{{orderInfo.workOrderObj.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
+						<div nz-col nzSpan="6">总耗时：{{orderInfo.workOrderObj.showTimeNum}}</div>
+						<div nz-col nzSpan="8">
+							申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}<ng-container
+								*ngIf="orderInfo.workOrderObj.goodsRemark">-{{orderInfo.workOrderObj.goodsRemark}}</ng-container>
+						</div>
+						<div nz-col nzSpan="4">配送人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
+					</div>
+					<div class="info" nz-row>
+						<div nz-col nzSpan="6">
+							申请科室：{{orderInfo.workOrderObj.createDeptDTO?orderInfo.workOrderObj.createDeptDTO.dept:''}}
+						</div>
+						<div nz-col nzSpan="6">
+							目标科室：{{(orderInfo.workOrderObj.endDepts&&orderInfo.workOrderObj.endDepts[0])?orderInfo.workOrderObj.endDepts[0].dept:''}}
+						</div>
+						<div nz-col nzSpan="8" *ngIf="orderInfo.workOrderObj.urgentDetails">
+							加急状态：{{orderInfo.workOrderObj.urgentDetails.checkStatus.name}}</div>
+					</div>
+					<div class="info" nz-row *ngIf="orderInfo.workOrderObj.urgentDetails">
+						<div nz-col nzSpan="24" class="jiaji">加急原因：{{orderInfo.workOrderObj.urgentDetails.urgentReason}}</div>
+					</div>
+				</div>
+				<div class="center">
+					<div class="box">
+						<div class="steps" *ngFor="let step of logList">
+							<div class="step">
+								<div class="info">
+									<i
+										[ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
+									<p>{{step.operationName}}</p>
+									<p>{{step.record?step.record.operationtime:''}}</p>
+									<p *ngIf="step.record&&step.record.length&&step.record[0].dept"><span
+											*ngFor="let dept of step.record">{{dept.dept}},</span></p>
+									<p *ngIf="step.record&&step.record.length&&step.operationName!='申请'">耗时{{filterTime(step.record)}}</p>
+								</div>
+								<div class="line"></div>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="bottom">
+					<div class="info">
+						<div nz-row class="top">
+							<div class="left" nz-col nzSpan="12">
+								<p>
+									<span class="label">患者姓名</span>
+									<span>{{orderInfo.workOrderObj.patient.patientName}}</span>
+								</p>
+								<p>
+									<span class="label">床位</span>
+									<span>{{orderInfo.workOrderObj.patient.bedNum}}</span>
+								</p>
+								<p *ngIf="orderInfo.workOrderObj.taskType.associationType.value=='inspect'">
+									<span class="label">检查项目</span>
+									<span>
+										<span *ngFor="let item of orderInfo.workOrderObj.checkList;let i = index;">
+											<span *ngIf="i!=orderInfo.workOrderObj.checkList.length-1">{{item.inspectName}},</span>
+											<span *ngIf="i==orderInfo.workOrderObj.checkList.length-1">{{item.inspectName}}</span>
+										</span>
+									</span>
+								</p>
+							</div>
+							<div class="right" nz-col nzSpan="12">
+								<p>
+									<span class="label">住院号</span>
+									<span>{{orderInfo.workOrderObj.patient.residenceNo}}</span>
+								</p>
+								<p>
+									<span class="label">携带设备</span>
+									<span>{{orderInfo.workOrderObj.goods}}</span>
+								</p>
+								<p *ngIf="orderInfo.workOrderObj.taskType.associationType.value=='inspect'">
+									<span class="label">预约时间</span>
+									<span>{{orderInfo.workOrderObj.yyTime?orderInfo.workOrderObj.yyTime:''}}</span>
+								</p>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<!-- 评价内容 -->
+			<div *ngIf="tabType==2" class="content pingjia">
+				<div class="msg">
+					<div>评价等级：{{orderInfo.evaluationLevel ? orderInfo.evaluationLevel.name:'-'}}</div>
+					<div>评价人：{{orderInfo.evaluatorDTO?orderInfo.evaluatorDTO.name:''}}</div>
+				</div>
+				<div class="con">
+					意见内容：{{orderInfo.evaluationContent}}
+				</div>
+			</div>
+		</div>
+
+		<!-- 调解(未调解) -->
+		<div *ngIf="orderInfo.handleStatus.value==1" class="content">
+			<div class="form">
+				<form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="reason">原因及事件过程</nz-form-label>
+						<nz-form-control nzErrorTip="请输入原因及事件过程!">
+							<nz-input-group>
+								<textarea rows="3" maxlength="500" nz-input type="reason" formControlName="reason"
+									placeholder="请输入原因及事件过程"></textarea>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item>
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="process">调解过程</nz-form-label>
+						<nz-form-control nzErrorTip="请输入调解过程!">
+							<nz-input-group>
+								<textarea rows="3" maxlength="500" nz-input type="process" formControlName="process"
+									placeholder="请输入调解过程"></textarea>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item>
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="handleType">解决方式</nz-form-label>
+						<nz-form-control nzErrorTip="请选择解决方式!">
+							<nz-select [nzDropdownMatchSelectWidth]="false" type="handleType" nzShowSearch nzAllowClear
+								formControlName="handleType" nzPlaceHolder="请选择解决方式">
+								<nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of allHandleType">
+								</nz-option>
+							</nz-select>
+						</nz-form-control>
+					</nz-form-item>
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="improve">改进意见</nz-form-label>
+						<nz-form-control nzErrorTip="请输入改进意见!">
+							<nz-input-group>
+								<textarea rows="3" maxlength="500" nz-input type="improve" formControlName="improve"
+									placeholder="请输入改进意见"></textarea>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item>
+				</form>
+			</div>
+		</div>
+		<!-- 调解(已调解) -->
+		<div *ngIf="orderInfo.handleStatus.value==2" class="content">
+			<div class="mediation">
+				<div class="item">
+					<div class="label">原因及事件过程：</div>
+					<div class="info">{{orderInfo.reasonAndEventProcess}}</div>
+				</div>
+				<div class="item">
+					<div class="label">调解过程：</div>
+					<div class="info">{{orderInfo.mediationProcess}}</div>
+				</div>
+				<div class="item display_flex align-items_center justify-content_space-between">
+					<div class="block">
+						<div class="label">解决方式：</div>
+						<div class="info">{{orderInfo.handleType.name}}</div>
+					</div>
+					<div class="block">
+						<div class="label">调解人：</div>
+						<div class="info">{{orderInfo.mediationUser?orderInfo.mediationUser.name:''}}</div>
+					</div>
+					<div class="block">
+						<div class="label">调解时间：</div>
+						<div class="info">{{orderInfo.mediationTime?date(orderInfo.mediationTime):''}}</div>
+					</div>
+				</div>
+				<div class="item">
+					<div class="label">改进意见：</div>
+					<div class="info">{{orderInfo.advice}}</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="btns">
+		<button *ngIf="orderInfo.handleStatus.value==1" class="candelBtn btn" nz-button nzType="primary"
+			[nzLoading]="btnLoading" (click)="submitForm()">调解记录保存</button>
+		<button class="candelBtn btn cancel" nz-button nzType="default" (click)="close()">关闭</button>
+	</div>
 </div>
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
-  [info]="promptInfo" (closeModel)="close()">
-  <!-- 2.父组件调用子组件时绑定到这个事件属性，并在事件发生时作出回应。(closeModel)="close()" -->
+	[info]="promptInfo" (closeModel)="close()">
+	<!-- 2.父组件调用子组件时绑定到这个事件属性，并在事件发生时作出回应。(closeModel)="close()" -->
 </app-prompt-modal>
 <!-- 遮罩 -->
-<app-mask *ngIf="maskFlag"></app-mask>
+<app-mask *ngIf="maskFlag"></app-mask>

src/app/share/appraise-detail/appraise-detail.component.ts

@@ -33,7 +33,7 @@ export class AppraiseDetailComponent implements OnInit {
   urgentLoading: boolean = false; //确认加急按钮loading状态
   recLoading: boolean = false; //撤回并删除按钮loading状态
   btnLoading: boolean = false; //确认按钮loading状态
-
+	allShow: boolean = true; //先全部隐藏
   ngOnInit() {
     this.getInfo();
     this.initForm();
@@ -80,7 +80,7 @@ export class AppraiseDetailComponent implements OnInit {
   // 获取工单历史记录
   logList = []; //工单历史记录
   getLog() {
-    return this.mainService.getWorkOrderLog(this.orderInfo["workOrderObj"].id);
+    return this.mainService.getWorkOrderLog(this.orderInfo.workOrder);
   }
 
   // 获取所有院区

src/app/share/businessData-detail-info-modal/businessData-detail-info-modal.component.html

@@ -10,15 +10,16 @@
       <div>发药科室：{{drugsBag.launch ? drugsBag.launch.dept : ''}}</div>
     </div>
     <div class="content">
-      <ng-container *ngIf="type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal'">
+      <ng-container *ngIf="configs.showDrugsBagDetails === 1 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')">
         <!-- 新药品 -->
         <nz-table class="hospitalTable" [nzData]="drugsBugSingleList" nzSize="middle" [nzShowPagination]="false"
           [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
           <thead>
             <tr class="thead">
               <th nzWidth="5%">序号</th>
-              <th nzWidth="85%">药品名称+规格</th>
+              <th nzWidth="65%">药品名称+规格</th>
               <th nzWidth="10%">数量</th>
+							<th nzWidth="20%" *ngIf="configs.showPatientInfo==1">患者信息</th>
             </tr>
           </thead>
           <tbody>
@@ -26,6 +27,9 @@
               <td>{{i+1}}</td>
               <td>{{ data.drugsInfo }} {{ data.model }}</td>
               <td>{{ data.drugsNum }}</td>
+							<td nz-tooltip [nzTooltipTitle]="data.patientNames" *ngIf="configs.showPatientInfo==1">
+								{{ data.patientNames }}
+							</td>
             </tr>
           </tbody>
         </nz-table>

src/app/share/businessData-detail-modal/businessData-detail-modal.component.html

@@ -41,13 +41,14 @@
         </tbody>
       </nz-table>
       <!-- 新药品-一单一码 -->
-      <nz-table *ngIf="configs.drugsModel === 1 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')" class="hospitalTable" [nzData]="drugsBugSingleList" nzSize="middle" [nzShowPagination]="false"
+      <nz-table *ngIf="configs.showDrugsBagDetails === 1 && configs.drugsModel === 1 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')" class="hospitalTable" [nzData]="drugsBugSingleList" nzSize="middle" [nzShowPagination]="false"
         [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
-            <th nzWidth="85%">药品名称+规格</th>
+            <th nzWidth="65%">药品名称+规格</th>
             <th nzWidth="10%">数量</th>
+						<th nzWidth="20%" *ngIf="configs.showPatientInfo==1">患者信息</th>
           </tr>
         </thead>
         <tbody>
@@ -55,6 +56,9 @@
             <td>{{i+1}}</td>
             <td>{{ data.drugsInfo }} {{ data.model }}</td>
             <td>{{ data.drugsNum }}</td>
+						<td nz-tooltip [nzTooltipTitle]="data.patientNames" *ngIf="configs.showPatientInfo==1">
+							{{ data.patientNames }}
+						</td>
           </tr>
         </tbody>
       </nz-table>
@@ -65,27 +69,41 @@
           <tr class="thead">
             <th nzWidth="5%">序号</th>
             <th nzWidth="11%">单号</th>
-            <th nzWidth="8%">种类数</th>
-            <th nzWidth="8%">总数</th>
-            <th nzWidth="10%">收取人</th>
-            <th nzWidth="10%">收取交接人</th>
+						<th nzWidth="10%" *ngIf="configs.showPatientInfo==1">患者信息</th>
+            <th nzWidth="8%" *ngIf="configs.showDrugsBagTypeCount==1">种类数</th>
+            <th nzWidth="8%" *ngIf="configs.showDrugsBagTypeCount==1">总数</th>
+            <th nzWidth="10%">收取人/交接人</th>
+            <!-- <th nzWidth="10%">收取交接人</th> -->
             <th nzWidth="14%">收取时间</th>
-            <th nzWidth="10%">送达人</th>
-            <th nzWidth="10%">送达交接人</th>
+            <th nzWidth="10%">送达人/交接人</th>
+            <!-- <th nzWidth="10%">送达交接人</th> -->
             <th nzWidth="14%">送达时间</th>
           </tr>
         </thead>
         <tbody>
-          <tr *ngFor="let data of drugsBugMultipleList;let i = index;" (click)="viewDetail(type, data.id)">
+          <tr *ngFor="let data of drugsBugMultipleList;let i = index;" (click)="viewDetail(type, data.id)" [ngStyle]="{ 'cursor': configs.showDrugsBagDetails == 1 ? 'pointer' : '' }">
             <td>{{i+1}}</td>
-            <td>{{ data.packid }}</td>
-            <td>{{ data.drugsTypeCount }}</td>
-            <td>{{ data.drugsCount }}</td>
-            <td><ng-container *ngIf="data.startLog">{{data.startLog.username}}</ng-container></td>
-            <td><ng-container *ngIf="data.startLog">{{data.startLog.handoverName}}</ng-container></td>
+						<td [ngStyle]="{ 'text-decoration': configs.showDrugsBagDetails == 1 ? 'underline' : '' }">{{ data.packid }}</td>
+						<td nz-tooltip [nzTooltipTitle]="data.patientNames" *ngIf="configs.showPatientInfo==1">
+							{{ data.patientNames }}
+						</td>
+            <td *ngIf="configs.showDrugsBagTypeCount==1">{{ data.drugsTypeCount }}</td>
+            <td *ngIf="configs.showDrugsBagTypeCount==1">{{ data.drugsCount }}</td>
+            <td>
+							<ng-container *ngIf="data.startLog">
+								<div>{{data.startLog.username}}</div>
+								<div>{{data.startLog.handoverName}}</div>
+							</ng-container>
+						</td>
+            <!-- <td><ng-container *ngIf="data.startLog"></ng-container></td> -->
             <td><ng-container *ngIf="data.startLog">{{data.startLog.operationTime | date:'yyyy-MM-dd HH:mm'}}</ng-container></td>
-            <td><ng-container *ngIf="data.endLog">{{data.endLog.username}}</ng-container></td>
-            <td><ng-container *ngIf="data.endLog">{{data.endLog.handoverName}}</ng-container></td>
+            <td>
+							<ng-container *ngIf="data.endLog">
+								<div>{{data.endLog.username}}</div>
+								<div>{{data.endLog.handoverName}}</div>
+							</ng-container>
+						</td>
+            <!-- <td><ng-container *ngIf="data.endLog"></ng-container></td> -->
             <td><ng-container *ngIf="data.endLog">{{data.endLog.operationTime | date:'yyyy-MM-dd HH:mm'}}</ng-container></td>
           </tr>
         </tbody>
@@ -221,7 +239,7 @@
         </nz-pagination>
       </div>
     </div>
-    <div class="display_flex justify-content_flex-center">
+    <div class="display_flex justify-content_flex-center bottom-btn">
       <button class="btn know" nz-button nzType="primary" (click)="hideModal()">知道了</button>
     </div>
   </div>

src/app/share/businessData-detail-modal/businessData-detail-modal.component.less

@@ -68,10 +68,22 @@
   }
 
   .modalBody {
-    width: 700px;
-    background: #fff;
-    border-radius: 5px;
-    color: #333;
+		// height: calc(100vh - 40px);
+  //   width: 700px;
+  //   background: #fff;
+  //   border-radius: 5px;
+  //   color: #333;
+		// position: relative;
+		
+		height: calc(100vh - 100px);
+		min-height: 580px;
+		border-radius: 5px;
+		background: #fff;
+		color: #333;
+		font-size: 14px;
+		padding: 12px 20px;
+		position: relative;
+		padding-bottom: 70px;
     &.modalBody-search {
       width: 480px;
       min-height: 250px;
@@ -158,7 +170,14 @@
         }
       }
     }
-
+		
+		.bottom-btn{
+			.btn {
+				position: absolute;
+				bottom: 10px;
+			}
+		}
+		
     button {
       margin-top: 10px;
       margin-bottom: 10px;

src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -433,6 +433,9 @@ export class BusinessDataDetailModalComponent implements OnInit {
   businessDataModalType = ''; //业务数据类型
   infoId = ''; //业务数据id
   viewDetail(type, id) {
+    if(this.configs.showDrugsBagDetails != 1){
+      return;
+    }
     this.infoId = id;
     this.businessDataModalType = type;
     this.businessDataModalShow = true;

src/app/share/detail-drug/detail-drug.component.html

@@ -37,6 +37,7 @@
                 <i
                   [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
                 <p>{{step.operationName}}</p>
+								<p>{{step.record.length>=1 && step.operationName=='申请' ? step.record[0].username : ''}}</p>
                 <p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
                 <p *ngIf="step.record&&step.record.length&&step.record[0].dept"><span
                     *ngFor="let dept of step.record">{{!showCoop&&deptDisplay==2?dept.deptalias:dept.dept}},</span></p>

src/app/share/detail-drug/detail-drug.component.less

@@ -6,7 +6,7 @@
   left: 0;
   top: 0;
   background: rgba(0, 0, 0, 0.4);
-  z-index: 9;
+  z-index: 9999;
 
   display: flex;
   justify-content: center;

src/app/share/detail-ordinary/detail-ordinary.component.html

@@ -38,6 +38,7 @@
                 <i
                   [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
                 <p>{{step.operationName}}</p>
+								<p>{{step.record.length>=1 && step.operationName=='申请' ? step.record[0].username : ''}}</p>
                 <p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
                 <p *ngIf="step.record[0]&&step.record[0].dept">
                   <span *ngFor="let dept of step.record">{{!showCoop&&deptDisplay==2?dept.deptalias:dept.dept}},</span>
@@ -70,6 +71,24 @@
           </div> -->
         </div>
 
+        <!-- 标本打包 -->
+        <div class="info" *ngIf="orderInfo.taskType.ordinaryField.value == 'specimenPackage'">
+          <div nz-row class="top">
+            <div class="left" nz-col nzSpan="12">
+              <p>
+                <span class="label">打包码</span>
+                <span>{{orderInfo.pathologyPackInfoDTO?.packCode}}</span>
+              </p>
+            </div>
+            <div class="right" nz-col nzSpan="12">
+              <p>
+                <span class="label">标本数量</span>
+                <span>{{orderInfo.pathologyPackInfoDTO?.specimenNum}}</span>
+              </p>
+            </div>
+          </div>
+        </div>
+
         <!-- <div class="table">
           <nz-table class="detailSampleTable" [nzData]="orderInfo.specimenSet" nzSize="small" [nzShowPagination]="null">
             <thead>

src/app/share/detail-ordinary/detail-ordinary.component.less

@@ -6,7 +6,7 @@
   left: 0;
   top: 0;
   background: rgba(0, 0, 0, 0.4);
-  z-index: 9;
+  z-index: 9999;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -174,6 +174,69 @@
           }
         }
       }
+
+      .info {
+        width: 100%;
+        height: 100%;
+        background: #fff;
+        border-radius: 5px;
+        border: 1px solid #e5e9ed;
+        padding: 24px 28px 14px 28px;
+        margin-bottom: 8px;
+
+        .top {
+          .left {
+            border-right: 1px dashed #e5e9ed;
+
+            p {
+              padding: 0 70px 0 102px;
+              overflow: hidden;
+
+              & > span:nth-child(1) {
+                float: left;
+              }
+
+              & > span:nth-child(2) {
+                float: right;
+                color: #666;
+                text-align: right;
+                max-width: 175px;
+              }
+            }
+          }
+
+          .right {
+            p {
+              padding: 0 102px 0 70px;
+              overflow: hidden;
+
+              span:nth-child(1) {
+                float: left;
+              }
+
+              span:nth-child(2) {
+                float: right;
+                color: #666;
+                text-align: right;
+              }
+            }
+          }
+        }
+
+        .wait {
+          text-align: center;
+          margin-top: 7px;
+
+          i {
+            font-size: 24px;
+            color: #62c26d;
+          }
+
+          span {
+            color: #62c26d;
+          }
+        }
+      }
     }
   }
 

src/app/share/detail-others/detail-others.component.html

@@ -35,6 +35,7 @@
                 <i
                   [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
                 <p>{{step.operationName}}</p>
+								<p>{{step.record.length>=1 && step.operationName=='申请' ? step.record[0].username : ''}}</p>
                 <p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
                 <p *ngIf="step.record[0]&&step.record[0].dept">
                   <span *ngFor="let dept of step.record">{{!showCoop&&deptDisplay==2?dept.deptalias:dept.dept}},</span>

src/app/share/detail-others/detail-others.component.less

@@ -6,7 +6,7 @@
   left: 0;
   top: 0;
   background: rgba(0, 0, 0, 0.4);
-  z-index: 9;
+  z-index: 9999;
 
   display: flex;
   justify-content: center;

src/app/share/detail-patients/detail-patients.component.html

@@ -51,6 +51,7 @@
                 <i
                   [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
                 <p>{{step.operationName}}</p>
+								<p>{{step.record.length>=1 && step.operationName=='申请' ? step.record[0].username : ''}}</p>
                 <p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
                 <p *ngIf="step.record[0]&&step.record[0].dept">
                   <span *ngFor="let dept of step.record">{{!showCoop&&deptDisplay==2?dept.deptalias:dept.dept}},</span>

src/app/share/detail-patients/detail-patients.component.less

@@ -6,7 +6,7 @@
   left: 0;
   top: 0;
   background: rgba(0, 0, 0, 0.4);
-  z-index: 9;
+  z-index: 9999;
   display: flex;
   justify-content: center;
   align-items: center;

src/app/share/detail-sample/detail-sample.component.html

@@ -35,6 +35,7 @@
                 <i
                   [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
                 <p>{{step.operationName}}</p>
+								<p>{{step.record.length>=1 && step.operationName=='申请' ? step.record[0].username : ''}}</p>
                 <p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
                 <p *ngIf="step.record[0]&&step.record[0].dept">
                   <span *ngFor="let dept of step.record">{{!showCoop&&deptDisplay==2?dept.deptalias:dept.dept}},</span>

src/app/share/detail-sample/detail-sample.component.less

@@ -6,7 +6,7 @@
   left: 0;
   top: 0;
   background: rgba(0, 0, 0, 0.4);
-  z-index: 9;
+  z-index: 9999;
   display: flex;
   justify-content: center;
   align-items: center;

src/app/share/dialog-delete/dialog-delete.component.html

@@ -1,5 +1,5 @@
 <!-- 删除模态框 -->
-<div class="dialog-delete" *ngIf="delModal" [ngStyle]="{'z-index': isSelected ? '9' : '9999999'}">
+<div class="dialog-delete" *ngIf="delModal" [ngStyle]="{'z-index': (isSelected || isShowEndDeptId) ? '9' : '9999999'}">
   <div class="modalBody" [ngStyle]="{'height': isSelected ? 'auto' : '220px'}">
     <div class="title">提示<i class="icon_transport transport-guanbi" (click)="hideDelModal('x')"></i></div>
     <div class="content">
@@ -21,6 +21,17 @@
           </nz-option>
         </nz-select>
       </div>
+      <div *ngIf="isShowEndDeptId" class="mt8 mb8 w100">
+        <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptId">
+          <ng-container *ngFor="let option of isShowEndDeptIdArr">
+            <nz-option *ngIf="!isLoading" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
+          </ng-container>
+          <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+            <i nz-icon nzType="loading" class="loading-icon"></i>
+            搜索中...
+          </nz-option>
+        </nz-select>
+      </div>
     </div>
     <div class="operate">
       <button nz-button nzType="primary" (click)="cancel('cancel')" *ngIf="!isShowConfirm">知道了</button>

src/app/share/dialog-delete/dialog-delete.component.less

@@ -12,7 +12,7 @@
 
   .modalBody {
     width: 350px;
-    height: 220px;
+    min-height: 220px;
     background: #fff;
     border-radius: 8px;
     padding: 8px 16px;
@@ -46,6 +46,7 @@
       flex-direction: column;
       align-items: center;
       justify-content: center;
+      padding: 0 16px;
 
       .defeat{
         width: 100%;

src/app/share/dialog-delete/dialog-delete.component.ts

@@ -22,11 +22,14 @@ export class DialogDeleteComponent implements OnInit, OnChanges {
   @Input() deptDisplay: number = 0;
   @Input() isShowConfirm: boolean = true;
   @Input() isShowConfirmInfo: string = '';
+  @Input() isShowEndDeptId: boolean = false;
+  @Input() isShowEndDeptIdArr: any[] = [];
   constructor(private message: NzMessageService) {}
 
   isRemandClean:boolean = true;
   isLoading:boolean = false;
   recoveryRoom:any = null;
+  endDeptId:any = null;
 
   ngOnInit() {}
 
@@ -36,6 +39,9 @@ export class DialogDeleteComponent implements OnInit, OnChanges {
       this.isLoading = false;
       // this.recoveryRoom = null;
     }
+    if(changes.isShowEndDeptId){
+      this.endDeptId = null;
+    }
     if(changes.isSelected && changes.isSelectedArr){
       if(changes.isSelectedArr.currentValue.length === 1){
         this.recoveryRoom = changes.isSelectedArr.currentValue[0].id;
@@ -55,6 +61,10 @@ export class DialogDeleteComponent implements OnInit, OnChanges {
       this.message.info('请选择苏醒科室！');
       return;
     }
+    if(this.isShowEndDeptId && !this.endDeptId){
+      this.message.info('请选择终点科室！');
+      return;
+    }
     let data:any = {};
     if(this.isChecked){
       data.isRemandClean = this.isRemandClean;
@@ -62,6 +72,9 @@ export class DialogDeleteComponent implements OnInit, OnChanges {
     if(this.isSelected){
       data.recoveryRoom = this.recoveryRoom;
     }
+    if(this.isShowEndDeptId){
+      data.endDeptId = this.endDeptId;
+    }
     this.confirmDelEvent.emit(data);
   }
 

src/app/share/hs-prompt-modal/hs-prompt-modal.component.ts

@@ -38,6 +38,7 @@ export class HsPromptModalComponent implements OnInit {
   searchDeptSubject = new Subject();
   deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
   deptDisplayLoading: boolean = false;
+	user:any;
   ngOnInit() {
     this.deptDisplayLoading = true;
     this.tool.getDeptDisplay().subscribe((result) => {
@@ -52,6 +53,7 @@ export class HsPromptModalComponent implements OnInit {
     this.hospitals = this.tool.getHospitalList();
     this.currentHospital = this.tool.getCurrentHospital();
     this.currentDept = this.tool.getCurrentUserDept();
+		this.user = this.tool.getCurrentUserInfo();
     this.initForm();
   }
   initForm() {
@@ -110,6 +112,8 @@ export class HsPromptModalComponent implements OnInit {
       if (result.status == 200) {
         let dataObj = {
           user: {
+						account: this.user.account,
+						upType: "changeDept",
             dept: {
               id: this.validateForm.controls.dutyDeptFc.value,
             },

src/app/share/inspection-execute-detail/inspection-execute-detail.component.html

@@ -81,6 +81,19 @@
               </div>
             </div>
           </div>
+          <div class="top" *ngIf="orderInfo.incidentDTO">
+            <div class="info" nz-row>
+              <div nz-col nzSpan="8">
+                关联故障单：{{ orderInfo.incidentDTO.incidentsign }}
+              </div>
+              <div nz-col nzSpan="8">
+                状态：{{ orderInfo.incidentDTO.state?.name }}
+              </div>
+              <div nz-col nzSpan="8">
+                处理人/组：{{ orderInfo.incidentDTO.groupORHandlerUser }}
+              </div>
+            </div>
+          </div>
         </div>
       </div>
     </overlay-scrollbars>

src/app/share/order-detail/order-detail.component.html

@@ -129,6 +129,7 @@
                     }"
                   ></i>
                   <p>{{ step.operationName }}</p>
+									<p>{{ step.record.length>=1 && step.operationName=='申请' ? step.record[0].username : '' }}</p>
 									<p>{{ step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):'' }}</p>
                   <p>{{ step.record ? step.record.operationtime : "" }}</p>
                   <p
@@ -256,6 +257,7 @@
                     }"
                   ></i>
                   <p>{{ step.operationName }}</p>
+									<p>{{ step.record.length>=1 && step.operationName=='申请' ? step.record[0].username : '' }}</p>
 									<p>{{ step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
                   <p>{{ step.record ? step.record.operationtime : "" }}</p>
                   <p
@@ -366,6 +368,7 @@
                     }"
                   ></i>
                   <p>{{ step.operationName }}</p>
+									<p>{{ step.record.length>=1 && step.operationName=='申请' ? step.record[0].username : '' }}</p>
 									<p>{{ step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
                   <p>{{ step.record ? step.record.operationtime : "" }}</p>
                   <p
@@ -476,6 +479,7 @@
                     }"
                   ></i>
                   <p>{{ step.operationName }}</p>
+									<p>{{ step.record.length>=1 && step.operationName=='申请' ? step.record[0].username : '' }}</p>
 									<p>{{ step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
                   <p>{{ step.record ? step.record.operationtime : "" }}</p>
                   <p
@@ -720,7 +724,8 @@
                     }"
                   ></i>
                   <p>{{ step.operationName }}</p>
-									<p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
+									<p>{{ step.record.length>=1 && step.operationName=='申请' ? step.record[0].username : '' }}</p>
+									<p>{{ step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):'' }}</p>
                   <p>{{ step.record ? step.record.operationtime : "" }}</p>
                   <p
                     *ngIf="
@@ -949,7 +954,8 @@
                   }"
                 ></i>
                 <p>{{ step.operationName }}</p>
-								<p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
+								<p>{{ step.record.length>=1 && step.operationName=='申请' ? step.record[0].username : '' }}</p>
+								<p>{{ step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):'' }}</p>
                 <p>{{ step.record ? step.record.operationtime : "" }}</p>
                 <p
                   *ngIf="
@@ -975,6 +981,25 @@
           </div>
         </div>
       </div>
+      <!-- 标本打包 -->
+      <div class="bottom">
+        <div class="info" *ngIf="orderInfo.taskType.ordinaryField.value == 'specimenPackage'">
+            <div nz-row class="top">
+              <div class="left" nz-col nzSpan="12">
+                <p>
+                  <span class="label">打包码</span>
+                  <span>{{orderInfo.pathologyPackInfoDTO?.packCode}}</span>
+                </p>
+              </div>
+              <div class="right" nz-col nzSpan="12">
+                <p>
+                  <span class="label">标本数量</span>
+                  <span>{{orderInfo.pathologyPackInfoDTO?.specimenNum}}</span>
+                </p>
+              </div>
+            </div>
+          </div>
+      </div>
     </div>
     </overlay-scrollbars>
     <!-- 评价内容 -->
@@ -987,24 +1012,18 @@
         <div class="msg">
           <div>
             评价等级：{{
-              orderInfo.evaluationDetails
-                ? orderInfo.evaluationDetails.serviceEvaluation.name
-                : ""
+              orderInfo.evaluationLevel ? orderInfo.evaluationLevel.name:'-'
             }}
           </div>
           <div>
             评价人：{{
-              orderInfo.evaluationDetails
-                ? orderInfo.evaluationDetails.evalutationUser.name
-                : ""
+              orderInfo.evaluatorDTO?orderInfo.evaluatorDTO.name:''
             }}
           </div>
         </div>
         <div class="con">
           意见内容：{{
-            orderInfo.evaluationDetails
-              ? orderInfo.evaluationDetails.remark
-              : ""
+            orderInfo.evaluationContent
           }}
         </div>
       </div>

src/app/share/package-specimen-rule/package-specimen-rule.component.html

@@ -0,0 +1,35 @@
+<div class="save add display_flex align-items_center justify-content_flex-center">
+  <div class="modalBody">
+    <div class="title">自动清点规则<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <div class="block">
+        <div class="name">标本紧急度：</div>
+        <div class="value">
+          <ng-container *ngFor="let item of configs.spePackageUrgentsList;let last = last">
+            {{item.name}}<ng-container *ngIf="!last">、</ng-container>
+          </ng-container>
+        </div>
+      </div>
+      <div class="block">
+        <div class="name">关联检验科室：</div>
+        <div class="value">
+          <ng-container *ngFor="let item of configs.spePackageDeptList;let last = last">
+            {{item.dept}}<br *ngIf="!last">
+          </ng-container>
+        </div>
+      </div>
+      <div class="block">
+        <div class="name">关联试管类型：</div>
+        <div class="value">
+          <ng-container *ngFor="let item of configs.spePackageTubeList;let last = last">
+            {{item.name}}<ng-container *ngIf="!last">、</ng-container>
+          </ng-container>
+        </div>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/share/package-specimen-rule/package-specimen-rule.component.less

@@ -0,0 +1,154 @@
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .block{
+    display: flex;
+    margin-top: 16px;
+    &:first-of-type{
+      margin-top: 0;
+    }
+    .name{
+      width: 114px;
+    }
+    .value{
+      flex: 1;
+    }
+  }
+
+  .modalBody {
+    width: 480px;
+    height: auto;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+    }
+  }
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      .tips{
+        margin-bottom: 19px;
+      }
+
+      div {
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 16px 24px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/share/package-specimen-rule/package-specimen-rule.component.ts

@@ -0,0 +1,70 @@
+import { Component, OnInit, Output, Input } from '@angular/core';
+import { EventEmitter } from '@angular/core';
+import { ToolService } from 'src/app/services/tool.service';
+import { MainService } from 'src/app/services/main.service';
+
+@Component({
+  selector: 'app-package-specimen-rule',
+  templateUrl: './package-specimen-rule.component.html',
+  styleUrls: ['./package-specimen-rule.component.less']
+})
+export class PackageSpecimenRuleComponent implements OnInit {
+  @Output() cancelFlagHand = new EventEmitter();
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+  ) { }
+
+  hosId:any = this.tool.getCurrentHospital().id; //当前院区
+
+  ngOnInit() {
+    this.getConfig();
+  }
+  // 隐藏模态框
+  hideModal() {
+    this.cancelFlagHand.emit(false)
+  }
+
+  // 获取配置
+  configs:any = {};
+  spePackageUrgents = {
+    '0': '普标',
+    '1': '急标',
+  }
+  getConfig() {
+		let postData = {
+      idx: 0,
+      sum: 10,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.hosId
+          },
+          ordinaryField: {
+            key:"ordinary_field",
+            value: 'specimenPackage'
+          }
+        }
+      }
+    };
+
+    this.mainService
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          let configs = result.list[0] || {};
+
+          configs.spePackageDeptList = configs.spePackageDeptList || [];
+          configs.spePackageTubeList = configs.spePackageTubeList || [];
+          if(configs.spePackageUrgents){
+            configs.spePackageUrgentsList = configs.spePackageUrgents.split(',').map(v => ({ name: this.spePackageUrgents[v] }));
+          }else{
+            configs.spePackageUrgentsList = [];
+          }
+
+          this.configs = configs;
+        }
+      });
+  }
+}
+

src/app/share/pathology-add/pathology-add.component.html

@@ -125,9 +125,10 @@
 					
 					<nz-form-item class="form-item">
 						<nz-form-label nzRequired [nzSm]="3" [nzXs]="24">标本</nz-form-label>
-						<div class="add-icon-class" (click)='openSpecimen()'>
+						<div class="add-icon-class" (click)='openSpecimen()' *ngIf="(pathologyFrozenSpecimen && specimenList.length==0) || !pathologyFrozenSpecimen">
 							<span class="icon_transport transport-tag27fuben form-icon"></span>
 						</div>
+						<span *ngIf="pathologyFrozenSpecimen" class="text-prompt">{{ prompt }}</span>
 					</nz-form-item>
 					
 					<div class="specimen-list">
@@ -239,7 +240,7 @@
 		</div>
 		<div class="display_flex justify-content_flex-center bottom-btn">
 			<button class="btn btn-right" nz-button nzType="primary" (click)="submitSpecimen(1)" [nzLoading]="btnSpLoading">确定</button>
-			<button class="btn btn-right" nz-button nzType="primary" (click)="submitSpecimen(2)">新增下一个标本</button>
+			<button *ngIf="!pathologyFrozenSpecimen" class="btn btn-right" nz-button nzType="primary" (click)="submitSpecimen(2)">新增下一个标本</button>
 			<button class="btn cancel" nz-button nzType="default" (click)="hideSpecimenModal()">取消</button>
 		</div>
 	</div>

src/app/share/pathology-add/pathology-add.component.less

@@ -247,6 +247,13 @@
 		}
 	}
 	
+	.text-prompt{
+		display: flex;
+		align-items: center;
+		margin-left: 20px;
+		color: red;
+	}
+	
 }
 	// 新增
 	&.add {

src/app/share/pathology-add/pathology-add.component.ts

@@ -67,7 +67,6 @@ export class PathologyAddComponent implements OnInit {
   ngOnInit() {
 		this.hosId = this.tool.getCurrentHospital().id;
 		this.initForm()
-		this.getTaskTypesId()
 		this.fetchDataList()
 		this.getStationaryLiquid()
   }
@@ -85,6 +84,9 @@ export class PathologyAddComponent implements OnInit {
 	pathologyBarCode:any = 1;
 	ifImmobilization:any = false;
 	surgeryPathologyLabelSize:any = 1;
+	prompt:any;
+	pathologyFrozenSpecimen:boolean = false;
+	taskTypeConfig:any;
 	getPathologySys(){
 		let postData = {
 			  idx: 0,
@@ -99,6 +101,7 @@ export class PathologyAddComponent implements OnInit {
 		  .getFetchDataList("simple/data", "taskTypeConfig", postData)
 		  .subscribe((result) => {
 		    if (result.status == 200) {
+					this.taskTypeConfig = result.list[0]
 					this.pathologyBarCode = result.list[0].pathologyBarCode?result.list[0].pathologyBarCode:1;
 					if(result.list[0].surgeryPathologyLabelSize){
 						this.surgeryPathologyLabelSize = result.list[0].surgeryPathologyLabelSize.value;
@@ -108,6 +111,15 @@ export class PathologyAddComponent implements OnInit {
 					}else{
 						this.ifImmobilization = false
 					}
+					
+					if(this.detailsData.pathologyFormType==1 && this.taskTypeConfig.pathologyFrozenSpecimenNum==1){
+						this.pathologyFrozenSpecimen = true
+						this.prompt = this.taskTypeConfig.prompt
+						console.log(4444)
+					}else{
+						this.pathologyFrozenSpecimen = false
+						this.prompt = null
+					}
 				}
 		  });
 	}
@@ -170,6 +182,8 @@ export class PathologyAddComponent implements OnInit {
 				if(this.detailsData.intraoperativeFindings){
 					this.validateForm.controls.intraoperativeFindings.setValue(this.detailsData.intraoperativeFindings);
 				}
+			
+				this.getTaskTypesId()
 				this.getSpecimenName()
 				this.getProDicData()
 				this.getDicData()
@@ -205,6 +219,10 @@ export class PathologyAddComponent implements OnInit {
 	// 快捷标本点击
 	specimenEditType:any = null;
 	fastSpecimenClick(e, item, index){
+		if(this.detailsData.pathologyFormType==1 && this.pathologyFrozenSpecimen && this.specimenList.length>0){
+			this.message.error(this.prompt)
+			return
+		}
 		if(item.containPosition==1){
 			this.isSpinning = true
 			let data = {

src/app/share/select-date-yytime/select-date-yytime.component.html

@@ -0,0 +1,26 @@
+<div class="save add display_flex align-items_center justify-content_flex-center">
+  <div class="modalBody">
+    <div class="title">修改预约时间<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <div class="tips">是否需要预约执行，如需预约请您选择时间</div>
+      <div class="addForm">
+        <div class="display_flex align-items_center">
+          <div>
+            <nz-date-picker [(ngModel)]="yyDate" [nzShowToday]="false"></nz-date-picker>
+            <nz-time-picker [nzDisabled]="!yyDate" class="ml8" nzFormat="HH:mm" [(ngModel)]="yyTime" [nzAllowEmpty]="false">
+            </nz-time-picker>
+            <button [disabled]="!yyDate" nz-button nzType="primary" class="ml8 mt0" (click)="nextDay()">
+              下一日
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn" nzType="primary" nz-button (click)="submitFormYytime()">预约陪检</button>
+      <button class="btn" nzType="primary" nz-button (click)="submitFormDirect()">立即执行</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/share/select-date-yytime/select-date-yytime.component.less

@@ -0,0 +1,131 @@
+.yyTimeError {
+  ::ng-deep .ant-time-picker-input,
+  ::ng-deep .ant-calendar-picker-input {
+    border: 1px solid red !important;
+  }
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      .tips{
+        margin-bottom: 19px;
+      }
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/app/share/select-date-yytime/select-date-yytime.component.ts

@@ -0,0 +1,53 @@
+import { Component, OnInit, Output, Input } from '@angular/core';
+import { EventEmitter } from '@angular/core';
+import { NzMessageService } from 'ng-zorro-antd';
+import { addDays, startOfMinute, format } from 'date-fns';
+
+@Component({
+  selector: 'app-select-date-yytime',
+  templateUrl: './select-date-yytime.component.html',
+  styleUrls: ['./select-date-yytime.component.less']
+})
+export class SelectDateYytimeComponent implements OnInit {
+  @Input() date:any;
+  @Output() submitFormYytimeE = new EventEmitter();
+  @Output() submitFormDirectE = new EventEmitter();
+  @Output() cancelFlagHand = new EventEmitter();
+  yyDate = null; //预约日期-患者其他服务
+  yyTime = null; //预约时间-患者其他服务
+  constructor(
+    private message: NzMessageService,
+  ) { }
+
+  ngOnInit() {
+    if(this.date){
+      this.yyDate = startOfMinute(new Date(this.date));
+      this.yyTime = startOfMinute(new Date(this.date));
+    }
+  }
+
+  // 下一日(患者其他服务)
+  nextDay() {
+    this.yyDate = addDays(this.yyDate, 1);
+  }
+
+  // 隐藏模态框
+  hideModal() {
+    this.cancelFlagHand.emit(false)
+  }
+
+  // 预约陪检
+  submitFormYytime(): void {
+    if(!this.yyDate || !this.yyTime) {
+      this.message.warning('请选择完整预约时间');
+      return;
+    }
+    this.submitFormYytimeE.emit(format(this.yyDate, 'yyyy-MM-dd') + ' ' + format(startOfMinute(this.yyTime), 'HH:mm:ss'));
+  }
+
+  // 立即执行
+  submitFormDirect(): void {
+    this.submitFormDirectE.emit();
+  }
+}
+

src/app/share/select-date/select-date.component.html

@@ -0,0 +1,24 @@
+<div class="save add display_flex align-items_center justify-content_flex-center">
+  <div class="modalBody">
+    <div class="title">修改预约时间<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <div class="addForm">
+        <div class="display_flex align-items_center">
+          <div>
+            <nz-date-picker [(ngModel)]="yyDate" [nzShowToday]="false"></nz-date-picker>
+            <nz-time-picker [nzDisabled]="!yyDate" class="ml8" nzFormat="HH:mm" [(ngModel)]="yyTime" [nzAllowEmpty]="false">
+            </nz-time-picker>
+            <button [disabled]="!yyDate" nz-button nzType="primary" class="ml8 mt0" (click)="nextDay()">
+              下一日
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitForm()">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/share/select-date/select-date.component.less

@@ -0,0 +1,135 @@
+.yyTimeError {
+  ::ng-deep .ant-time-picker-input,
+  ::ng-deep .ant-calendar-picker-input {
+    border: 1px solid red !important;
+  }
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      .tips{
+        margin-bottom: 19px;
+      }
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/share/select-date/select-date.component.ts

@@ -0,0 +1,47 @@
+import { Component, OnInit, Output, Input } from '@angular/core';
+import { EventEmitter } from '@angular/core';
+import { NzMessageService } from 'ng-zorro-antd';
+import { addDays, startOfMinute, format } from 'date-fns';
+
+@Component({
+  selector: 'app-select-date',
+  templateUrl: './select-date.component.html',
+  styleUrls: ['./select-date.component.less']
+})
+export class SelectDateComponent implements OnInit {
+  @Input() date:any;
+  @Output() submitFormHand = new EventEmitter();
+  @Output() cancelFlagHand = new EventEmitter();
+  yyDate = null; //预约日期-患者其他服务
+  yyTime = null; //预约时间-患者其他服务
+  constructor(
+    private message: NzMessageService,
+  ) { }
+
+  ngOnInit() {
+    if(this.date){
+      this.yyDate = new Date(this.date);
+      this.yyTime = new Date(this.date);
+    }
+  }
+
+  // 下一日(患者其他服务)
+  nextDay() {
+    this.yyDate = addDays(this.yyDate, 1);
+  }
+
+  // 隐藏模态框
+  hideModal() {
+    this.cancelFlagHand.emit(false)
+  }
+
+  // 表单提交
+  submitForm(): void {
+    if(!this.yyDate || !this.yyTime) {
+      this.message.warning('请选择完整预约时间');
+      return;
+    }
+    this.submitFormHand.emit(format(this.yyDate, 'yyyy-MM-dd') + ' ' + format(startOfMinute(this.yyTime), 'HH:mm:ss'));
+  }
+}
+

src/app/share/share.module.ts

@@ -59,6 +59,13 @@ import { PathologyAddComponent } from './pathology-add/pathology-add.component';
 import { PathologyDetailComponent } from './pathology-detail/pathology-detail.component';
 import { StringToFirstValuePipe } from '../pipes/string-to-first-name.pipe';
 import { BusinessDataDetailInfoModalComponent } from './businessData-detail-info-modal/businessData-detail-info-modal.component';
+import { SelectDateComponent } from './select-date/select-date.component';
+import { AddInspectModalComponent } from './add-inspect-modal/add-inspect-modal.component';
+import { SelectDateYytimeComponent } from './select-date-yytime/select-date-yytime.component';
+import { PackageSpecimenRuleComponent } from './package-specimen-rule/package-specimen-rule.component';
+import { SpecimenPackageListModalComponent } from './specimen-package-list-modal/specimen-package-list-modal.component';
+import { NgxPrintModule } from 'ngx-print';
+import { SpecimenPackageLogPromptModalComponent } from './specimen-package-log-prompt-modal/specimen-package-log-prompt-modal.component';
 
 @NgModule({
   declarations: [
@@ -121,6 +128,12 @@ import { BusinessDataDetailInfoModalComponent } from './businessData-detail-info
     BloodHistoryPromptModalComponent,
     MedicalWasteHistoryPromptModalComponent,
     MedicalWasteLogPromptModalComponent,
+    SelectDateComponent,
+    AddInspectModalComponent,
+    SelectDateYytimeComponent,
+    PackageSpecimenRuleComponent,
+    SpecimenPackageListModalComponent,
+    SpecimenPackageLogPromptModalComponent,
   ],
   imports: [
     CommonModule,
@@ -129,6 +142,7 @@ import { BusinessDataDetailInfoModalComponent } from './businessData-detail-info
     ReactiveFormsModule,
     OverlayscrollbarsModule,
     NzIconModule,
+    NgxPrintModule,
   ],
   exports: [
     DetailSampleComponent,
@@ -191,6 +205,12 @@ import { BusinessDataDetailInfoModalComponent } from './businessData-detail-info
     BloodHistoryPromptModalComponent,
     MedicalWasteHistoryPromptModalComponent,
     MedicalWasteLogPromptModalComponent,
+    SelectDateComponent,
+    AddInspectModalComponent,
+    SelectDateYytimeComponent,
+    PackageSpecimenRuleComponent,
+    SpecimenPackageListModalComponent,
+    SpecimenPackageLogPromptModalComponent,
   ]
 })
 export class ShareModule { }

src/app/share/specimen-package-list-modal/specimen-package-list-modal.component.html

@@ -0,0 +1,92 @@
+<div class="modal display_flex justify-content_flex-center align-items_center">
+  <div class="modalBody" style="width: 1200px;">
+    <div class="title">科室内打包信息<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="list-template w100">
+      <div class="list-template__content">
+        <div class="list-template__top" nz-row>
+          <div nz-col nzXl='24' class="list-template__searchBox">
+            <div class="list-template__searchItem">
+              <span class="label">状态</span>：
+              <nz-select class="formItem" nzAllowClear [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择状态" [(ngModel)]="searchCriteria.status" (ngModelChange)="selectStatus($event)">
+                <nz-option *ngFor="let option of specimentPackageTypeList" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+              </nz-select>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="content">
+      <nz-table class="hospitalTable" [nzData]="packageList" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="13%">包号</th>
+            <th nzWidth="6%">打包人</th>
+            <th nzWidth="15%">打包时间</th>
+            <th nzWidth="6%">标本数</th>
+            <th nzWidth="6%">配送人</th>
+            <th nzWidth="15%">配送时间</th>
+            <th nzWidth="6%">接收人</th>
+            <th nzWidth="15%">接收时间</th>
+            <th nzWidth="8%">状态</th>
+            <th nzWidth="10%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of packageList;let i = index;">
+            <td>{{ data.packCode }}</td>
+            <td>{{ data.packUserDTO?.name }}</td>
+            <td>{{ data.packTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{ data.specimenNum }}</td>
+            <td>{{ data.deliveryUserDTO?.name }}</td>
+            <td>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{ data.receiveUserDTO?.name }}</td>
+            <td>{{ data.receiveTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{ data.status?.name }}</td>
+            <td>
+              <div class="coop">
+                <span (click)="printPackageByConfig(data)" *ngIf="data.status.value !== '0'">补打</span>
+                <span (click)="toSpecimenPackage(data)" *ngIf="data.status.value === '0' || data.status.value === '1'">修改</span>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+
+      <div class="pagination">
+        <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="total"
+          [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList()"
+          (nzPageSizeChange)="getList()" [nzShowTotal]="totalTemplate">
+        </nz-pagination>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center bottom-btn">
+      <button class="btn cancel know" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 打印的内容 -->
+<div id="print-section-package" hidden>
+  <!-- 80mm*80mm -->
+  <ng-container *ngIf="configs.spePackageCodeSize == 1">
+    <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;height: 80mm;">
+      <div style="display: flex;">
+        <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
+        <div style="flex: 1;">
+          <div>包号：{{package.packCode}}</div>
+          <div style="margin-top: 3mm;">打包人：{{package.packUserDTO?.name}}</div>
+          <div style="margin-top: 3mm;">标本总数：{{package.specimenNum}}</div>
+        </div>
+      </div>
+      <div style="margin-top: 3mm;">打包时间：{{package.packTime | date: 'yyyy-MM-dd HH:mm'}}</div>
+      <div style="margin-top: 3mm;">打包科室：{{package.packDeptDTO?.dept}}</div>
+      <div style="margin-top: 3mm;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">终点科室：{{package.targetDeptDTO?.dept}}</div>
+      <div style="display: flex;flex-wrap: wrap;">
+        <div style="width: 33.33%;margin-top: 3mm;" *ngFor="let item of typeSpecimentList | slice:0:9">{{item.name}}：{{item.size}}</div>
+      </div>
+    </div>
+  </ng-container>
+</div>
+<button ngxPrint printSectionId="print-section-package" #printBtnPackage hidden [printStyle]="{ '@page': { margin: '0 !important' }, 'body': { margin: '0 !important' } }">打印</button>

src/app/share/specimen-package-list-modal/specimen-package-list-modal.component.less

@@ -0,0 +1,261 @@
+@import "../../../../src/theme.less";
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .drugsBag{
+    display: flex;
+    align-items: center;
+    font-size: 16px;
+    gap: 40px;
+    padding: 16px 24px 0;
+    border-top: 1px solid #E8EBEF;
+  }
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+      position: relative;
+      word-break: break-all;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .ji {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    width: 30px;
+  }
+
+  .list-template{
+    padding: 0 24px;
+  }
+
+  .list-template__searchItem .label{
+    width: auto;
+    margin-left: 0;
+  }
+
+  .list-template__top{
+    div{
+      text-align: left!important;
+    }
+  }
+
+  .coop {
+    button{
+      color: #333;
+    }
+    span,button {
+      display: inline-block;
+      padding: 0 8px;
+      cursor: pointer;
+      position: relative;
+
+      &::after {
+        content: "|";
+        position: absolute;
+        top: 0;
+        right: 0;
+      }
+
+      &:hover,
+      &:active {
+        color: @primary-color;
+      }
+
+      &:nth-last-child(1) {
+        &::after {
+          content: "";
+        }
+      }
+    }
+  }
+
+  .tab {
+    width: 100%;
+    height: 60px;
+    border-bottom: 1px solid #e5e9ed;
+    background-color: #fff;
+
+    .item {
+      text-align: center;
+      line-height: 60px;
+      height: 100%;
+      border-right: 1px solid #e5e9ed;
+
+      &:nth-last-child(1) {
+        border: none;
+      }
+
+      &.checked {
+        background: #f0f6ed;
+      }
+    }
+  }
+
+  .modalBody {
+		min-height: 760px;
+    width: 700px;
+    background: #fff;
+    border-radius: 5px;
+    color: #333;
+		position: relative;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .title {
+      width: 100%;
+      height: 53px;
+      line-height: 53px;
+      border-bottom: 1px solid #E8EBEF;
+      padding: 0 28px;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 28px;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin: 0 24px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      &.content-search {
+        min-height: 147px;
+        justify-content: start;
+        .defeat-search {
+          width: 100%;
+          height: 52px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          border-bottom: solid 1px #e5e9ed;
+          em {
+            color: #666;
+            font-style: normal;
+          }
+        }
+        .form {
+          width: 100%;
+          padding: 0 16px;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
+          }
+        }
+      }
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
+        }
+
+        &.pagination {
+          font-size: 14px;
+          color: #666;
+          padding-top: 16px;
+          padding-bottom: 16px;
+          margin-left: auto;
+          margin-right: 16px;
+        }
+      }
+    }
+
+		.bottom-btn{
+			.btn {
+				position: absolute;
+				bottom: 10px;
+			}
+		}
+
+    button {
+      margin-top: 10px;
+      margin-bottom: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/share/specimen-package-list-modal/specimen-package-list-modal.component.ts

@@ -0,0 +1,158 @@
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild, ElementRef } from '@angular/core';
+import { MainService } from '../../services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+import { format, startOfDay, endOfDay } from 'date-fns';
+import { NzMessageService } from 'ng-zorro-antd';
+import { Router } from '@angular/router';
+@Component({
+  selector: 'app-specimen-package-list-modal',
+  templateUrl: './specimen-package-list-modal.component.html',
+  styleUrls: ['./specimen-package-list-modal.component.less']
+})
+export class SpecimenPackageListModalComponent implements OnInit {
+  @ViewChild('printBtnPackage', { static: false }) printBtnPackage: ElementRef<HTMLElement>;
+  // 切换科室，切换弹窗
+  hosId;
+  hsLoading = false;
+  packageList: any = [];// 标本列表
+  pageIndex: number = 1;//表格当前页码
+  pageSize: number = 10;//表格每页展示条数
+  total: number = 0;//表格总数据量
+  searchCriteria:any = {}
+
+  deptId = this.tool.getCurrentUserDept().id;
+  @Input() specimenPackageStateValue = '';
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+    public router: Router,
+  ) { }
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+
+    this.getStatusList();
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 切换状态下拉框
+  selectStatus(e){
+    this.getSpecimenPackageList(1);
+  }
+
+  // 分页获取数据
+  getList(){
+    this.getSpecimenPackageList();
+  }
+
+  // 获取状态
+  specimentPackageTypeList: any[] = [];
+  getStatusList() {
+    this.mainService.getDictionary("list", "pathology_pack_status").subscribe((data:any) => {
+      this.specimentPackageTypeList = data || [];
+
+      let obj = this.specimentPackageTypeList.find(v => v.value == this.specimenPackageStateValue);
+      if(obj){
+        this.searchCriteria.status = obj.id;
+      }
+      this.getSpecimenPackageList(1);
+    })
+  }
+
+  // 获取标本列表
+  getSpecimenPackageList(idx?) {
+    if (idx) {
+      this.pageIndex = 1;
+    }
+    let postData = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      pathologyPackInfo: {
+        deptId: this.deptId,
+        busiType: 'specimen',//标本打包
+        status: this.searchCriteria.status ? { id: this.searchCriteria.status } : undefined,
+      }
+    }
+    this.hsLoading = true;
+    this.mainService.getFetchDataList('simple/data','pathologyPackInfo',postData).subscribe(data => {
+      this.hsLoading = false;
+      this.packageList = data.list || [];
+      this.total = data.totalNum || 0;
+    })
+  }
+
+  // 修改
+  toSpecimenPackage(data){
+    this.router.navigateByUrl(`/batchSpecimen?id=${data.id}`);
+  }
+
+  // 补打
+  base64:string = '';
+  typeSpecimentList:any[] = [];
+  patientSpecimentList:any[] = [];
+  package:any = {};
+  printPackage(item){
+    this.mainService
+      .makeQrCode({}, item.packCode)
+      .subscribe((data:any) => {
+        if (data.state == 200) {
+          this.typeSpecimentList = data.tube || [];
+          this.patientSpecimentList = data.patient || [];
+          let packageDTO:any = data.package || {};
+          if(packageDTO.endDeptList){
+            packageDTO.endDeptNames = packageDTO.endDeptList.map(v => v.dept).toString();
+          }else{
+            packageDTO.endDeptNames = "";
+          }
+          this.package = packageDTO;
+
+          this.base64 = data.base64 || '';
+
+          this.message.success("操作成功");
+          setTimeout(()=>{
+            this.printBtnPackage.nativeElement.click();
+          },0)
+        } else {
+          this.message.error(data.msg || "操作失败");
+        }
+      });
+  }
+
+  // 获取配置
+  configs:any = {};
+  printPackageByConfig(data) {
+		let postData = {
+      idx: 0,
+      sum: 10,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.hosId
+          },
+          ordinaryField: {
+            key:"ordinary_field",
+            value: 'specimenPackage'
+          }
+        }
+      }
+    };
+
+    this.mainService
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          this.configs = result.list[0] || {};
+          this.printPackage(data);
+        }
+      });
+  }
+}
+
+
+

src/app/share/specimen-package-log-prompt-modal/specimen-package-log-prompt-modal.component.html

@@ -0,0 +1,56 @@
+<div
+  class="modal display_flex justify-content_flex-center align-items_center"
+  *ngIf="show"
+>
+  <div class="modalBody">
+    <div class="title">
+      流程信息查看<i
+        class="icon_transport transport-guanbi"
+        (click)="hideModal()"
+      ></i>
+    </div>
+    <div class="content">
+      <nz-table
+        class="hospitalTable"
+        [nzData]="historySpecimenList"
+        nzSize="middle"
+        [nzShowPagination]="false"
+        [nzLoading]="hsLoading"
+      >
+        <thead>
+          <tr class="thead">
+            <th nzWidth="8%">序号</th>
+            <th nzWidth="23%">动作</th>
+            <th nzWidth="23%">时间</th>
+            <th nzWidth="23%">备注</th>
+            <th nzWidth="23%">操作人</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of historySpecimenList; let i = index">
+            <td>{{ i+(historySpecimenPageIndex-1) * historySpecimenPageSize + 1 }}</td>
+            <td>{{ data.operationType?.name }}</td>
+            <td>{{ data.createTime | date: "MM-dd HH:mm:ss" }}</td>
+            <td>{{ data.logRemarks }}</td>
+            <td>{{ data.operationUserDTO?.name }}</td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="pagination">
+        <nz-pagination
+          [(nzPageIndex)]="historySpecimenPageIndex"
+          [(nzTotal)]="historySpecimenListLength"
+          [(nzPageSize)]="historySpecimenPageSize"
+          (nzPageIndexChange)="getHistorySpecimen()"
+          (nzPageSizeChange)="getHistorySpecimen()"
+        >
+        </nz-pagination>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn cancel" nz-button (click)="hideModal()">
+        关闭
+      </button>
+    </div>
+  </div>
+</div>

src/app/share/specimen-package-log-prompt-modal/specimen-package-log-prompt-modal.component.less

@@ -0,0 +1,165 @@
+@import "../../../../src/theme.less";
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .pagination{
+    padding: 8px;
+    margin-left: auto;
+  }
+
+  .modalBody {
+    width: 700px;
+    min-height: 220px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      min-height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      &.content-search {
+        min-height: 147px;
+        justify-content: start;
+        .defeat-search {
+          width: 100%;
+          height: 52px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          border-bottom: solid 1px #e5e9ed;
+          em {
+            color: #666;
+            font-style: normal;
+          }
+        }
+        .form {
+          width: 100%;
+          padding: 0 16px;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
+          }
+        }
+      }
+
+      div {
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+          padding-bottom: 10px;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/share/specimen-package-log-prompt-modal/specimen-package-log-prompt-modal.component.ts

@@ -0,0 +1,54 @@
+import { Component, OnInit, Input, Output, EventEmitter } from "@angular/core";
+import { MainService } from "../../services/main.service";
+import { ToolService } from "src/app/services/tool.service";
+
+@Component({
+  selector: "app-specimen-package-log-prompt-modal",
+  templateUrl: "./specimen-package-log-prompt-modal.component.html",
+  styleUrls: ["./specimen-package-log-prompt-modal.component.less"],
+})
+export class SpecimenPackageLogPromptModalComponent implements OnInit {
+  hosId;
+  // 切换科室，切换弹窗
+  hsLoading = false;
+  historySpecimenList: any = [];
+  historySpecimenPageIndex: number = 1; //表格当前页码
+  historySpecimenPageSize: number = 5; //表格每页展示条数
+  historySpecimenListLength: number = 10; //表格总数据量
+  @Input() show: Boolean;
+  @Input() id: String;
+
+  @Output() closeModelHs = new EventEmitter<any>(); //1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(private mainService: MainService, private tool: ToolService) {}
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.getHistorySpecimen();
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false })); //emits(向上弹射)事件
+  }
+  // 获取列表数据
+  getHistorySpecimen(idx?) {
+    if (idx) {
+      this.historySpecimenPageIndex = 1;
+    }
+    let postData = {
+      idx: this.historySpecimenPageIndex - 1,
+      sum: this.historySpecimenPageSize,
+      pathologyPackLog: {
+        packId: this.id,
+      },
+    };
+    this.hsLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "pathologyPackLog", postData)
+      .subscribe((data) => {
+        this.hsLoading = false;
+        this.historySpecimenList = data.list || [];
+        this.historySpecimenListLength = data.totalNum || 0;
+      });
+  }
+}

src/app/views/appraise-management/appraise-management.component.html

@@ -7,7 +7,7 @@
           <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
             nzPlaceHolder="请选择工单类型" [(ngModel)]="taskType">
             <ng-container *ngFor="let data of allTaskType">
-              <nz-option nzLabel="{{data.taskName}}" nzValue="{{data.id}}"></nz-option>
+              <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}"></nz-option>
             </ng-container>
           </nz-select>
         </div>
@@ -42,6 +42,10 @@
             <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of handleStatus"></nz-option>
           </nz-select>
         </div>
+				<div class="list-template__searchItem">
+				  <span class="label">单号</span>：
+				  <input class="formItem" nz-input placeholder="请输入单号" [(ngModel)]="orderNo" />
+				</div>
       </div>
       <div nz-col nzXl='6' class="list-template__btns">
         <button nz-button class="btn default" (click)='search()'>搜索</button>
@@ -54,37 +58,40 @@
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
-            <th nzWidth="10%">工单单号</th>
-            <th nzWidth="10%">申请科室</th>
-            <th nzWidth="7%">工单类型</th>
-            <th nzWidth="10%">发起时间</th>
-            <th nzWidth="10%">评价描述</th>
-            <th nzWidth="7%">评价等级</th>
-            <th nzWidth="10%">执行配送人员</th>
-            <th nzWidth="7%">处理状态</th>
-            <th nzWidth="7%">调解人</th>
-            <th nzWidth="17%">操作</th>
+						<th>工单类型</th>
+            <th>单号</th>
+            <th>申请科室</th>
+            <!-- <th>发起时间</th> -->
+						<th>执行人</th>
+						<th>评价时间</th>
+            <th>评价等级</th>
+						<th>评价描述</th>
+						<th>评价人</th>
+            <th>处理状态</th>
+            <th nzWidth="180px">操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;">
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{data.workOrderObj?data.workOrderObj.gdcode:''}}</td>
+						<td>{{data.orderType?data.orderType.name:'-'}}</td>
+            <td>{{data.orderNo}}</td>
             <td>{{ data.startDept.dept }}</td>
-            <td>{{data.workOrderObj.taskType.taskName}}</td>
-            <td>{{timestampToTime(data.startTime)}}</td>
-            <td>
-              <span style="overflow: hidden;text-overflow: ellipsis;">{{ data.evaluationDetails.remark }}</span>
-            </td>
-            <td>{{ data.evaluationDetails.serviceEvaluation.name }}</td>
-            <td>{{data.worker?data.worker.name:''}}</td>
+            <!-- <td>{{timestampToTime(data.startTime)}}</td> -->
+						<td>{{data.worker?data.worker.name:''}}</td>
+						<td>{{ data.evaluationTime?timestampToTime(data.evaluationTime):'-'}}</td>
+						<td>{{ data.evaluationLevel ? data.evaluationLevel.name:'-' }}</td>
+						<td>
+						  <span style="overflow: hidden;text-overflow: ellipsis;">{{ data.evaluationContent }}</span>
+						</td>
+            <td>{{data.evaluatorDTO?data.evaluatorDTO.name:''}}</td>
             <td>{{data.handleStatus.name}}</td>
-            <td>{{data.mediationUser?data.mediationUser.name:''}}</td>
-            <td>
+						<td>
               <div class="coop">
-                <span *ngIf="coopBtns.look" (click)="detail(data.id)">查看</span>
-                <span *ngIf="coopBtns.mediate&&data.handleStatus.id==286" (click)="detail(data.id,true)">调解</span>
-                <span *ngIf="coopBtns.designate&&data.handleStatus.id==286"
+								<span *ngIf="coopBtns.viewGd" (click)="viewDetail(data)">查看工单</span>
+                <span *ngIf="coopBtns.look && data.handleStatus.value==2" (click)="detail(data.id)">查看</span>
+                <span *ngIf="coopBtns.mediate && data.handleStatus.value==1" (click)="detail(data.id,true)">调解</span>
+                <span *ngIf="coopBtns.designate && data.handleStatus.value==1"
                   (click)="designate(data.id,data.hosId)">指派</span>
               </div>
             </td>
@@ -136,3 +143,6 @@
 
 <!-- 查看详情 -->
 <router-outlet (deactivate)="getList()"></router-outlet>
+
+<!-- 详情 -->
+<app-incident-detail [id]="coopData.workOrder" *ngIf="detailModalShow" (closeModelHs)="closeDetailModelOrder($event)" (confirmModelHs)="confirmDetailModelOrder($event)"></app-incident-detail>

src/app/views/appraise-management/appraise-management.component.ts

@@ -29,6 +29,7 @@ export class AppraiseManagementComponent implements OnInit {
   department: any; //所属科室
   mediUser: number; //调解人
   taskType: number; //工单类型
+	orderNo:any;
   allTaskType: any; //所有工单类型
   allHospital: any; //所有院区
   pageIndex: number = 1; //页码
@@ -70,7 +71,6 @@ export class AppraiseManagementComponent implements OnInit {
     this.worker = null;
     this.mediUser = null;
     this.status = null;
-    this.getAllTaskType();
     this.getAllWorker();
     this.getAllMediUser();
   }
@@ -123,7 +123,6 @@ export class AppraiseManagementComponent implements OnInit {
       user: {
         name: e || "",
         hospital: { id: that.hospital },
-        usertype: { id: 107 }, //服务台
       },
       idx: 0,
       sum: 20,
@@ -167,6 +166,11 @@ export class AppraiseManagementComponent implements OnInit {
       .subscribe((data) => {
         that.handleStatus = data;
       });
+		that.mainService
+		  .getDictionary("list", "order_type")
+		  .subscribe((data) => {
+		    that.allTaskType = data;
+		  });
   }
 
   // 搜索
@@ -178,6 +182,7 @@ export class AppraiseManagementComponent implements OnInit {
   reset() {
     this.pageIndex = 1;
     this.taskType = null;
+		this.orderNo = null;
     this.worker = null;
     this.mediUser = null;
     this.status = null;
@@ -191,15 +196,18 @@ export class AppraiseManagementComponent implements OnInit {
       idx: that.pageIndex - 1,
       sum: that.pageSize,
       badEvaluationHandle: {
-        taskType: that.taskType || "",
+				orderNo: that.orderNo || "",
+        orderType: {
+					id: that.taskType || "",
+				},
         worker: { id: that.worker || "" },
         handleStatus: { id: that.status || "" },
         hosId: that.hospital,
         mediationUser: { id: that.mediUser },
       },
     };
-    if (!data.badEvaluationHandle.taskType) {
-      delete data.badEvaluationHandle.taskType;
+    if (!data.badEvaluationHandle.orderType) {
+      delete data.badEvaluationHandle.orderType;
     }
     if (!data.badEvaluationHandle.worker.id) {
       delete data.badEvaluationHandle.worker;
@@ -293,7 +301,29 @@ export class AppraiseManagementComponent implements OnInit {
     }, 100);
     this.getList();
   }
-
+	
+	// 查看工单
+	detailModalShow = false; //弹窗开关
+	coopData:any;
+	viewDetail(data){ // 1:维修 2:配送陪检
+		this.coopData = data;
+		if(data.orderType.value==1){
+			this.detailModalShow = true;
+		}else{
+			this.router.navigateByUrl("/main/orderManagement/orderDetail/" + data.workOrder);
+		}
+	}
+	
+	// 关闭弹窗
+	closeDetailModelOrder(e) {
+	  this.detailModalShow = JSON.parse(e).show;
+	}
+	// 弹窗确定
+	confirmDetailModelOrder(e){
+	  this.detailModalShow = false;
+	  this.getList();
+	}
+	
   // 查看
   detail(id, tj?) {
     if (tj) {
@@ -301,7 +331,9 @@ export class AppraiseManagementComponent implements OnInit {
         fragment: "tj",
       });
     } else {
-      this.router.navigate(["/main/appraiseManagement/appraiseDetail/" + id]);
+      this.router.navigate(["/main/appraiseManagement/appraiseDetail/" + id],  {
+        fragment: "wtj",
+      });
     }
   }
 

src/app/views/appraise-management/appraise-management.module.ts

@@ -4,7 +4,7 @@ import { CommonModule } from '@angular/common';
 import { AppraiseManagementRoutingModule } from './appraise-management-routing.module';
 import { AppraiseManagementComponent } from './appraise-management.component';
 import { ShareModule } from 'src/app/share/share.module';
-
+import { IncidentDetailModule } from 'src/app/components/incidentManagement/incident-detail/incident-detail.module';
 
 @NgModule({
   declarations: [
@@ -13,7 +13,8 @@ import { ShareModule } from 'src/app/share/share.module';
   imports: [
     CommonModule,
     AppraiseManagementRoutingModule,
-    ShareModule
+    ShareModule,
+		IncidentDetailModule,
   ]
 })
 export class AppraiseManagementModule { }