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

@@ -101,6 +101,11 @@
 										  <nz-form-label class="label">支持拍照留存</nz-form-label>
 										  <nz-checkbox-group [(ngModel)]="item.postData.drugsEndPhoto"></nz-checkbox-group>
 										</div>
+                    <!-- 开通一扫交接 -->
+										<div class="display_flex align-items_center mb8">
+										  <nz-form-label class="label">开通一扫交接</nz-form-label>
+										  <nz-checkbox-group [(ngModel)]="item.postData.drugsScanHandover"></nz-checkbox-group>
+										</div>
                   </ng-container>
 									<!-- 药单显示患者 -->
 									<div class="display_flex align-items_center mb8">
@@ -138,7 +143,7 @@
                   <!-- 自动建单 -->
 									<div class="display_flex align-items_center mb8">
 									  <nz-form-label class="label">是否自动建单</nz-form-label>
-									  <nz-checkbox-group [(ngModel)]="item.postData.autoCreate"></nz-checkbox-group>
+									  <nz-checkbox-group [(ngModel)]="item.postData.autoCreate" (ngModelChange)="changeAutoCreate($event, item)"></nz-checkbox-group>
 									</div>
 									<!-- 药品自动建单状态 -->
 									<div class="display_flex align-items_center mb8" *ngIf="item.postData.autoCreate[0].checked">
@@ -147,6 +152,18 @@
 										  <nz-option *ngFor="let item of drugStateData" [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
 										</nz-select>
 									</div>
+                  <!-- 限制药单类型建单 -->
+                  <div class="display_flex align-items_center mb8" *ngIf="item.postData.autoCreate[0].checked">
+                    <nz-form-label class="label">限制药单类型建单</nz-form-label>
+                    <nz-select nzMode="multiple" class="w320px" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择限制药单类型建单" [(ngModel)]="item.postData.drugsCreateLimitMarkType">
+                      <ng-container *ngFor="let option of markTypeList">
+                        <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>
+                  </div>
                 </div>
                 <div class="bottom">
                   <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>

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

@@ -33,6 +33,7 @@ export class ConfigurationDrugComponent implements OnInit {
     this.activeDictionary = this.dictionaryKeyList[0];
     this.init();
 		this.getDrugState();
+		this.getMarkTypeList();
   }
 
   // 工单模式
@@ -70,13 +71,15 @@ export class ConfigurationDrugComponent implements OnInit {
 				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+        drugsScanHandover: [{ label:'是否开启', value: 0 }],//终点科室开通一扫交接
 				showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
 				sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
 				drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
 				urgentCreateOrder: [{ label:'是否开启', value: 0 }],//是否开启紧急配送建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
-				autoCreateState: undefined // 药品自动建单状态
+				autoCreateState: undefined, // 药品自动建单状态
+				drugsCreateLimitMarkType: [], // 限制药单类型建单
 			}
     },
     {
@@ -97,13 +100,15 @@ export class ConfigurationDrugComponent implements OnInit {
 				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+        drugsScanHandover: [{ label:'是否开启', value: 0 }],//终点科室开通一扫交接
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
 				sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
         drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
         urgentCreateOrder: [{ label:'是否开启', value: 0 }],//是否开启紧急配送建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
-				autoCreateState: undefined // 药品自动建单状态
+				autoCreateState: undefined, // 药品自动建单状态
+        drugsCreateLimitMarkType: [], // 限制药单类型建单
 			}
     },
     {
@@ -124,13 +129,15 @@ export class ConfigurationDrugComponent implements OnInit {
 				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+        drugsScanHandover: [{ label:'是否开启', value: 0 }],//终点科室开通一扫交接
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
         sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
         drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
         urgentCreateOrder: [{ label:'是否开启', value: 0 }],//是否开启紧急配送建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
-				autoCreateState: undefined // 药品自动建单状态
+				autoCreateState: undefined, // 药品自动建单状态
+        drugsCreateLimitMarkType: [], // 限制药单类型建单
 			}
     },
     {
@@ -151,13 +158,15 @@ export class ConfigurationDrugComponent implements OnInit {
 				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+        drugsScanHandover: [{ label:'是否开启', value: 0 }],//终点科室开通一扫交接
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
         sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
         drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
         urgentCreateOrder: [{ label:'是否开启', value: 0 }],//是否开启紧急配送建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
-				autoCreateState: undefined // 药品自动建单状态
+				autoCreateState: undefined, // 药品自动建单状态
+        drugsCreateLimitMarkType: [], // 限制药单类型建单
 			}
     },
     {
@@ -178,13 +187,15 @@ export class ConfigurationDrugComponent implements OnInit {
 				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+        drugsScanHandover: [{ label:'是否开启', value: 0 }],//终点科室开通一扫交接
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
         sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
         drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
         urgentCreateOrder: [{ label:'是否开启', value: 0 }],//是否开启紧急配送建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
-				autoCreateState: undefined // 药品自动建单状态
+				autoCreateState: undefined, // 药品自动建单状态
+        drugsCreateLimitMarkType: [], // 限制药单类型建单
 			}
     },
   ];
@@ -198,6 +209,14 @@ export class ConfigurationDrugComponent implements OnInit {
 		});
 	}
 
+  // 获取药单类型
+	markTypeList:any = []
+	getMarkTypeList(){
+		this.mainService.getDictionary("list", "drugsbag_mark_type").subscribe((data) => {
+			this.markTypeList = data
+		});
+	}
+
   // 点击数据字典key
   activeDictionary:any;
   clickDictionaryKey(item){
@@ -222,6 +241,7 @@ export class ConfigurationDrugComponent implements OnInit {
       this.activeDictionary.postData.drugsEndCheckScanIds = this.activeDictionary.postData.drugsEndCheckScanIds.map(v => ({...v, checked: false}));;
       this.activeDictionary.postData.drugsEndManual = undefined;
       this.activeDictionary.postData.drugsEndPhoto[0].checked = false;
+      this.activeDictionary.postData.drugsScanHandover[0].checked = false;
     }
   }
 
@@ -278,6 +298,7 @@ export class ConfigurationDrugComponent implements OnInit {
       drugsEndCheckScanIds: this.activeDictionary.postData.drugsEndCheckScanIds.filter(v => v.checked).map(v => v.value).toString() || undefined,
       drugsEndManual: this.activeDictionary.postData.drugsEndManual ? { id: this.activeDictionary.postData.drugsEndManual } : undefined,
       drugsEndPhoto: this.activeDictionary.postData.drugsEndPhoto[0].checked ? 1 : 0,
+      drugsScanHandover: this.activeDictionary.postData.drugsScanHandover[0].checked ? 1 : 0,
 			showPatientInfo: this.activeDictionary.postData.showPatientInfo[0].checked ? 1 : 0,
 			showDrugsBagTypeCount: this.activeDictionary.postData.showDrugsBagTypeCount[0].checked ? 1 : 0,
 			showDrugsBagDetails: this.activeDictionary.postData.showDrugsBagDetails[0].checked ? 1 : 0,
@@ -287,7 +308,8 @@ export class ConfigurationDrugComponent implements OnInit {
 			autoCreate: this.activeDictionary.postData.autoCreate[0].checked ? 1 : 0,
 			autoCreateState:{
 				id:this.activeDictionary.postData.autoCreateState || undefined
-			}
+			},
+      drugsCreateLimitMarkType: this.activeDictionary.postData.drugsCreateLimitMarkType.length ? this.activeDictionary.postData.drugsCreateLimitMarkType.toString() : undefined,
 		};
     this.btnLoading = true;
     this.mainService
