轮巡建单增加每日每月每年每周，时间点单选；其他功能BUG修复

package-lock.json

@@ -853,7 +853,7 @@
     },
     "@types/zrender": {
       "version": "4.0.0",
-      "resolved": "https://registry.nlark.com/@types/zrender/download/@types/zrender-4.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/@types/zrender/download/@types/zrender-4.0.0.tgz",
       "integrity": "sha1-poBvEuxOzKrr2bDYFvBJrKYYj70=",
       "dev": true
     },
@@ -2608,9 +2608,9 @@
       }
     },
     "core-js": {
-      "version": "3.14.0",
-      "resolved": "https://registry.nlark.com/core-js/download/core-js-3.14.0.tgz",
-      "integrity": "sha1-YjIrmMccwgGLAnlxppQZ4kJcKmw="
+      "version": "3.15.1",
+      "resolved": "https://registry.nlark.com/core-js/download/core-js-3.15.1.tgz?cache=0&sync_timestamp=1624386897006&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-js%2Fdownload%2Fcore-js-3.15.1.tgz",
+      "integrity": "sha1-bAiriKvfVlRQRcz1/YH0f0B+fxo="
     },
     "core-util-is": {
       "version": "1.0.2",

package.json

@@ -24,7 +24,7 @@
     "@angular/router": "~8.1.1",
     "@types/crypto-js": "^3.1.47",
     "@types/overlayscrollbars": "^1.9.0",
-    "core-js": "^3.14.0",
+    "core-js": "^3.15.1",
     "crypto-js": "^4.0.0",
     "datatables.net": "^1.10.25",
     "date-fns": "^2.22.1",

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

@@ -8,7 +8,7 @@
       <div [ngClass]="{'item':true, 'flex_1':true, checked:tabType==3}" (click)="checkTab(3)">调解</div>
     </div>
     <!-- 其他类型工单信息 -->
-    <div *ngIf="(tabType==1)&&(orderInfo.workOrderObj.taskType.associationType.id==259)" class="content orders">
+    <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>
@@ -56,7 +56,7 @@
     </div>
     <!-- 标本类型工单信息 -->
     <div
-      *ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.id==256||orderInfo.workOrderObj.taskType.associationType.id==380)"
+      *ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.value=='specimen'||orderInfo.workOrderObj.taskType.associationType.value=='specimenPlan')"
       class="content orders">
       <div class="top">
         <div class="num">
@@ -143,7 +143,7 @@
     </div>
     <!-- 药品/静配配送类型工单信息 -->
     <div
-      *ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.id==257||orderInfo.workOrderObj.taskType.associationType.id==258)"
+      *ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.value=='drugsBag'||orderInfo.workOrderObj.taskType.associationType.value=='jPBag')"
       class="content orders">
       <div class="top">
         <div class="num">
@@ -246,7 +246,7 @@
     </div>
     <!-- 患者陪检/患者转运类型工单信息 -->
     <div
-      *ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.id==260||orderInfo.workOrderObj.taskType.associationType.id==255)"
+      *ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.value=='inspect'||orderInfo.workOrderObj.taskType.associationType.value=='patientTransport')"
       class="content orders">
       <div class="top">
         <div class="num">
@@ -304,7 +304,7 @@
                 <span class="label">床位</span>
                 <span>{{orderInfo.workOrderObj.patient.bedNum}}</span>
               </p>
-              <p *ngIf="orderInfo.workOrderObj.taskType.associationType.id==260">
+              <p *ngIf="orderInfo.workOrderObj.taskType.associationType.value=='inspect'">
                 <span class="label">检查项目</span>
                 <span>
                   <span *ngFor="let item of orderInfo.workOrderObj.checkList;let i = index;">
@@ -323,7 +323,7 @@
                 <span class="label">携带物品</span>
                 <span>{{orderInfo.workOrderObj.goods}}</span>
               </p>
-              <p *ngIf="orderInfo.workOrderObj.taskType.associationType.id==260">
+              <p *ngIf="orderInfo.workOrderObj.taskType.associationType.value=='inspect'">
                 <span class="label">预约时间</span>
                 <span>{{orderInfo.workOrderObj.yyTime?orderInfo.workOrderObj.yyTime:''}}</span>
               </p>

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

@@ -85,7 +85,7 @@
             </div>
           </div>
         </div>
-        <ng-container *ngIf="orderInfo.taskType.associationType.id==260">
+        <ng-container *ngIf="orderInfo.taskType.associationType.value=='inspect'">
           <div class="info" *ngFor="let item of orderInfo.checkList">
             <div nz-row class="top">
               <div nz-col nzSpan="8">

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

@@ -35,7 +35,8 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="dutyDeptFc">搜索当值科室
+            <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="dutyDeptFc">搜索当值科室<span
+                class="red ml8">(可通过拼音首字母检索科室)</span>
             </nz-form-label>
             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择当值科室！">
               <nz-select formControlName="dutyDeptFc" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch

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

@@ -9,7 +9,7 @@
     </div>
     <!-- 其他类型工单信息 -->
     <overlay-scrollbars #osComponentRef3 style="max-height: 400px;">
-      <div *ngIf="(tabType==1)&&(orderInfo.taskType.associationType.id==259)" class="content orders">
+      <div *ngIf="(tabType==1)&&(orderInfo.taskType.associationType.value=='other')" class="content orders">
         <div class="top">
           <div class="num">
             <span class="left">单号：{{orderInfo.gdcode}}</span>
