白求恩优化

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

@@ -38,13 +38,13 @@
                     <nz-form-label class="label">支持接单并签到</nz-form-label>
                     <nz-checkbox-group [(ngModel)]="item.postData.drugsReceiveSign"></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.drugsVerifyPharmacy"></nz-checkbox-group>
 									</div>
-									
+
 									<!-- 终点清点方式 -->
 									<div class="display_flex align-items_center mb8" *ngIf="item.postData.drugsModel==2">
 									  <nz-form-label class="label" nzRequired>终点清点方式</nz-form-label>
@@ -52,7 +52,7 @@
 									    <label nz-radio [nzValue]="item.value" *ngFor="let item of endClearingList">{{ item.label }}</label>
 									  </nz-radio-group>
 									</div>
-									
+
                   <!-- 起点科室支持核对 -->
                   <div class="display_flex align-items_center mb8">
                     <nz-form-label class="label">起点科室支持核对</nz-form-label>
@@ -122,6 +122,11 @@
 									  <nz-form-label class="label">待送达合并工单</nz-form-label>
 									  <nz-checkbox-group [(ngModel)]="item.postData.sendingMergeOrder"></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.drugsResidueCreateOrder"></nz-checkbox-group>
+									</div>
                 </div>
                 <!-- 自动建单配置 -->
                 <div *ngIf="tabModalName=='automaticOrderCreation'">

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

@@ -40,13 +40,13 @@ export class ConfigurationDrugComponent implements OnInit {
     { label: '一单一码', value: 1 },
     { label: '一单多码', value: 2 },
   ];
-	
+
 	// 终点清点方式
 	endClearingList:any[] = [
 	  { label: '扫一扫清点', value: 1 },
 	  { label: '数量核对清点', value: 2 },
 	];
-	
+
   // 手动填写
   drugsManualList:any[] = [];
 