@@ -383,6 +405,7 @@ export class ConfigurationDrugComponent implements OnInit {
           this.activeDictionary.postData.drugsEndCheckScanIds = this.activeDictionary.postData.drugsEndCheckScanIds.map(v => ({...v, checked: (this.configs.drugsEndCheckScanIds || '').split(',').includes(v.value.toString())}));
           this.activeDictionary.postData.drugsEndManual = this.configs.drugsEndManual ? this.configs.drugsEndManual.id : undefined;
           this.activeDictionary.postData.drugsEndPhoto[0].checked = this.configs.drugsEndPhoto == 1;
+          this.activeDictionary.postData.drugsScanHandover[0].checked = this.configs.drugsScanHandover == 1;
 					this.activeDictionary.postData.showPatientInfo[0].checked = this.configs.showPatientInfo == 1;
 					this.activeDictionary.postData.showDrugsBagTypeCount[0].checked = this.configs.showDrugsBagTypeCount == 1;
 					this.activeDictionary.postData.showDrugsBagDetails[0].checked = this.configs.showDrugsBagDetails == 1;
@@ -391,7 +414,14 @@ export class ConfigurationDrugComponent implements OnInit {
 					this.activeDictionary.postData.urgentCreateOrder[0].checked = this.configs.urgentCreateOrder == 1;
 					this.activeDictionary.postData.autoCreate[0].checked = this.configs.autoCreate == 1;
 					this.activeDictionary.postData.autoCreateState = this.configs.autoCreateState && this.configs.autoCreateState.id || undefined;
+          this.activeDictionary.postData.drugsCreateLimitMarkType = this.configs.drugsCreateLimitMarkType ? this.configs.drugsCreateLimitMarkType.split(',').map(v => +v) : [];
 				}
       });
   }
+
+  // 是否自动建单
+  changeAutoCreate(e, item){
+    item.postData.autoCreateState = null;
+    item.postData.drugsCreateLimitMarkType = [];
+  }
 }

src/app/components/configurationCenter/configuration-specimen/configuration-specimen-auto-build-order/configuration-specimen-auto-build-order.component.html