@@ -64,7 +64,7 @@
     </overlay-scrollbars>
     <!-- 标本类型工单信息 -->
     <overlay-scrollbars #osComponentRef4 style="max-height: 400px;">
-      <div *ngIf="tabType==1&&orderInfo.taskType.associationType.id==256" class="content orders">
+      <div *ngIf="tabType==1&&orderInfo.taskType.associationType.value=='specimen'" class="content orders">
         <div class="top">
           <div class="num">
             <span class="left">单号：{{orderInfo.gdcode}}</span>
@@ -154,7 +154,7 @@
     </overlay-scrollbars>
     <!-- 标本轮巡工单信息 -->
     <overlay-scrollbars #osComponentRef5 style="max-height: 400px;">
-      <div *ngIf="tabType==1&&orderInfo.taskType.associationType.id==380" class="content orders">
+      <div *ngIf="tabType==1&&orderInfo.taskType.associationType.value=='specimenPlan'" class="content orders">
         <div class="top">
           <div class="num">
             <span class="left">单号：{{orderInfo.gdcode}}</span>
@@ -244,7 +244,7 @@
     </overlay-scrollbars>
     <!-- 药品/静配配送类型工单信息 -->
     <overlay-scrollbars #osComponentRef6 style="max-height: 400px;">
-      <div *ngIf="tabType==1&&(orderInfo.taskType.associationType.id==257||orderInfo.taskType.associationType.id==258)"
+      <div *ngIf="tabType==1&&(orderInfo.taskType.associationType.value=='drugsBag'||orderInfo.taskType.associationType.value=='jPBag')"
         class="content orders">
         <div class="top">
           <div class="num">
@@ -353,7 +353,7 @@
     </overlay-scrollbars>
     <!-- 患者陪检/患者转运类型工单信息 -->
     <overlay-scrollbars #osComponentRef1 style="max-height: 400px;">
-      <div *ngIf="tabType==1&&(orderInfo.taskType.associationType.id==260||orderInfo.taskType.associationType.id==255)"
+      <div *ngIf="tabType==1&&(orderInfo.taskType.associationType.value=='inspect'||orderInfo.taskType.associationType.value=='patientTransport')"
         class="content orders">
         <div class="top">
           <div class="num">
@@ -434,7 +434,7 @@
               </div>
             </div>
           </div>
-          <ng-container *ngIf="orderInfo.taskType.associationType.id==260">
+          <ng-container *ngIf="orderInfo.taskType.associationType.value=='inspect'">
             <div class="info" *ngFor="let item of orderInfo.checkList">
               <div nz-row class="top">
                 <div nz-col nzSpan="8">

src/app/views/fuwutai/fuwutai.component.html

@@ -102,7 +102,7 @@
                 </div>
                 <!-- 地点 -->
                 <div class="didian" (click)='openDetails(data.id,data.taskType.associationType.id)'>
-                  <span class="left" *ngIf="data.taskType.associationType.id==260">
+                  <span class="left" *ngIf="data.taskType.associationType.value=='inspect'">
                     {{data.startDept?data.startDept.dept:''}}
                     <span *ngFor="let item of data.middleDept">
                       ->{{item.dept}}
@@ -121,14 +121,14 @@
                   <span class="left" *ngIf="data.expectTimeNum&&data.timeOut!=true">
                     <i class="icon_transport transport-shouye10" nz-tooltip nzTooltipTitle="进行中"></i>
                     <ng-container
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.illnessState">
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.illnessState">
                       <i *ngIf="data.patient.illnessState.value === '2'"
                         class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
                       <i *ngIf="data.patient.illnessState.value === '3'" class="colorRed icon_transport transport-zhong"
                         nz-tooltip nzTooltipTitle="病重"></i>
                     </ng-container>
                     <ng-container
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.careLevel">
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.careLevel">
                       <i *ngIf="data.patient.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip
                         nzTooltipTitle="特级护理"></i>
                       <i *ngIf="data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid"
@@ -143,14 +143,14 @@
                   <span class="left" *ngIf="data.timeOutLength&&data.timeOut==true">
                     <i class="colorRed icon_transport transport-daojishi" nz-tooltip nzTooltipTitle="超时"></i>
                     <ng-container
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.illnessState">
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.illnessState">
                       <i *ngIf="data.patient.illnessState.value === '2'"
                         class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
                       <i *ngIf="data.patient.illnessState.value === '3'" class="colorRed icon_transport transport-zhong"
                         nz-tooltip nzTooltipTitle="病重"></i>
                     </ng-container>
                     <ng-container
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.careLevel">
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.careLevel">
                       <i *ngIf="data.patient.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip
                         nzTooltipTitle="特级护理"></i>
                       <i *ngIf="data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid"
@@ -266,7 +266,7 @@
                 </div>
                 <!-- 地点 -->
                 <div class="didian" (click)='openDetails(data.id,data.taskType.associationType.id)'>
-                  <span class="left" *ngIf="data.taskType.associationType&&data.taskType.associationType.id==260">
+                  <span class="left" *ngIf="data.taskType.associationType&&data.taskType.associationType.value=='inspect'">
                     {{data.startDept?data.startDept.dept:''}}
                     <span *ngFor="let item of data.middleDept">
                       ->{{item.dept}}
