护士端陪检图标

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/views/hushijiandan/hushijiandan.component.html

@@ -357,6 +357,10 @@
                           <span *ngIf="item.urgentFlag" (click)="changeSpeDetail($event, 1)">急:<span class="red">{{ specimenWorkOrderMsg.specimenCount ? specimenWorkOrderMsg.specimenCount.urgent : 0 }}</span></span>
                           <span *ngIf="item.ordinaryFlag" (click)="changeSpeDetail($event, 0)">普:{{ specimenWorkOrderMsg.specimenCount ? specimenWorkOrderMsg.specimenCount.noUrgent : 0 }}</span>
                         </div>
+                        <div class="navSpecimen" *ngIf="item.bussType.value === 'inspect'">
+                          <span>预:0</span>
+                          <span>检:0</span>
+                        </div>
                       </div>
                     </div>
                   </div>

src/app/views/hushijiandan/hushijiandan.component.less

@@ -270,7 +270,7 @@
         padding: 0 5px;
       }
     }
-		
+
 		.new-title {
 		  width: 100%;
 		  text-align: center;
@@ -286,7 +286,7 @@
 		    padding: 0 5px;
 		  }
 		}
-		
+
 		.title-weight{
 			font-weight: bold;
 			font-size: 15px;
@@ -402,7 +402,7 @@
 				            text-decoration: underline;
 				            cursor: pointer;
 				          }
-									
+
 									.coop-btn{
 										button{
 											margin-top: 0 !important;
@@ -415,14 +415,14 @@
 										  display: inline-block;
 										  cursor: pointer;
 										  position: relative;
-										
+
 										  &::after {
 										    content: "|";
 										    position: absolute;
 										    top: 0;
 										    right: 0;
 										  }
-										
+
 										  &:nth-last-child(1) {
 										    &::after {
 										      content: "";
@@ -430,7 +430,7 @@
 										  }
 										}
 									}
-									
+
 				          .coop {
 				            button{
 				              color: #333;
@@ -1461,6 +1461,12 @@
                           font-size: 24px;
                         }
                       }
+                      &.inspect{
+                        background: linear-gradient( 41deg, #28EDD9 0%, #0FBBE2 100%);
+                        .icon_transport{
+                          font-size: 24px;
+                        }
+                      }
                     }
                     h2{
                       font-size: 12px;

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

@@ -783,6 +783,8 @@ export class HushijiandanComponent implements OnInit {
       return 'drugbag';
     }else if(icon === 'transport-baoxiu'){
       return 'incident';
+    }else if(icon === 'transport-peihuguanli'){
+      return 'inspect';
     }else{
       return '';
     }

src/assets/iconfont/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon icon_transport">&#xe670;</span>
+                <div class="name">陪护管理</div>
+                <div class="code-name">&amp;#xe670;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon icon_transport">&#xe6e1;</span>
                 <div class="name">数据生成规则</div>
                 <div class="code-name">&amp;#xe6e1;</div>
@@ -1068,9 +1074,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1743147201353') format('woff2'),
-       url('iconfont.woff?t=1743147201353') format('woff'),
-       url('iconfont.ttf?t=1743147201353') format('truetype');
+  src: url('iconfont.woff2?t=1743992402666') format('woff2'),
+       url('iconfont.woff?t=1743992402666') format('woff'),
+       url('iconfont.ttf?t=1743992402666') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -1097,6 +1103,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon icon_transport transport-peihuguanli"></span>
+            <div class="name">
+              陪护管理
+            </div>
+            <div class="code-name">.transport-peihuguanli
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon icon_transport transport-shujushengchengguize"></span>
             <div class="name">
               数据生成规则
@@ -2619,6 +2634,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-peihuguanli"></use>
+                </svg>
+                <div class="name">陪护管理</div>
+                <div class="code-name">#transport-peihuguanli</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-shujushengchengguize"></use>
                 </svg>
                 <div class="name">数据生成规则</div>

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon_transport"; /* Project id 4543613 */
-  src: url('iconfont.woff2?t=1743147201353') format('woff2'),
-       url('iconfont.woff?t=1743147201353') format('woff'),
-       url('iconfont.ttf?t=1743147201353') format('truetype');
+  src: url('iconfont.woff2?t=1743992402666') format('woff2'),
+       url('iconfont.woff?t=1743992402666') format('woff'),
+       url('iconfont.ttf?t=1743992402666') format('truetype');
 }
 
 .icon_transport {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.transport-peihuguanli:before {
+  content: "\e670";
+}
+
 .transport-shujushengchengguize:before {
   content: "\e6e1";
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "24101601",
+      "name": "陪护管理",
+      "font_class": "peihuguanli",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
+    {
       "icon_id": "18532319",
       "name": "数据生成规则",
       "font_class": "shujushengchengguize",