@@ -0,0 +1,210 @@
+<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()" *ngIf="this.taskTypeDTO.id">新增</button>
+            </div>
+          </div>
+          <nz-table class="list-template__nzTable" [nzData]="dataList" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="loading1">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="14%">班次</th>
+                <th nzWidth="14%">急查建单</th>
+                <th nzWidth="14%">普查建单</th>
+                <th nzWidth="14%">限制检验接收科室</th>
+                <th nzWidth="14%">自动清理标本</th>
+                <th nzWidth="14%">停用|启用</th>
+                <th nzWidth="16%">操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of dataList;let i = index">
+                <td>{{data.scheduleClassDTO?.name}}</td>
+                <td>{{data.urgentFlag == 1 ? '启用' : '停用'}}</td>
+                <td>{{data.ordinaryFlag == 1 ? '启用' : '停用'}}</td>
+                <td>{{data.autoDeptLimit == 1 ? '启用' : '停用'}}</td>
+                <td>{{data.autoCleanSpecimen == 1 ? '启用' : '停用'}}</td>
+                <td>{{data.flag == 1 ? '启用' : '停用'}}</td>
+                <td>
+                  <div class="coop">
+                    <span (click)="showDelModal(data, '您确认要删除吗？', '删除', 'del')">删除</span>
+                    <span (click)="editWechat(data)">编辑</span>
+                    <span (click)="showDelModal(data, '您确认要' + (data.flag == 1 ? '停用' : '启用') + '吗？', data.flag == 1 ? '停用' : '启用', 'flag')">{{data.flag == 1 ? '停用' : '启用'}}</span>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 新增/编辑模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalWechat">
+  <div class="modalBody">
+    <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideWechatModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm">
+        <nz-form-item>
+          <nz-form-label [nzSpan]="4" nzRequired nzFor="classesId">班次</nz-form-label>
+          <nz-form-control [nzSpan]="20" nzErrorTip="请选择班次!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="classesId" nzPlaceHolder="请选择班次" nzServerSearch>
+              <ng-container *ngFor="let data of classList">
+                <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]="4" nzRequired nzFor="autoCleanSpecimen">自动清理标本</nz-form-label>
+          <nz-form-control [nzSpan]="20" nzErrorTip="请选择自动清理标本!">
+            <nz-radio-group formControlName="autoCleanSpecimen">
+              <label nz-radio [nzValue]="1">启用</label>
+              <label nz-radio [nzValue]="0">停用</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="4" nzRequired nzFor="urgentFlag">急查建单</nz-form-label>
+          <nz-form-control [nzSpan]="20" nzErrorTip="请选择急查建单!">
+            <nz-radio-group formControlName="urgentFlag" (ngModelChange)="changeUrgentFlag($event)">
+              <label nz-radio [nzValue]="1">启用</label>
+              <label nz-radio [nzValue]="0">停用</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item [hidden]="validateForm.value.urgentFlag != 1">
+          <nz-form-label [nzSpan]="4" nzRequired nzFor="urgentTypeIds">急查标本类型</nz-form-label>
+          <nz-form-control [nzSpan]="20" nzErrorTip="请选择急查标本类型!">
+            <nz-select nzMode="multiple" [nzDropdownMatchSelectWidth]="false" formControlName="urgentTypeIds" nzPlaceHolder="请选择急查标本类型" nzShowSearch nzAllowClear>
+              <ng-container *ngFor="let option of specimenTypeList">
+                <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-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="4" nzRequired nzFor="ordinaryFlag">普查建单</nz-form-label>
+          <nz-form-control [nzSpan]="20" nzErrorTip="请选择普查建单!">
+            <nz-radio-group formControlName="ordinaryFlag" (ngModelChange)="changeOrdinaryFlag($event)">
+              <label nz-radio [nzValue]="1">启用</label>
+              <label nz-radio [nzValue]="0">停用</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item [hidden]="validateForm.value.ordinaryFlag != 1">
+          <nz-form-label [nzSpan]="4" nzRequired nzFor="ordinaryTypeIds">普查标本类型</nz-form-label>
+          <nz-form-control [nzSpan]="20" nzErrorTip="请选择普查标本类型!">
+            <nz-select nzMode="multiple" [nzDropdownMatchSelectWidth]="false" formControlName="ordinaryTypeIds" nzPlaceHolder="请选择普查标本类型" nzShowSearch nzAllowClear>
+              <ng-container *ngFor="let option of specimenTypeList">
+                <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-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="4" nzRequired nzFor="autoDeptLimit">限制检验接收科室</nz-form-label>
+          <nz-form-control [nzSpan]="20" nzErrorTip="请选择限制检验接收科室!">
+            <nz-radio-group formControlName="autoDeptLimit" (ngModelChange)="changeAutoDeptLimit($event)">
+              <label nz-radio [nzValue]="1">启用</label>
+              <label nz-radio [nzValue]="0">停用</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item [hidden]="validateForm.value.autoDeptLimit != 1">
+          <nz-form-label [nzSpan]="4" nzRequired nzFor="limitDeptIds">收取检验科室</nz-form-label>
+          <nz-form-control [nzSpan]="20" nzErrorTip="请选择收取检验科室!">
+            <nz-select nzMode="multiple" [nzDropdownMatchSelectWidth]="false" formControlName="limitDeptIds" nzPlaceHolder="请选择收取检验科室" nzShowSearch nzAllowClear>
+              <ng-container *ngFor="let option of deptList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <!-- <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="stype">标本类型</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择标本类型!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="stype" 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]="6" nzRequired nzFor="checkItem">检验项目</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入检验项目!">
+            <nz-input-group>
+              <input formControlName="checkItem" nz-input placeholder="请输入检验项目">
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzFor="startDept"><span class="visibility_hidden">囧</span>申请科室</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择申请科室!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="startDept" nzPlaceHolder="请选择申请科室" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
+              <ng-container *ngFor="let option of deptList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzFor="tubeType"><span class="visibility_hidden">囧</span>试管类型</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择试管类型!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="tubeType" nzPlaceHolder="请选择试管类型" nzServerSearch>
+              <nz-option *ngFor="let data of tubeTypeList" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="urgent">标记类型</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择标记类型!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="urgent" nzPlaceHolder="请选择标记类型" nzServerSearch>
+              <nz-option nzLabel="标记加急" [nzValue]="1"></nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item> -->
+      </form>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitWechatForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideWechatModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/components/configurationCenter/configuration-specimen/configuration-specimen-auto-build-order/configuration-specimen-auto-build-order.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: 900px;
+        height: auto;
+
+        .content {
+          width: 100%;
+          height: auto;
+          padding: 16px;
+          max-height: 800px;
+          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-specimen-auto-build-order/configuration-specimen-auto-build-order.component.ts

@@ -0,0 +1,348 @@
+import { Component, OnInit, Input } from "@angular/core";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { Validators, FormGroup, FormBuilder } from '@angular/forms';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { MainService } from 'src/app/services/main.service';
+
+@Component({
+  selector: "app-configuration-specimen-auto-build-order",
+  templateUrl: "./configuration-specimen-auto-build-order.component.html",
+  styleUrls: ["./configuration-specimen-auto-build-order.component.less"],
+})
+export class ConfigurationSpecimenAutoBuildOrderComponent implements OnInit {
+  @Input() taskTypeDTO:any = {};
+  constructor(
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  coopData: any = {}; //当前操作列
+  hosId: any = this.tool.getCurrentHospital().id;
+  classList: any = [];
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.classList = this.taskTypeDTO.classesIds || [];
+    this.getSpecimenTypeList();
+    this.getDeptList();
+    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;
+  }
+
+  // 防抖
+  isLoading = false;
+  isSelecting:boolean = false; // 是否在选中状态
+  searchTimer(fun, e) {
+    if (this.isSelecting) {
+      this.isSelecting = false; // 重置标志
+      return; // 跳过处理
+    }
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 设置标志
+  setIsSelecting(flag){
+    this.isSelecting = flag; // 设置标志
+  }
+
+  openChangeDept(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getDeptList();
+  }
+
+  // 科室搜索
+  changeDeptInp(e) {
+    this.searchTimer(this.getDeptList, e);
+  }
+
+  // 获取申请科室
+  deptList: any = [];
+  getDeptList(e = undefined) {
+    let postData = {
+      idx: 0,
+      sum: 99999,
+      department: {
+        searchType: 1,// 简单查询
+        dept: e,
+        hospital: {
+          id: this.hosId,
+        },
+        type: {
+          value: "checkRoom",
+        },
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "department", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.deptList = data.list || [];
+      });
+  }
+
+  requiredChange(field, required: boolean): void {
+    if (!required) {
+      this.validateForm.get(field)!.clearValidators();
+      this.validateForm.get(field)!.markAsPristine();
+    } else {
+      this.validateForm.get(field)!.setValidators(Validators.required);
+      this.validateForm.get(field)!.markAsDirty();
+    }
+    this.validateForm.get(field)!.updateValueAndValidity();
+  }
+
+  changeUrgentFlag(e){
+    this.validateForm.controls.urgentTypeIds.setValue([]);
+    this.requiredChange('urgentTypeIds', e == 1);
+  }
+
+  changeOrdinaryFlag(e){
+    this.validateForm.controls.ordinaryTypeIds.setValue([]);
+    this.requiredChange('ordinaryTypeIds', e == 1);
+  }
+
+  changeAutoDeptLimit(e){
+    this.validateForm.controls.limitDeptIds.setValue([]);
+    this.requiredChange('limitDeptIds', e == 1);
+  }
+
+  // 编辑
+  editWechat(data) {
+    console.log(data);
+    this.modelName = "编辑";
+    this.add = false;
+    this.modalWechat = true;
+    this.initWechatForm();
+    this.coopData = data;
+    this.validateForm.controls.classesId.setValue(data.classesId || null);
+    this.validateForm.controls.autoCleanSpecimen.setValue(data.autoCleanSpecimen || 0);
+    this.validateForm.controls.urgentFlag.setValue(data.urgentFlag || 0);
+    this.validateForm.controls.urgentTypeIds.setValue(data.urgentTypeIds ? data.urgentTypeList.map(v => v.id) : []);
+    this.validateForm.controls.ordinaryFlag.setValue(data.ordinaryFlag || 0);
+    this.validateForm.controls.ordinaryTypeIds.setValue(data.ordinaryTypeIds ? data.ordinaryTypeList.map(v => v.id) : []);
+    this.validateForm.controls.autoDeptLimit.setValue(data.autoDeptLimit || 0);
+    this.validateForm.controls.limitDeptIds.setValue(data.limitDeptIds ? data.limitDeptList.map(v => v.id) : []);
+
+    this.requiredChange('urgentTypeIds', data.urgentFlag == 1);
+    this.requiredChange('ordinaryTypeIds', data.ordinaryFlag == 1);
+    this.requiredChange('limitDeptIds', data.autoDeptLimit == 1);
+  }
+
+  // 新增/编辑表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitWechatForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+    console.log(this.validateForm.value);
+    this.btnLoading = true;
+    let postData:any = {};
+
+    if (this.add) {
+      //增加
+      postData = {
+        createRuleConfiguration: {
+          hosId: this.hosId,
+          taskType: this.taskTypeDTO.id,
+          flag: 1,
+          classesId: this.validateForm.value.classesId,
+          autoCleanSpecimen: this.validateForm.value.autoCleanSpecimen,
+          urgentFlag: this.validateForm.value.urgentFlag,
+          urgentTypeIds: this.validateForm.value.urgentTypeIds ? this.validateForm.value.urgentTypeIds.toString() : undefined,
+          ordinaryFlag: this.validateForm.value.ordinaryFlag,
+          ordinaryTypeIds: this.validateForm.value.ordinaryTypeIds ? this.validateForm.value.ordinaryTypeIds.toString() : undefined,
+          autoDeptLimit: this.validateForm.value.autoDeptLimit,
+          limitDeptIds: this.validateForm.value.limitDeptIds ? this.validateForm.value.limitDeptIds.toString() : undefined,
+        }
+      };
+    } else {
+      //编辑
+      postData = {
+        createRuleConfiguration: {
+          ...this.coopData,
+          classesId: this.validateForm.value.classesId,
+          autoCleanSpecimen: this.validateForm.value.autoCleanSpecimen,
+          urgentFlag: this.validateForm.value.urgentFlag,
+          urgentTypeIds: this.validateForm.value.urgentTypeIds ? this.validateForm.value.urgentTypeIds.toString() : undefined,
+          ordinaryFlag: this.validateForm.value.ordinaryFlag,
+          ordinaryTypeIds: this.validateForm.value.ordinaryTypeIds ? this.validateForm.value.ordinaryTypeIds.toString() : undefined,
+          autoDeptLimit: this.validateForm.value.autoDeptLimit,
+          limitDeptIds: this.validateForm.value.limitDeptIds ? this.validateForm.value.limitDeptIds.toString() : undefined,
+        }
+      };
+    }
+    this.mainService
+      .coopData(this.add ? "addData" : "updData", "createRuleConfiguration", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hideWechatModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, '');
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 初始化新增form表单
+  validateForm: FormGroup; //新增/编辑表单
+  initWechatForm() {
+    this.validateForm = this.fb.group({
+      classesId: [null, [Validators.required]],
+      autoCleanSpecimen: [0, [Validators.required]],
+      urgentFlag: [0, [Validators.required]],
+      urgentTypeIds: [null],
+      ordinaryFlag: [0, [Validators.required]],
+      ordinaryTypeIds: [null],
+      autoDeptLimit: [0, [Validators.required]],
+      limitDeptIds: [null],
+    });
+  }
+
+  // 获取列表
+  loading1:boolean = false;
+  dataList: any[] = []; //表格数据
+  getList() {
+    if(!this.taskTypeDTO.id){
+      this.dataList = [];
+      return;
+    }
+    let data = {
+      idx: 0,
+      sum: 9999,
+      createRuleConfiguration: {
+        hosId: this.hosId,
+        taskType: this.taskTypeDTO.id,
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "createRuleConfiguration", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.dataList = data.list || [];
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 获取标本类型
+  specimenTypeList: any = [];
+  getSpecimenTypeList() {
+    this.mainService.getDictionary('list', 'specimen_type').subscribe((data) => {
+      this.specimenTypeList = data || [];
+    });
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "del") {
+      //删除
+      this.mainService
+        .simplePost("rmvData", "createRuleConfiguration", [this.coopData.id])
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }else if (this.confirmDelType === "flag") {
+      //启用/停用
+    let postData:any = {
+      createRuleConfiguration: {
+        ...this.coopData,
+        flag: this.coopData.flag == 1 ? 0 : 1,
+      }
+    };
+
+    this.mainService
+      .coopData("updData", "createRuleConfiguration", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.delModal = false;
+        if (result.status == 200) {
+          this.showPromptModal(this.coopData.flag == 1 ? '停用' : '启用', true, '');
+        } else {
+          this.showPromptModal(this.coopData.flag == 1 ? '停用' : '启用', false, result.msg);
+        }
+      });
+    }
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList();
+  }
+}

src/app/components/configurationCenter/configuration-specimen/configuration-specimen-auto-build-order/configuration-specimen-auto-build-order.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ConfigurationSpecimenAutoBuildOrderComponent } from './configuration-specimen-auto-build-order.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    ConfigurationSpecimenAutoBuildOrderComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    ConfigurationSpecimenAutoBuildOrderComponent,
+  ]
+})
+export class ConfigurationSpecimenAutoBuildOrderModule { }

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