@@ -285,14 +285,14 @@
                   <span class="left" *ngIf="data.expectTimeNum&&data.timeOut!=true">
                     <i class="icon_transport transport-shouye10" nz-tooltip nzTooltipTitle="进行中"></i>
                     <ng-container
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.illnessState">
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.illnessState">
                       <i *ngIf="data.patient.illnessState.value === '2'"
                         class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
                       <i *ngIf="data.patient.illnessState.value === '3'" class="colorRed icon_transport transport-zhong"
                         nz-tooltip nzTooltipTitle="病重"></i>
                     </ng-container>
                     <ng-container
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.careLevel">
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.careLevel">
                       <i *ngIf="data.patient.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip
                         nzTooltipTitle="特级护理"></i>
                       <i *ngIf="data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid"
@@ -307,14 +307,14 @@
                   <span class="left" *ngIf="data.timeOutLength&&data.timeOut==true">
                     <i class="colorRed icon_transport transport-daojishi" nz-tooltip nzTooltipTitle="超时"></i>
                     <ng-container
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.illnessState">
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.illnessState">
                       <i *ngIf="data.patient.illnessState.value === '2'"
                         class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
                       <i *ngIf="data.patient.illnessState.value === '3'" class="colorRed icon_transport transport-zhong"
                         nz-tooltip nzTooltipTitle="病重"></i>
                     </ng-container>
                     <ng-container
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.careLevel">
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.careLevel">
                       <i *ngIf="data.patient.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip
                         nzTooltipTitle="特级护理"></i>
                       <i *ngIf="data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid"
@@ -427,7 +427,7 @@
                 </div>
                 <!-- 地点 -->
                 <div class="didian">
-                  <span class="left" *ngIf="data.taskType.associationType&&data.taskType.associationType.id==260">
+                  <span class="left" *ngIf="data.taskType.associationType&&data.taskType.associationType.value=='inspect'">
                     {{data.startDept?data.startDept.dept:''}}
                     <span *ngFor="let item of data.middleDept">
                       ->{{item.dept}}
@@ -446,14 +446,14 @@
                   <span class="left" *ngIf="data.expectTimeNum&&data.timeOut!=true">
                     <i class="icon_transport transport-shouye10" nz-tooltip nzTooltipTitle="进行中"></i>
                     <ng-container
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.illnessState">
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.illnessState">
                       <i *ngIf="data.patient.illnessState.value === '2'"
                         class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
                       <i *ngIf="data.patient.illnessState.value === '3'" class="colorRed icon_transport transport-zhong"
                         nz-tooltip nzTooltipTitle="病重"></i>
                     </ng-container>
                     <ng-container
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.careLevel">
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.careLevel">
                       <i *ngIf="data.patient.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip
                         nzTooltipTitle="特级护理"></i>
                       <i *ngIf="data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid"
@@ -468,14 +468,14 @@
                   <span class="left" *ngIf="data.timeOutLength&&data.timeOut==true">
                     <i class="colorRed icon_transport transport-daojishi" nz-tooltip nzTooltipTitle="超时"></i>
                     <ng-container
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.illnessState">
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.illnessState">
                       <i *ngIf="data.patient.illnessState.value === '2'"
                         class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
                       <i *ngIf="data.patient.illnessState.value === '3'" class="colorRed icon_transport transport-zhong"
                         nz-tooltip nzTooltipTitle="病重"></i>
                     </ng-container>
                     <ng-container
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.careLevel">
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.careLevel">
                       <i *ngIf="data.patient.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip
                         nzTooltipTitle="特级护理"></i>
                       <i *ngIf="data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid"
@@ -1143,7 +1143,7 @@
                     </div>
                     <!-- 地点 -->
                     <div class="didian">
-                      <span class="left" *ngIf="data.taskType.associationType.id==260">
+                      <span class="left" *ngIf="data.taskType.associationType.value=='inspect'">
                         {{data.startDept?data.startDept.dept:''}}
                         <span *ngFor="let item of data.middleDept">
                           ->{{item.dept}}
@@ -1162,14 +1162,14 @@
                       <span class="left" *ngIf="data.expectTimeNum&&data.timeOut!=true">
                         <i class="icon_transport transport-shouye10" nz-tooltip nzTooltipTitle="进行中"></i>
                         <ng-container
-                          *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.illnessState">
+                          *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.illnessState">
                           <i *ngIf="data.patient.illnessState.value === '2'"
                             class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
                           <i *ngIf="data.patient.illnessState.value === '3'"
                             class="colorRed icon_transport transport-zhong" nz-tooltip nzTooltipTitle="病重"></i>
                         </ng-container>
                         <ng-container
-                          *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.careLevel">
+                          *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.careLevel">
                           <i *ngIf="data.patient.careLevel.value === '0'" class="icon_transport transport-te1"
                             nz-tooltip nzTooltipTitle="特级护理"></i>
                           <i *ngIf="data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid"
@@ -1184,14 +1184,14 @@
                       <span class="left" *ngIf="data.timeOutLength&&data.timeOut==true">
                         <i class="colorRed icon_transport transport-daojishi" nz-tooltip nzTooltipTitle="超时"></i>
                         <ng-container
-                          *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.illnessState">
+                          *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.illnessState">
                           <i *ngIf="data.patient.illnessState.value === '2'"
                             class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
                           <i *ngIf="data.patient.illnessState.value === '3'"
                             class="colorRed icon_transport transport-zhong" nz-tooltip nzTooltipTitle="病重"></i>
                         </ng-container>
                         <ng-container
-                          *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.careLevel">
+                          *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.careLevel">
                           <i *ngIf="data.patient.careLevel.value === '0'" class="icon_transport transport-te1"
                             nz-tooltip nzTooltipTitle="特级护理"></i>
                           <i *ngIf="data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid"

