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

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

@@ -42,8 +42,8 @@
                     </nz-input-group>
                   </nz-form-control>
                 </nz-form-item>
-                <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)" *ngIf="!(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree') && activeDictionaryKey.key != 'alarm_urgency'"></i>
-                <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system && !(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree') && activeDictionaryKey.key != 'alarm_urgency'" (click)="removeField(data, i)"></i>
+                <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)" *ngIf="!(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree' || this.activeDictionaryKey.key === 'abo_type' || this.activeDictionaryKey.key === 'rh_type' || this.activeDictionaryKey.key === 'blood_unit' || this.activeDictionaryKey.key === 'blood_trans_type') && activeDictionaryKey.key != 'alarm_urgency'"></i>
+                <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system && !(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree' || this.activeDictionaryKey.key === 'abo_type' || this.activeDictionaryKey.key === 'rh_type' || this.activeDictionaryKey.key === 'blood_unit' || this.activeDictionaryKey.key === 'blood_trans_type') && activeDictionaryKey.key != 'alarm_urgency'" (click)="removeField(data, i)"></i>
               </div>
 							<div class="value_2" *ngIf="activeDictionaryKey.key == 'alarm_urgency'">
 							  <nz-form-item>
@@ -53,8 +53,8 @@
 							      </nz-input-group>
 							    </nz-form-control>
 							  </nz-form-item>
-							  <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)" *ngIf="!(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree') && activeDictionaryKey.key == 'alarm_urgency'"></i>
-							  <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system && !(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree') && activeDictionaryKey.key == 'alarm_urgency'" (click)="removeField(data, i)"></i>
+							  <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)" *ngIf="!(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree' || this.activeDictionaryKey.key === 'abo_type' || this.activeDictionaryKey.key === 'rh_type' || this.activeDictionaryKey.key === 'blood_unit' || this.activeDictionaryKey.key === 'blood_trans_type') && activeDictionaryKey.key == 'alarm_urgency'"></i>
+							  <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system && !(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree' || this.activeDictionaryKey.key === 'abo_type' || this.activeDictionaryKey.key === 'rh_type' || this.activeDictionaryKey.key === 'blood_unit' || this.activeDictionaryKey.key === 'blood_trans_type') && activeDictionaryKey.key == 'alarm_urgency'" (click)="removeField(data, i)"></i>
 							</div>
             </div>
           </form>

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

@@ -209,7 +209,7 @@ export class ConfigurationDictionaryComponent implements OnInit {
       this.dictionaryList.forEach((obj, i) => {
         for (const key in obj) {
           if(key !== 'id' && key !== 'system'){
-            if(this.activeDictionaryKey.key === 'incident_status' || this.activeDictionaryKey.key === 'incident_degree'){
+            if(this.activeDictionaryKey.key === 'incident_status' || this.activeDictionaryKey.key === 'incident_degree' || this.activeDictionaryKey.key === 'abo_type' || this.activeDictionaryKey.key === 'rh_type' || this.activeDictionaryKey.key === 'blood_unit' || this.activeDictionaryKey.key === 'blood_trans_type'){
               this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: true}, [Validators.required]))
             }else if(this.activeDictionaryKey.key === 'alarm_urgency'){
               this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: key === 'value' ? obj.system : false}, []))

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

@@ -0,0 +1,133 @@
+<div class="content priority">
+  <div class="contentInner">
+    <div class="list-template" id="wechatTable">
+      <div class="list-template__content">
+        <div class="list-template__bottom">
+          <div class="list-template__top" nz-row>
+            <div nz-col nzXl='17' class="list-template__searchBox">
+            </div>
+            <div nz-col nzXl="7" class="list-template__btns">
+              <button nz-button class="btn default" (click)="addWechatModal()">新增</button>
+            </div>
+          </div>
+          <nz-table class="list-template__nzTable" [nzData]="dataList" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="loading1" [nzScroll]="{ y: tableWechatHeight + 'px' }">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="10%">排序号</th>
+                <th nzWidth="18%">项目名称</th>
+                <th nzWidth="18%">项目编码</th>
+                <th nzWidth="18%">标本类型</th>
+                <th nzWidth="18%">试管类型</th>
+                <th nzWidth="18%">检验科室</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of dataList;let i = index">
+                <td>{{data.orders}}</td>
+                <td>{{data.name}}</td>
+                <td>{{data.value}}</td>
+                <td>{{data.dictionaryDTO?data.dictionaryDTO.name:''}}</td>
+                <td>{{data.extra5DTO?data.extra5DTO.name:''}}</td>
+                <td>{{data.dept.join(',')}}</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 新增/编辑模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalWechat">
+  <div class="modalBody">
+    <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideWechatModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm">
+        <nz-form-item>
+          <nz-form-label [nzSpan]="7" nzRequired nzFor="orders">排序号</nz-form-label>
+          <nz-form-control [nzSpan]="17" nzErrorTip="请输入排序号!">
+            <nz-input-group>
+              <nz-input-number class="w100" formControlName="orders" nzPlaceHolder="请输入排序号" [nzMin]="0" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="7" nzRequired nzFor="name">项目名称</nz-form-label>
+          <nz-form-control [nzSpan]="17" nzErrorTip="请输入项目名称!">
+            <nz-input-group>
+              <input formControlName="name" nz-input placeholder="请输入项目名称">
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+				<nz-form-item>
+				  <nz-form-label [nzSpan]="7" nzRequired nzFor="value">项目编码</nz-form-label>
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请输入项目编码!">
+				    <nz-input-group>
+				      <input formControlName="value" nz-input placeholder="请输入项目编码">
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="7" nzRequired nzFor="extra4">标本类型</nz-form-label>
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择标本类型!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra4" nzPlaceHolder="请选择标本类型" nzServerSearch>
+              <ng-container *ngFor="let data of typeList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+				<nz-form-item>
+				  <nz-form-label [nzSpan]="7" nzRequired nzFor="extra5">试管类型</nz-form-label>
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择试管类型!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra5" nzPlaceHolder="请选择试管类型" nzServerSearch>
+				      <ng-container *ngFor="let data of tubeTypeList">
+				        <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+				      </ng-container>
+				      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+				        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+				      </nz-option>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="7" nzRequired nzFor="extra7">检验科室</nz-form-label>
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择检验科室!">
+            <nz-select nzMode="multiple" [nzDropdownMatchSelectWidth]="false" formControlName="extra7" nzPlaceHolder="请选择检验科室" nzServerSearch (nzOnSearch)="changeInp($event)">
+              <ng-container *ngFor="let data of deptList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.dept" [nzValue]="data.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+				<nz-form-item>
+				  <nz-form-label [nzSpan]="7" nzRequired nzFor="desc">备注</nz-form-label>
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择备注!">
+				     <textarea formControlName="desc" nz-input rows="3" placeholder="请输入备注"></textarea>
+				  </nz-form-control>
+				</nz-form-item>
+      </form>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitWechatForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideWechatModal()">取消</button>
+    </div>
+  </div>
+</div>

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

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

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

@@ -0,0 +1,226 @@
+import { Component, OnInit, Input } from "@angular/core";
+import { Validators, FormGroup, FormBuilder } from '@angular/forms';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { MainService } from 'src/app/services/main.service';
+import { forkJoin, Subject } from "rxjs";
+import { debounceTime, filter } from "rxjs/operators";
+
+@Component({
+  selector: "app-configuration-checkout-project",
+  templateUrl: "./configuration-checkout-project.component.html",
+  styleUrls: ["./configuration-checkout-project.component.less"],
+})
+export class ConfigurationCheckoutProjectComponent implements OnInit {
+  constructor(
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  coopData: any = {}; //当前操作列
+  hosId: any;
+	changeInpSubject = new Subject(); //防抖
+
+  ngOnInit() {
+		this.hosId = this.tool.getCurrentHospital().id;
+		this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.getDept(v[0]);
+		});
+    setTimeout(() => {
+      this.tableWechatHeight = document.querySelector('#wechatTable').clientHeight - document.querySelector('#wechatTable .list-template__top').clientHeight - 8 - document.querySelector('#wechatTable .thead').clientHeight;
+    }, 0)
+    this.getTypes();
+		this.getTubeTypeList();
+		this.getDept();
+    this.getList();
+  }
+
+  // 新增弹框
+  modelName = ""; //模态框名称
+  modalWechat: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  addWechatModal() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modalWechat = true;
+    this.initWechatForm();
+  }
+  //关闭新增/编辑弹框
+  hideWechatModal() {
+    this.modalWechat = false;
+  }
+
+  // 新增/编辑表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitWechatForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+    this.btnLoading = true;
+    let postData = {
+			orders: this.validateForm.value.orders,
+			name: this.validateForm.value.name,
+			value: this.validateForm.value.value,
+			extra4: this.validateForm.value.extra4,
+			extra5: this.validateForm.value.extra5,
+			extra7: this.validateForm.value.extra7.toString(),
+			desc: this.validateForm.value.desc,
+			key: "examination_items"
+    };
+
+    this.mainService
+      .simplePost("addData", "dictionary", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hideWechatModal();
+        let msg = "新增";
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, '');
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+	
+	// 隐藏删除框
+	hideDelModal() {
+	  this.delModal = false;
+	}
+	// 确认删除
+	confirmDel() {
+
+	}
+	
+  // 初始化新增form表单
+  validateForm: FormGroup; //新增/编辑表单
+  initWechatForm() {
+    this.validateForm = this.fb.group({
+      orders: [null, [Validators.required]],
+      name: [null, [Validators.required]],
+      value: [null, [Validators.required]],
+			extra4: [null, [Validators.required]],
+      extra5: [null, [Validators.required]],
+      extra7: [null, [Validators.required]],
+      desc: [null, [Validators.required]],
+    });
+  }
+
+  // 获取列表
+  loading1:boolean = false;
+  dataList: any[] = []; //表格数据
+  tableWechatHeight:number = 0;
+  getList() {
+    let data = {
+      idx: 0,
+      sum: 9999,
+      dictionary: {
+        key: "examination_items",
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "dictionary", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+					data.list.forEach(i=>{
+						i.dept = i.deptList.map(x=>{
+							return x.dept
+						})
+						
+					})
+          this.dataList = data.list || [];
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  isLoading = false;
+  extra7List: any = [
+    { name: '无', id: '0' },
+    { name: '科室码', id: '1' },
+    { name: '动态码', id: '2' },
+    { name: '填写工号', id: '3' },
+  ];
+	
+	// 获取试管类型
+	tubeTypeList: any = [];
+	getTubeTypeList() {
+	  this.mainService.getDictionary('list', 'specimen_tube_type').subscribe((data) => {
+	    this.tubeTypeList = data || [];
+	  });
+	}
+	
+	// 获取标本类型
+	typeList: any = [];
+	getTypes() {
+	  this.mainService.getDictionary('list', 'specimen_type').subscribe((data) => {
+	    this.typeList = data || [];
+	  });
+	}
+	
+	// 获取检验科室
+	deptList: any = [];
+	getDept(dept?) {
+	  let data = {
+	    idx: 0,
+	    sum: 10,
+	    department: {
+	      hospital: { id: this.hosId },
+	      dept: dept,
+	    },
+	  };
+	  
+	  this.mainService
+	    .getFetchDataList("data", "department", data)
+	    .subscribe((data) => {
+	      this.isLoading = false;
+	      this.deptList = data.list;
+	    });
+	}
+	
+	changeInp(e){
+		this.isLoading = true;
+		this.changeInpSubject.next([e]);
+	}
+	
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList();
+  }
+}

src/app/components/configurationCenter/configuration-specimen/configuration-checkout-project/configuration-checkout-project.module.ts

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

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

@@ -473,6 +473,10 @@
         <div class="TaskTypeManagement" *ngIf="activeDictionaryKey=='specimenReturn'">
           <app-configuration-specimen-return></app-configuration-specimen-return>
         </div>
+				<!-- 检验项目 -->
+				<div class="TaskTypeManagement" *ngIf="activeDictionaryKey=='checkoutProject'">
+				  <app-configuration-checkout-project></app-configuration-checkout-project>
+				</div>
       </div>
     </div>
   </div>

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

@@ -29,7 +29,10 @@ export class ConfigurationSpecimenComponent implements OnInit {
     },
     {
       name:'标本退回',key:'specimenReturn'
-    }
+    },
+		{
+		  name:'检验项目',key:'checkoutProject'
+		}
 	];
 
   spePackageUnionReceive:any = undefined;//是否联合标本收取

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

@@ -6,7 +6,7 @@ import { ShareModule } from 'src/app/share/share.module';
 import { ConfigurationSpecimenComponent } from './configuration-specimen.component';
 import { ConfigurationSpecimenReturnModule } from './configuration-specimen-return/configuration-specimen-return.module';
 import { ConfigurationSpecialSpecimenMarkingModule } from './configuration-special-specimen-marking/configuration-special-specimen-marking.module';
-
+import { ConfigurationCheckoutProjectModule } from './configuration-checkout-project/configuration-checkout-project.module';
 
 @NgModule({
   declarations: [
@@ -17,6 +17,7 @@ import { ConfigurationSpecialSpecimenMarkingModule } from './configuration-speci
     ShareModule,
     ConfigurationSpecimenReturnModule,
     ConfigurationSpecialSpecimenMarkingModule,
+		ConfigurationCheckoutProjectModule
   ],
   exports: [
     ConfigurationSpecimenComponent,

src/app/services/main.service.ts

@@ -1289,4 +1289,9 @@ export class MainService {
 	getInfoPack(packageId, data){
 		return this.http.post(host.host + `/nurse/specimen/getInfo/${packageId}`, data);
 	}
+	
+	// 业务信息自动生成
+	autoMake(model, count, data){
+		return this.http.post(host.host + `/testData/make/${model}/${count}`, data);
+	}
 }

src/app/services/tool.service.ts

@@ -376,9 +376,13 @@ export class ToolService {
 				case "unlock":
 				  coopBtns.unlock = true; //解锁
 				  break;
-					case "lock":
-					  coopBtns.lock = true; //锁定
-					  break;
+				case "lock":
+					coopBtns.lock = true; //锁定
+					break;
+				case "collect":
+					coopBtns.collect = true; //设置核收
+					break;
+				
       }
     });
     console.log(coopBtns);

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

@@ -12,7 +12,7 @@
     <div class="content">
       <!-- 血制品 -->
       <nz-table *ngIf="type === 'blood'" class="hospitalTable" [nzData]="bloodList" nzSize="middle" [nzShowPagination]="false"
-        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+        [nzLoading]="hsLoading" >
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
@@ -42,7 +42,7 @@
       </nz-table>
       <!-- 新药品-一单一码 -->
       <nz-table *ngIf="configs.showDrugsBagDetails === 1 && configs.drugsModel === 1 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')" class="hospitalTable" [nzData]="drugsBugSingleList" nzSize="middle" [nzShowPagination]="false"
-        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+        [nzLoading]="hsLoading" >
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
@@ -64,7 +64,7 @@
       </nz-table>
       <!-- 新药品-一单多码 -->
       <nz-table *ngIf="configs.drugsModel === 2 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')" class="hospitalTable" [nzData]="drugsBugMultipleList" nzSize="middle" [nzShowPagination]="false"
-        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+        [nzLoading]="hsLoading" >
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
@@ -179,7 +179,7 @@
       </nz-table>
       <!-- 科室检查率统计 -->
       <nz-table *ngIf="type === 'deptInspectionRateStatistics' || type === 'deptInspectionStatistics'" class="hospitalTable" [nzData]="inspectionRateStatisticsList" nzSize="middle" [nzShowPagination]="false"
-        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+        [nzLoading]="hsLoading" >
         <thead>
           <tr class="thead">
             <th nzWidth="4%">序号</th>
@@ -210,7 +210,7 @@
 
       <!-- 被服洗涤批次管理-查看视图-查看异常 -->
       <nz-table *ngIf="type === 'washingException'" class="hospitalTable" [nzData]="washingExceptionList" nzSize="middle" [nzShowPagination]="false"
-        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+        [nzLoading]="hsLoading" >
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>

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

@@ -31,7 +31,7 @@
   }
   .hospitalTable {
     width: 100%;
-		height: calc(100vh - 360px);
+		height: calc(100vh - 280px);
 		overflow-y: auto;
     td {
       text-align: center !important;

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

@@ -2,6 +2,31 @@
   <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>
+				  <nz-select
+				    [nzDropdownMatchSelectWidth]="false"
+				    class="formItem"
+				    nzServerSearch
+				    nzShowSearch
+				    nzAllowClear
+				    nzPlaceHolder="请选择申请科室"
+				    [(ngModel)]="searchCriteria.applyDept"
+				    (nzOnSearch)="changeInp($event)"
+				    (nzOpenChange)="changeSearch($event)"
+				  >
+				    <ng-container *ngFor="let data of deptList">
+				      <nz-option
+				        *ngIf="!isLoading"
+				        nzLabel="{{ data.dept }}"
+				        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>
           <input nz-input class="formItem" placeholder="请输入血袋号" [(ngModel)]="searchCriteria.bloodCode" />
@@ -34,52 +59,105 @@
             </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.arriver"
+				    (nzOnSearch)="changeInp2($event, 'search')"
+				    (nzOpenChange)="changeSearch2($event)"
+				  >
+				    <ng-container *ngFor="let data of userSearch">
+				      <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>
+				<button nz-button class="btn default ml8" (click)='addForm()'>新增</button>
+				<button nz-button class="btn default ml8" (click)='batchSend()'>批量发送</button>
+				<button nz-button class="btn default ml8" (click)='autoCreate()'>自动生成</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="2%">#</th>
-            <th nzWidth="7%">医嘱号</th>
-            <th nzWidth="7%">血袋号</th>
-            <th nzWidth="6%">状态</th>
-            <th nzWidth="7%">申请科室</th>
-            <th nzWidth="7%">血液类型</th>
-            <th nzWidth="4%">ABO血型</th>
-            <th nzWidth="4%">RH(血型)</th>
-            <th nzWidth="7%">血量(单位)</th>
-            <th nzWidth="7%">患者姓名（住院号）</th>
-            <th nzWidth="7%">发血时间</th>
-            <th nzWidth="7%">取血者</th>
-            <th nzWidth="7%">取血时间</th>
-            <th nzWidth="7%">接收人</th>
-            <th nzWidth="7%">接收时间</th>
-            <th nzWidth="7%">操作</th>
+						<th nzWidth="5%" nzShowCheckbox [(nzChecked)]="isAllDisplayDataChecked"
+						  (nzCheckedChange)="checkAll($event)"></th>
+            <!-- <th nzWidth="2%">#</th> -->
+						<th nzWidth="8%">血袋标识</th>
+						<th nzWidth="8%">血液信息</th>
+						<th nzWidth="8%">患者信息</th>
+						<th nzWidth="8%">发血号</th>
+						<th nzWidth="8%">申请使用科室</th>
+						<th nzWidth="8%">发血科室</th>
+						<th nzWidth="8%">状态</th>
+						<th nzWidth="8%">发血信息</th>
+						<th nzWidth="8%">取血信息</th>
+						<th nzWidth="8%">送达信息</th>
+						<th nzWidth="8%">接收信息</th>
+            <th nzWidth="8%">操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.applyCode || '无'}}</td>
-            <td>{{ data.bloodCode || '无'}}</td>
-            <td>{{ data.state?.name }}</td>
-            <td>{{ data.applyDeptDTO ? data.applyDeptDTO.dept :'无' }}</td>
-            <td>{{ data.type ? data.type.name : "无" }}</td>
-            <td>{{ data.aboType || '无' }}</td>
-            <td>{{ data.rhType || '无' }}</td>
-            <td>{{ data.volume ? (ttconfig_sign_type4 ? data.volume + data.unit : data.volume + 'ML') : '无' }}</td>
-            <td>{{ data.patientName }}<span *ngIf="data.hosNum">({{ data.hosNum }})</span></td>
-            <td>{{ data.printDate | date:"yyyy-MM-dd HH:mm:ss" }}</td>
-            <td>{{ data.arriverDTO ? data.arriverDTO.name: '无' }}</td>
-            <td>{{ data.arriveTime | date:"yyyy-MM-dd HH:mm:ss" }}</td>
-            <td>{{ data.receiverDTO ? data.receiverDTO.name : '' }}</td>
-            <td>{{ data.receiveTime | date:"yyyy-MM-dd HH:mm:ss" }}</td>
+            <!-- <td>{{i+(pageIndex-1) * pageSize + 1}}</td> -->
+						<td nzShowCheckbox [(nzChecked)]="mapOfCheckedId[data.id]" 
+						(nzCheckedChange)="refreshStatus()" 
+						[nzDisabled]="data.state.value==1 || data.state.value==2 || 
+						data.state.value==4 || data.state.value=='cx'"
+						></td>
+            <td>
+							<div>{{ data.bloodCode }}</div>
+							<div>{{ data.productCode }}</div>
+						</td>
+						<td>
+							<div>{{ data.type ? data.type.name : "无" }}、{{data.volume}}{{data.unit}}</div>
+							<div>{{ data.aboType }}、{{ data.rhType }}</div>
+						</td>
+						<td>
+							<div>{{ data.patientName }}<span *ngIf="data.bedNum">({{ data.bedNum }})</span></div>
+							<div>{{ data.patientNo }}</div>
+						</td>
+						<td>{{ data.dataCode || '无'}}</td>
+						<td>
+							<div>{{ data.applyDeptDTO ? data.applyDeptDTO.dept :'无' }}</div>
+							<div>{{ data.useDeptDTO ? data.useDeptDTO.dept :'无' }}</div>
+						</td>
+						<td>{{ data.sendDeptDTO ? data.sendDeptDTO.dept :'无'}}</td>
+						<td>{{ data.state?.name}}</td>
+						<td>
+							<div>{{ data.printDate | date:"yyyy-MM-dd HH:mm:ss" }}</div>
+							<div>{{ data.bleedUserDTO ? data.bleedUserDTO.name: '无'}}</div>
+						</td>
+						<td>
+							<div>{{ data.arriveTime | date:"yyyy-MM-dd HH:mm:ss" }}</div>
+							<div>{{ data.arriverDTO ? data.arriverDTO.name: '无' }}</div>
+						</td>
+						<td>
+							<div>{{ data.deliveryTime | date:"yyyy-MM-dd HH:mm:ss" }}</div>
+							<div>{{ data.deliveryUserDTO ? data.deliveryUserDTO.name: '无'}}</div>
+						</td>
+						<td>
+							<div>{{ data.receiveTime | date:"yyyy-MM-dd HH:mm:ss" }}</div>
+							<div>{{ data.receiverDTO ? data.receiverDTO.name: '无' }}</div>
+						</td>
             <td><button (click)="viewBloodHistory(data)">查看日志</button></td>
           </tr>
         </tbody>
@@ -99,3 +177,377 @@
   [bloodId]="bloodId"
   (closeModelHs)="closeModelHistory($event)"
 ></app-blood-history-prompt-modal>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal
+  *ngIf="promptModalShow"
+  [content]="promptContent"
+  [success]="ifSuccess"
+  [show]="promptModalShow"
+  [info]="promptInfo"
+>
+</app-prompt-modal>
+
+<!-- 新增/编辑模态框 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="addModal">
+  <div class="modalBody">
+    <div class="title">{{add?"新增":view?"查看":"编辑"}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+				<div class="df">
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="applyDept">申请科室</nz-form-label>
+						<nz-form-control nzErrorTip="请选择申请科室!">
+							<nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+									(nzOnSearch)="changeInp($event)" (nzOpenChange)="changeSearch($event)" (ngModelChange)="onDeptChange($event)" nzAllowClear nzPlaceHolder="请选择申请科室" formControlName="applyDept">
+									<ng-container *ngFor="let option of deptList">
+										<nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+									</ng-container>
+									<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+										<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+									</nz-option>
+								</nz-select>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="sendDept">发血科室</nz-form-label>
+						<nz-form-control nzErrorTip="请选择发血科室!">
+							<nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+									(nzOnSearch)="changeInp($event)" (nzOpenChange)="changeSearch($event)" nzAllowClear nzPlaceHolder="请选择发血科室" formControlName="sendDept">
+									<ng-container *ngFor="let option of deptList">
+										<nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+									</ng-container>
+									<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+										<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+									</nz-option>
+								</nz-select>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="useDept">使用科室</nz-form-label>
+						<nz-form-control nzErrorTip="请选择使用科室!">
+							<nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+									(nzOnSearch)="changeInp($event)" (nzOpenChange)="changeSearch($event)" nzAllowClear nzPlaceHolder="请选择使用科室" formControlName="useDept">
+									<ng-container *ngFor="let option of deptList">
+										<nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+									</ng-container>
+									<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+										<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+									</nz-option>
+								</nz-select>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item>
+				</div>
+				
+				<div class="df"> 
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="type">血液类型</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择血液类型!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDisabled]="view" [nzDropdownMatchSelectWidth]="false" nzShowSearch
+								   nzAllowClear nzPlaceHolder="请选择血液类型" formControlName="type">
+									<ng-container *ngFor="let option of bloodTypeList">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+									</ng-container>
+								</nz-select>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="7" [nzXs]="24" nzRequired nzFor="volume">血量</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择血量!">
+					    <nz-input-group>
+								<input nz-input class="formItem" formControlName="volume" placeholder="请输入血量" nzSize="default" />
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="unit">单位</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择单位!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDisabled]="view" (ngModelChange)="onUnitChange($event)" [nzDropdownMatchSelectWidth]="false" nzShowSearch
+								   nzAllowClear nzPlaceHolder="请选择单位" formControlName="unit">
+									<ng-container *ngFor="let option of unitList">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+									</ng-container>
+								</nz-select>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+				</div>
+				
+      	<div class="df">
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="aboType">ABO血型</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择ABO血型!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDisabled]="view" (ngModelChange)="onAboChange($event)" (ngModelChange)="onPatientChange($event)" [nzDropdownMatchSelectWidth]="false" nzShowSearch
+								   nzAllowClear nzPlaceHolder="请选择ABO血型" formControlName="aboType">
+									<ng-container *ngFor="let option of aboList">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+									</ng-container>
+								</nz-select>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="rhType">RH血型</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择RH血型!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDisabled]="view" (ngModelChange)="onRhChange($event)" [nzDropdownMatchSelectWidth]="false" nzShowSearch
+								   nzAllowClear nzPlaceHolder="请选择RH血型" formControlName="rhType">
+									<ng-container *ngFor="let option of rhList">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+									</ng-container>
+								</nz-select>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+						<nz-form-item>
+						  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="patientId">患者</nz-form-label>
+						  <nz-form-control nzErrorTip="请选择患者!">
+						    <nz-input-group>
+									<nz-select class="formItem" [nzDisabled]="view" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+									  (nzOnSearch)="changePatient($event, 1)" (ngModelChange)="onPatientChange($event)" nzAllowClear nzPlaceHolder="请选择患者" formControlName="patientId">
+										<ng-container *ngFor="let option of patientList">
+										  <nz-option *ngIf="!isLoading" [nzLabel]="option.patientName" [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-input-group>
+						  </nz-form-control>
+						</nz-form-item>
+				</div>
+				
+				<div class="df">
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="bleedUser">发血人</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择发血人!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDisabled]="view" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择发血人" formControlName="bleedUser">
+									<ng-container *ngFor="let option of userList">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [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-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="overDate">过期时间</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择过期时间!">
+					    <nz-input-group>
+					      <nz-date-picker
+					    		nzShowTime
+					    		nzFormat="yyyy-MM-dd HH:mm:ss"
+					    		nzPlaceHolder="请选择过期时间"
+					    		formControlName="overDate"
+					    		(ngModelChange)="onStartChange($event)"
+					    	></nz-date-picker>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="7" [nzXs]="24" nzFor="state">默认状态</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择默认状态!">
+					    <nz-input-group>
+								<input nz-input disabled class="formItem" formControlName="state" placeholder="请输入默认状态" nzSize="default" />
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+				</div>
+				<div class="df">
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="sendMsg">是否同步发送消息</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择是否同步发送消息!">
+					    <nz-input-group>
+								<nz-radio-group [nzDisabled]="view" formControlName="sendMsg">
+									<label nz-radio nzValue="1">是</label>
+									<label nz-radio nzValue="0">否</label>
+								</nz-radio-group>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+				</div>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 批量发送 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="batchModal">
+  <div class="modalBody collect">
+    <div class="title">{{infoContent}}<i class="icon_transport transport-guanbi" (click)="hideMsgModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateMsgForm" class="addForm" (ngSubmit)="submitMsgForm()">
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="sendMsgType">消息发送类型</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择消息发送类型!">
+					    <nz-input-group>
+								<nz-radio-group [nzDisabled]="view" formControlName="sendMsgType" (ngModelChange)="msgTypeChange($event)">
+									<label nz-radio nzValue="createMsg">建单消息</label>
+									<label nz-radio nzValue="createAndSignMsg">建单并签到消息</label>
+								</nz-radio-group>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item *ngIf="validateMsgForm.value.sendMsgType=='createAndSignMsg'">
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="arriver">取血人</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择取血人!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDisabled]="view" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+									(nzOnSearch)="changeInp2($event, 'search')"
+									(nzOpenChange)="changeSearch2($event)"
+									nzAllowClear nzPlaceHolder="请选择取血人" formControlName="arriver">
+									<ng-container *ngFor="let option of userSearch">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [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-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+				
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitMsgForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideMsgModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 自动生成模态框 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="autoCreateModal">
+  <div class="modalBody collect">
+    <div class="title">自动生成<i class="icon_transport transport-guanbi" (click)="hideAutoModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateAutoForm" class="addForm" (ngSubmit)="submitAutoForm()">
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="applyDept">申请科室</nz-form-label>
+						<nz-form-control nzErrorTip="请选择申请科室!">
+							<nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+									(nzOnSearch)="changeInp($event, 'search')" (nzOpenChange)="changeSearch($event)" (ngModelChange)="onAutoDeptChange($event)" nzAllowClear nzPlaceHolder="请选择申请科室" formControlName="applyDept">
+									<ng-container *ngFor="let option of deptList">
+										<nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+									</ng-container>
+									<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+										<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+									</nz-option>
+								</nz-select>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="sendDept">发血科室</nz-form-label>
+						<nz-form-control nzErrorTip="请选择发血科室!">
+							<nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+									(nzOnSearch)="changeInp($event, 'search')" (nzOpenChange)="changeSearch($event)" nzAllowClear nzPlaceHolder="请选择发血科室" formControlName="sendDept">
+									<ng-container *ngFor="let option of deptList">
+										<nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+									</ng-container>
+									<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+										<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+									</nz-option>
+								</nz-select>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="patientId">患者</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择患者!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDisabled]="view" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changePatient($event, 2)" (ngModelChange)="onPatientChange($event)" nzAllowClear nzPlaceHolder="请选择患者" formControlName="patientId">
+									<ng-container *ngFor="let option of patientList">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="option.patientName" [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-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label nzRequired [nzSm]="6" [nzXs]="24" nzFor="amount">生成数量</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择生成数量!">
+					    <nz-input-group>
+								<nz-input-number formControlName="amount" (ngModelChange)="numChange($event)" [nzMin]="1" [nzMax]="50" [nzStep]="1"></nz-input-number>
+							</nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="sendMsgType">消息类型</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择消息类型!">
+					    <nz-input-group>
+								<nz-radio-group [nzDisabled]="view" formControlName="sendMsgType" (ngModelChange)="autoMsgTypeChange($event)">
+									<label nz-radio nzValue="noMsg">不发消息</label>
+									<label nz-radio nzValue="createMsg">发送建单消息</label>
+									<label nz-radio nzValue="createAndSignMsg">发送建单并签到消息</label>
+								</nz-radio-group>
+							</nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item *ngIf="validateAutoForm.value.sendMsgType=='createAndSignMsg'">
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="arriver">取血人</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择取血人!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDisabled]="view" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+									(nzOnSearch)="changeInp2($event, 'search')"
+									(nzOpenChange)="changeSearch2($event)"
+									nzAllowClear nzPlaceHolder="请选择取血人" formControlName="arriver">
+									<ng-container *ngFor="let option of userSearch">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [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-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitAutoForm()" [nzLoading]="btnLoading">生成血制品</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideAutoModal()">取消</button>
+    </div>
+  </div>
+</div>

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

@@ -1 +1,206 @@
 @import "../../../../src/theme.less";
+:host ::ng-deep .on {
+  color: #fff !important;
+}
+.list-template__checkBoxes{
+  display: flex;
+  justify-content: space-between;
+}
+.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 {
+		.collect{
+			width: 500px !important;
+		}
+    .modalBody {
+      width: 70%;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+        max-height: 497px;
+        overflow-y: auto;
+
+        .addForm {
+					.df{
+						display: flex;
+						margin-bottom: 15px;
+						.ant-form-item {
+							width: 30%;
+							margin-right: 3%;
+							.ant-form-item-label{
+								overflow: visible !important;
+							}
+							
+							.ant-select{
+								width: 100% !important;
+							}
+							
+						  .ant-form-item-label {
+						    line-height: 14px;
+						    text-align: left;
+						  }
+						
+						  .desc {
+						    margin-top: 5px;
+						  }
+						}
+					}
+          .ant-form-item {
+            margin-bottom: 15px;
+						
+						.ant-select{
+							width: 100% !important;
+						}
+						.ant-input-number{
+							width: 100% !important;
+						}
+            .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/blood-search/blood-search.component.ts

@@ -4,6 +4,9 @@ import { debounceTime } from "rxjs/operators";
 import { MainService } from "src/app/services/main.service";
 import { ToolService } from "src/app/services/tool.service";
 import { format } from 'date-fns';
+import { Validators, FormGroup, FormControl, FormBuilder } from '@angular/forms';
+import { ActivatedRoute, Router } from "@angular/router";
+import { NzMessageService } from "ng-zorro-antd";
 
 @Component({
   selector: "app-blood-search",
@@ -11,11 +14,19 @@ import { format } from 'date-fns';
   styleUrls: ["./blood-search.component.less"],
 })
 export class BloodSearchComponent implements OnInit {
-  constructor(private mainService: MainService, private tool: ToolService) {}
+  constructor(
+		private mainService: MainService, 
+		private msg: NzMessageService, 
+		private tool: ToolService,
+		private fb: FormBuilder,
+		public route: ActivatedRoute,
+	) {}
 
   searchCriteria = {
     //搜索条件
     bloodCode: "", //血袋号
+		applyDept: null,
+		arriver: null,
     dateRange: [],
     state: null,
   };
@@ -26,10 +37,28 @@ export class BloodSearchComponent implements OnInit {
   pageSize: number = 10; //表格每页展示条数
   listLength: number = 10; //表格总数据量
   changeInpSubject = new Subject();
+	changeInp2Subject = new Subject();
+	changeInpUserSubject = new Subject();
+	changeInpPaSubject = new Subject();
   ngOnInit() {
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.searchDept(v);
     });
+		
+		this.changeInp2Subject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.searchUser(v[0], v[1]);
+		});
+		
+		this.changeInpUserSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.getUserList(v);
+		});
+		
+		this.changeInpPaSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.getPatient(v[1], v[0]);
+		});
+		
+		this.getUserList();
+		this.getDicList();
     this.getHospital();
   }
   // 搜索类型