@@ -194,13 +194,14 @@
               <!-- 自动建单配置 -->
               <div *ngIf="tabModalName=='automaticOrderCreation'">
                 <!-- 自动建单 -->
+                 <app-configuration-specimen-auto-build-order [taskTypeDTO]="taskTypeDTO"></app-configuration-specimen-auto-build-order>
               </div>
               <!-- 特殊标本标记 -->
               <div *ngIf="tabModalName=='specialSpecimenMarking'">
                 <app-configuration-special-specimen-marking></app-configuration-special-specimen-marking>
               </div>
               <div class="bottom">
-                <button *ngIf="tabModalName != 'specialSpecimenMarking'" class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>
+                <button *ngIf="tabModalName == 'characteristics'" class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>
               </div>
             </div>
             <div class="list" *ngIf="loading">

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

@@ -594,6 +594,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
   }
 
   // 获取配置
+  taskTypeDTO:any = {};
   getConfig() {
     this.loading = true;
 		let postData = null;
@@ -640,6 +641,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
         this.loading = false;
         if (result.status == 200) {
           this.configs = result.list[0] || {};
+          this.taskTypeDTO = this.configs.taskTypeDTO || {};
 					if(this.activeDictionaryKey=='examine'){
             // 检验标本
             this.speHandoverTubeType = this.configs.speHandoverTubeType;

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

@@ -6,6 +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 { ConfigurationSpecimenAutoBuildOrderModule } from './configuration-specimen-auto-build-order/configuration-specimen-auto-build-order.module';
 import { ConfigurationCheckoutProjectModule } from './configuration-checkout-project/configuration-checkout-project.module';
 
 @NgModule({
@@ -17,7 +18,8 @@ import { ConfigurationCheckoutProjectModule } from './configuration-checkout-pro
     ShareModule,
     ConfigurationSpecimenReturnModule,
     ConfigurationSpecialSpecimenMarkingModule,
-		ConfigurationCheckoutProjectModule
+		ConfigurationCheckoutProjectModule,
+    ConfigurationSpecimenAutoBuildOrderModule,
   ],
   exports: [
     ConfigurationSpecimenComponent,

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

@@ -8,6 +8,7 @@
       <div>单号：{{drugsBag.packid}}</div>
       <div>申请科室：{{drugsBag.target ? drugsBag.target.dept : ''}}</div>
       <div>发药科室：{{drugsBag.launch ? drugsBag.launch.dept : ''}}</div>
+      <div>打印时间：{{drugsBag.creatTime}}</div>
     </div>
     <div class="content">
       <ng-container *ngIf="configs.showDrugsBagDetails === 1 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')">

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

@@ -8,6 +8,7 @@
       <div>单号：{{drugsBag.packid}}</div>
       <div>申请科室：{{drugsBag.target ? drugsBag.target.dept : ''}}</div>
       <div>发药科室：{{drugsBag.launch ? drugsBag.launch.dept : ''}}</div>
+      <div>打印时间：{{drugsBag.creatTime}}</div>
     </div>
     <div class="content">
       <!-- 血制品 -->
@@ -68,22 +69,24 @@
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
-            <th nzWidth="11%">单号</th>
-						<th nzWidth="10%" *ngIf="configs.showPatientInfo==1">患者信息</th>
+            <th nzWidth="12%">单号</th>
+            <th nzWidth="14%">发药科室|打印时间</th>
+						<th nzWidth="8%" *ngIf="configs.showPatientInfo==1">患者信息</th>
             <th nzWidth="8%" *ngIf="configs.showDrugsBagTypeCount==1">种类数</th>
             <th nzWidth="8%" *ngIf="configs.showDrugsBagTypeCount==1">总数</th>
             <th nzWidth="10%">收取人/交接人</th>
             <!-- <th nzWidth="10%">收取交接人</th> -->
-            <th nzWidth="14%">收取时间</th>
+            <th nzWidth="12%">收取时间</th>
             <th nzWidth="10%">送达人/交接人</th>
             <!-- <th nzWidth="10%">送达交接人</th> -->
-            <th nzWidth="14%">送达时间</th>
+            <th nzWidth="12%">送达时间</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of drugsBugMultipleList;let i = index;" (click)="viewDetail(type, data.id)" [ngStyle]="{ 'cursor': configs.showDrugsBagDetails == 1 ? 'pointer' : '' }">
             <td>{{i+1}}</td>
 						<td [ngStyle]="{ 'text-decoration': configs.showDrugsBagDetails == 1 ? 'underline' : '' }">{{ data.packid }}</td>
+            <td>{{ data.launch?.dept }}<br>{{ data.creatTime }}</td>
 						<td nz-tooltip [nzTooltipTitle]="data.patientNames" *ngIf="configs.showPatientInfo==1">
 							{{ data.patientNames }}
 						</td>
@@ -160,7 +163,7 @@
 							<span class="sign" *ngIf="orderId != data.gdIdSend && orderId != data.gdid"></span>
 						{{ (pageIndex - 1) * pageSize + i + 1 }}</td>
             <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
-            <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo}}</td>
+            <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo || data.patientNo}}</td>
             <td class="underline" (click)="viewSpecimenHistory(data)">{{ data.scode || "-" }}</td>
             <td>{{ data.specimenDesc || "-" }}</td>
             <td>{{ data.stype ? data.stype.name : "-" }}<span *ngIf="data.tubeType">,</span>{{data.tubeType && data.tubeType.name}}</td>

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

@@ -31,7 +31,7 @@
   }
   .hospitalTable {
     width: 100%;
-		height: calc(100vh - 280px);
+		height: calc(100vh - 366px);
 		overflow-y: auto;
     td {
       text-align: center !important;
@@ -91,8 +91,8 @@
   //   border-radius: 5px;
   //   color: #333;
 		// position: relative;
-		
-		height: calc(100vh - 100px);
+
+		// height: calc(100vh - 100px);
 		min-height: 580px;
 		border-radius: 5px;
 		background: #fff;
@@ -138,7 +138,7 @@
       flex-direction: column;
       justify-content: center;
       align-items: center;
-			
+
       &.content-search {
         min-height: 147px;
         justify-content: start;
@@ -189,14 +189,14 @@
         }
       }
     }