@@ -73,6 +73,7 @@ export class ConfigurationDrugComponent implements OnInit {
 				showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
 				sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
+				drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -98,6 +99,7 @@ export class ConfigurationDrugComponent implements OnInit {
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
 				sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
+        drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -123,6 +125,7 @@ export class ConfigurationDrugComponent implements OnInit {
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
         sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
+        drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -148,6 +151,7 @@ export class ConfigurationDrugComponent implements OnInit {
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
         sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
+        drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -173,6 +177,7 @@ export class ConfigurationDrugComponent implements OnInit {
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
         sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
+        drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -230,7 +235,7 @@ export class ConfigurationDrugComponent implements OnInit {
       this.msg.create("warning", "请选择工单模式！");
       return;
     }
-		
+
     if(this.activeDictionary.postData.drugsStartCheck[0].checked && !this.activeDictionary.postData.drugsStartCheckScanIds.filter(v => v.checked).length){
       this.msg.create("warning", "请选择起点科室的核对方式！");
       return;
@@ -240,12 +245,12 @@ export class ConfigurationDrugComponent implements OnInit {
       this.msg.create("warning", "请选择终点科室的核对方式！");
       return;
     }
-		
+
 		if(this.activeDictionary.postData.drugsModel==2 && !this.activeDictionary.postData.drugsEndCountMethod){
 		  this.msg.create("warning", "请选择终点清点方式！");
 		  return;
 		}
-		
+
     let postData:any = {
       id: this.configs.id,
       taskType: this.tasktype.id,
@@ -267,6 +272,7 @@ export class ConfigurationDrugComponent implements OnInit {
 			showDrugsBagTypeCount: this.activeDictionary.postData.showDrugsBagTypeCount[0].checked ? 1 : 0,
 			showDrugsBagDetails: this.activeDictionary.postData.showDrugsBagDetails[0].checked ? 1 : 0,
 			sendingMergeOrder: this.activeDictionary.postData.sendingMergeOrder[0].checked ? 1 : 0,
+			drugsResidueCreateOrder: this.activeDictionary.postData.drugsResidueCreateOrder[0].checked ? 1 : 0,
 			autoCreate: this.activeDictionary.postData.autoCreate[0].checked ? 1 : 0,
 			autoCreateState:{
 				id:this.activeDictionary.postData.autoCreateState || undefined
@@ -370,6 +376,7 @@ export class ConfigurationDrugComponent implements OnInit {
 					this.activeDictionary.postData.showDrugsBagTypeCount[0].checked = this.configs.showDrugsBagTypeCount == 1;
 					this.activeDictionary.postData.showDrugsBagDetails[0].checked = this.configs.showDrugsBagDetails == 1;
 					this.activeDictionary.postData.sendingMergeOrder[0].checked = this.configs.sendingMergeOrder == 1;
+					this.activeDictionary.postData.drugsResidueCreateOrder[0].checked = this.configs.drugsResidueCreateOrder == 1;
 					this.activeDictionary.postData.autoCreate[0].checked = this.configs.autoCreate == 1;
 					this.activeDictionary.postData.autoCreateState = this.configs.autoCreateState && this.configs.autoCreateState.id || undefined;
 				}

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

@@ -0,0 +1,126 @@
+<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="7%">排序号</th>
+                <th nzWidth="30%">退回原因</th>
+                <th nzWidth="12%">退回标本状态</th>
+                <th nzWidth="12%">是否开启</th>
+                <th nzWidth="12%">是否消除单号</th>
+                <th nzWidth="12%">验证方式</th>
+                <th nzWidth="15%">操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of dataList;let i = index">
+                <td>{{data.orders}}</td>
+                <td>{{data.name}}</td>
+                <td>{{data.dictionaryDTO?.name}}</td>
+                <td>{{data.extra5 == 1 ? '是' : '否'}}</td>
+                <td>{{data.extra6 == 1 ? '是' : '否'}}</td>
+                <td>{{data.extra7 == 1 ? '科室码' : (data.extra7 == 2 ? '动态码' : (data.extra7 == 3 ? '填写工号' : '无'))}}</td>
+                <td>
+                  <div class="coop">
+                    <span (click)="showDelModal(data,'您确认要删除吗？','删除','del')">删除</span>
+                    <span (click)="editWechat(data)">编辑</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]="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="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 style="line-height:40px;" [nzSpan]="7" nzRequired nzFor="extra5">是否开启</nz-form-label>
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择是否开启!">
+            <nz-radio-group formControlName="extra5">
+              <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 style="line-height:40px;" [nzSpan]="7" nzRequired nzFor="extra6">是否消除单号</nz-form-label>
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择是否消除单号!">
+            <nz-radio-group formControlName="extra6">
+              <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]="7" nzRequired nzFor="extra7">验证方式</nz-form-label>
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择验证方式!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra7" nzPlaceHolder="请选择验证方式" nzServerSearch>
+              <nz-option *ngFor="let data of extra7List" [nzLabel]="data.name" [nzValue]="data.id"></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-return/configuration-specimen-return.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-specimen-return/configuration-specimen-return.component.ts

@@ -0,0 +1,256 @@
+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';
+
+@Component({
+  selector: "app-configuration-specimen-return",
+  templateUrl: "./configuration-specimen-return.component.html",
+  styleUrls: ["./configuration-specimen-return.component.less"],
+})
+export class ConfigurationSpecimenReturnComponent implements OnInit {
+  constructor(
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  coopData: any = {}; //当前操作列
+  hosId: any = this.tool.getCurrentHospital().id;
+
+
+  ngOnInit() {
+    setTimeout(() => {
+      this.tableWechatHeight = document.querySelector('#wechatTable').clientHeight - document.querySelector('#wechatTable .list-template__top').clientHeight - 8 - document.querySelector('#wechatTable .thead').clientHeight;
+    }, 0)
+    this.getTypes();
+    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;
+  }
+
+  // 编辑
+  editWechat(data) {
+    console.log(data);
+    this.modelName = "编辑";
+    this.add = false;
+    this.modalWechat = true;
+    this.initWechatForm();
+    this.coopData = data;
+    this.validateForm.controls.orders.setValue(data.orders);
+    this.validateForm.controls.name.setValue(data.name);
+    this.validateForm.controls.extra4.setValue(data.extra4 ? +data.extra4 : undefined);
+    this.validateForm.controls.extra5.setValue(data.extra5 || '0');
+    this.validateForm.controls.extra6.setValue(data.extra6 || '0');
+    this.validateForm.controls.extra7.setValue(data.extra7);
+  }
+
+  // 新增/编辑表单提交
+  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 = {};
+
+    let arr = this.dataList.filter(
+      (item) => item.name == this.validateForm.value.name && item.id != this.coopData.id
+    );
+
+    //有重复名称
+    if (arr.length > 0) {
+      this.btnLoading = false;
+      this.showPromptModal(
+        this.add ? "新增" : "编辑",
+        false,
+        `存在重复的退回原因【${this.validateForm.value.name}】请修改后再保存！`
+      );
+      return;
+    }
+
+    if (this.add) {
+      //增加
+      let n = 0;
+      if (this.dataList.length > 0) {
+        let sortArr = this.dataList.map((item) => Number(item.value));
+        n = Math.max.apply(null, sortArr);
+      } else {
+        n = 0;
+      }
+      postData = {
+        // dictionary: {
+          key: "reason_for_return",
+          value: n + 1,
+          desc: "标本退回",
+          orders: this.validateForm.value.orders,
+          name: this.validateForm.value.name,
+          extra6: this.validateForm.value.extra6,
+          extra4: this.validateForm.value.extra4,
+          extra5: this.validateForm.value.extra5,
+          extra7: this.validateForm.value.extra7,
+        // }
+      };
+    } else {
+      //编辑
+      postData = {
+        // dictionary: {
+          ...this.coopData,
+          orders: this.validateForm.value.orders,
+          name: this.validateForm.value.name,
+          extra6: this.validateForm.value.extra6,
+          extra4: this.validateForm.value.extra4,
+          extra5: this.validateForm.value.extra5,
+          extra7: this.validateForm.value.extra7,
+        // }
+      };
+    }
+    this.mainService
+      .simplePost("addData", "dictionary", 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({
+      orders: [null, [Validators.required]],
+      name: [null, [Validators.required]],
+      extra4: [null, [Validators.required]],
+      extra5: [null, [Validators.required]],
+      extra6: [null, [Validators.required]],
+      extra7: [null, [Validators.required]],
+    });
+  }
+
+  // 获取列表
+  loading1:boolean = false;
+  dataList: any[] = []; //表格数据
+  tableWechatHeight:number = 0;
+  getList() {
+    let data = {
+      idx: 0,
+      sum: 9999,
+      dictionary: {
+        key: "reason_for_return",
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "dictionary", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          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' },
+  ];
+
+  // 获取退回标本状态
+  typeList: any = [];
+  getTypes() {
+    this.mainService.getDictionary('list', 'speState').subscribe((data) => {
+      this.isLoading = false;
+      this.typeList = 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", "dictionary", [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);
+          }
+        });
+    }
+  }
+
+  // 展示信息提示框（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-return/configuration-specimen-return.module.ts

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

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

@@ -462,6 +462,10 @@
             </div>
           </div>
 				</div>
+        <!-- 标本退回 -->
+        <div class="TaskTypeManagement" *ngIf="activeDictionaryKey=='specimenReturn'">
+          <app-configuration-specimen-return></app-configuration-specimen-return>
+        </div>
       </div>
     </div>
   </div>

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

@@ -26,6 +26,9 @@ export class ConfigurationSpecimenComponent implements OnInit {
 		},
     {
       name:'标本打包',key:'specimenPackage'
+    },
+    {
+      name:'标本退回',key:'specimenReturn'
     }
 	];
 

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

@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ShareModule } from 'src/app/share/share.module';
+
+import { ConfigurationSpecimenComponent } from './configuration-specimen.component';
+import { ConfigurationSpecimenReturnModule } from './configuration-specimen-return/configuration-specimen-return.module';
+
+
+@NgModule({
+  declarations: [
+    ConfigurationSpecimenComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+    ConfigurationSpecimenReturnModule,
+  ],
+  exports: [
+    ConfigurationSpecimenComponent,
+  ]
+})
+export class ConfigurationSpecimenModule { }

src/app/share/dialog-delete/dialog-delete.component.html

@@ -21,7 +21,7 @@
           </nz-option>
         </nz-select>
       </div>
-      <div *ngIf="isShowEndDeptId" class="mt8 mb8 w100">
+      <div *ngIf="isShowEndDeptId" class="mt8 mb8 w100" style="text-align: left;">
         <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptId">
           <ng-container *ngFor="let option of isShowEndDeptIdArr">
             <nz-option *ngIf="!isLoading" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>

src/app/share/dialog-delete/dialog-delete.component.ts

@@ -39,8 +39,9 @@ export class DialogDeleteComponent implements OnInit, OnChanges {
       this.isLoading = false;
       // this.recoveryRoom = null;
     }
-    if(changes.isShowEndDeptId){
-      this.endDeptId = null;
+    if(changes.isShowEndDeptIdArr){
+      this.endDeptId = this.isShowEndDeptIdArr.length === 1 ? this.isShowEndDeptIdArr[0].id : null;
+      console.log('this.isShowEndDeptIdArr:', this.isShowEndDeptIdArr)
     }
     if(changes.isSelected && changes.isSelectedArr){
       if(changes.isSelectedArr.currentValue.length === 1){

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

@@ -1344,9 +1344,9 @@
                                 ({{ item.drugs.packid }})
                               </ng-container>
                               <ng-container *ngIf="item.goodsRemark">-{{ item.goodsRemark }}</ng-container>
-                              
+
                             </div>
-		
+
                             <div nz-col nzSpan="12" class="col txtR">
                               {{ item.gdState.name }}
                             </div>
@@ -1653,8 +1653,8 @@
             <!-- 携带设备 -->
             <div class="display_flex justify-content_space-between align-items_center">
               <nz-form-item class="display_flex align-items_center flex_1" *ngIf="inspectAndPatientTransportConfig.enableTripType == 1">
-                <nz-form-label nzFor="inspectScore" class="goods mt8">陪检方式</nz-form-label>
-                <nz-form-control>
+                <nz-form-label nzFor="inspectScore" nzRequired class="goods mt8">陪检方式</nz-form-label>
+                <nz-form-control nzErrorTip="请选择陪检方式!">
                   <nz-radio-group formControlName="inspectScore" [(ngModel)]="workOrderInspectScore">
                     <label nz-radio [nzValue]="item.id" *ngFor="let item of workOrderInspectScoreList">{{item.inspectMode}}</label>
                   </nz-radio-group>

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

@@ -213,7 +213,7 @@ export class HushijiandanComponent implements OnInit {
     this.getTodayNum();
     this.initLogin();
     this.getDeptTaskType();
-    this.initForm();
+
     this.getAdvice();
     this.getOrderSelectList();
     this.getCheckStatusLis();
@@ -931,6 +931,8 @@ export class HushijiandanComponent implements OnInit {
           if(this.inspectAndPatientTransportConfig.queuingInformation == 1){
             this.getQueuingInformation();
           }
+
+          this.initForm();
         }
       });
   }
@@ -2349,7 +2351,7 @@ export class HushijiandanComponent implements OnInit {
     this.patientForm = this.fb.group({
       checkedType: [null, [Validators.required]],
       goods: [null],
-      inspectScore: [null],
+      inspectScore: this.inspectAndPatientTransportConfig.enableTripType == 1 ? [null, [Validators.required]] : [null],
       workOrderRemark2: [null],
       linkCheck: [null, []],
       targetOffice: [null, [this.targetOfficeValidator]],

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

@@ -60,10 +60,12 @@
             <ng-container *ngIf="!data.tripType">
               <span class="circle red" title="未标记患者"></span>
             </ng-container>
-            <span>{{data.patientName}}<ng-container *ngIf="data.age !== undefined">({{data.age}}岁)</ng-container></span>
+            <span>{{data.patientName}}</span>
           </span>
           <br>
           <ng-container *ngIf="data.patientType && data.patientType.value == 'I'">住：{{data.patientCode}}（{{data.bedNum}}）</ng-container><ng-container *ngIf="data.patientType && data.patientType.value == 'O'">门诊：{{data.patientCode}}</ng-container><ng-container *ngIf="data.patientType && data.patientType.value == 'E'">急：{{data.patientCode}}</ng-container>
+          <br>
+          <ng-container *ngIf="data.age !== undefined">{{data.age}}岁</ng-container>-{{data.gender?.name}}
         </td>
         <td>
           <ng-container *ngIf="configs.updatePatientIllness == 1;else elseIllnessStateTpl">

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

@@ -61,7 +61,7 @@
             <th nzWidth="14%">预约时间|入库时间</th>
             <th nzWidth="8%">检查状态</th>
             <th nzWidth="8%">陪检人员</th>
-            <th nzWidth="14%">出行方式|注意事项</th>
+            <th nzWidth="14%">陪检方式|注意事项</th>
             <th nzWidth="10%">操作</th>
           </tr>
         </thead>

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

@@ -4,17 +4,16 @@ import { CommonModule } from '@angular/common';
 import { PageConfigRoutingModule } from './page-config-routing.module';
 import { PageConfigComponent } from './page-config.component';
 import { ShareModule } from 'src/app/share/share.module';
-import { ConfigurationSpecimenComponent } from 'src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component';
 import { ConfigurationDrugComponent } from 'src/app/components/configurationCenter/configuration-drug/configuration-drug.component';
 import { ConfigurationInspectModule } from 'src/app/components/configurationCenter/configuration-inspect/configuration-inspect.module';
 import { ConfigurationDictionaryModule } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.module';
 import { ConfigurationMessageModule } from 'src/app/components/configurationCenter/configuration-message/configuration-message.module';
+import { ConfigurationSpecimenModule } from 'src/app/components/configurationCenter/configuration-specimen/configuration-specimen.module';
 
 
 @NgModule({
   declarations: [
     PageConfigComponent,
-    ConfigurationSpecimenComponent,
     ConfigurationDrugComponent,
   ],
   imports: [
@@ -24,6 +23,7 @@ import { ConfigurationMessageModule } from 'src/app/components/configurationCent
     ConfigurationInspectModule,
     ConfigurationDictionaryModule,
     ConfigurationMessageModule,
+    ConfigurationSpecimenModule,
   ]
 })
 export class PageConfigModule { }

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

@@ -81,7 +81,7 @@
             <th nzWidth="10%">护理等级</th>
             <th nzWidth="10%">病情级别</th>
             <th nzWidth="10%">性别、年龄</th>
-            <th nzWidth="12%">出行方式|注意事项</th>
+            <th nzWidth="12%">陪检方式|注意事项</th>
             <th nzWidth="10%">操作</th>
           </tr>
         </thead>
@@ -247,9 +247,9 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-          <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="tripType">出行方式</nz-form-label>
-          <nz-form-control nzErrorTip="请选择出行方式!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="tripType" nzAllowClear nzPlaceHolder="请选择出行方式" (nzOpenChange)="openTripType($event)">
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="tripType">陪检方式</nz-form-label>
+          <nz-form-control nzErrorTip="请选择陪检方式!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="tripType" nzAllowClear nzPlaceHolder="请选择陪检方式" (nzOpenChange)="openTripType($event)">
               <ng-container *ngFor="let data of tripTypeList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="data.inspectMode" [nzValue]="data.id">
                 </nz-option>

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

@@ -410,7 +410,7 @@ export class PatientSearchComponent implements OnInit {
     });
 	}
 
-  // 获取出行方式
+  // 获取陪检方式
 	tripTypeList: any = [];
 	getTripTypeList() {
     let postData = {

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

@@ -200,6 +200,13 @@
             <label nz-radio [nzValue]='0'>否</label>
           </nz-radio-group>
         </div>
+        <div class="mb8 w100">
+          <nz-form-label class="label" nzRequired>是否需要验证科室码</nz-form-label>
+          <nz-radio-group class="handlerType" [(ngModel)]="closeOrderCheckDept">
+            <label nz-radio [nzValue]='1'>是</label>
+            <label nz-radio [nzValue]='0'>否</label>
+          </nz-radio-group>
+        </div>
         <div class="mb8 w100" *ngIf="association.value == 'other'">
           <nz-form-label class="label" nzRequired>是否关联数据</nz-form-label>
           <nz-radio-group class="handlerType" [(ngModel)]="bindTrans">

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

@@ -110,6 +110,7 @@ export class TaskTypeManagementComponent implements OnInit {
   defaultNullDeptId = null; //空单默认科室-标本配送
   specialCloseButton = "0"; //是否开通自动送回
   executeSwitch = 0;
+  closeOrderCheckDept = 0; //是否需要验证科室码
   bindTrans = "0"; //是否关联数据
   appointmentBuildFlag = "0"; //护士端是否允许预约建单,患者陪检业务
   appointmentBuildFlagZy = "0"; //护士端是否允许预约建单,患者其他服务
@@ -991,6 +992,7 @@ export class TaskTypeManagementComponent implements OnInit {
       ? data.specialCloseButton + ""
       : "0";
     this.executeSwitch = data.executeSwitch ? data.executeSwitch : 0;
+    this.closeOrderCheckDept = data.closeOrderCheckDept ? data.closeOrderCheckDept : 0;
     this.bindTrans = data.bindTrans
       ? data.bindTrans + ""
       : "0";
@@ -1285,6 +1287,7 @@ export class TaskTypeManagementComponent implements OnInit {
     }
     this.taskData.taskType["specialCloseButton"] = this.specialCloseButton;
     this.taskData.taskType["executeSwitch"] = this.executeSwitch;
+    this.taskData.taskType["closeOrderCheckDept"] = this.closeOrderCheckDept;
     this.taskData.taskType["bindTrans"] = this.bindTrans;
     if (this.departmentStrategy.idv) {
       this.taskData.taskType.carryingCourses[this.indexs].departmentStrategy = {
@@ -1513,6 +1516,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.defaultNullDeptId = null; //标本配送空单默认值
     this.specialCloseButton = "0"; //是否特殊情况关闭
     this.executeSwitch = 0;
+    this.closeOrderCheckDept = 0;
     this.bindTrans = "0"; //是否关联数据
     this.appointmentBuildFlag = "0"; //护士端是否允许预约建单,患者陪检
     this.appointmentBuildFlagZy = "0"; //护士端是否允许预约建单，患者其他