@@ -48,10 +77,384 @@ export class BloodSearchComponent implements OnInit {
       this.searchTypes();
     }
   }
+	// 打开搜索框
+	changeSearch2(flag) {
+	  if (flag) {
+	    this.changeInp2("no", "search");
+	  }
+	}
+	
+	// 搜索患者
+	changePatient(e, type){
+		this.isLoading = true;
+		this.changeInpPaSubject.next([e, type]);
+	}	
+	
+	// 搜索用户
+	changeUser(e){
+		this.isLoading = true;
+		this.changeInpUserSubject.next(e);
+	}	
+	
+	// 获取用户
+	userList:any = [];
+	getUserList(name?){
+		let data = {
+		  idx: 0,
+		  sum: 20,
+		  user: {
+		    name: name,
+		    hospital: { id: this.hosId || "" },
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("data", "user", data)
+		  .subscribe((data) => {
+		    this.isLoading = false;
+		    this.userList = data.list;
+		  });
+	}
+	
+	// 获取血型/单位/abo/rh
+	bloodTypeList:any = [];
+	unitList:any = [];
+	aboList:any = [];
+	rhList:any = [];
+	getDicList(){
+		this.mainService.getDictionary("list", "blood_trans_type").subscribe((res) => {
+		  this.bloodTypeList = res;
+		});
+		this.mainService.getDictionary("list", "blood_unit").subscribe((res) => {
+		  this.unitList = res;
+		});
+		this.mainService.getDictionary("list", "abo_type").subscribe((res) => {
+		  this.aboList = res;
+		});
+		this.mainService.getDictionary("list", "rh_type").subscribe((res) => {
+		  this.rhList = res;
+		});
+	}
+	
+	// 获取患者
+	patientList:any = [];
+	getPatient(type, patientName?){
+		console.log(1234, type, patientName)
+		let postData = {
+		  idx: 0,
+		  sum: 20,
+			patient:{
+				department:{
+					id: type==1 ? this.validateForm.value.applyDept : this.validateAutoForm.value.applyDept
+				},
+				keyWord: patientName,
+			}
+		};
+		this.mainService.getFetchDataList('nurse', 'patient', postData).subscribe((data) => {
+		  this.isLoading = false;
+		  if (data["status"] == 200) {
+				data["list"].forEach(i=>{
+					if(i.bedNum && i.residenceNo){
+						i.patientName = i.patientName + '('+ i.bedNum +')' +'-'+ i.residenceNo
+					}
+					if(i.bedNum && !i.residenceNo){
+						i.patientName = i.patientName + '('+ i.bedNum +')'
+					}
+					if(!i.bedNum && !i.residenceNo){
+						i.patientName = i.patientName 
+					}
+					if(!i.bedNum && i.residenceNo){
+						i.patientName = i.patientName +'-'+ i.residenceNo
+					}
+				})
+		    this.patientList = data["list"];
+		  }
+		});
+	}
+	
+	// 选择申请科室
+	onDeptChange(e){
+		this.validateForm.controls.patientId.setValue(null)
+		this.getPatient(1);
+	}
+	
+	// 选择患者
+	onPatientChange(e){
+	
+	}
+	
+	//  选择开始时间
+	applyDate:any;
+	onStartChange(result: Date): void {
+		if( typeof result == 'object'){
+			this.applyDate = format(result, 'yyyy-MM-dd HH:mm:ss');
+			this.validateForm.controls.overDate.setValue(this.applyDate);
+		}
+	}
+	
+	// 自动生成
+	autoCreateModal:boolean = false;
+	autoCreate(){
+		this.autoCreateModal = true
+		this.initAutoForm()
+	}
+	
+	// 初始化form
+	validateAutoForm: FormGroup
+	initAutoForm(){
+		this.validateAutoForm = this.fb.group({
+			applyDept: [null, [Validators.required]],
+			sendDept: [null, [Validators.required]],
+			patientId: [null, []],
+			amount: [1, [Validators.required]],
+			sendMsgType: ['noMsg', []],
+		});
+	}
+	
+	numChange(e){
+		console.log(4, e)
+	}
+	
+	// 选择消息类型
+	autoMsgTypeChange(e){
+		if(e=='createAndSignMsg'){
+			this.validateAutoForm.addControl(
+				'arriver',
+				new FormControl(null, Validators.required)
+			);
+		}else{
+			this.validateAutoForm.removeControl('arriver');
+		}
+	}
+	
+	// 选择申请科室
+	onAutoDeptChange(e){
+		this.validateAutoForm.controls.patientId.setValue(null)
+		this.getPatient(2);
+	}
+	
+	aboName:any;
+	onAboChange(e){
+		let item = this.aboList.find(i=> i.id == e)
+		if(item){
+			this.aboName = item.name
+		}
+	}
+	
+	unitName:any;
+	onUnitChange(e){
+		let item = this.unitList.find(i=> i.id == e)
+		if(item){
+			this.unitName = item.name
+		}
+	}
+	
+	rhName:any;
+	onRhChange(e){
+		let item = this.rhList.find(i=> i.id == e)
+		if(item){
+			this.rhName = item.name
+		}
+	}
+	
+	hideAutoModal(){
+		this.autoCreateModal = false
+		this.patientList = []
+	}
+	
+	// 自动生成提交
+	submitAutoForm(){
+		var that = this;
+		for (const i in that.validateAutoForm.controls) {
+		  that.validateAutoForm.controls[i].markAsDirty();
+		  that.validateAutoForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateAutoForm.invalid) return;
+		let data = {
+			blood:{
+				applyDept: this.validateAutoForm.value.applyDept,
+				sendDept: this.validateAutoForm.value.sendDept,
+				patientId: this.validateAutoForm.value.patientId || undefined,
+				arriver: this.validateAutoForm.value.arriver || undefined,
+				sendMsgType: this.validateAutoForm.value.sendMsgType || undefined
+			}
+		};
+		if(this.validateAutoForm.value.sendMsgType=='createAndSignMsg'){
+			data.blood.arriver = this.validateAutoForm.value.arriver
+		}else{
+			delete data.blood.arriver
+		}
+		that.btnLoading = true;
+		that.mainService
+		  .autoMake("blood", this.validateAutoForm.value.amount, data)
+		  .subscribe((data:any) => {
+		    that.btnLoading = false;
+		    that.hideAutoModal();
+		    that.initAutoForm();
+		    if (data.status == 200) {
+		      that.showPromptModal("生成", true, "");
+		    } else {
+		      that.showPromptModal("生成", false, data.msg);
+		    }
+		  });
+	}
+	
+	// 新增
+	addModal:boolean = false;
+	view:boolean = false;
+	add:boolean = false;
+	addForm(){
+		this.addModal = true;
+		this.initForm();
+	}
+	
+	hideModal() {
+	  this.addModal = false;
+		this.patientList = [];
+	  this.initForm();
+	}
+	
+	// 初始化form
+	validateForm: FormGroup; //新增/编辑表单
+	initForm() {
+	  this.validateForm = this.fb.group({
+	    applyDept: [null, [Validators.required]],
+	    sendDept: [null, [Validators.required]],
+			useDept: [null, []],
+	    patientId: [null, [Validators.required]],
+			type: [null, [Validators.required]],
+	    volume: [null, [Validators.required]],
+	    unit: [null, [Validators.required]],
+	    state: ['发血', [Validators.required]],
+			aboType: [null, [Validators.required]],
+			rhType: [null, [Validators.required]],
+			bleedUser: [null, [Validators.required]],
+			overDate: [null, [Validators.required]],
+			sendMsg: ['0', []],
+	  });
+	}
+	
+	// 表单提交
+	btnLoading:boolean = false;
+	submitForm(): void {
+	  var that = this;
+		for (const i in that.validateForm.controls) {
+		  that.validateForm.controls[i].markAsDirty();
+		  that.validateForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateForm.invalid) return;
+	  let data = {
+			blood:{
+				patientId:this.validateForm.value.patientId,
+				applyDept: this.validateForm.value.applyDept,
+				sendDept: this.validateForm.value.sendDept,
+				useDept: this.validateForm.value.useDept,
+				bleedUser:this.validateForm.value.bleedUser,
+				volume: this.validateForm.value.volume,
+				type: {
+					id: this.validateForm.value.type
+				},
+				unit: this.unitName,
+				aboType: this.aboName,
+				rhType: this.rhName,
+				overDate: this.validateForm.value.overDate,
+				sendMsg: this.validateForm.value.sendMsg
+			}
+	  };
+		that.btnLoading = true;
+	  that.mainService
+	    .dataPost("addData", "blood", data)
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+	      that.hideModal();
+	      that.initForm();
+	      if (data.status == 200) {
+	        that.showPromptModal("新增", true, "");
+	      } else {
+	        that.showPromptModal("新增", false, data.msg);
+	      }
+	    });
+	}
+	
+	// 批量发送
+	batchModal:boolean = false;
+	infoContent:any;
+	batchSend(){
+		if(this.checkedDepIds.length==0){
+			this.msg.error('请勾选血制品列表')
+			return
+		}
+		this.infoContent = `您选择了${this.checkedDepIds.length}条血制品信息，确认发送建单消息吗`
+		this.batchModal = true
+		this.initMsgForm();
+	}
+	
+	// 初始化form
+	validateMsgForm: FormGroup
+	initMsgForm(){
+		this.validateMsgForm = this.fb.group({
+			sendMsgType: ['createMsg', [Validators.required]]
+		});
+	}
+	
+	// 选择消息发送类型
+	msgTypeChange(e){
+		if(e=='createAndSignMsg'){
+			this.validateMsgForm.addControl(
+				'arriver',
+				new FormControl(null, Validators.required)
+			);
+		}else{
+			this.validateMsgForm.removeControl('arriver');
+		}
+	}
+	
+	// 提交批量消息发送
+	submitMsgForm(): void{
+		var that = this;
+		for (const i in that.validateMsgForm.controls) {
+		  that.validateMsgForm.controls[i].markAsDirty();
+		  that.validateMsgForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateMsgForm.invalid) return;
+		let data = {
+			blood:{
+				ids: this.checkedDepIds.toString(),
+				sendMsgType: this.validateMsgForm.value.sendMsgType,
+				arriver: this.validateMsgForm.value.arriver,
+			}
+		};
+		if(this.validateMsgForm.value.sendMsgType=='createAndSignMsg'){
+			data.blood.arriver = this.validateMsgForm.value.arriver
+		}else{
+			delete data.blood.arriver
+		}
+		that.btnLoading = true;
+		that.mainService
+		  .dataPost("updData", "blood", data)
+		  .subscribe((data) => {
+		    that.btnLoading = false;
+		    that.hideMsgModal();
+		    that.initMsgForm();
+		    if (data.status == 200) {
+					this.mapOfCheckedId = {};
+					this.checkedDepIds = [];
+		      that.showPromptModal("发送", true, "");
+		    } else {
+		      that.showPromptModal("发送", false, data.msg);
+		    }
+		  });
+	}
+	
+	hideMsgModal(){
+		this.batchModal = false;
+	}
+	
   // 重置
   reset() {
     this.searchCriteria = {
       //搜索条件
+			applyDept: null,
+			arriver: null,
       bloodCode: "",
       dateRange: [],
       state: null,
@@ -113,9 +516,9 @@ export class BloodSearchComponent implements OnInit {
   // 边输边搜节流阀
   isLoading = false;
   changeInp(dept) {
-    if (!dept) {
-      return;
-    }
+    // if (!dept) {
+    //   return;
+    // }
     if (dept === "no") {
       dept = "";
     }
@@ -141,7 +544,91 @@ export class BloodSearchComponent implements OnInit {
         }
       });
   }
-
+	
+	// 边输边搜节流阀
+	userKey = "";
+	changeInp2(keyword, type) {
+	  // if (!keyword) {
+	  //   return;
+	  // }
+	  if (keyword === "no") {
+	    keyword = "";
+	  }
+	  this.userKey = keyword;
+	  this.isLoading = true;
+	  this.changeInp2Subject.next([keyword, type]);
+	}
+	
+	userSearch:any = [];
+	// 搜索科室
+	searchUser(keyword, type) {
+	  let data = {
+	    user: {
+	      usertype: { id: 106 },
+	      name: keyword,
+	      dept: {
+	        id: this.searchCriteria.applyDept,
+	      },
+	    },
+	    idx: 0,
+	    sum: 10,
+	  };
+	  this.mainService
+	    .getFetchDataList("data", "user", data)
+	    .subscribe((data) => {
+	      if (data.status == 200) {
+	        if (type === "search") {
+	          if (this.userKey === keyword) {
+	            this.isLoading = false;
+	            this.userSearch = data.list;
+	          }
+	        }
+	      }
+	    });
+	}
+	
+	
+	// 选中表格中科室
+	mapOfCheckedId: { [key: string]: boolean } = {};
+	checkedDepIds = []; //已选中科室id
+	refreshStatus(): void {
+	  this.isAllDisplayDataChecked = this.listOfData.every(
+	    (item) => this.mapOfCheckedId[item.id]
+	  );
+	  let arr = [];
+	  for (var k in this.mapOfCheckedId) {
+	    if (this.mapOfCheckedId[k]) {
+	      arr.push(Number(k));
+	    }
+	  }
+	  this.checkedDepIds = arr;
+	  console.log(this.checkedDepIds);
+	}
+	
+	//表格整行选中
+	selectedListData(id) {
+	  this.mapOfCheckedId[id] = !this.mapOfCheckedId[id];
+	  this.refreshStatus();
+	}
+	
+	// 全选
+	isAllDisplayDataChecked = false; //当前页是否全选
+	checkAll(value: boolean): void {
+		// let isConformTo = this.listOfData.some(
+		//   (item) => item.state.value==1 || item.state.value==4 || item.state.value=='cx'
+		// )
+		// if(isConformTo){
+		// 	this.msg.error('只有“发血、病房接收”状态才能被选择')
+		// 	return
+		// }
+	  this.listOfData.forEach((item) => {
+			if(item.state.value!=1 && item.state.value!=4 && item.state.value!='cx'){
+				this.mapOfCheckedId[item.id] = value
+			}
+		});
+	  this.refreshStatus();
+	}
+	
   // 表格数据
   loading1 = false;
   getList(type) {
@@ -153,6 +640,8 @@ export class BloodSearchComponent implements OnInit {
       sum: this.pageSize,
       blood: {
         hosId: this.hosId,
+				applyDept: this.searchCriteria.applyDept || undefined,
+				arriver: this.searchCriteria.arriver || undefined,
         state: this.searchCriteria.state ? { id: this.searchCriteria.state } : undefined,
       },
     };
@@ -176,5 +665,21 @@ export class BloodSearchComponent implements OnInit {
         }
       });
   }