-		
+
 		.bottom-btn{
 			.btn {
 				position: absolute;
 				bottom: 10px;
 			}
 		}
-		
+
     button {
       margin-top: 10px;
       margin-bottom: 10px;

src/app/share/patient-log-prompt-modal/patient-log-prompt-modal.component.html

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

src/app/share/patient-log-prompt-modal/patient-log-prompt-modal.component.less

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

src/app/share/patient-log-prompt-modal/patient-log-prompt-modal.component.ts

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

src/app/share/share.module.ts

@@ -76,6 +76,7 @@ import { UploadFileComponent } from './upload-file/upload-file.component';
 import { AddInspectTwoModalComponent } from './add-inspect-two-modal/add-inspect-two-modal.component';
 import { AddInspectThreeModalComponent } from './add-inspect-three-modal/add-inspect-three-modal.component';
 import { ViewSpecimenComponent } from './view-specimen/view-specimen.component';
+import { PatientLogPromptModalComponent } from './patient-log-prompt-modal/patient-log-prompt-modal.component';
 
 @NgModule({
   declarations: [
@@ -152,6 +153,7 @@ import { ViewSpecimenComponent } from './view-specimen/view-specimen.component';
     PackageSpecimenRuleComponent,
     SpecimenPackageListModalComponent,
     SpecimenPackageLogPromptModalComponent,
+    PatientLogPromptModalComponent,
     InspectLogPromptModalComponent,
 		UploadFileComponent
   ],
@@ -239,6 +241,7 @@ import { ViewSpecimenComponent } from './view-specimen/view-specimen.component';
     PackageSpecimenRuleComponent,
     SpecimenPackageListModalComponent,
     SpecimenPackageLogPromptModalComponent,
+    PatientLogPromptModalComponent,
     InspectLogPromptModalComponent,
 		UploadFileComponent
   ]

src/app/share/view-specimen/view-specimen.component.html

@@ -3,10 +3,7 @@
 >
   <div class="modalBody" style="width: 1200px;">
     <div class="title">
-      标本查看<i
-        class="icon_transport transport-guanbi"
-        (click)="hideModal()"
-      ></i>
+      标本查看({{packageNo}})<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
     </div>
 		<div class="list-template">
 		  <div class="list-template__content">

src/app/share/view-specimen/view-specimen.component.ts

@@ -20,7 +20,7 @@ export class ViewSpecimenComponent implements OnInit {
 	changeInpSubject = new Subject(); //防抖
 	userId:any = 0;
 	tubeTypeId:any = 0;
-	
+
   @Input() speId: String;
 
   @Output() closeModelHs = new EventEmitter<any>(); //1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
@@ -35,27 +35,28 @@ export class ViewSpecimenComponent implements OnInit {
   hideModal() {
     this.closeModelHs.emit(JSON.stringify({ show: false })); //emits(向上弹射)事件
   }
-	
+
 	// 重置
 	reset(){
 		this.userId = 0
 		this.tubeTypeId = 0
 		this.getHistorySpecimen(true)
 	}
-	
+
 	// 选择患者
 	userChange(e){
 		this.getHistorySpecimen(true)
 	}
-	
+
 	// 选择试管类型
 	tubeChange(e){
 		this.getHistorySpecimen(true)
 	}
-	
+
   // 获取列表数据
 	userList:any = [];
 	tubeList:any = [];
+  packageNo:string = '';
   getHistorySpecimen(idx?) {
     if (idx) {
       this.historySpecimenPageIndex = 1;
@@ -71,7 +72,10 @@ export class ViewSpecimenComponent implements OnInit {
       .getInfoPack(this.speId, postData)
       .subscribe((data:any) => {
         this.hsLoading = false;
+        this.packageNo = data.packageNo;
         this.historySpecimenList = data.specimen || [];
+        data.patient = data.patient || [];
+        data.tubeType = data.tubeType || [];
 				data.patient.forEach(i=>{
 					if(i.bedNum){
 						i.name = i.patientName + '-' + i.bedNum + '-' + i.patientNo

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

@@ -79,7 +79,7 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
       .subscribe((result) => {
         if (result.status == 200) {
           this.configs = result.list[0] || {};
-          this.querySaveSpePackage();
+          this.querySaveSpePackage(true);
         }
       });
   }
@@ -89,7 +89,7 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
   typeSpecimentList:any[] = [];
   patientSpecimentList:any[] = [];
   package:any = {};
-  querySaveSpePackage(){
+  querySaveSpePackage(isInit = false){
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,
     }).messageId;
@@ -112,11 +112,15 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
           this.typeSpecimentList = result.tube || [];
           this.patientSpecimentList = result.patient || [];
           this.package = result.package || {};
-          this.getList();
+          if(isInit){
+            this.showDelModal({}, '您确认要重置标本吗，重置会先清空标本在根据规则自动清点？','重置标本','reset');
+          }else{
+            this.getList();
+          }
         }
       })
   }
-	
+
 	// 批量移除
 	infoContent:any;
 	batchDel(){
@@ -128,7 +132,7 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
 		this.tipsMsg1 = `您确认要移除${this.checkedDepIds.length}项标本吗？`
 		this.delModal = true;
 	}
-	
+
 	// 选中表格中科室
 	mapOfCheckedId: { [key: string]: boolean } = {};
 	checkedDepIds = []; //已选中科室id
@@ -145,20 +149,20 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
 	  this.checkedDepIds = arr;
 	  console.log(this.checkedDepIds);
 	}
-	
+
 	//表格整行选中
 	selectedListData(id) {
 	  this.mapOfCheckedId[id] = !this.mapOfCheckedId[id];
 	  this.refreshStatus();
 	}
-	
+
 	// 全选
 	isAllDisplayDataChecked = false; //当前页是否全选
 	checkAll(value: boolean): void {
 	  this.listOfData.forEach((item) => (this.mapOfCheckedId[item.id] = value));
 	  this.refreshStatus();
 	}
-	
+
   inspectActiveList: any = [];//选中检查列表
   patientActiveList: any = [];//选中患者列表
 

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

@@ -56,7 +56,7 @@
             </nz-option>
           </nz-select>
         </div>
-				
+
 				<div class="list-template__searchItem">
 				  <span class="label">药品类型：</span>
 				  <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzShowSearch nzAllowClear
@@ -66,7 +66,7 @@
 				    </ng-container>
 				  </nz-select>
 				</div>
-				
+
 				<div class="list-template__searchItem">
 				  <span class="label">收取人：</span>
 				  <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzServerSearch nzShowSearch nzAllowClear
@@ -79,7 +79,7 @@
 				    </nz-option>
 				  </nz-select>
 				</div>
-				
+
 				<div class="list-template__searchItem">
 				  <span class="label width-105">收取时间区间：</span>
 				  <nz-range-picker nzShowTime [(ngModel)]="searchCriteria.dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)" (ngModelChange)="changeDate($event)"></nz-range-picker>
@@ -98,7 +98,8 @@
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
-						<th nzWidth="12%">请领单号|药品类型</th>
+						<th nzWidth="6%">请领单号|药品类型</th>
+						<th nzWidth="6%">药单类型</th>
             <th nzWidth="12%">发药科室|申请科室</th>
             <th nzWidth="10%">同步时间</th>
 						<th nzWidth="12%">收取人|收取时间</th>
@@ -116,6 +117,7 @@
 							<div>{{data.packid}}</div>
 							<div>{{data.drugsBagType && data.drugsBagType.name}}</div>
 						</td>
+            <td>{{ data.markType?.name }}</td>
             <td>
 							<div>{{ data.launch?.dept}}</div>
 							<div>{{ data.target?.dept }}</div>
@@ -184,7 +186,7 @@
             </nz-input-group>
           </nz-form-control>
         </nz-form-item>
-				
+
 				<nz-form-item>
 				  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="batchNo">批次号</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择批次号!">
@@ -193,7 +195,7 @@
 				    </nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item>
 				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="launch">发药科室</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择发药科室!">
@@ -210,7 +212,7 @@
 				    </nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item>
 				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="target">申请科室</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择申请科室!">
@@ -227,7 +229,7 @@
 				    </nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item>
 				  <nz-form-label [nzSm]="8" [nzXs]="24" nzRequired nzFor="creatTime">同步时间</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择同步时间!">
@@ -242,7 +244,7 @@
 				    </nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item>
 				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="drugsState">药品状态</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择药品状态!">
@@ -255,7 +257,7 @@
 				    </nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item>
 				  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="drugsBagType">药品类型</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择药品类型!">
@@ -268,6 +270,19 @@
 				    </nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
+
+        <nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="markType">药单类型</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择药单类型!">
+				    <nz-input-group>
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear nzPlaceHolder="请选择药单类型" formControlName="markType">
+							  <ng-container *ngFor="let option of markTypeList">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
       </form>
     </div>
     <div class="display_flex justify-content_flex-center">
@@ -278,7 +293,7 @@
 </div>
 
 <!-- 发送消息 -->
-<app-dialog-delete [delModal]="sendModal" (hideDelModalEvent)="hideSendModal()" [btnLoading]="btnLoading" 
+<app-dialog-delete [delModal]="sendModal" (hideDelModalEvent)="hideSendModal()" [btnLoading]="btnLoading"
   (confirmDelEvent)="confirmSend()" (cancelDelEvent)="cancelSend()" content="您确认发送消息吗？消息发送会进入建单通道" confirmTxt="是" cancelTxt="否">
 </app-dialog-delete>
 
@@ -308,7 +323,7 @@
 							</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="请选择药品类型!">
@@ -321,7 +336,20 @@
 					    </nz-input-group>
 					  </nz-form-control>
 					</nz-form-item>
-				
+
+          <nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="markType">药单类型</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择药单类型!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear nzPlaceHolder="请选择药单类型" formControlName="markType">
+								  <ng-container *ngFor="let option of markTypeList">
+								    <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="请选择申请科室!">
@@ -338,7 +366,7 @@
 							</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="请选择生成数量!">
@@ -347,7 +375,7 @@
 							</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="请选择是否自动发消息!">

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

@@ -57,6 +57,7 @@ export class DrugSearchComponent implements OnInit {
 		});
     this.getHospital();
 		this.getDrugsList();
+		this.getMarkTypeList();
 		this.getDept('');
 		this.searchUser('');
 		this.searchTypes();
@@ -141,6 +142,14 @@ export class DrugSearchComponent implements OnInit {
 		});
 	}
 
+  // 获取药单类型
+	markTypeList:any = [];
+	getMarkTypeList(){
+		this.mainService.getDictionary("list", "drugsbag_mark_type").subscribe((res) => {
+		  this.markTypeList = res;
+		});
+	}
+
 	//获取用户
 	userSearch:any = [];
 	searchUser(keyword) {
@@ -334,6 +343,7 @@ export class DrugSearchComponent implements OnInit {
 	    creatTime: [null, [Validators.required]],
 	    drugsState: [null, [Validators.required]],
 			drugsBagType: [null, []],
+			markType: [null, []],
 	  });
 	}
 
@@ -363,6 +373,9 @@ export class DrugSearchComponent implements OnInit {
 				drugsBagType: {
 					id: this.validateForm.value.drugsBagType
 				},
+				markType: {
+					id: this.validateForm.value.markType
+				},
 				launch: {
 					id:this.validateForm.value.launch
 				},
@@ -383,6 +396,11 @@ export class DrugSearchComponent implements OnInit {
 		}else{
 			delete data.drugsBag.drugsBagType
 		}
+		if(this.validateForm.value.markType){
+			data.drugsBag.markType.id = this.validateForm.value.markType
+		}else{
+			delete data.drugsBag.markType
+		}
 		that.btnLoading = true;
 	  that.mainService
 	    .dataPost(this.add ? "addData":"updData", "drugsBag", data)
@@ -411,6 +429,7 @@ export class DrugSearchComponent implements OnInit {
 		this.validateForm.controls.target.setValue(data.target.id)
 		this.validateForm.controls.drugsState.setValue(data.drugsState.id)
 		this.validateForm.controls.drugsBagType.setValue(data.drugsBagType && data.drugsBagType.id)
+		this.validateForm.controls.markType.setValue(data.markType && data.markType.id)
 		this.validateForm.controls.creatTime.setValue(data.creatTime);
 		let item = this.deptList1.find(i=>i.id == data.launch.id)
 		if(!item){
@@ -428,34 +447,35 @@ 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]],
+			markType: [null, []],
 			target: [null, []],
 			amount: [1, []],
 			sendMsg: ['0', []],
 		});
 	}