src/app/views/hushijiandan/hushijiandan.component.html

@@ -647,7 +647,7 @@
                             <div nz-col nzSpan="12" class="col txtL">
                               {{item.taskType.taskName}}
                               <span
-                                *ngIf="item.patient&&(item.taskType.associationType.id == 255||item.taskType.associationType.id == 260)">
+                                *ngIf="item.patient&&(item.taskType.associationType.value=='patientTransport'||item.taskType.associationType.value=='inspect')">
                                 （{{item.patient.patientName}}）
                               </span>
                             </div>
@@ -726,7 +726,7 @@
 
 <!-- 返回系统按钮 -->
 <!-- 右侧悬浮框 -->
-<div id="fixedMenu" class="fixed" *ngIf="mainRole">
+<!-- <div id="fixedMenu" class="fixed" *ngIf="mainRole">
   <div class="right">
     <div class="fixedMenu hujiaozhongxin">
       <div class="menuItems">
@@ -752,7 +752,7 @@
   </div>
   <div *ngIf="showLastItems&&fixedTab!=''" (click)="fixedMenuShangla()" class="fixedMark">
   </div>
-</div>
+</div> -->
 
 <!-- 患者信息一键建单模态框 -->
 <div class="save display_flex align-items_center justify-content_flex-center patient" *ngIf="patientModal">

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