+	
+	// 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+	promptContent: string; //操作提示框提示信息
+	ifSuccess: boolean; //操作成功/失败
+	promptInfo: string; //操作结果提示信息
+	promptModalShow: boolean; //操作提示框是否展示
+	showPromptModal(con, success, promptInfo?) {
+	  this.promptModalShow = false;
+	  this.promptContent = con;
+	  this.ifSuccess = success;
+	  this.promptInfo = promptInfo;
+	  setTimeout(() => {
+	    this.promptModalShow = true;
+	  }, 100);
+	  this.getList(1);
+	}
 }
 

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

@@ -89,7 +89,8 @@
         <button nz-button class="btn default" (click)="addMoadl()" *ngIf="coopBtns.add">新增</button>
         <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
         <button nz-button class="btn default ml8" (click)='getList(1)'>搜索</button>
-      </div>
+				<button nz-button class="btn default ml8" (click)='autoCreate()'>自动生成</button>
+			</div>
     </div>
     <div class="list-template__bottom">
       <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
@@ -282,4 +283,87 @@
 </app-dialog-delete>
 
 <!-- 查看详情 -->
-<router-outlet></router-outlet>
+<router-outlet></router-outlet>
+
+<!-- 自动生成模态框 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="autoCreateModal">
+  <div class="modalBody">
+    <div class="title">自动生成<i class="icon_transport transport-guanbi" (click)="hideAutoModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateAutoForm" class="addForm" (ngSubmit)="submitAutoForm()">
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="launch">发药科室</nz-form-label>
+						<nz-form-control nzErrorTip="请选择发药科室!">
+							<nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+									(nzOnSearch)="changeInp($event)" (nzOpenChange)="changeSearch($event)" nzAllowClear nzPlaceHolder="请选择发药科室" formControlName="launch">
+									<ng-container *ngFor="let option of deptList">
+										<nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+									</ng-container>
+									<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+										<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+									</nz-option>
+								</nz-select>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="drugsBagType">药品类型</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择药品类型!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear nzPlaceHolder="请选择药品类型" formControlName="drugsBagType">
+								  <ng-container *ngFor="let option of drugsList">
+								    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+								  </ng-container>
+								</nz-select>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+				
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="target">申请科室</nz-form-label>
+						<nz-form-control nzErrorTip="请选择申请科室!">
+							<nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+									(nzOnSearch)="changeInp($event)" (nzOpenChange)="changeSearch($event)" nzAllowClear nzPlaceHolder="请选择申请科室" formControlName="target">
+									<ng-container *ngFor="let option of deptList">
+										<nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+									</ng-container>
+									<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+										<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+									</nz-option>
+								</nz-select>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="amount">生成数量</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择生成数量!">
+					    <nz-input-group>
+								<nz-input-number formControlName="amount" (ngModelChange)="numChange($event)" [nzMin]="1" [nzMax]="50" [nzStep]="1"></nz-input-number>
+							</nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="sendMsg">是否自动发消息</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择是否自动发消息!">
+					    <nz-input-group>
+								<nz-radio-group [nzDisabled]="view" formControlName="sendMsg">
+									<label nz-radio nzValue="1">是</label>
+									<label nz-radio nzValue="0">否</label>
+								</nz-radio-group>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitAutoForm()" [nzLoading]="btnLoading">生成药品</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideAutoModal()">取消</button>
+    </div>
+  </div>
+</div>

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