-	
+
 	numChange(e){
 		console.log(4, e)
 	}
-	
+
 	hideAutoModal(){
 		this.autoCreateModal = false
 	}
-	
+
 	// 自动生成提交
 	submitAutoForm(){
 		var that = this;
@@ -471,7 +491,10 @@ export class DrugSearchComponent implements OnInit {
 				sendMsg: this.validateAutoForm.value.sendMsg || undefined,
 				drugsBagType: {
 					id: this.validateAutoForm.value.drugsBagType
-				}
+				},
+				markType: {
+					id: this.validateAutoForm.value.markType
+				},
 			}
 		};
 		that.btnLoading = true;
@@ -488,7 +511,7 @@ export class DrugSearchComponent implements OnInit {
 		    }
 		  });
 	}
-	
+
 	// 消息发送
 	sendModal:boolean = false;
 	sendMsg(data){

src/app/views/fuwutai/fuwutai.component.ts

@@ -5644,7 +5644,7 @@ export class FuwutaiComponent implements OnInit {
               execDeptId: e.execDept.id,
               yyTime: e.yyTime,
               priority: e.priority,
-              label: (e.newTime + '--' + e.newTime2 || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName || "检查"),
+              label: (e.newTime + '--' + e.newTime2 || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName + '-' + e.inspectCode || "检查"),
               value: e["id"],
               checked: false,
               remark: e.remark,
@@ -7290,7 +7290,7 @@ export class FuwutaiComponent implements OnInit {
               execDeptId: e.execDept.id,
               yyTime: e.yyTime,
               priority: e.priority,
-              label: (e.newTime + '--' + e.newTime2 || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName || "检查"),
+              label: (e.newTime + '--' + e.newTime2 || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName + '-' + e.inspectCode || "检查"),
               value: e["id"],
               checked: false,
             });
@@ -7361,7 +7361,7 @@ export class FuwutaiComponent implements OnInit {
             execDeptId: e.execDept.id,
             yyTime: e.yyTime,
             priority: e.priority,
-            label: (e.newTime + '--' + e.newTime2 || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName || "检查"),
+            label: (e.newTime + '--' + e.newTime2 || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName + '-' + e.inspectCode || "检查"),
             value: e["id"],
             checked: false,
           });

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

@@ -1500,7 +1500,7 @@
                 <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck">关联的检查</nz-form-label>
                 <nz-form-control class="datesGroup" *ngIf="linkCheckLis.length">
                   <nz-checkbox-wrapper nz-row class="linkCheckCheck w100" ngDefaultControl formControlName="linkCheck" (nzOnChange)="linkCheckLisChange($event)">
-                    <div nz-row nz-col nzSpan="12" *ngFor="let item of linkCheckLis">
+                    <div nz-row nz-col nzSpan="24" *ngFor="let item of linkCheckLis">
                       <div nz-col nzSpan="24">
                         <label nz-checkbox [nzValue]="item" [title]="item.remark" *ngIf="item.remark"><i class="icon_transport transport-chaoshi"></i>{{ item.label}}</label>
                         <label nz-checkbox [nzValue]="item" *ngIf="!item.remark">{{ item.label}}</label>

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

