Merge branch 'lmm' into develop

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",

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.3.96",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/services/tool.service.ts

@@ -21,6 +21,10 @@ export class ToolService {
       ? JSON.parse(localStorage.getItem("user")).user.currentHospital
       : JSON.parse(localStorage.getItem("user")).infoPermission.hospitals[0];
   }
+  //获取当前用户科室
+  getCurrentUserDept() {
+    return JSON.parse(localStorage.getItem("user")).user.dept;
+  }
   //获取当前菜单的权限
   initCoopBtns(route) {
     let link;

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

@@ -2,7 +2,7 @@
   <div class="modalBody" *ngIf="changeShow">
     <div class="title">当前科室<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
     <div class="content">
-      <div class="defeat">{{currentDept}}</div>
+      <div class="defeat">{{currentDept.dept}}</div>
       <div class="countDown">关闭倒计时<em>{{closeTime}}s</em></div>
     </div>
     <div class="display_flex justify-content_flex-center">
@@ -15,16 +15,32 @@
     <div class="content content-search">
       <div class="defeat-search display_flex justify-content_flex-center flex-direction_column">
         <span>当前院区：<em>{{currentHospital.hosName}}</em></span>
-        <span>当前科室：<em>{{currentDept}}</em></span>
+        <span>当前科室：<em>{{currentDept.dept}}</em></span>
       </div>
       <div class="form">
         <form nz-form [formGroup]="validateForm">
+          <nz-form-item style="margin-bottom: 0;">
+            <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="hospital">搜索院区
+            </nz-form-label>
+            <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择院区！">
+              <nz-select formControlName="hospital" [nzDropdownMatchSelectWidth]="false"
+                (ngModelChange)="searchHospital($event)" nzPlaceHolder="请选择院区">
+                <ng-container *ngFor="let option of hospitals">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [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 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
-                (nzOnSearch)="searchDept($event)" nzAllowClear nzPlaceHolder="请选择当值科室" [(ngModel)]="dutyDept">
+                (nzOnSearch)="searchDept(validateForm.controls.hospital.value,$event)" nzPlaceHolder="请选择当值科室">
                 <ng-container *ngFor="let option of dutyDepts">
                   <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
                 </ng-container>

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

@@ -1,4 +1,3 @@
-
 @import "../../../../src/theme.less";
 .modal {
   position: fixed;
@@ -6,7 +5,7 @@
   top: 0;
   width: 100%;
   height: 100%;
-  background: rgba(0, 0, 0, .4);
+  background: rgba(0, 0, 0, 0.4);
   z-index: 99;
 
   .modalBody {
@@ -16,7 +15,7 @@
     border-radius: 5px;
     padding: 10px 20px;
     color: #333;
-    &.modalBody-search{
+    &.modalBody-search {
       width: 480px;
       min-height: 250px;
     }
@@ -49,42 +48,42 @@
       flex-direction: column;
       justify-content: center;
       align-items: center;
-      &.content-search{
+      &.content-search {
         min-height: 147px;
         justify-content: start;
-        .defeat-search{
+        .defeat-search {
           width: 100%;
           height: 52px;
           display: flex;
           justify-content: center;
           align-items: center;
           border-bottom: solid 1px #e5e9ed;
-          em{
+          em {
             color: #666;
             font-style: normal;
           }
         }
-        .form{
+        .form {
           width: 100%;
           padding: 0 16px;
-          .ant-form-item-label,.ant-form-explain{
-            text-align: left!important;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
           }
         }
       }
 
       div {
-        text-align: center;
         margin: 0;
 
         &.defeat {
           color: #333;
           font-size: 28px;
         }
-        &.countDown{
+        &.countDown {
           font-size: 14px;
           color: 666;
-          em{
+          em {
             font-style: normal;
             color: @primary-color;
           }
@@ -105,7 +104,6 @@
         margin-left: 8px;
       }
     }
-
   }
 
   // 新增
@@ -138,17 +136,13 @@
             }
           }
         }
-
       }
 
       button {
         &:nth-child(1) {
           margin-right: 20px;
-
         }
       }
-
     }
   }
-
 }

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

@@ -1,10 +1,5 @@
 import { Component, OnInit, Input, Output, EventEmitter } from "@angular/core";
-import {
-  FormBuilder,
-  FormControl,
-  FormGroup,
-  Validators,
-} from "@angular/forms";
+import { FormBuilder, FormGroup, Validators } from "@angular/forms";
 import { MainService } from "../../services/main.service";
 import { ToolService } from "../../services/tool.service";
 import { Subject } from "rxjs";
@@ -20,11 +15,11 @@ export class HsPromptModalComponent implements OnInit {
   // 切换科室，切换弹窗
   // changeShow = true //true显示第一个弹窗，false显示选择科室的弹窗
   validateForm!: FormGroup;
-  dutyDept; //当值科室
   dutyDepts = []; //当值科室列表
   isLoading = false;
   currentHospital; //当前院区
-  currentDept = JSON.parse(localStorage.getItem("user")).user.dept.dept; //当前科室
+  hospitals = []; //所有院区
+  currentDept; //当前科室
   @Input() show: Boolean;
   @Input() changeShow: Boolean;
   @Input() closeTime: Number;
@@ -40,17 +35,24 @@ export class HsPromptModalComponent implements OnInit {
   ) {}
   searchDeptSubject = new Subject();
   ngOnInit() {
-    this.searchDeptSubject.pipe(debounceTime(500)).subscribe((v) => {
-      this.search(v);
+    this.searchDeptSubject.pipe(debounceTime(500)).subscribe((v: any) => {
+      this.search(v.hosId, v.e);
     });
+    this.hospitals = this.tool.getHospitalList();
     this.currentHospital = this.tool.getCurrentHospital();
+    this.currentDept = this.tool.getCurrentUserDept();
+    this.initForm();
+  }
+  initForm() {
+    this.search(this.currentHospital.id, "");
     this.validateForm = this.fb.group({
+      hospital: [this.currentHospital.id, [Validators.required]], //院区
       dutyDeptFc: [null, [Validators.required]], //当班科室
     });
-    this.search(false);
   }
   // 关闭弹窗
   hideModal() {
+    this.initForm();
     this.closeModelHs.emit(JSON.stringify({ show: false, changeShow: true })); //emits(向上弹射)事件
   }
   // 切换科室
@@ -60,9 +62,12 @@ export class HsPromptModalComponent implements OnInit {
   // 获取当前用户信息
   getCurrentUserNow() {
     this.mainService.getCurrentUser1().subscribe((data) => {
+      this.msg.remove(this.maskFlag);
+      this.maskFlag = false;
       if (data["status"] == 200) {
         let user = JSON.parse(localStorage.getItem("user"));
         user.user.dept = data["data"].dept;
+        user.user.currentHospital = data["data"].currentHospital;
         localStorage.setItem("user", JSON.stringify(user));
         this.showPromptModal("切换科室", true, "");
         this.hideModal();
@@ -77,31 +82,40 @@ export class HsPromptModalComponent implements OnInit {
       this.validateForm.controls[i].markAsDirty();
       this.validateForm.controls[i].updateValueAndValidity();
       if (this.validateForm.controls[i].valid === false) {
-        //携带物品非必填
         flag = false;
       }
     }
     if (!flag) {
       return;
     }
-    let dataObj = {
-      user: {
-        dept: {
-          id: this.validateForm.controls.dutyDeptFc.value,
-        },
-        id: JSON.parse(localStorage.getItem("user")).user.id,
-      },
-    };
     this.maskFlag = this.msg.loading("正在加载中..", {
       nzDuration: 0,
     }).messageId;
-    this.mainService.coopData("updData", "user", dataObj).subscribe((data) => {
-      this.msg.remove(this.maskFlag);
-      this.maskFlag = false;
-      if (data.status == 200) {
-        this.getCurrentUserNow();
-      } else {
-        this.showPromptModal("切换科室", false, "");
+    let postData = {
+      currentHosId: this.validateForm.controls.hospital.value,
+      loginType: "PC",
+    };
+    this.mainService.changeHospital(postData).subscribe((result) => {
+      if (result.status == 200) {
+        let dataObj = {
+          user: {
+            dept: {
+              id: this.validateForm.controls.dutyDeptFc.value,
+            },
+            id: JSON.parse(localStorage.getItem("user")).user.id,
+          },
+        };
+        this.mainService
+          .coopData("updData", "user", dataObj)
+          .subscribe((data) => {
+            if (data.status == 200) {
+              this.getCurrentUserNow();
+            } else {
+              this.showPromptModal("切换科室", false, "");
+              this.msg.remove(this.maskFlag);
+              this.maskFlag = false;
+            }
+          });
       }
     });
   }
@@ -121,26 +135,37 @@ export class HsPromptModalComponent implements OnInit {
     }, 100);
   }
   //当值科室搜索
-  searchDept(e) {
-    this.searchDeptSubject.next(e);
+  searchDept(hosId, e) {
+    this.isLoading = true;
+    this.searchDeptSubject.next({ hosId, e });
+  }
+  // 院区选择
+  searchHospital(hosId) {
+    this.validateForm.controls.dutyDeptFc.setValue(null);
+    this.searchDept(hosId, "");
   }
   // 当值科室搜索
-  search(e) {
+  currentKeywords = "";
+  search(hosId, e) {
     let keywords = "";
     if (e) {
       keywords = e;
     }
+    this.currentKeywords = keywords;
     let dataObj = {
       idx: 0,
-      sum: 20,
+      sum: 10,
       department: {
-        hospital: { id: this.currentHospital.id },
+        hospital: { id: hosId },
         keyWord: keywords,
       },
     };
     this.mainService
       .getFetchDataList("data", "department", dataObj)
       .subscribe((data) => {
+        if (this.currentKeywords == keywords) {
+          this.isLoading = false;
+        }
         if (data.status == 200) {
           this.dutyDepts = data.list;
         }

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/drug-search/drug-search-routing.module.ts

@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { DrugSearchComponent } from './drug-search.component';
+
+
+const routes: Routes = [{ path: "", component: DrugSearchComponent }];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class DrugSearchRoutingModule { }

src/app/views/drug-search/drug-search.component.html

@@ -0,0 +1 @@
+<p>drug-search works!</p>

src/app/views/drug-search/drug-search.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-drug-search',
+  templateUrl: './drug-search.component.html',
+  styleUrls: ['./drug-search.component.less']
+})
+export class DrugSearchComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/views/drug-search/drug-search.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { DrugSearchRoutingModule } from './drug-search-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { DrugSearchComponent } from './drug-search.component';
+
+
+@NgModule({
+  declarations: [DrugSearchComponent],
+  imports: [
+    CommonModule,
+    DrugSearchRoutingModule,
+    ShareModule
+  ]
+})
+export class DrugSearchModule { }

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

@@ -414,9 +414,10 @@ export class HushijiandanComponent implements OnInit {
   }
 
   // 药品静配提示信息
-  drugJpLoading = true;
+  drugJpLoading = false;
   getJpDrugsWKOMsg() {
     let that = this;
+    this.drugJpLoading = true;
     that.mainService
       .postCustom("nurse", "getJpDrugsWKOMsg", {})
       .subscribe((data) => {
@@ -613,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);
             }
@@ -668,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) {
@@ -995,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'
       );
     });
     //预约时间-患者陪检不能为空
@@ -1317,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 =
@@ -1397,12 +1399,19 @@ export class HushijiandanComponent implements OnInit {
   }
   // 需要预约建单-事件
   yyInspectChange(e) {
-    if (this.filterLinkCheckLis.length) {
-      this.showDateTime();
+    if (this.currentTasktype.associationType.value === "inspect") {
+      //陪检
+      if (this.filterLinkCheckLis.length) {
+        this.showDateTime();
+      } else {
+        this.yyTime = null;
+        this.yyDate = new Date();
+        console.log(this.isYyInspect);
+      }
     } else {
-      this.yyTime = null;
-      this.yyDate = null;
-      console.log(this.isYyInspect);
+      //转运
+      this.yyTimeZy = null;
+      this.yyDateZy = new Date();
     }
   }
   //回显时间日期

src/app/views/jp-search/jp-search-routing.module.ts

@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { JpSearchComponent } from './jp-search.component';
+
+
+const routes: Routes = [{ path: "", component: JpSearchComponent }];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class JpSearchRoutingModule { }

src/app/views/jp-search/jp-search.component.html

@@ -0,0 +1,80 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='16' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">请领单号：</span>
+          <input nz-input class="formItem" placeholder="请输入请领单号" [(ngModel)]="searchCriteria.patientName" />
+        </div>
+        <!-- <div class="list-template__searchItem">
+          <span class="label">检查单号：</span>
+          <input nz-input class="formItem" placeholder="请输入检查单号" [(ngModel)]="searchCriteria.inspectCode" />
+        </div> -->
+        <div class="list-template__searchItem">
+          <span class="label">发药科室：</span>
+          <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzServerSearch nzShowSearch nzAllowClear
+            nzPlaceHolder="请选择发药科室" [(ngModel)]="searchCriteria.workerId" (nzOnSearch)="changeInp($event)"
+            (nzOpenChange)="changeSearch($event)">
+            <ng-container *ngFor="let data of workerSearch">
+              <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>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">申请科室：</span>
+          <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzServerSearch nzShowSearch nzAllowClear
+            nzPlaceHolder="请选择申请科室" [(ngModel)]="searchCriteria.workerId" (nzOnSearch)="changeInp($event)"
+            (nzOpenChange)="changeSearch($event)">
+            <ng-container *ngFor="let data of workerSearch">
+              <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>
+        </div>
+      </div>
+      <div nz-col nzXl="8" class="list-template__btns">
+        <button nz-button class="btn default" (click)='reset()'>重置</button>
+        <button nz-button class="btn default ml8" (click)='getList(1)'>搜索</button>
+      </div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="6%">序号</th>
+            <th nzWidth="14%">发药科室</th>
+            <th nzWidth="14%">申请科室</th>
+            <th nzWidth="14%">创建时间</th>
+            <th nzWidth="14%">药品状态</th>
+            <th nzWidth="14%">批次号</th>
+            <th nzWidth="12%">请领单号</th>
+            <th nzWidth="12%">药品标识</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let i = index">
+            <td>{{i+1}}</td>
+            <td>{{ data.patientName||'-' }}</td>
+            <td>{{ data.patientCode||'-' }}</td>
+            <td>{{ data.inspectCode||'-' }}</td>
+            <td>{{ data.patientBedNum||'-' }}</td>
+            <td>{{data.inspectName||'-'}}</td>
+            <td>{{ data.yyTime||'-' }}</td>
+            <td>{{data.arriveTime||'-'}}</td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList(0)" (nzPageSizeChange)="getList(0)">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+</div>

src/app/views/jp-search/jp-search.component.less

@@ -0,0 +1,167 @@
+@import "../../../../src/theme.less";
+
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    height: 220px;
+    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;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      & > 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: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+      .roundRobinTips {
+        font-size: 12px;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+        max-height: 497px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              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;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/views/jp-search/jp-search.component.ts

@@ -0,0 +1,128 @@
+import { Component, OnInit } from "@angular/core";
+import { Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+import { MainService } from "src/app/services/main.service";
+import { ToolService } from "src/app/services/tool.service";
+
+@Component({
+  selector: "app-jp-search",
+  templateUrl: "./jp-search.component.html",
+  styleUrls: ["./jp-search.component.less"],
+})
+export class JpSearchComponent implements OnInit {
+  constructor(private mainService: MainService, private tool: ToolService) {}
+
+  searchCriteria = {
+    //搜索条件
+    patientName: "",
+    inspectCode: "",
+    hospital: null,
+    workerId: null,
+  };
+  workerSearch = []; // 院区下的支助人员列表(搜索框)
+  allHospital: any = []; //院区下拉框
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+  changeInpSubject = new Subject();
+  ngOnInit() {
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.searchWorker(v);
+    });
+    this.getAllHospital();
+  }
+  // 重置
+  reset() {
+    this.searchCriteria = {
+      //搜索条件
+      patientName: "",
+      inspectCode: "",
+      hospital: this.allHospital[0] ? this.allHospital[0]["id"] + "" : null,
+      workerId: null,
+    };
+    this.getList(1);
+  }
+
+  // 获取所有院区
+  getAllHospital() {
+    this.allHospital = [this.tool.getCurrentHospital()];
+    this.searchCriteria.hospital = this.tool.getCurrentHospital().id + "";
+    this.getList(1);
+  }
+  // 查看标本历史记录
+  historyPromptModalShow = false; //标本历史记录弹窗开关
+  scode = ""; //查看历史记录携带
+  viewSpecimenHistory(data) {
+    this.scode = data.scode;
+    this.historyPromptModalShow = true;
+  }
+  // 关闭标本历史记录弹窗
+  closeModelHistory(e) {
+    this.historyPromptModalShow = JSON.parse(e).show;
+  }
+  // 打开搜索框
+  changeSearch(flag) {
+    if (flag) {
+      this.changeInp("no");
+    }
+  }
+  // 边输边搜节流阀
+  isLoading = false;
+  changeInp(worker) {
+    if (!worker) {
+      return;
+    }
+    if (worker === "no") {
+      worker = "";
+    }
+    this.isLoading = true;
+    this.changeInpSubject.next(worker);
+  }
+  // 搜索支助人员
+  searchWorker(worker) {
+    let postData = {
+      user: {
+        name: worker,
+        hospital: { id: this.searchCriteria.hospital },
+        usertype: { id: 106 },
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.mainService
+      .getFetchDataList("data", "user", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          this.isLoading = false;
+          this.workerSearch = result.list;
+        }
+      });
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(type) {
+    if (type == 1) {
+      this.pageIndex = 1;
+    }
+    let postData = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      hosId: this.searchCriteria.hospital,
+      patientName: this.searchCriteria.patientName,
+      inspectCode: this.searchCriteria.inspectCode,
+      workerId: this.searchCriteria.workerId,
+    };
+    this.loading1 = true;
+    this.mainService
+      .listMsgByMain("listInspect", postData)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data["status"] == 200) {
+          this.listOfData = data["list"];
+          this.listLength = data["totalNum"];
+        }
+      });
+  }
+}

src/app/views/jp-search/jp-search.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { JpSearchRoutingModule } from './jp-search-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { JpSearchComponent } from './jp-search.component';
+
+
+@NgModule({
+  declarations: [JpSearchComponent],
+  imports: [
+    CommonModule,
+    JpSearchRoutingModule,
+    ShareModule
+  ]
+})
+export class JpSearchModule { }

src/app/views/main/main-routing.module.ts

@@ -250,6 +250,20 @@ const routes: Routes = [
           ),
       },
       {
+        // 药品信息
+        path: "drugSearch",
+        loadChildren: () =>
+          import("../drug-search/drug-search.module").then(
+            (m) => m.DrugSearchModule
+          ),
+      },
+      {
+        // 静配信息
+        path: "jpSearch",
+        loadChildren: () =>
+          import("../jp-search/jp-search.module").then((m) => m.JpSearchModule),
+      },
+      {
         // 院区系统配置
         path: "hospitalConfig",
         loadChildren: () =>

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/office-management/office-management.component.html

@@ -142,7 +142,7 @@
             </nz-form-control>
             <nz-form-control style="display: inline-block;">
               <nz-select [nzDropdownMatchSelectWidth]="false" style="width:120px;" class="mr8" type="floor" nzShowSearch
-                nzAllowClear formControlName="floor" nzPlaceHolder="请选择楼层">
+                nzAllowClear formControlName="floor" nzPlaceHolder="请选择楼层" [nzLoading]="floorLoading">
                 <nz-option nzLabel="{{data.floorName}}" nzValue="{{data.id}}" *ngFor="let data of floors"></nz-option>
               </nz-select>
             </nz-form-control>

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

@@ -193,6 +193,7 @@ export class OfficeManagementComponent implements OnInit {
 
   // 切换楼栋信息
   floors: Array<any> = []; //楼层
+  floorLoading: boolean = false;
   changeBuilding(buildingId?, obj?) {
     var that = this;
     that.floors = [];
@@ -207,7 +208,9 @@ export class OfficeManagementComponent implements OnInit {
     let data = {
       buildingId: bid,
     };
+    this.floorLoading = true;
     that.mainService.getBuildingOrFloor("floor", data).subscribe((data) => {
+      this.floorLoading = false;
       this.message.remove(this.maskFlag);
       this.maskFlag = false;
       this.modal = true;
@@ -500,7 +503,6 @@ export class OfficeManagementComponent implements OnInit {
   confirmDel() {
     var that = this;
     that.btnLoading = true;
-    that.delModal = false;
     that.mainService
       .coopData(
         "rmvData",
@@ -509,6 +511,7 @@ export class OfficeManagementComponent implements OnInit {
       )
       .subscribe((data) => {
         that.btnLoading = false;
+        that.delModal = false;
         if (data.status == 200) {
           if (
             that.listOfData.length == 1 &&

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,23 @@ 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.validateForm.controls.executeTime.setValue(new Date(data.executeTime)); //轮巡策略
+    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 +612,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

@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
+import { ActivatedRoute } from "@angular/router";
 import { MainService } from "../../services/main.service";
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { FormBuilder, FormGroup } from "@angular/forms";
@@ -387,6 +387,7 @@ export class TaskTypeManagementComponent implements OnInit {
   // 获取所有院区
   getAllHospital() {
     this.hosId = this.tool.getCurrentHospital().id;
+    this.hosName = this.tool.getCurrentHospital().hosName;
     this.onSearch("");
   }
   // 获取所有关联类型
@@ -600,7 +601,6 @@ export class TaskTypeManagementComponent implements OnInit {
     };
     this.taskData.taskType["id"] = data.id;
     this.taskName = data.taskName;
-    this.hosName = data.hosId.hosName;
     this.association.id = data.associationType.id + "";
     this.association.value = data.associationType.value;
     if (data.deptIds) {
@@ -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 = [];
@@ -1686,14 +1685,6 @@ export class TaskTypeManagementComponent implements OnInit {
           );
         }
       });
-      // 双层for循环取name
-      // for (var i = 0; i < this.autoClass.length; i++) {
-      //   for (var k = 0; k < this.createRuleConfiguration.length; k++) {
-      //     if (this.autoClass[i].id == this.createRuleConfiguration[k].classesId) {
-      //       this.createRuleConfiguration[k]['name'] = this.autoClass[i].name
-      //     }
-      //   }
-      // }
     } else {
       this.createRuleConfiguration = [];
     }