@@ -118,6 +118,10 @@
 							width: 100% !important;
 						}
 						
+						.ant-input-number{
+							width: 100% !important;
+						}
+						
             .ant-form-item-label {
               line-height: 14px;
               text-align: left;

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

@@ -428,7 +428,67 @@ export class DrugSearchComponent implements OnInit {
 		}
 		this.modal = true
 	}
-
+	
+	// 自动生成
+	autoCreateModal:boolean = false;
+	autoCreate(){
+		this.autoCreateModal = true
+		this.initAutoForm()
+	}
+	
+	// 初始化form
+	validateAutoForm: FormGroup
+	initAutoForm(){
+		this.validateAutoForm = this.fb.group({
+			launch: [null, [Validators.required]],
+			drugsBagType: [null, [Validators.required]],
+			target: [null, []],
+			amount: [1, []],
+			sendMsg: ['0', []],
+		});
+	}
+	
+	numChange(e){
+		console.log(4, e)
+	}
+	
+	hideAutoModal(){
+		this.autoCreateModal = false
+	}
+	
+	// 自动生成提交
+	submitAutoForm(){
+		var that = this;
+		for (const i in that.validateAutoForm.controls) {
+		  that.validateAutoForm.controls[i].markAsDirty();
+		  that.validateAutoForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateAutoForm.invalid) return;
+		let data = {
+			drugsBag:{
+				target: this.validateAutoForm.value.target || undefined,
+				launch: this.validateAutoForm.value.launch || undefined,
+				sendMsg: this.validateAutoForm.value.sendMsg || undefined,
+				drugsBagType: {
+					id: this.validateAutoForm.value.drugsBagType
+				}
+			}
+		};
+		that.btnLoading = true;
+		that.mainService
+		  .autoMake("drugsBag", this.validateAutoForm.value.amount, data)
+		  .subscribe((data:any) => {
+		    that.btnLoading = false;
+		    that.hideAutoModal();
+		    that.initAutoForm();
+		    if (data.status == 200) {
+		      that.showPromptModal("生成", true, "");
+		    } else {
+		      that.showPromptModal("生成", false, data.msg);
+		    }
+		  });
+	}
+	
 	// 消息发送
 	sendModal:boolean = false;
 	sendMsg(data){

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

@@ -617,40 +617,41 @@ export class MainComponent implements OnInit, OnDestroy {
 	}
 
 	initOrderScope() {
-	  let scopeInfo = this.user.user.scope;
-	  this.checkedHos = scopeInfo.hospitalId ? scopeInfo.hospitalId.id : undefined;
-	  this.checkedHosDTO = scopeInfo.hospitalId || undefined;
-	  this.orderScopeRadio = scopeInfo.range + "";
-	  let groupIds = scopeInfo.groupIds || [];
-	  let dutyGroupList = scopeInfo.dutyGroupList || [];
-	  this.scopeGroups = dutyGroupList.concat(groupIds);
-	  if(this.scopeGroups.length){
-	    this.typeId = this.scopeGroups[0].id;
-	  }
-	  this.hsmsData = {
-	    checkedHos: this.checkedHos,
-	    checkedHosDTO: this.checkedHosDTO,
-	    scopeGroups: this.scopeGroups,
-	    orderScopeRadio: this.orderScopeRadio || '0',
-	    hsmsSwitch: scopeInfo.hsmsSwitch === 1,
-	  }
-	  this.flagList.hsmsFlag1 = this.hsmsData.hsmsSwitch;
-	  this.flagList.hsmsFlag2 = this.hsmsData.hsmsSwitch;
-	  this.flagList.hsmsFlag3 = this.hsmsData.hsmsSwitch;
-	  this.itsmCheckedHos = scopeInfo.dutyList || [];
-	  this.itsmOrderScopeRadio = scopeInfo.dutyRange + "";
-	  this.itsmScopeGroups = scopeInfo.dutyGroupList || [];
-	  this.itsmData = {
-	    checkedHos: this.itsmCheckedHos,
-	    scopeGroups: this.itsmScopeGroups,
-	    orderScopeRadio: this.itsmOrderScopeRadio || '0',
-	    mdv2Switch: scopeInfo.mdv2Switch === 1,
-	    allDuty: scopeInfo.allDuty === undefined ? 1 : scopeInfo.allDuty,
-			showReassign: scopeInfo.showReassign == null || scopeInfo.showReassign == 0 ? 0 : 1,
-	  }
-	  this.flagList.itsmFlag1 = this.itsmData.mdv2Switch;
-	  this.flagList.itsmFlag2 = this.itsmData.mdv2Switch;
-	  this.flagList.itsmFlag3 = this.itsmData.mdv2Switch;
+	  // let scopeInfo = this.user.user.scope;
+		// let hsoObj = this.user.user.currentHospital;
+	  // this.currentHospital.id = hsoObj.hospitalId ? hsoObj.hospitalId.id : undefined;
+	  // this.checkedHosDTO = scopeInfo.hospitalId || undefined;
+	  // this.orderScopeRadio = scopeInfo.range + "";
+	  // let groupIds = scopeInfo.groupIds || [];
+	  // let dutyGroupList = scopeInfo.dutyGroupList || [];
+	  // this.scopeGroups = dutyGroupList.concat(groupIds);
+	  // if(this.scopeGroups.length){
+	  //   this.typeId = this.scopeGroups[0].id;
+	  // }
+	  // this.hsmsData = {
+	  //   checkedHos: this.currentHospital.id,
+	  //   checkedHosDTO: this.checkedHosDTO,
+	  //   scopeGroups: this.scopeGroups,
+	  //   orderScopeRadio: this.orderScopeRadio || '0',
+	  //   hsmsSwitch: scopeInfo.hsmsSwitch === 1,
+	  // }
+	  // this.flagList.hsmsFlag1 = this.hsmsData.hsmsSwitch;
+	  // this.flagList.hsmsFlag2 = this.hsmsData.hsmsSwitch;
+	  // this.flagList.hsmsFlag3 = this.hsmsData.hsmsSwitch;
+	  // this.itsmCheckedHos = scopeInfo.dutyList || [];
+	  // this.itsmOrderScopeRadio = scopeInfo.dutyRange + "";
+	  // this.itsmScopeGroups = scopeInfo.dutyGroupList || [];
+	  // this.itsmData = {
+	  //   checkedHos: this.itsmCheckedHos,
+	  //   scopeGroups: this.itsmScopeGroups,
+	  //   orderScopeRadio: this.itsmOrderScopeRadio || '0',
+	  //   mdv2Switch: scopeInfo.mdv2Switch === 1,
+	  //   allDuty: scopeInfo.allDuty === undefined ? 1 : scopeInfo.allDuty,
+			// showReassign: scopeInfo.showReassign == null || scopeInfo.showReassign == 0 ? 0 : 1,
+	  // }
+	  // this.flagList.itsmFlag1 = this.itsmData.mdv2Switch;
+	  // this.flagList.itsmFlag2 = this.itsmData.mdv2Switch;
+	  // this.flagList.itsmFlag3 = this.itsmData.mdv2Switch;
 		this.showNewOrder();
 	  this.getHospitalConfigList('allowNucleicAcidPrinting');
 	  this.getConfigTasktype();
@@ -662,7 +663,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	  // if(!this.hsmsData.hsmsSwitch){
 	  //   return;
 	  // }
-	  let postData = { idx: 0, sum: 1, hospitalConfig: { hosId: this.checkedHos, key } };
+	  let postData = { idx: 0, sum: 1, hospitalConfig: { hosId: this.currentHospital.id, key } };
 	  this.mainService.getFetchDataList("simple/data", "hospitalConfig", postData).subscribe(result=>{
 	    if(result.status == 200){
 	      this.isShowNucleicAcidPrinting = result.list[0].value == 1;
@@ -682,7 +683,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	    idx: 0,
 	    sum: 1,
 	    hospitalConfig: {
-	      hosId: this.checkedHos,
+	      hosId: this.currentHospital.id,
 	      key: "rebackPatientTypeId",
 	    },
 	  };
@@ -869,7 +870,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	  return this.mainService.getTaskTypeBySearchKey({
 	    searchKey: keyword || undefined,
 	    countRemark: countRemark || undefined,
-	    hosId: this.checkedHos,
+	    hosId: this.currentHospital.id,
 	  });
 	}
 
@@ -898,7 +899,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	  let postData = {
 	    patientLog: {
 	      sqDept: { id },
-	      hosId: this.checkedHos,
+	      hosId: this.currentHospital.id,
 	    },
 	    idx: 0,
 	    sum: 10000,
@@ -923,14 +924,14 @@ export class MainComponent implements OnInit, OnDestroy {
 	    this.noArrives = [];
 	    return;
 	  }
-	  let types = "";
-	  this.user.user.scope.typeIds.forEach((e) => {
-	    types += e.id + ",";
-	  });
-	  types = types.slice(0, types.length - 1);
+	  // let types = "";
+	  // this.user.user.scope.typeIds.forEach((e) => {
+	  //   types += e.id + ",";
+	  // });
+	  // types = types.slice(0, types.length - 1);
 	  let dataObj = {
 	    workOrder: {
-	      serTaskTypes: types,
+	      serTaskTypes: null,
 	      // serGdState: 4,
 	      range: "0",
 	      platform: 3,
@@ -1105,7 +1106,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	getPatientByResidenceNo(residenceNo) {
 	  let postData = {
 	    residenceNo,
-	    hosId: this.checkedHos,
+	    hosId: this.currentHospital.id,
 	    idx: 0,
 	    sum: 2,
 	  };
@@ -1792,7 +1793,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	  if(type == 'itsm'){
 	    cascadeHosId = this.incidentModel.hosId || undefined;
 	  }else{
-	    cascadeHosId = this.checkedHos;
+	    cascadeHosId = this.currentHospital.id;
 	  }
 	  let dataObj = {
 	    idx: 0,
@@ -2553,7 +2554,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	// 查类型
 	getTaskTypeCountRemarkList(){
 	  this.mainService.getTaskTypeCountRemarkList({
-	      hosId: this.checkedHos,
+	      hosId: this.currentHospital.id,
 	      typeValues: 'other,specimen,ordinary',
 	  }).subscribe((data) => {
 	    if (data["status"] == 200){
@@ -2978,7 +2979,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	workOrderInspectScoreList:any[] = [];
 	workOrderInspectScore:any;
 	getWorkOrderInspectScore() {
-	  let postData = { idx: 0, sum: 9999, workOrderInspectScore: { hosId: this.checkedHos } };
+	  let postData = { idx: 0, sum: 9999, workOrderInspectScore: { hosId: this.currentHospital.id } };
 	  this.mainService
 	    .getFetchDataList("simple/data", "workOrderInspectScore", postData)
 	    .subscribe((result) => {
@@ -3041,7 +3042,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	    } else if (data["startStatus"] == 203) {
 	      this.startDeptQt = data["startDept"][0]["id"];
 	    } else if (data["startStatus"] == 204 || data["startStatus"] == 205) {
-	      this.getHosDepartmentQt(this.checkedHos, "start", "");
+	      this.getHosDepartmentQt(this.currentHospital.id, "start", "");
 	    }
 	    // 终点科室
 	    if (data["endStatus"] == 201) {
@@ -3055,7 +3056,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	    } else if (data["endStatus"] == 203) {
 	      this.endDeptQt = data["endDept"][0]["id"];
 	    } else if (data["endStatus"] == 204 || data["endStatus"] == 205) {
-	      this.getHosDepartmentQt(this.checkedHos, "end", "");
+	      this.getHosDepartmentQt(this.currentHospital.id, "end", "");
 	    }
 	  });
 	}

src/app/views/page-config/page-config.component.ts

@@ -19,6 +19,10 @@ export class PageConfigComponent implements OnInit, AfterViewInit {
   // 数据字典
   dictionaryKeyList:any[] = [
     { id: 1, name: '检查类型', key: "inspect_check_item"},
+		{ id: 2, name: 'ABO血型', key: "abo_type"},
+		{ id: 3, name: 'RH血型', key: "rh_type"},
+		{ id: 4, name: '单位', key: "blood_unit"},
+		{ id: 5, name: '血液类型', key: "blood_trans_type"},
   ]
 
   ngOnInit(): void {}

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

@@ -140,6 +140,12 @@
         <button nz-button class="btn default ml8" (click)="getList(1)">
           搜索
         </button>
+				<button nz-button class="btn default ml8" (click)="addForm()">
+				  新增
+				</button>
+				<button nz-button class="btn default ml8" (click)="autoCreate()">
+				  自动生成
+				</button>
       </div>
     </div>
     <div class="list-template__checkBoxes">
@@ -167,7 +173,7 @@
             <th nzShowSort nzSortKey="arrive_time" [(nzSort)]="sortCurrent.arrive_time">收取信息</th>
             <th nzWidth="8%">中转时间</th>
             <th>送达信息</th>
-            <th nzWidth="7%"></th>
+            <th nzWidth="12%">操作</th>
           </tr>
         </thead>
         <tbody>
@@ -202,7 +208,14 @@
 							<div>{{ data.delivererName || "-" }}</div>
 							<div>{{ data.sendTime || '-' }}</div>
 						</td>
-            <td><button (click)="viewSpecimenHistory(data)">查看</button></td>
+            <td>
+							<!-- <button (click)="viewSpecimenHistory(data)">查看</button> -->
+							<div class="coop">
+							  <span (click)="viewSpecimenHistory(data)">查看</span>
+								<span *ngIf="coopBtns.collect && (data.speState.value==2 || data.speState.value==3)" (click)="collect($event,data)">设置核收</span>
+								<span *ngIf="coopBtns.send && (data.speState.value==1 || data.speState.value==30)" (click)="send($event,data)">消息发送</span>
+							</div>
+						</td>
           </tr>
         </tbody>
       </nz-table>
@@ -227,6 +240,14 @@
   (confirmDelEvent)="confirmDel()"
   [content]="tipsMsg1"
 ></app-dialog-delete>
+<!-- 发送模态框 -->
+<app-dialog-delete
+  [delModal]="sendModal"
+  (hideDelModalEvent)="hideSendModal()"
+  [btnLoading]="btnLoading"
+  (confirmDelEvent)="confirmSend()"
+  [content]="tipsMsg2"
+></app-dialog-delete>
 <!-- 标本历史记录查看 -->
 <app-history-prompt-modal
   *ngIf="historyPromptModalShow"
@@ -243,3 +264,306 @@
   [info]="promptInfo"
 >
 </app-prompt-modal>
+
+<!-- 新增/编辑模态框 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="addModal">
+  <div class="modalBody">
+    <div class="title">{{add?"新增":view?"查看":"编辑"}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+				<div class="df">
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="sickRoom">申请科室</nz-form-label>
+						<nz-form-control nzErrorTip="请选择申请科室!">
+							<nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+									(nzOnSearch)="changeInp($event, 'search')" (nzOpenChange)="changeSearch($event)" (ngModelChange)="onDeptChange($event)" nzAllowClear nzPlaceHolder="请选择申请科室" formControlName="sickRoom">
+									<ng-container *ngFor="let option of departmentSearch">
+										<nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+									</ng-container>
+									<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+										<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+									</nz-option>
+								</nz-select>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="checkDept">检验科室</nz-form-label>
+						<nz-form-control nzErrorTip="请选择检验科室!">
+							<nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+									(nzOnSearch)="changeInp($event, 'search')" (nzOpenChange)="changeSearch($event)" nzAllowClear nzPlaceHolder="请选择检验科室" formControlName="checkDept">
+									<ng-container *ngFor="let option of departmentSearch">
+										<nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+									</ng-container>
+									<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+										<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+									</nz-option>
+								</nz-select>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="patientId">患者</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择患者!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDisabled]="view" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changePatient($event, 1)" (ngModelChange)="onPatientChange($event)" nzAllowClear nzPlaceHolder="请选择患者" formControlName="patientId">
+									<ng-container *ngFor="let option of patientList">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="option.patientName" [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-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+				</div>
+				
+				<div class="df"> 
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="examinationItemsId">检验项目</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择检验项目!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDisabled]="view" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								   (ngModelChange)="onExamineChange($event)" nzAllowClear nzPlaceHolder="请选择检验项目" formControlName="examinationItemsId">
+									<ng-container *ngFor="let option of projectList">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [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-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="7" [nzXs]="24" nzFor="stype">标本类型</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择标本类型!">
+					    <nz-input-group>
+								<input nz-input disabled class="formItem" formControlName="stype" placeholder="请输入标本类型" nzSize="default" />
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="tubeType">试管类型</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择试管类型!">
+					    <nz-input-group>
+								<input nz-input disabled class="formItem" formControlName="tubeType" placeholder="请输入试管类型" nzSize="default" />
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+				</div>
+				
+      	<div class="df">
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" nzRequired [nzXs]="24" nzFor="speState">默认状态</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择默认状态!">
+					    <nz-input-group>
+								<input nz-input disabled class="formItem" formControlName="speState" placeholder="请输入默认状态" nzSize="default" />
+							</nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" nzRequired [nzXs]="24" nzFor="urgent">紧急度</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择紧急度!">
+					    <nz-input-group>
+								<nz-radio-group [nzDisabled]="view" formControlName="urgent">
+									<label nz-radio nzValue="1">急查</label>
+									<label nz-radio nzValue="0">普查</label>
+								</nz-radio-group>
+							</nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="collectNurseId">采集人</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择采集人!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDisabled]="view" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择采集人" formControlName="collectNurseId">
+									<ng-container *ngFor="let option of userList">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [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-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+				</div>
+				
+				<div class="df">
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="sendMsg">是否自动发消息</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择是否自动发消息!">
+					    <nz-input-group>
+								<nz-radio-group [nzDisabled]="view" formControlName="sendMsg">
+									<label nz-radio nzValue="1">是</label>
+									<label nz-radio nzValue="0">否</label>
+								</nz-radio-group>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+				</div>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 设置核收 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="collectModal">
+  <div class="modalBody collect">
+    <div class="title">设置核收<i class="icon_transport transport-guanbi" (click)="hideCollectModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateCollectForm" class="addForm" (ngSubmit)="submitCollectForm()">
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="collect">核收人</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择核收人!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDisabled]="view" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择核收人" formControlName="collect">
+									<ng-container *ngFor="let option of userList">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [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-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="sendMsg">是否自动发消息</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择是否自动发消息!">
+					    <nz-input-group>
+								<nz-radio-group [nzDisabled]="view" formControlName="sendMsg">
+									<label nz-radio nzValue="1">是</label>
+									<label nz-radio nzValue="0">否</label>
+								</nz-radio-group>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+				
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitCollectForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideCollectModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 自动生成模态框 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="autoCreateModal">
+  <div class="modalBody collect">
+    <div class="title">自动生成<i class="icon_transport transport-guanbi" (click)="hideAutoModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateAutoForm" class="addForm" (ngSubmit)="submitAutoForm()">
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="sickRoom">申请科室</nz-form-label>
+						<nz-form-control nzErrorTip="请选择申请科室!">
+							<nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+									(nzOnSearch)="changeInp($event, 'search')" (nzOpenChange)="changeSearch($event)" (ngModelChange)="onAutoDeptChange($event)" nzAllowClear nzPlaceHolder="请选择申请科室" formControlName="sickRoom">
+									<ng-container *ngFor="let option of departmentSearch">
+										<nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+									</ng-container>
+									<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+										<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+									</nz-option>
+								</nz-select>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="patientId">患者</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择患者!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDisabled]="view" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changePatient($event, 2)" (ngModelChange)="onPatientChange($event)" nzAllowClear nzPlaceHolder="请选择患者" formControlName="patientId">
+									<ng-container *ngFor="let option of patientList">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="option.patientName" [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-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+				
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="examinationItemsId">检验项目</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择检验项目!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDisabled]="view" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								   (ngModelChange)="onAutoExamineChange($event)" nzAllowClear nzPlaceHolder="请选择检验项目" formControlName="examinationItemsId">
+									<ng-container *ngFor="let option of projectList">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [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-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label nzRequired [nzSm]="6" [nzXs]="24" nzFor="amount">生成数量</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择生成数量!">
+					    <nz-input-group>
+								<nz-input-number formControlName="amount" (ngModelChange)="numChange($event)" [nzMin]="1" [nzMax]="50" [nzStep]="1"></nz-input-number>
+							</nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="urgent">紧急度</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择紧急度!">
+					    <nz-input-group>
+								<nz-radio-group [nzDisabled]="view" formControlName="urgent">
+									<label nz-radio nzValue="1">急查</label>
+									<label nz-radio nzValue="0">普查</label>
+								</nz-radio-group>
+							</nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="sendMsg">是否自动发消息</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择是否自动发消息!">
+					    <nz-input-group>
+								<nz-radio-group [nzDisabled]="view" formControlName="sendMsg">
+									<label nz-radio nzValue="1">是</label>
+									<label nz-radio nzValue="0">否</label>
+								</nz-radio-group>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitAutoForm()" [nzLoading]="btnLoading">生成标本</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideAutoModal()">取消</button>
+    </div>
+  </div>
+</div>

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

@@ -96,8 +96,11 @@
 
   // 新增
   &.add {
+		.collect{
+			width: 500px !important;
+		}
     .modalBody {
-      width: 480px;
+      width: 70%;
       height: auto;
 
       .content {
@@ -108,9 +111,39 @@
         overflow-y: auto;
 
         .addForm {
+					.df{
+						display: flex;
+						margin-bottom: 15px;
+						.ant-form-item {
+							width: 30%;
+							margin-right: 3%;
+							.ant-form-item-label{
+								overflow: visible !important;
+							}
+							
+							.ant-select{
+								width: 100% !important;
+							}
+							
+						  .ant-form-item-label {
+						    line-height: 14px;
+						    text-align: left;
+						  }
+						
+						  .desc {
+						    margin-top: 5px;
+						  }
+						}
+					}
           .ant-form-item {
             margin-bottom: 15px;
-
+						
+						.ant-select{
+							width: 100% !important;
+						}
+						.ant-input-number{
+							width: 100% !important;
+						}
             .ant-form-item-label {
               line-height: 14px;
               text-align: left;

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

@@ -4,13 +4,21 @@ import { ToolService } from "../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
 import { format, subDays, endOfDay, startOfDay } from "date-fns";
+import { Validators, FormGroup, FormBuilder } from '@angular/forms';
+import { ActivatedRoute, Router } from "@angular/router";
+
 @Component({
   selector: "app-specimen-search",
   templateUrl: "./specimen-search.component.html",
   styleUrls: ["./specimen-search.component.less"],
 })
 export class SpecimenSearchComponent implements OnInit {
-  constructor(private mainService: MainService, private tool: ToolService) {}
+  constructor(
+	private mainService: MainService, 
+	private tool: ToolService,
+	private fb: FormBuilder,
+	public route: ActivatedRoute,
+	) {}
 
   currentUserAccount: any = JSON.parse(localStorage.getItem("user")).user.account; //当前登录人账号
   searchCriteria = {
@@ -32,12 +40,19 @@ export class SpecimenSearchComponent implements OnInit {
   pageIndex: number = 1; //表格当前页码
   pageSize: number = 10; //表格每页展示条数
   listLength: number = 10; //表格总数据量
+	hosId:any;
   checkOptionsOne: Array<any> = [
     { label: "服务中心收取", value: "0", checked: true },
   ];
   changeInpSubject = new Subject();
+	changeInpUserSubject = new Subject();
   changeInp2Subject = new Subject();
+	changeInpPaSubject = new Subject();
+	coopBtns:any;
+	
   ngOnInit() {
+		this.coopBtns = this.tool.initCoopBtns(this.route);
+		this.hosId = this.tool.getCurrentHospital().id;
 		// this.searchCriteria.dateRange = [
 		// 	format(subDays(new Date(), 7), "yyyy-MM-dd") + ' ' +'00:00:00',
 		// 	format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss")
@@ -50,7 +65,15 @@ export class SpecimenSearchComponent implements OnInit {
     this.changeInp2Subject.pipe(debounceTime(500)).subscribe((v) => {
       this.searchUser(v[0], v[1]);
     });
+		this.changeInpUserSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.getUserList(v);
+		});
+		this.changeInpPaSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.getPatient(v[1], v[0]);
+		});
+		this.getUserList();
     this.getAllHospital();
+		this.getProjectList();
   }
   // 表格筛选
   log(value: object[]): void {
@@ -106,7 +129,7 @@ export class SpecimenSearchComponent implements OnInit {
     setTimeout(() => {
       this.promptModalShow = true;
     }, 100);
-    this.getList(0, this.sortCurrentKey, this.sortCurrentValue);
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
   }
   // 查看标本历史记录
   historyPromptModalShow = false; //标本历史记录弹窗开关
@@ -141,6 +164,362 @@ export class SpecimenSearchComponent implements OnInit {
 	    this.searchCriteria.dateRange = [dateStart,dateEnd];
 	  }
 	}
+	
+	// 搜索患者
+	changePatient(e, type){
+		this.isLoading = true;
+		this.changeInpPaSubject.next([e, type]);
+	}	
+	
+	// 搜索用户
+	changeUser(e){
+		this.isLoading = true;
+		this.changeInpUserSubject.next(e);
+	}	
+	
+	// 获取用户
+	userList:any = [];
+	getUserList(name?){
+		let data = {
+		  idx: 0,
+		  sum: 20,
+		  user: {
+		    name: name,
+		    hospital: { id: this.hosId || "" },
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("data", "user", data)
+		  .subscribe((data) => {
+		    this.isLoading = false;
+		    this.userList = data.list;
+		  });
+	}
+	
+	// 获取检验项目
+	projectList:any = [];
+	getProjectList(){
+	let data = {
+		idx: 0,
+		sum: 9999,
+		dictionary: {
+			key: "examination_items",
+		},
+	};
+	this.loading1 = true;
+	this.mainService
+		.getFetchDataList("simple/data", "dictionary", data)
+		.subscribe((data) => {
+			this.loading1 = false;
+			if (data.status == 200) {
+				this.projectList = data.list || [];
+			}
+		});
+	}
+	
+	// 获取患者
+	patientList:any = [];
+	getPatient(type, patientName?){
+		let postData = {
+		  idx: 0,
+		  sum: 20,
+			patient:{
+				department:{
+					id: type==1 ? this.validateForm.value.sickRoom : this.validateAutoForm.value.sickRoom
+				},
+				keyWord: patientName,
+			}
+		};
+		this.mainService.getFetchDataList('nurse', 'patient', postData).subscribe((data) => {
+		  this.isLoading = false;
+		  if (data["status"] == 200) {
+				data["list"].forEach(i=>{
+					if(i.bedNum && i.residenceNo){
+						i.patientName = i.patientName + '('+ i.bedNum +')' +'-'+ i.residenceNo
+					}
+					if(i.bedNum && !i.residenceNo){
+						i.patientName = i.patientName + '('+ i.bedNum +')'
+					}
+					if(!i.bedNum && !i.residenceNo){
+						i.patientName = i.patientName 
+					}
+					if(!i.bedNum && i.residenceNo){
+						i.patientName = i.patientName +'-'+ i.residenceNo
+					}
+				})
+		    this.patientList = data["list"];
+		  }
+		});
+	}
+	
+	// 选择检验项目
+	stypeId:any;
+	tubeTypeId:any;
+	onExamineChange(e){
+		let item = this.projectList.find(i => i.id == e);
+		if(item){
+			this.validateForm.controls.stype.setValue(item.dictionaryDTO.name)
+			this.validateForm.controls.tubeType.setValue(item.extra5DTO.name)
+			this.stypeId = item.dictionaryDTO.id
+			this.tubeTypeId = item.extra5DTO.id
+		}else{
+			this.validateForm.controls.stype.setValue(null)
+			this.validateForm.controls.tubeType.setValue(null)
+			this.stypeId = null
+			this.tubeTypeId = null
+		}
+	}
+	
+	onAutoExamineChange(e){
+
+	}
+	
+	// 选择申请科室
+	onDeptChange(e){
+		this.validateForm.controls.patientId.setValue(null)
+		this.getPatient(1);
+	}
+	
+	// 选择患者
+	onPatientChange(e){
+
+	}
+	
+	//  选择开始时间
+	applyDate:any;
+	onApplyChange(result: Date): void {
+	
+	}
+	
+	// 自动生成
+	autoCreateModal:boolean = false;
+	autoCreate(){
+		this.autoCreateModal = true
+		this.initAutoForm()
+	}
+	
+	// 初始化form
+	validateAutoForm: FormGroup
+	initAutoForm(){
+		this.validateAutoForm = this.fb.group({
+			sickRoom: [null, [Validators.required]],
+			patientId: [null, []],
+			examinationItemsId: [null, []],
+			amount: [1, [Validators.required]],
+			urgent: [null, []],
+			sendMsg: ['0', []],
+		});
+	}
+	
+	numChange(e){
+		console.log(4, e)
+	}
+	
+	// 选择申请科室
+	onAutoDeptChange(e){
+		this.validateAutoForm.controls.patientId.setValue(null)
+		this.getPatient(2);
+	}
+	
+	hideAutoModal(){
+		this.autoCreateModal = false
+		this.patientList = [];
+	}
+	
+	// 自动生成提交
+	submitAutoForm(){
+		var that = this;
+		for (const i in that.validateAutoForm.controls) {
+		  that.validateAutoForm.controls[i].markAsDirty();
+		  that.validateAutoForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateAutoForm.invalid) return;
+		let data = {
+			specimen:{
+				sickRoom: this.validateAutoForm.value.sickRoom,
+				patientId: this.validateAutoForm.value.patientId || undefined,
+				examinationItemsId: this.validateAutoForm.value.examinationItemsId || undefined,
+				urgent: this.validateAutoForm.value.urgent || undefined,
+				sendMsg: this.validateAutoForm.value.sendMsg || undefined
+			}
+		};
+		that.btnLoading = true;
+		that.mainService
+		  .autoMake("specimen", this.validateAutoForm.value.amount, data)
+		  .subscribe((data:any) => {
+		    that.btnLoading = false;
+		    that.hideAutoModal();
+		    that.initAutoForm();
+		    if (data.status == 200) {
+		      that.showPromptModal("生成", true, "");
+		    } else {
+		      that.showPromptModal("生成", false, data.msg);
+		    }
+		  });
+	}
+	
+	// 设置核收
+	collectModal:boolean = false;
+	itemData:any;
+	collect(e, data){
+		this.itemData = data;
+		this.collectModal = true
+		this.initCollectForm()
+	}
+	
+	// 初始化form
+	validateCollectForm: FormGroup
+	initCollectForm(){
+		this.validateCollectForm = this.fb.group({
+			collect: [null, [Validators.required]],
+			sendMsg: ['0', [Validators.required]],
+		});
+	}
+	
+	hideCollectModal(){
+		this.collectModal = false
+	}
+	
+	// 设置核收提交
+	submitCollectForm(){
+		var that = this;
+		for (const i in that.validateCollectForm.controls) {
+		  that.validateCollectForm.controls[i].markAsDirty();
+		  that.validateCollectForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateCollectForm.invalid) return;
+		let data = {
+			specimen:{
+				operationType: 'checkCollect',
+				id: this.itemData.id,
+				checkCollectUserId: this.validateCollectForm.value.collect,
+				sendMsg: this.validateCollectForm.value.sendMsg
+			}
+		};
+		that.btnLoading = true;
+		that.mainService
+		  .dataPost("updData", "specimen", data)
+		  .subscribe((data) => {
+		    that.btnLoading = false;
+		    that.hideCollectModal();
+		    that.initCollectForm();
+		    if (data.status == 200) {
+		      that.showPromptModal("操作", true, "");
+		    } else {
+		      that.showPromptModal("操作", false, data.msg);
+		    }
+		  });
+	}
+	
+	// 消息发送
+	sendModal:boolean = false;
+	tipsMsg2:any = '您确定要发送消息吗？';
+	send(e, data){
+		this.itemData = data;
+		this.sendModal = true;
+	}
+	
+	hideSendModal(){
+		this.sendModal = false;
+	}
+	
+	// 确定发送消息
+	confirmSend(){
+		let data = {
+			specimen:{
+				operationType: 'sendMessage',
+				id: this.itemData.id,
+			}
+		};
+		this.btnLoading = true;
+		this.mainService
+		  .dataPost("updData", "specimen", data)
+		  .subscribe((data) => {
+		    this.btnLoading = false;
+				this.sendModal = false;
+		    if (data.status == 200) {
+		      this.showPromptModal("操作", true, "");
+		    } else {
+		      this.showPromptModal("操作", false, data.msg);
+		    }
+		  });
+	}
+	
+	// 新增
+	addModal:boolean = false;
+	view:boolean = false;
+	addForm(){
+		this.addModal = true;
+		this.initForm();
+	}
+	
+	hideModal() {
+	  this.addModal = false;
+		this.patientList = [];
+	  this.initForm();
+	}
+	
+	// 初始化form
+	validateForm: FormGroup; //新增/编辑表单
+	initForm() {
+	  this.validateForm = this.fb.group({
+	    sickRoom: [null, [Validators.required]],
+	    checkDept: [null, [Validators.required]],
+	    patientId: [null, [Validators.required]],
+			examinationItemsId: [null, [Validators.required]],
+	    stype: [null, [Validators.required]],
+	    tubeType: [null, [Validators.required]],
+	    speState: ['已采集', [Validators.required]],
+			urgent: ['0', [Validators.required]],
+			collectNurseId: [null, []],
+			sendMsg: ['0', []],
+	  });
+	}
+	
+	// 表单提交
+	submitForm(): void {
+	  var that = this;
+		for (const i in that.validateForm.controls) {
+		  that.validateForm.controls[i].markAsDirty();
+		  that.validateForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateForm.invalid) return;
+	  let data = {
+			specimen:{
+				patientId:this.validateForm.value.patientId,
+				checkDept: {
+					id: this.validateForm.value.checkDept
+				},
+				sickRoom: {
+					id: this.validateForm.value.sickRoom
+				},
+				collectNurseId: this.validateForm.value.collectNurseId || undefined,
+				urgent: this.validateForm.value.urgent,
+				examinationItemsId: this.validateForm.value.examinationItemsId,
+				stype: {
+					id: this.stypeId
+				},
+				tubeType: {
+					id: this.tubeTypeId
+				},
+				sendMsg: this.validateForm.value.sendMsg
+			}
+	  };
+		that.btnLoading = true;
+	  that.mainService
+	    .dataPost("addData", "specimen", data)
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+	      that.hideModal();
+	      that.initForm();
+	      if (data.status == 200) {
+	        that.showPromptModal("新增", true, "");
+	      } else {
+	        that.showPromptModal("新增", false, data.msg);
+	      }
+	    });
+	}
+	
   // 重置
   reset() {
     this.searchCriteria = {