@@ -3521,7 +3521,7 @@ export class HushijiandanComponent implements OnInit {
                   ? e.execDept.deptalias
                   : e.execDept.dept) +
                 " 进行 " +
-                (e.inspectName || "检查"),
+                (e.inspectName + '-' + e.inspectCode || "检查"),
               value: e["id"],
               checked: false,
               remark: e.remark,
@@ -5713,7 +5713,7 @@ export class HushijiandanComponent implements OnInit {
                   ? e.execDept.deptalias
                   : e.execDept.dept) +
                 " 进行 " +
-                (e.inspectName || "检查"),
+                (e.inspectName + '-' + e.inspectCode || "检查"),
               value: e["id"],
               checked: false,
               remark: e.remark,

src/app/views/inspect-info-config/inspect-info-config.component.html

@@ -106,8 +106,8 @@
                   <span class="circle red" title="无预约时间检查"></span>
                 </ng-container>
               </ng-template>
-              <span [title]="inspect.remark" *ngIf="inspect.remark"><i class="icon_transport transport-chaoshi"></i>{{(inspect.yyEndTime || "") + " " + (inspect.execDept ? (deptDisplay == 2 ? inspect.execDept.deptalias : inspect.execDept.dept) : '') + " 进行 " + (inspect.inspectName || "检查")}} <span class="inspectState" *ngIf="inspect.gdId" (click)="detail($event, inspect.gdId)">{{inspect.inspectState?.name}}</span></span>
-              <span *ngIf="!inspect.remark">{{(inspect.yyEndTime || "") + " " + (inspect.execDept ? (deptDisplay == 2 ? inspect.execDept.deptalias : inspect.execDept.dept) : '') + " 进行 " + (inspect.inspectName || "检查")}} <span class="inspectState" *ngIf="inspect.gdId" (click)="detail($event, inspect.gdId)">{{inspect.inspectState?.name}}</span></span>
+              <span [title]="inspect.remark" *ngIf="inspect.remark"><i class="icon_transport transport-chaoshi"></i>{{(inspect.yyEndTime || "") + " " + (inspect.execDept ? (deptDisplay == 2 ? inspect.execDept.deptalias : inspect.execDept.dept) : '') + " 进行 " + (inspect.inspectName + '-' + inspect.inspectCode || "检查")}} <span class="inspectState" *ngIf="inspect.gdId" (click)="detail($event, inspect.gdId)">{{inspect.inspectState?.name}}</span></span>
+              <span *ngIf="!inspect.remark">{{(inspect.yyEndTime || "") + " " + (inspect.execDept ? (deptDisplay == 2 ? inspect.execDept.deptalias : inspect.execDept.dept) : '') + " 进行 " + (inspect.inspectName + '-' + inspect.inspectCode || "检查")}} <span class="inspectState" *ngIf="inspect.gdId" (click)="detail($event, inspect.gdId)">{{inspect.inspectState?.name}}</span></span>
             </span>
             <span *ngIf="!inspect.gdId" class="icon_transport transport-weibiaoti2010104" (click)="editInspect({data: data, inspect: inspect})"></span>
             <span *ngIf="!inspect.gdId" class="icon_transport transport-shanchu1" (click)="showDelModal({data: data, inspect: inspect}, '您确认要删除吗？','删除','delInspect')"></span>

src/app/views/inspect-info-config/inspect-info-config.component.ts

@@ -55,6 +55,7 @@ export class InspectInfoConfigComponent implements OnInit {
       nzDuration: 0,
     }).messageId;
     let postData = this.listOfData.find(v => v.id == id);
+    postData.operationType = 'evaluatePatient';
     this.mainService
     .simplePost("addData", 'patient', postData)
     .subscribe((data) => {
@@ -78,6 +79,7 @@ export class InspectInfoConfigComponent implements OnInit {
     postData.illnessState = {
       id: illnessStateId,
     }
+    postData.operationType = 'evaluatePatient';
     this.mainService
     .simplePost("addData", 'patient', postData)
     .subscribe((data) => {
@@ -261,6 +263,7 @@ export class InspectInfoConfigComponent implements OnInit {
     let postData = {
       ...this.coopData.data,
       remark,
+      operationType: 'evaluatePatient',
     };
 
     this.mainService

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

@@ -79,10 +79,10 @@
             <th nzWidth="10%">住院号|条码号</th>
             <th nzWidth="10%">院区|当前科室</th>
             <th nzWidth="10%">护理等级</th>
-            <th nzWidth="10%">病情级别</th>
-            <th nzWidth="10%">性别、年龄</th>
+            <th nzWidth="8%">病情级别</th>
+            <th nzWidth="8%">性别、年龄</th>
             <th nzWidth="12%">陪检方式|注意事项</th>
-            <th nzWidth="10%">操作</th>
+            <th nzWidth="14%">操作</th>
           </tr>
         </thead>
         <tbody>
@@ -100,6 +100,7 @@
               <div class="coop">
                 <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
                 <span *ngIf="coopBtns.removeSign" (click)="showDelModal(data, '您确认要清空标记吗？','清空标记','clearSign')">清空标记</span>
+                <span *ngIf="coopBtns.lookLog" (click)="showLogs(data)">查看日志</span>
               </div>
             </td>
           </tr>
@@ -295,3 +296,6 @@
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo"></app-prompt-modal>
+
+<!-- 查看日志 -->
+<app-patient-log-prompt-modal *ngIf="logPromptModalShow" [show]="logPromptModalShow" [id]="patientId" (closeModelHs)="closeModelLog($event)"></app-patient-log-prompt-modal>

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

@@ -506,4 +506,16 @@ export class PatientSearchComponent implements OnInit {
         });
     }
   }
+
+  // 查看日志弹窗
+  logPromptModalShow = false; //弹窗开关
+  patientId = ""; //查看记录携带id
+  showLogs(data) {
+    this.patientId = data.id;
+    this.logPromptModalShow = true;
+  }
+  // 关闭日志弹窗
+  closeModelLog(e) {
+    this.logPromptModalShow = JSON.parse(e).show;
+  }
 }

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

@@ -184,7 +184,7 @@
 							<div>{{ data.checkDept ? data.checkDept.dept : "-" }}</div>
 						</td>
             <td>
-							<div>{{data.residenceNo}}</div>
+							<div>{{data.residenceNo || data.patientNo}}</div>
 							<div>
 								{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span>
 							</div>
@@ -200,7 +200,7 @@
             <td>{{ data.stype ? data.stype.name : "-" }}<span *ngIf="data.tubeType">,</span>{{data.tubeType && data.tubeType.name}}</td>
             <td>{{ data.speState ? data.speState.name : "-" }}</td>
             <td>
-							<div>{{ data.receiverName || "-" }}</div>
+							<div>{{ data.receiverName }}<ng-container *ngIf="data.packageId">-<span class="underline" (click)="viewSpe(data.packageId)">包</span></ng-container></div>
 							<div>{{ data.arriveTime || "-" }}</div>
 						</td>
             <td>{{ data.transTime || '-' }}</td>
@@ -289,7 +289,7 @@
 							</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="请选择检验科室!">
@@ -306,7 +306,7 @@
 							</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="请选择患者!">
@@ -324,8 +324,8 @@
 					  </nz-form-control>
 					</nz-form-item>
 				</div>
-				
-				<div class="df"> 
+
+				<div class="df">
 					<nz-form-item>
 					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="examinationItemsId">检验项目</nz-form-label>
 					  <nz-form-control nzErrorTip="请选择检验项目!">
@@ -342,7 +342,7 @@
 					    </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="请选择标本类型!">
@@ -351,7 +351,7 @@
 					    </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="请选择试管类型!">
@@ -361,7 +361,7 @@
 					  </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>
@@ -371,7 +371,7 @@
 							</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="请选择紧急度!">
@@ -383,7 +383,7 @@
 							</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="请选择采集人!">
@@ -401,7 +401,7 @@
 					  </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>
@@ -447,7 +447,7 @@
 					    </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="请选择是否自动发消息!">
@@ -459,7 +459,7 @@
 					    </nz-input-group>
 					  </nz-form-control>
 					</nz-form-item>
-				
+
       </form>
     </div>
     <div class="display_flex justify-content_flex-center">
@@ -492,7 +492,7 @@
 							</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="请选择患者!">
@@ -509,7 +509,7 @@
 					    </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="请选择检验项目!">
@@ -526,7 +526,7 @@
 					    </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="请选择生成数量!">
@@ -535,7 +535,7 @@
 							</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="请选择紧急度!">
@@ -547,7 +547,7 @@
 							</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="请选择是否自动发消息!">
@@ -567,3 +567,5 @@
     </div>
   </div>
 </div>
+<!-- 查看标本 -->
+<app-view-specimen *ngIf="showModal" [speId]="speId" (closeModelHs)="closeModel($event)"></app-view-specimen>

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

@@ -6,6 +6,10 @@
   display: flex;
   justify-content: space-between;
 }
+.underline{
+  text-decoration: underline;
+	cursor: pointer;
+}
 .save {
   position: fixed;
   left: 0;
@@ -120,16 +124,16 @@
 							.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;
 						  }
@@ -137,7 +141,7 @@
 					}
           .ant-form-item {
             margin-bottom: 15px;
-						
+
 						.ant-select{
 							width: 100% !important;
 						}

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

@@ -14,7 +14,7 @@ import { ActivatedRoute, Router } from "@angular/router";
 })
 export class SpecimenSearchComponent implements OnInit {
   constructor(
-	private mainService: MainService, 
+	private mainService: MainService,
 	private tool: ToolService,
 	private fb: FormBuilder,
 	public route: ActivatedRoute,
@@ -49,7 +49,7 @@ export class SpecimenSearchComponent implements OnInit {
   changeInp2Subject = new Subject();
 	changeInpPaSubject = new Subject();
 	coopBtns:any;
-	
+
   ngOnInit() {
 		this.coopBtns = this.tool.initCoopBtns(this.route);
 		this.hosId = this.tool.getCurrentHospital().id;
@@ -80,6 +80,18 @@ export class SpecimenSearchComponent implements OnInit {
     console.log(value);
     this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
   }
+	// 关闭弹窗
+	closeModel(e){
+		this.showModal = JSON.parse(e).show;
+	}
+
+	// 查看标本
+	speId:any;
+	showModal:boolean = false;
+	viewSpe(packageId){
+		this.speId = packageId;
+		this.showModal = true;
+	}
   // 搜索类型
   isLoading1 = false;
   searchTypes() {
@@ -164,19 +176,19 @@ 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?){
@@ -195,7 +207,7 @@ export class SpecimenSearchComponent implements OnInit {
 		    this.userList = data.list;
 		  });
 	}
-	
+
 	// 获取检验项目
 	projectList:any = [];
 	getProjectList(){
@@ -216,7 +228,7 @@ export class SpecimenSearchComponent implements OnInit {
 			}
 		});
 	}
-	
+
 	// 获取患者
 	patientList:any = [];
 	getPatient(type, patientName?){
@@ -241,7 +253,7 @@ export class SpecimenSearchComponent implements OnInit {
 						i.patientName = i.patientName + '('+ i.bedNum +')'
 					}
 					if(!i.bedNum && !i.residenceNo){
-						i.patientName = i.patientName 
+						i.patientName = i.patientName
 					}
 					if(!i.bedNum && i.residenceNo){
 						i.patientName = i.patientName +'-'+ i.residenceNo
@@ -251,7 +263,7 @@ export class SpecimenSearchComponent implements OnInit {
 		  }
 		});
 	}