@@ -614,13 +614,13 @@ export class HushijiandanComponent implements OnInit {
           that.othersList = [];
           that.patientMsgList = [];
           data.data.allTaskTypes.forEach((e) => {
-            if (e.associationType.id == 259) {
+            if (e.associationType.value=='other') {
               that.othersList.push(e);
-            } else if (e.associationType.id == 256) {
+            } else if (e.associationType.value=='specimen') {
               that.bbMsg = e;
             } else if (
-              e.associationType.id == 255 ||
-              e.associationType.id == 260
+              e.associationType.value=='patientTransport' ||
+              e.associationType.value=='inspect'
             ) {
               that.patientMsgList.push(e);
             }
@@ -669,9 +669,10 @@ export class HushijiandanComponent implements OnInit {
     }
     let postData = {
       idx: 0,
-      sum: 50,
+      sum: 20,
       department: {
         searchType: 1,
+        hospital: { id: this.currentHospital.id },
       },
     };
     if (key) {
@@ -996,7 +997,7 @@ export class HushijiandanComponent implements OnInit {
     let flag = this.checkTypeLis.some((item) => {
       return (
         item.id == this.patientForm.controls.checkedType.value &&
-        item.associationType.id == 255
+        item.associationType.value=='patientTransport'
       );
     });
     //预约时间-患者陪检不能为空
@@ -1318,7 +1319,7 @@ export class HushijiandanComponent implements OnInit {
     let appointmentZyBuildFlag = this.checkTypeLis.filter(
       (item) =>
         item.id == this.patientForm.controls.checkedType.value &&
-        item.associationType.id == 255
+        item.associationType.value=='patientTransport'
     );
     if (appointmentZyBuildFlag.length) {
       this.appointmentZyBuildFlag =

src/app/views/main/main.component.ts

@@ -170,9 +170,11 @@ export class MainComponent implements OnInit {
       menus.forEach((item1) => {
         item1.flagBg = false;
         // item1.flag = false;
-        item1.childrens.forEach((value) => {
-          value.flag = false;
-        });
+        if (item1.childrens) {
+          item1.childrens.forEach((value) => {
+            value.flag = false;
+          });
+        }
       });
       localStorage.setItem("menu", JSON.stringify(menus));
       // 操作菜单一级 二级

src/app/views/round-robin/round-robin.component.html

@@ -45,11 +45,20 @@
             <td>{{ i+1 }}</td>
             <td>{{ data.title }}</td>
             <td>{{ data.taskType.taskName }}</td>
-            <td>{{ data.timePlan&&data.timePlan.name }}
-              {{data.dayType == 0?'':'（'+dayType[data.dayType]+'）'}}</td>
-            <td>
-              <div class="orderPlanTimeShow" nz-tooltip nzTooltipTitle="{{data.orderPlanTimeShow.join()}}">{{
-                data.orderPlanTimeShow.join() }}</div>
+            <td [ngSwitch]="data.timeStep">
+              <ng-container *ngSwitchCase="'day'">每日{{data.dayType == 0?'':'（'+dayType[data.dayType]+'）'}</ng-container>
+              <ng-container *ngSwitchCase="'week'">每周{{data.dayType == 0?'':'（'+dayType[data.dayType]+'）'}
+              </ng-container>
+              <ng-container *ngSwitchCase="'month'">每月{{data.dayType == 0?'':'（'+dayType[data.dayType]+'）'}
+              </ng-container>
+              <ng-container *ngSwitchCase="'year'">每年{{data.dayType == 0?'':'（'+dayType[data.dayType]+'）'}
+              </ng-container>
+            </td>
+            <td [ngSwitch]="data.timeStep">
+              <ng-container *ngSwitchCase="'day'">{{ data.executeTime|date:'HH时mm分' }}</ng-container>
+              <ng-container *ngSwitchCase="'week'">{{data.weekName}} {{ data.executeTime|date:'HH时mm分' }}</ng-container>
+              <ng-container *ngSwitchCase="'month'">{{data.extra1}}日 {{ data.executeTime|date:'HH时mm分' }}</ng-container>
+              <ng-container *ngSwitchCase="'year'">{{ data.executeTime|date:'MM月dd日HH时mm分' }}</ng-container>
             </td>
             <td>
               <div class="targetDept" nz-tooltip nzTooltipTitle="{{data.targetDeptShow}}">{{ data.targetDeptShow }}
@@ -57,7 +66,7 @@
             </td>
             <td>
               <div class="coop">
-                <span *ngIf="coopBtns.edit&&data.taskType.associationType.id == 259&&!data.taskTypeDeptOrder"
+                <span *ngIf="coopBtns.edit&&data.taskType.associationType.value=='other'&&!data.taskTypeDeptOrder"
                   (click)="batchOrdersHandler(data)">批量建单设置</span>
                 <span *ngIf="coopBtns.look" (click)="detail(data.id)">查看</span>
                 <span *ngIf="coopBtns.edit" (click)="edit(data)">修改</span>
@@ -111,22 +120,21 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="roundRobinStrategy">轮巡策略</nz-form-label>
-            <nz-form-control nzErrorTip="请选择轮巡策略!">
-              <nz-select [nzDropdownMatchSelectWidth]="false" [nzDisabled]="true" formControlName="roundRobinStrategy"
-                nzShowSearch nzAllowClear nzPlaceHolder="请选择轮巡策略">
-                <nz-option nzLabel="{{data.hosName}}" nzValue="{{data.id}}" *ngFor="let data of roundRobinStrategys">
-                </nz-option>
-              </nz-select>
-            </nz-form-control>
-          </nz-form-item>
-          <nz-form-item class="datesControl">
-            <nz-form-control nzErrorTip="请选择适用日期类型!" class="datesGroup">
+            <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="datesType">工作日或节假日</nz-form-label>
+            <nz-form-control nzErrorTip="请选择工作日或节假日!" class="datesGroup">
               <nz-checkbox-group formControlName="datesType" [(ngModel)]="oneOption">
               </nz-checkbox-group>
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
+            <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="timeStep">轮巡策略</nz-form-label>
+            <nz-form-control nzErrorTip="请选择轮巡策略!">
+              <nz-radio-group formControlName="timeStep" (ngModelChange)="timeStepChange($event)">
+                <label nz-radio [nzValue]="data.key" *ngFor="let data of timeSteps">{{data.name}}</label>
+              </nz-radio-group>
+            </nz-form-control>
+          </nz-form-item>
+          <!-- <nz-form-item>
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="executionTime">执行时间</nz-form-label>
             <nz-form-control nzErrorTip="请选择执行时间!">
               <nz-select formControlName="executionTime" class="select-seimin" nzMode="multiple" nzPlaceHolder="请选择执行时间"
@@ -142,11 +150,49 @@
                 <button nz-button nzSize="small" nzType="primary" (click)="timePickerClick()">确定</button>
               </ng-template>
             </nz-form-control>
+          </nz-form-item> -->
+          <nz-form-item *ngIf="validateForm.value.timeStep == 'week'">
+            <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="doWeek">计划执行周（每周）</nz-form-label>
+            <nz-form-control nzErrorTip="请选择周!">
+              <nz-select formControlName="doWeek" nzPlaceHolder="请选择周">
+                <nz-option nzValue="1" nzLabel="周一"></nz-option>
+                <nz-option nzValue="2" nzLabel="周二"></nz-option>
+                <nz-option nzValue="3" nzLabel="周三"></nz-option>
+                <nz-option nzValue="4" nzLabel="周四"></nz-option>
+                <nz-option nzValue="5" nzLabel="周五"></nz-option>
+                <nz-option nzValue="6" nzLabel="周六"></nz-option>
+                <nz-option nzValue="7" nzLabel="周日"></nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item *ngIf="validateForm.value.timeStep == 'month'">
+            <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="doMonth">计划执行（每月）</nz-form-label>
+            <nz-form-control nzErrorTip="请选择日!">
+              <nz-select formControlName="doMonth" nzPlaceHolder="请选择日">
+                <nz-option nzValue="{{item}}" nzLabel="{{item}}号" *ngFor="let item of months">
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item *ngIf="validateForm.value.timeStep == 'year'">
+            <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="doYear">计划执行（每年）</nz-form-label>
+            <nz-form-control nzErrorTip="请选择月日!">
+              <nz-date-picker nzFormat="MM-dd" formControlName="doYear" nzPlaceHolder="请选择月日"></nz-date-picker>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="executeTime">执行时间</nz-form-label>
+            <nz-form-control nzErrorTip="请选择执行时间!">
+              <nz-time-picker nzFormat="HH:mm" formControlName="executeTime" class="w100" nzPlaceHolder="请选择执行时间"
+                [nzAllowEmpty]="false">
+              </nz-time-picker>
+            </nz-form-control>
           </nz-form-item>
           <ng-container *ngIf="selectedTasktype">
-            <nz-form-item *ngIf="selectedTasktype.associationType.id == 380">
-              <nz-form-label [nzSm]="6" [nzXs]="24" [nzRequired]="selectedTasktype.associationType.id == 380"
-                nzFor="endDepartment">终点科室</nz-form-label>
+            <nz-form-item *ngIf="selectedTasktype.associationType.value=='specimenPlan'">
+              <nz-form-label [nzSm]="6" [nzXs]="24"
+                [nzRequired]="selectedTasktype.associationType.value=='specimenPlan'" nzFor="endDepartment">终点科室
+              </nz-form-label>
               <nz-form-control nzErrorTip="请选择终点科室!">
                 <nz-select [nzMode]="'multiple'" [nzDropdownMatchSelectWidth]="false" formControlName="endDepartment"
                   nzShowSearch nzAllowClear nzPlaceHolder="请选择终点科室" nzServerSearch
@@ -161,7 +207,7 @@
               </nz-form-control>
             </nz-form-item>
             <nz-form-item
-              *ngIf="selectedTasktype.associationType.id == 259&&(selectedTasktype.carryingCourses[0].departmentStrategy.value==1||selectedTasktype.carryingCourses[1].departmentStrategy.value==1)">
+              *ngIf="selectedTasktype.associationType.value=='other'&&(selectedTasktype.carryingCourses[0].departmentStrategy.value==1||selectedTasktype.carryingCourses[1].departmentStrategy.value==1)">
               <nz-form-control>
                 <label nz-checkbox formControlName="openDepartments">
                   <span>是否根据开通科室建单</span>
@@ -172,14 +218,14 @@
           </ng-container>
         </form>
         <ng-container *ngIf="selectedTasktype">
-          <p *ngIf="selectedTasktype.associationType.id == 380" class="roundRobinTips">
+          <p *ngIf="selectedTasktype.associationType.value=='specimenPlan'" class="roundRobinTips">
             提示：起点科室即为标本开通科室；执行人即为科室绑定人员设定；前往设置<a [routerLink]="['/main','officeManagement']">开通科室</a>、<a
               [routerLink]="['/main','workAssignment']">工作分配</a>>>
           </p>
-          <p *ngIf="selectedTasktype.associationType.id == 259&&(selectedTasktype.carryingCourses[0].departmentStrategy.value==1||selectedTasktype.carryingCourses[1].departmentStrategy.value==1)"
+          <p *ngIf="selectedTasktype.associationType.value=='other'&&(selectedTasktype.carryingCourses[0].departmentStrategy.value==1||selectedTasktype.carryingCourses[1].departmentStrategy.value==1)"
             class="roundRobinTips">
             提示：您选择的任务类型，需要根据发起科室进行建单，您需要再批量建单中增加发起科室。</p>
-          <p *ngIf="selectedTasktype.associationType.id == 259&&selectedTasktype.carryingCourses[0].departmentStrategy.value!=1&&selectedTasktype.carryingCourses[1].departmentStrategy.value!=1"
+          <p *ngIf="selectedTasktype.associationType.value=='other'&&selectedTasktype.carryingCourses[0].departmentStrategy.value!=1&&selectedTasktype.carryingCourses[1].departmentStrategy.value!=1"
             class="roundRobinTips">
             提示：您选择的任务类型，需要选择起点科室和终点科室，请在”批量建单“中进行设置。</p>
         </ng-container>
@@ -204,4 +250,5 @@
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>
 <!-- 批量建单设置 -->
-<app-batch-orders *ngIf="batchOrdersFlag" [selectedBatchOrder]="selectedBatchOrder" (close)="close($event)"></app-batch-orders>
+<app-batch-orders *ngIf="batchOrdersFlag" [selectedBatchOrder]="selectedBatchOrder" (close)="close($event)">
+</app-batch-orders>

src/app/views/round-robin/round-robin.component.less

@@ -9,7 +9,7 @@
     text-overflow: ellipsis;
     white-space: nowrap;
   }
-  .orderPlanTimeShow {
+  .executeTime {
     overflow: hidden;
     width: 142px;
     text-overflow: ellipsis;
@@ -28,10 +28,10 @@
   }
 }
 // 时间选择框相关
-::ng-deep .ant-time-picker-panel[ng-reflect-nz-place-holder="请选择执行时间"] {
-  left: -155px;
-  top: -103px;
-}
+// ::ng-deep .ant-time-picker-panel[ng-reflect-nz-place-holder="请选择执行时间"] {
+//   left: -155px;
+//   top: -103px;
+// }
 
 .save {
   position: fixed;

src/app/views/round-robin/round-robin.component.ts

@@ -13,6 +13,7 @@ import { ToolService } from "../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
 import { NzMessageService } from "ng-zorro-antd";
+import { format } from "date-fns";
 @Component({
   selector: "app-round-robin",
   templateUrl: "./round-robin.component.html",
@@ -42,7 +43,13 @@ export class RoundRobinComponent implements OnInit {
     endDepartment: null,
   };
   roundRobinTypes = []; //轮巡类型
-  roundRobinStrategys = [{ id: "381", hosName: "每天轮巡" }]; //轮巡类型
+  timeSteps = [
+    // { id: "381", name: "每天轮巡" },
+    { key: "day", name: "每天" },
+    { key: "week", name: "每周" },
+    { key: "month", name: "每月" },
+    { key: "year", name: "每年" },
+  ]; //轮巡类型
   createUser = "";
   dayType = ["全部", "节假日", "工作日"]; //执行策略里的复选框数据字典
   department = []; // 院区下的科室列表
@@ -154,7 +161,7 @@ export class RoundRobinComponent implements OnInit {
   selectedTasktypeHandler(e) {
     this.selectedTasktype = this.roundRobinTypes.find((item) => item.id == e);
     this.requiredChange(
-      this.selectedTasktype.associationType.id == 380,
+      this.selectedTasktype.associationType.value == "specimenPlan",
       "endDepartment"
     );
     console.log(this.selectedTasktype);
@@ -255,6 +262,20 @@ export class RoundRobinComponent implements OnInit {
         if (data.status == 200) {
           this.listOfData = data.list;
           this.listLength = data.totalNum;
+          this.listOfData.forEach((item) => {
+            if (item.timeStep == "week") {
+              let weeks = [
+                "周一",
+                "周二",
+                "周三",
+                "周四",
+                "周五",
+                "周六",
+                "周日",
+              ];
+              item.weekName = weeks[item.extra1 - 1];
+            }
+          });
         }
       });
   }
@@ -317,18 +338,52 @@ export class RoundRobinComponent implements OnInit {
     this.validateForm = this.fb.group({
       roundRobinName: [null, [Validators.required]],
       roundRobinType: [null, [Validators.required]],
-      roundRobinStrategy: [null, [Validators.required]],
+      timeStep: [null, [Validators.required]],
       datesType: [null, [this.dateValidator]],
-      executionTime: [null, [Validators.required]],
-      time: [null],
+      executeTime: [null, [Validators.required]],
+      // executionTime: [null, [Validators.required]],
+      // time: [null],
       endDepartment: [null, [Validators.required]],
       openDepartments: [false],
     });
-    this.validateForm.controls.roundRobinStrategy.setValue(
-      this.roundRobinStrategys[0].id
-    );
+    this.validateForm.controls.timeStep.setValue(this.timeSteps[0].key);
     this.timeSelectedValue = [];
   }
+  // 修改轮巡策略
+  months = [...Array(32).keys()].slice(1);
+  timeStepChange(e) {
+    switch (e) {
+      case "day":
+        this.validateForm.removeControl("doWeek");
+        this.validateForm.removeControl("doMonth");
+        this.validateForm.removeControl("doYear");
+        break;
+      case "week":
+        this.validateForm.addControl(
+          "doWeek",
+          new FormControl(null, Validators.required)
+        );
+        this.validateForm.removeControl("doMonth");
+        this.validateForm.removeControl("doYear");
+        break;
+      case "month":
+        this.validateForm.addControl(
+          "doMonth",
+          new FormControl(null, Validators.required)
+        );
+        this.validateForm.removeControl("doWeek");
+        this.validateForm.removeControl("doYear");
+        break;
+      case "year":
+        this.validateForm.addControl(
+          "doYear",
+          new FormControl(null, Validators.required)
+        );
+        this.validateForm.removeControl("doWeek");
+        this.validateForm.removeControl("doMonth");
+        break;
+    }
+  }
 
   //创建自定义校验规则dateValidator，用于复选框组校验时调用。
   selectedDate: any = [];
@@ -372,63 +427,66 @@ export class RoundRobinComponent implements OnInit {
       this.btnLoading = false;
       return;
     }
-    let data: any = {};
+    let postData: any = {};
 
     if (this.add) {
       //增加
-      data = {
+      postData = {
         orderPlan: {
           title: this.validateForm.value.roundRobinName,
           hospital: this.hosId,
           taskType: { id: this.validateForm.value.roundRobinType },
-          timePlan: {
-            id: this.validateForm.value.roundRobinStrategy,
-          },
+          timeStep: this.validateForm.value.timeStep,
           dayType: this.validateForm.value.datesType,
-          orderPlanTimeShow: this.validateForm.value.executionTime,
+          executeTime: new Date(this.validateForm.value.executeTime).getTime(),
         },
       };
-      if (this.selectedTasktype.associationType.id == 380) {
+      if (this.selectedTasktype.associationType.value == "specimenPlan") {
         //标本轮巡
-        data.orderPlan.targetDept =
+        postData.orderPlan.targetDept =
           this.validateForm.value.endDepartment.join();
-      } else if (this.selectedTasktype.associationType.id == 259) {
+      } else if (this.selectedTasktype.associationType.value == "other") {
         //其他配送
-        data.orderPlan.taskTypeDeptOrder =
+        postData.orderPlan.taskTypeDeptOrder =
           this.validateForm.value.openDepartments;
       }
     } else {
       //编辑
-      let timeSelectedValue = JSON.parse(
-        JSON.stringify(this.timeSelectedValue)
-      );
-      let diff =
-        timeSelectedValue.sort().join("-") ===
-        this.executionTimeTemporaryStorage.sort().join("-")
-          ? []
-          : this.timeSelectedValue;
-      data = {
+      postData = {
         id: this.coopId,
         title: this.validateForm.value.roundRobinName,
         hospital: this.hosId,
         taskType: { id: this.validateForm.value.roundRobinType },
-        timePlan: {
-          id: this.validateForm.value.roundRobinStrategy,
-        },
+        timeStep: this.validateForm.value.timeStep,
         dayType: this.validateForm.value.datesType,
-        orderPlanTimeShow: diff,
+        executeTime: new Date(this.validateForm.value.executeTime).getTime(),
       };
-      if (this.selectedTasktype.associationType.id == 380) {
+      if (this.selectedTasktype.associationType.value == "specimenPlan") {
         //标本轮巡
-        data.targetDept = this.validateForm.value.endDepartment.join();
-      } else if (this.selectedTasktype.associationType.id == 259) {
+        postData.targetDept = this.validateForm.value.endDepartment.join();
+      } else if (this.selectedTasktype.associationType.value == "other") {
         //其他配送
-        data.taskTypeDeptOrder = this.validateForm.value.openDepartments;
+        postData.taskTypeDeptOrder = this.validateForm.value.openDepartments;
       }
     }
-    console.log(data);
+    if (this.validateForm.value.timeStep == "day") {
+      delete postData.extra1;
+    } else if (this.validateForm.value.timeStep == "week") {
+      postData.extra1 = this.validateForm.value.doWeek;
+    } else if (this.validateForm.value.timeStep == "month") {
+      postData.extra1 = this.validateForm.value.doMonth;
+    } else if (this.validateForm.value.timeStep == "year") {
+      delete postData.extra1;
+      postData.executeTime = new Date(
+        format(new Date(this.validateForm.value.doYear), "yyyy-MM-dd") +
+          " " +
+          format(new Date(this.validateForm.value.executeTime), "HH:mm:ss")
+      ).getTime();
+    }
+    console.log(postData);
+    return; //baba
     this.mainService
-      .addRoundRobin(this.add ? "addPlan" : "updatePlan", data)
+      .addRoundRobin(this.add ? "addPlan" : "updatePlan", postData)
       .subscribe((data) => {
         this.btnLoading = false;
         this.hideAddModal();
@@ -449,7 +507,7 @@ export class RoundRobinComponent implements OnInit {
   maskFlagLoading2 = false;
   edit(data) {
     this.requiredChange(
-      data.taskType.associationType.id == 380,
+      data.taskType.associationType.value == "specimenPlan",
       "endDepartment"
     );
     this.maskFlag = this.message.loading("正在加载中..", {
@@ -461,7 +519,7 @@ export class RoundRobinComponent implements OnInit {
     this.coopId = data.id;
     this.createUser = data.createUser ? data.createUser.name : ""; //创建人
     this.validateForm.controls.roundRobinName.setValue(data.title); //名称
-    // 轮巡类型
+    // 轮巡类型 start
     {
       this.selectedTasktype = data.taskType;
       let postData = {
@@ -496,19 +554,22 @@ export class RoundRobinComponent implements OnInit {
           }
         });
     }
-    // 轮巡类型
-    this.validateForm.controls.roundRobinStrategy.setValue(
-      this.roundRobinStrategys[0].id
-    ); //轮巡策略
-    this.defaultSelectTimesOption = JSON.parse(
-      JSON.stringify(data.orderPlanTimeShow)
-    ); //轮巡策略(时间)
-    this.timeSelectedValue = JSON.parse(JSON.stringify(data.orderPlanTimeShow)); //轮巡策略（时间）
-    this.executionTimeTemporaryStorage = JSON.parse(
-      JSON.stringify(data.orderPlanTimeShow)
-    ); //轮巡策略（时间暂存）
+    // 轮巡类型end
+    this.validateForm.controls.timeStep.setValue(data.timeStep); //轮巡策略
+    this.defaultSelectTimesOption = data.executeTime;
+    //轮巡策略(时间) start
+    if (data.timeStep == "year") {
+      this.validateForm.controls.doYear.setValue(
+        format(data.executeTime, "yyyy-MM-dd HH:mm:ss")
+      );
+    } else if (data.timeStep == "month") {
+      this.validateForm.controls.doMonth.setValue(data.extra1);
+    } else if (data.timeStep == "week") {
+      this.validateForm.controls.doWeek.setValue(data.extra1);
+    }
+    //轮巡策略（时间）end
     // --------终点科室---
-    if (data.taskType.associationType.id == 380) {
+    if (data.taskType.associationType.value == "specimenPlan") {
       //标本轮巡，则回显
       let targetDeptArr = [];
       let targetDept = data.targetDept.split(",");
@@ -550,7 +611,7 @@ export class RoundRobinComponent implements OnInit {
     }
     // --------/终点科室---
     if (
-      data.taskType.associationType.id == 259 &&
+      data.taskType.associationType.value == "other" &&
       (data.taskType.carryingCourses[0].departmentStrategy.value == 1 ||
         data.taskType.carryingCourses[1].departmentStrategy.value == 1)
     ) {

src/app/views/task-type-management/task-type-management.component.html

@@ -51,8 +51,9 @@
           </div>
         </div>
         <nz-form-label class="label" nzRequired>关联类型</nz-form-label>
+        <!-- 关联类型禁止修改 -->
         <nz-select class="mb8 w100" nzShowSearch nzAllowClear nzPlaceHolder="请选择关联类型" [(ngModel)]="association.id"
-          (ngModelChange)="asso(association)">
+          (ngModelChange)="asso(association)" [nzDisabled]="!add">
           <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of allAssociation"></nz-option>
         </nz-select>
         <nz-form-label *ngIf="association['id'] == 256" class="label" nzRequired>空单默认科室</nz-form-label>

src/app/views/task-type-management/task-type-management.component.ts

@@ -673,12 +673,12 @@ export class TaskTypeManagementComponent implements OnInit {
 
       if (this.allScheduleClass[i].checked) {
         this.scheduleClassChecked.push(this.allScheduleClass[i]);
-        if (data.associationType.id == 256) {
+        if (data.associationType.value=='specimen') {
           this.autoClass.push(this.allScheduleClass[i]);
         }
       }
     }
-    if (data.associationType.id == 256) {
+    if (data.associationType.value=='specimen') {
       let ids = data.carryingCourses[0].createRuleConfiguration
         ? data.carryingCourses[0].createRuleConfiguration.map(
             (item) => item.classesId
@@ -739,7 +739,6 @@ export class TaskTypeManagementComponent implements OnInit {
       data.remarksPrompts === undefined ? "" : data.remarksPrompts + ""; //备注信息提示用语
     this.quickRemarks =
       data.customRemarks === undefined ? "" : data.customRemarks; //备注快速输入
-    // this.optionList
     let addEndDeptIdsArr = data.carryingCourses[0].endDepartmentList || [];
     let ids = [];
     let arrMiddle = [];