-	
+
 	// 选择检验项目
 	stypeId:any;
 	tubeTypeId:any;
@@ -269,35 +281,35 @@ export class SpecimenSearchComponent implements OnInit {
 			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(){
@@ -310,22 +322,22 @@ export class SpecimenSearchComponent implements OnInit {
 			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;
@@ -357,7 +369,7 @@ export class SpecimenSearchComponent implements OnInit {
 		    }
 		  });
 	}
-	
+
 	// 设置核收
 	collectModal:boolean = false;
 	itemData:any;
@@ -366,7 +378,7 @@ export class SpecimenSearchComponent implements OnInit {
 		this.collectModal = true
 		this.initCollectForm()
 	}
-	
+
 	// 初始化form
 	validateCollectForm: FormGroup
 	initCollectForm(){
@@ -375,11 +387,11 @@ export class SpecimenSearchComponent implements OnInit {
 			sendMsg: ['0', [Validators.required]],
 		});
 	}
-	
+
 	hideCollectModal(){
 		this.collectModal = false
 	}
-	
+
 	// 设置核收提交
 	submitCollectForm(){
 		var that = this;
@@ -410,7 +422,7 @@ export class SpecimenSearchComponent implements OnInit {
 		    }
 		  });
 	}
-	
+
 	// 消息发送
 	sendModal:boolean = false;
 	tipsMsg2:any = '您确定要发送消息吗？';
@@ -418,11 +430,11 @@ export class SpecimenSearchComponent implements OnInit {
 		this.itemData = data;
 		this.sendModal = true;
 	}
-	
+
 	hideSendModal(){
 		this.sendModal = false;
 	}
-	
+
 	// 确定发送消息
 	confirmSend(){
 		let data = {
@@ -444,7 +456,7 @@ export class SpecimenSearchComponent implements OnInit {
 		    }
 		  });
 	}
-	
+
 	// 新增
 	addModal:boolean = false;
 	view:boolean = false;
@@ -452,13 +464,13 @@ export class SpecimenSearchComponent implements OnInit {
 		this.addModal = true;
 		this.initForm();
 	}
-	
+
 	hideModal() {
 	  this.addModal = false;
 		this.patientList = [];
 	  this.initForm();
 	}
-	
+
 	// 初始化form
 	validateForm: FormGroup; //新增/编辑表单
 	initForm() {
@@ -475,7 +487,7 @@ export class SpecimenSearchComponent implements OnInit {
 			sendMsg: ['0', []],
 	  });
 	}
-	
+
 	// 表单提交
 	submitForm(): void {
 	  var that = this;
@@ -519,7 +531,7 @@ export class SpecimenSearchComponent implements OnInit {
 	      }
 	    });
 	}
-	
+
   // 重置
   reset() {
     this.searchCriteria = {

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

@@ -858,7 +858,7 @@
           </div>
           <div *ngIf="depaShow3">
             <!-- 标本配送才有自动建单，重要！ -->
-            <div class="red">自动建单需配置检验科室的工作时间；任务类型的开通科室；关联班次的时间区间；配置是否急标；配置标本类型；</div>
+            <!-- <div class="red">自动建单需配置检验科室的工作时间；任务类型的开通科室；关联班次的时间区间；配置是否急标；配置标本类型；</div>
             <nz-form-label class="label">自动建单</nz-form-label>
             <div class="item_type_cont">
               <div>
@@ -898,7 +898,7 @@
                   <span class="icon_text">设置</span>
                 </div>
               </div>
-            </div>
+            </div> -->
             <nz-form-label class="label">自动(手动)建单追加终点科室</nz-form-label>
             <nz-select class="mb8 w100" nzMode="multiple" nzPlaceHolder="请选择科室" nzAllowClear nzShowSearch nzServerSearch
               [(ngModel)]="addEndDeptIds" (nzOnSearch)="onSearch($event)">