合并代码

src/app/services/main.service.ts

@@ -839,5 +839,11 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
+	// 发药批次-配置科室数据
+	getConsumeDept(data): any {
+	  return this.http.post(host.host + "/infusion/solutions/getConsumeDept", data, {
+	    headers: this.headers,
+	  });
+	}
 
 }

src/app/views/admin-office-prescription/admin-office-prescription.component.html

@@ -117,11 +117,6 @@
               </tr>
             </tbody>
           </nz-table>
-        <!--  <div class="list-template__pagination">
-            <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
-              (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
-            </nz-pagination>
-          </div> -->
         </div>
       </overlay-scrollbars>
       <div class="display_flex justify-content_flex-center">
@@ -146,65 +141,79 @@
 				border-radius: 5px;">
 			<div class="monad-title" 
 				style="text-align: center;
-				font-weight: 700;
-				font-size: 16px;
+				font-size: 18px;
 				border-bottom: 1px solid #e7e7e7;
 				padding-bottom: 10px;">
 				大输液发药单-{{rowData.applyDeptDTO?rowData.applyDeptDTO.dept:''}}
 			</div>
-			<div class="monad-sign" style="display: flex;line-height: 40px;font-size: 14px;">
+			<div class="monad-sign" style="display: flex;line-height: 23px;font-size: 14px;">
 				<div style="margin-right: 15px;">日期：{{rowData.createTime|date:'yyyy-MM-dd HH:mm'}}</div>
 				<div style="margin-right: 15px;">批次号：{{rowData.batch?rowData.batch.batchNo:'-'}}</div>
 				<div style="margin-right: 15px;">单号：{{rowData.packingNo}}</div>
 			</div>
 			<div style="border: 1px solid #e7e7e7;border-bottom: none;font-size: 14px;">
 				<div class="thead" style="display: flex;">
-					<div style="text-align: center;width: 40%;height: 40px;
-					line-height: 40px;
+					<div style="text-align: center;width: 30%;height: 23px;
+					line-height: 23px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">药品名称</div>
 					
-					<div style="text-align: center;width: 20%;height: 40px;
-					line-height: 40px;
+					<div style="text-align: center;width: 20%;height: 23px;
+					line-height: 23px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">规格</div>
 					
-					<div style="text-align: center;width: 10%;height: 40px;
-					line-height: 40px;
+					<div style="text-align: center;width: 10%;height: 23px;
+					line-height: 23px;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">总量</div>
+					border-bottom: 1px solid #e7e7e7;">实际消耗</div>
 					
-					<div style="text-align: center;width: 10%;height: 40px;
-					line-height: 40px;
+					<div style="text-align: center;width: 10%;height: 23px;
+					line-height: 23px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">临时增发</div>
+					
+					<div style="text-align: center;width: 10%;height: 23px;
+					line-height: 23px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">箱数</div>
 					
-					<div style="text-align: center;width: 20%;height: 40px;
-					line-height: 40px;border-bottom: 1px solid #e7e7e7;">取药药房</div>
+					<div style="text-align: center;width: 20%;height: 23px;
+					line-height: 23px;border-bottom: 1px solid #e7e7e7;">取药药房</div>
 				</div>
 				<div *ngFor="let data of codes" style="display: flex;">
-					<div style="text-align: center;width: 40%;height: 40px;
-					line-height: 40px;
+					<div style="text-align: center;width: 30%;height: 23px;
+					line-height: 23px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.drugName }}</div>
 					
-					<div style="text-align: center;width: 20%;height: 40px;
-					line-height: 40px;
+					<div style="text-align: center;width: 20%;height: 23px;
+					line-height: 23px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.specs }}</div>
 					
-					<div style="text-align: center;width: 10%;height: 40px;
-					line-height: 40px;
+					<div style="text-align: center;width: 10%;height: 23px;
+					line-height: 23px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.expendCount }}</div>
+					
+					<div style="text-align: center;width: 10%;height: 23px;
+					line-height: 23px;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">{{ data.actualCount }}</div>
+					border-bottom: 1px solid #e7e7e7;">{{ data.addSub || 0 }}</div>
 					
-					<div style="text-align: center;width: 10%;height: 40px;
-					line-height: 40px;
+					<div style="text-align: center;width: 10%;height: 23px;
+					line-height: 23px;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">{{ data.cartonNum }}</div>
+					border-bottom: 1px solid #e7e7e7;">
+						<span *ngIf="data.drugsInfoDTO.drugName!='合计'">
+							{{ data.cartonNum }} {{data.giveOutType && data.giveOutType.value==1?
+							data.drugsInfoDTO.unit:'箱'}}
+						</span>
+					</div>
 					
-					<div style="text-align: center;width: 20%;height: 40px;
-					line-height: 40px;border-bottom: 1px solid #e7e7e7;">{{ data.deptName }}</div>
+					<div style="text-align: center;width: 20%;height: 23px;
+					line-height: 23px;border-bottom: 1px solid #e7e7e7;">{{ data.deptName }}</div>
 				</div>
 			</div>
 		</div>

src/app/views/admin-office-prescription/admin-office-prescription.component.ts

@@ -848,8 +848,8 @@ export class AdminOfficePrescriptionComponent implements OnInit{
 						drugName:'合计',
 						specs:'',
 					},
-					actualCount:res.data.totalActual,
-					cartonNum:res.data.totalCarton,
+					expendCount:res.data.totalExpendCount,
+					addSub:res.data.totalAddSub,
 					deptName:''
 				})
         that.codes = arr

src/app/views/big-transfusion-set/big-transfusion-set.component.html

@@ -24,6 +24,18 @@
            </nz-option>
          </nz-select>
        </div>
+			 <!-- 默认发药科室 -->
+			 <div class="display_flex align-items_center mb8">
+			   <nz-form-label class="label" nzRequired>默认发药科室</nz-form-label>
+			   <nz-select class="w320px" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event)" nzServerSearch nzShowSearch nzPlaceHolder="请选择默发药科室" [(ngModel)]="pharmacyDept">
+			     <ng-container *ngFor="let option of hospitals">
+			       <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>
+			 </div>
       </div>
       <!-- 自动建单配置 -->
       <div *ngIf="tabModalName=='automaticOrderCreation'">
@@ -32,6 +44,13 @@
           <nz-form-label class="label">自动建单</nz-form-label>
           <nz-checkbox-group [(ngModel)]="autoCreateOrders"></nz-checkbox-group>
         </div>
+				<div class="display_flex align-items_center mb8" *ngIf="autoCreateOrders[0].checked">
+					<nz-radio-group [(ngModel)]="radioValue">
+						<label nz-radio nzValue="1">定时建单</label>
+						<label nz-radio nzValue="2">打印并建单</label>
+					</nz-radio-group>
+					<nz-time-picker [(ngModel)]="executeTime" nzFormat="HH:mm" *ngIf="radioValue==1"></nz-time-picker>
+				</div>
       </div>
       <div class="bottom">
         <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>

src/app/views/big-transfusion-set/big-transfusion-set.component.ts

@@ -4,6 +4,7 @@ import { ToolService } from 'src/app/services/tool.service';
 import { NzMessageService } from 'ng-zorro-antd';
 import { Subject } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
+import { format, startOfMinute } from 'date-fns';
 
 @Component({
   selector: "app-big-transfusion-set",
@@ -18,6 +19,7 @@ export class BigTransfusionSetComponent implements OnInit {
   hosId = this.tool.getCurrentHospital().id; //当前院区
   // 接手术关联任务类型
   infusionSolutionsTypeId:Number;
+	pharmacyDept:''; //默认发药科室
   taskTypes1:any[] = [];
   taskTypeData:{id:''};
   // 苏醒室科室
@@ -27,6 +29,17 @@ export class BigTransfusionSetComponent implements OnInit {
   autoCreateOrders:any[] = [
     {label:'是否开启',value: 0}
   ];
+	// 定时建单
+	timingOrder:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+	// 打印并建单
+	printOrder:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+	radioValue:string = '';
+	// 定时建单-选择时分
+	executeTime:Date | null = null;
   // 是否开通送回病房
   autoSendWard:any[] = [
     {label:'是否开启',value: 0}
@@ -56,6 +69,7 @@ export class BigTransfusionSetComponent implements OnInit {
 	editId:'';
 	targetData:any = [];
 	stateData:any = [];
+	hospitals:any = [];
 	// 间隔时间数据
 	timeData:any[] = [
 	  {label:'10',value: 10},
@@ -66,6 +80,7 @@ export class BigTransfusionSetComponent implements OnInit {
   // 配置
   configs:any = {};
   searchTimerSubject = new Subject();
+	searchParentDeptSubject = new Subject();
   constructor(private mainService: MainService,private tool: ToolService,private msg: NzMessageService) {}
 
   ngOnInit():void {
@@ -74,7 +89,14 @@ export class BigTransfusionSetComponent implements OnInit {
       let fun = v[0];
       fun.call(this, v[1], v[2], v[3]);
     });
-    this.getTaskTypes('', true);
+		
+		this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
+			this.isLoading = true;
+			this.getDeparts(e,'search');
+		});
+		
+    this.getTaskTypes('', true, 'load');
+		this.getDeparts('','load')
   }
 
   // 切换tab
@@ -93,6 +115,10 @@ export class BigTransfusionSetComponent implements OnInit {
 			taskType:this.taskTypeData.id,
 			hosId: this.hosId,
 			infusionSolutionsTypeId:this.infusionSolutionsTypeId, //任务类型参数
+			pharmacyDept:this.pharmacyDept,//默认发药科室
+			timingOrder:0,//定时建单
+			printOrder:0,// 打印并建单
+			executeTime:'',// 定时建单-选择时分
 			autoCreate:0
     };
 		if(this.editId){
@@ -100,11 +126,27 @@ export class BigTransfusionSetComponent implements OnInit {
 		}else{
 			delete editData.id 
 		}
+		
 		if(this.autoCreateOrders[0].checked){
 			editData.autoCreate = 1
 		}else{
 			delete editData.autoCreate
 		}
+		
+		if(this.radioValue=='1'){
+			editData.timingOrder = 1
+			editData.executeTime = this.executeTime ? format(startOfMinute(this.executeTime), "yyyy-MM-dd HH:mm:ss") : undefined
+		}else{
+			delete editData.timingOrder
+			delete editData.executeTime
+		}
+		
+		if(this.radioValue=='2'){
+			editData.printOrder = 1
+		}else{
+			delete editData.printOrder
+		}
+		
     this.btnLoading = true;
     this.mainService
       .simplePost("addData", "taskTypeConfig", editData)
@@ -128,10 +170,15 @@ export class BigTransfusionSetComponent implements OnInit {
     this.searchTimerSubject.next([fun, e, isFirst, type]);
   }
 	
+	// 搜索科室
+	changeInp(e) {
+	  this.searchParentDeptSubject.next(e);
+	}
+	
   //获取关联任务类型
   // 1 患者其他服务
   // 2 其他临床服务
-  getTaskTypes(e:string = '', isFirst:boolean = false) {
+  getTaskTypes(e:string = '', isFirst:boolean = false, type) {
     isFirst && (this.loading = true);
     let postData:any = {
       idx: 0,
@@ -155,7 +202,9 @@ export class BigTransfusionSetComponent implements OnInit {
         this.isLoading = false;
         if (result.status == 200) {
           this.taskTypes1 = result.list || [];
-					this.getTaskTypesId();
+					if(type=='load'){
+						this.getTaskTypesId();
+					}
         }
       });
   }
@@ -168,6 +217,43 @@ export class BigTransfusionSetComponent implements OnInit {
 		});
 	}
 	
+	// 获取所有科室
+	getDeparts(dept, type) {
+	  var that = this;
+	  let data = {
+	    department: {
+	      dept,
+	      hospital: {
+	        id: this.hosId
+	      },
+				type:{
+					id:''
+				}
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+		that.mainService.getDictionary("list", "dept_type").subscribe((res) => {
+		  let typeData = res.find(i=>i.value=='pharmacyRoom');
+			if(typeData){
+				data.department.type.id = typeData.id
+			}
+			that.mainService
+			  .getFetchDataList("data", "department", data)
+			  .subscribe((data) => {
+					if(type=='search'){
+						setTimeout(_=>{
+							this.hospitals = data.list
+							that.isLoading = false;
+						},500)
+					}else{
+						this.hospitals = data.list
+						that.isLoading = false;
+					}
+			  });
+		});
+	}
+	
   // 获取配置
   getConfig() {
     this.loading = true;
@@ -188,6 +274,13 @@ export class BigTransfusionSetComponent implements OnInit {
 					this.editId = data.id
 					this.autoCreateOrders[0].checked = data.autoCreate == 1;
     			this.infusionSolutionsTypeId = data.infusionSolutionsTypeId
+					this.pharmacyDept = data.pharmacyDept
+					if(data.timingOrder=='1'){
+						this.radioValue = '1'
+						this.executeTime = data.executeTime ? new Date(data.executeTime) : null;
+					}else if(data.printOrder=='1'){
+						this.radioValue = '2'
+					}
         }
       });
   }

src/app/views/dept-statistics/dept-statistics.component.html

@@ -27,37 +27,24 @@
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
-            <th nzWidth="10%">科室名称</th>
-            <th nzWidth="10%">工单总量</th>
-            <th nzWidth="10%">主动评价次数</th>
-            <th nzWidth="10%">标本数量</th>
-            <th nzWidth="10%">标本轮巡数量</th>
-            <th nzWidth="10%">患者陪检数量</th>
-            <th nzWidth="10%">药品数量</th>
-            <th nzWidth="10%">静配数量</th>
-            <th nzWidth="10%">患者转运数量</th>
-            <th nzWidth="5%">其他数量</th>
+            <th nzWidth="10%" nzShowSort nzSortKey="bid" [(nzSort)]="sortCurrent.bid" (nzSortChange)="sort('bid',$event)">科室名称</th>
+            <th nzShowSort nzSortKey="total" [(nzSort)]="sortCurrent.total" (nzSortChange)="sort('total',$event)">工单总量</th>
+            <th *ngFor="let item of listOfHeads; let index=index;" (nzSortChange)="sort(item.dataSort,$event)"
+            	nzShowSort [(nzSort)]="item.sortName"
+            	>{{item.name}}</th>
+            <th nzShowSort nzSortKey="other" [(nzSort)]="sortCurrent.other" (nzSortChange)="sort('other',$event)">其他数量</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;">
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.date }}</td>
-            <td>{{ data.total||0}}</td>
-            <td>{{data.elevateCount||0}}</td>
-            <td>{{data.speCount||0}}</td>
-            <td>{{data.spePlanCount||0}}</td>
-            <td>{{data.insCount||0}}</td>
-            <td>{{data.drugsCount||0}}</td>
-            <td>{{data.jpCount||0}}</td>
-            <td>{{data.transCount||0}}</td>
-            <td>{{data.otherCount||0}}</td>
+            <td *ngFor="let item of data;">{{ item }}</td>
           </tr>
         </tbody>
       </nz-table>
       <div class="list-template__pagination">
         <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
-          (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+          (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue,'forbid')" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue,'forbid')">
         </nz-pagination>
       </div>
     </div>

src/app/views/dept-statistics/dept-statistics.component.ts

@@ -132,11 +132,33 @@ export class DeptStatisticsComponent implements OnInit {
   // 重置
   reset() {
     this.changeDateRange("1");
+		this.sortCurrent = {
+		  bid: null,
+		  total: null,
+			other: null,
+		};
     this.search();
   }
+	
+	// 列表排序
+	sortCurrent = {
+	  bid: null,
+	  total: null,
+		other: null,
+	};
+	sortCurrentKey: string = "";
+	sortCurrentValue: string | null = "";
+	sort(name,e) {
+		console.log(22,name,e)
+	  this.sortCurrentKey = name == 'bid' ? 'b.id' : name;
+	  this.sortCurrentValue = e || '';
+	  this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue,'forbid');
+	}
+	
   // 表格数据
   loading1 = false;
-  getList(num?: number) {
+	listOfHeads = [];
+  getList(num?: number, field?: string, sort?: string, type?: string) {
     if (num !== undefined) {
       this.pageIndex = num;
     }
@@ -146,12 +168,25 @@ export class DeptStatisticsComponent implements OnInit {
       startTime: this.searchData.dateRange.start,
       endTime: this.searchData.dateRange.end,
       hosId: this.searchData.hosId,
+			sort: null
     };
+		if (field && sort) {
+		  postData.sort = sort === "ascend" ? `${field} asc` : `${field} desc`;
+		}
     this.loading1 = true;
     this.mainService
       .postCustom("report", "dept", postData)
       .subscribe((result) => {
         this.loading1 = false;
+				let header = result.heads
+				console.log(55,type)
+				if(!type){
+					for(let i in header){
+						header[i].dataSort = 'data'+i
+						header[i].sortName = null
+					}
+					this.listOfHeads = header || [];
+				}
         this.listOfData = result.list || [];
         this.listLength = result.totalNum;
       });

src/app/views/dispensing-batch/dispensing-batch.component.html

@@ -101,6 +101,14 @@
        			</nz-input-group>
        	  </nz-form-control>
        	</nz-form-item>
+				<nz-form-item>
+				  <nz-form-label>加载所有消耗科室</nz-form-label>
+					<nz-form-control>
+						<label nz-checkbox formControlName="loadAllConsumeDept">
+							<span>是否开启</span>
+						</label>
+					</nz-form-control>
+				</nz-form-item>
        </form>
       </overlay-scrollbars>
       <div class="display_flex justify-content_flex-center">
@@ -125,65 +133,80 @@
 				border-radius: 5px;margin-bottom: 40px;">
 			<div class="monad-title" 
 				style="text-align: center;
-				font-weight: 700;
-				font-size: 16px;
+				font-size: 18px;
 				border-bottom: 1px solid #e7e7e7;
 				padding-bottom: 10px;">
 				大输液发药单-{{item.applyDeptDTO.dept}}
 			</div>
-			<div class="monad-sign" style="display: flex;line-height: 40px;font-size: 14px;">
+			<div class="monad-sign" style="display: flex;line-height: 23px;font-size: 14px;">
 				<div style="margin-right: 15px;">日期：{{item.createTime|date:'yyyy-MM-dd HH:mm'}}</div>
 				<div style="margin-right: 15px;">批次号：{{item.batch.batchNo}}</div>
 				<div style="margin-right: 15px;">单号：{{item.packingNo}}</div>
 			</div>
 			<div style="border: 1px solid #e7e7e7;border-bottom: none;font-size: 14px;">
 				<div class="thead" style="display: flex;">
-					<div style="text-align: center;width: 40%;height: 40px;
-					line-height: 40px;
+					<div style="text-align: center;width: 30%;height: 23px;
+					line-height: 23px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">药品名称</div>
 					
-					<div style="text-align: center;width: 20%;height: 40px;
-					line-height: 40px;
+					<div style="text-align: center;width: 25%;height: 23px;
+					line-height: 23px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">规格</div>
 					
-					<div style="text-align: center;width: 10%;height: 40px;
-					line-height: 40px;
+					<div style="text-align: center;width: 10%;height: 23px;
+					line-height: 23px;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">总量</div>
+					border-bottom: 1px solid #e7e7e7;">实际消耗</div>
 					
-					<div style="text-align: center;width: 10%;height: 40px;
-					line-height: 40px;
+					<div style="text-align: center;width: 10%;height: 23px;
+					line-height: 23px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">临时增发</div>
+					
+					<div style="text-align: center;width: 10%;height: 23px;
+					line-height: 23px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">箱数</div>
 					
-					<div style="text-align: center;width: 20%;height: 40px;
-					line-height: 40px;border-bottom: 1px solid #e7e7e7;">取药药房</div>
+					<div style="text-align: center;width: 25%;height: 23px;
+					line-height: 23px;border-bottom: 1px solid #e7e7e7;">取药药房</div>
 				</div>
 				<div *ngFor="let data of item.drugsConfigureDTOS" style="display: flex;">
-					<div style="text-align: center;width: 40%;height: 40px;
-					line-height: 40px;
+					<div style="text-align: center;width: 30%;height: 23px;
+					line-height: 23px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.drugName }}</div>
 					
-					<div style="text-align: center;width: 20%;height: 40px;
-					line-height: 40px;
+					<div style="text-align: center;width: 25%;height: 23px;
+					line-height: 23px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.specs }}</div>
 					
-					<div style="text-align: center;width: 10%;height: 40px;
-					line-height: 40px;
+					<div style="text-align: center;width: 10%;height: 23px;
+					line-height: 23px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.expendCount }}</div>
+					
+					<div style="text-align: center;width: 10%;height: 23px;
+					line-height: 23px;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">{{ data.actualCount }}</div>
+					border-bottom: 1px solid #e7e7e7;">{{ data.addSub || 0 }}</div>
 					
-					<div style="text-align: center;width: 10%;height: 40px;
-					line-height: 40px;
+					<div style="text-align: center;width: 10%;height: 23px;
+					line-height: 23px;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">{{ data.cartonNum }}</div>
+					border-bottom: 1px solid #e7e7e7;">
+					<span *ngIf="data.drugsInfoDTO.drugName!='合计'">
+						{{ data.giveOutType.value==1 ? data.actualCount :data.cartonNum }}
+						{{data.giveOutType && data.giveOutType.value==1?
+						data.drugsInfoDTO.unit:'箱'}}
+					</span>
+					</div>
 					
-					<div style="text-align: center;width: 20%;height: 40px;
-					line-height: 40px;border-bottom: 1px solid #e7e7e7;">{{ data.deptName }}</div>
+					<div style="text-align: center;width: 25%;height: 23px;
+					line-height: 23px;border-bottom: 1px solid #e7e7e7;">{{ data.deptName }}</div>
 				</div>
 			</div>
 		</div>
@@ -197,7 +220,3 @@
  <!-- 模态框 -->
 <app-dialog-delete [delModal]="printModal" (hideDelModalEvent)="hidePrintModal()" [btnLoading]="btnLoading"
   (confirmDelEvent)="confirmPrintDel()" [content]="'您确认发药并打印吗？打印同时会更新云库存并建立配送工单？'"></app-dialog-delete>
-		
-<!-- 遮罩 -->
-<app-mask *ngIf="maskFlag"></app-mask>
-<app-excel-import [isShow]="isShow" (hideFormHand)="hideExcelImport($event)" *ngIf="isShow" (submitFormHand)="submitExcelImport($event)"></app-excel-import>

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

@@ -47,7 +47,6 @@ export class DispensingBatchComponent implements OnInit {
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.initForm();
     this.getAllHospital();
-    this.getType();
     this.getDeptHandoverType();
   }
   listOfData: any[] = []; //表格数据
@@ -62,6 +61,7 @@ export class DispensingBatchComponent implements OnInit {
   department: number; //所属科室
 	hosId: number; 
 	dateRange;//时间
+	loadAllConsumeDept: boolean = true;//是否加载所有消耗科室
   batchNumber; //批次号
   num; //编码
   deptalias; //别名
@@ -83,100 +83,14 @@ export class DispensingBatchComponent implements OnInit {
   // 初始化增删改按钮
   coopBtns: any = {};
 	saveLoading:boolean = false;
-  // 模板导出
-  excelExport(){
-    this.maskFlag = this.message.loading("下载模板中..", {
-      nzDuration: 0,
-    }).messageId;
-    this.mainService.exportExcel("department", {}).subscribe(
-      (data) => {
-        this.message.remove(this.maskFlag);
-        this.maskFlag = false;
-        this.message.success('下载模板成功');
-        var file = new Blob([data], {
-          type: "application/vnd.ms-excel",
-        });
-        //trick to download store a file having its URL
-        var fileURL = URL.createObjectURL(file);
-        var a = document.createElement("a");
-        a.href = fileURL;
-        a.target = "_blank";
-        a.download = "科室导入模板.xls";
-        document.body.appendChild(a);
-        a.click();
-      },
-      (err) => {
-        this.message.remove(this.maskFlag);
-        this.maskFlag = false;
-        this.message.error('下载模板失败');
-      }
-    );
-  }
-
-  // 导入---start
-  // model-取消
-  isShow = false;
-  hideExcelImport() {
-    this.isShow = false;
-  }
-  // 触发
-  excelImport() {
-    this.isShow = true;
-  }
-  submitExcelImport({fileList}){
-    this.isShow = false;
-    const formData = new FormData();
-    fileList.forEach((file: any) => {
-      formData.append('file', file);
-    });
-    this.maskFlag = this.message.loading("正在导入中..", {
-      nzDuration: 0,
-    }).messageId;
-    const req = new HttpRequest('Post', host.host + '/user/data/importExcel/department', formData, {
-      reportProgress: true
-    });
-    this.http
-      .request(req)
-      .pipe(filter(e => e instanceof HttpResponse))
-      .subscribe(
-        (res:any) => {
-          if(res.body.status == 200){
-            this.message.remove(this.maskFlag);
-            this.maskFlag = false;
-            this.message.success('导入成功');
-            this.getList();
-          }else{
-            this.message.remove(this.maskFlag);
-            this.maskFlag = false;
-            this.showPromptModal("导入", false, res.body.msg);
-          }
-        },
-        () => {
-          this.message.remove(this.maskFlag);
-          this.maskFlag = false;
-          this.message.error('导入失败');
-        },
-      );
-  }
+	taskTypeData:{id:''};
+	
   // 导入---end
   //搜索父级科室
 	isDeptLoading = false;
   changeInp(e) {
     this.searchParentDeptSubject.next(e);
   }
-  // 打开父级科室下拉框baba
-  isLoading = false;
-  openDeptSelect(flag) {
-    if (flag) {
-      this.isLoading = true;
-      this.getAllParentdepart().subscribe((result) => {
-        this.isLoading = false;
-        if (result.status == 200) {
-          this.allParentdepart = result.list;
-        }
-      });
-    }
-  }
   // 配送建单
   coopData:any = {};
   addDateModal(data) {
@@ -204,7 +118,8 @@ export class DispensingBatchComponent implements OnInit {
 			endTime:this.formEndDate?this.formEndDate:this.loadEndTime,//发起时间结束
 			hosId:this.hosId,
 			pharmacy:this.validateForm.value.department,
-			id:that.coopId
+			id:that.coopId,
+			loadAllConsumeDept:this.validateForm.value.loadAllConsumeDept?1:0
     };
 		that.saveLoading = true;
 		that.mainService
@@ -221,48 +136,6 @@ export class DispensingBatchComponent implements OnInit {
 		    }
 		  });
   }
-	
-  //获取所有的父级科室列表
-  getAllParentdepart(keyWord = "") {
-    let postData: any = {
-      idx: 0,
-      sum: 10,
-      department: {
-        // hospital: { id: this.add ? this.tool.getCurrentHospital().id : this.hospital },
-        keyWord: keyWord,
-      },
-    };
-    if (this.coopItem) {
-      // 过滤这个科室及其子科室
-      postData.department.filterByDeptId = this.coopItem.id;
-    }
-    return this.mainService.getFetchDataList("data", "department", postData);
-  }
-  // 新添加科室号码
-  addDeptPhone(e: MouseEvent) {
-    e.preventDefault();
-    this.deptPhones.push({ id: ++this.deptsPhoneId, phone: "" });
-    this.deptsPhoneChange();
-  }
-  // 删除新添加科室号码
-  removeDeptPhone(index: number, e: MouseEvent) {
-    e.preventDefault();
-    this.deptPhones.splice(index, 1);
-    this.deptsPhoneChange();
-  }
-  //监听科室电话输入事件
-  deptsPhoneChange(e?, phone?) {
-    if (e !== undefined && phone !== undefined) {
-      phone.phone = e;
-    }
-    // -------------判断添加按钮是否禁用 start
-    this.isAddDeptsPhone = !this.validateForm.value.officeNum;
-    if (!this.isAddDeptsPhone) {
-      //如果没禁用
-      this.isAddDeptsPhone = this.deptPhones.some((item) => item.phone === "");
-    }
-    // -------------判断添加按钮是否禁用 end
-  }
 
   // 搜索
   search() {
@@ -369,108 +242,6 @@ export class DispensingBatchComponent implements OnInit {
     this.getList();
   }
 
-  // 切换院区选项
-  buildings: any = []; //楼栋
-  maskFlag: any = false;
-  changeHosp(obj?) {
-    let hospitalId;
-    if (obj) {
-      hospitalId = obj.hospital.id;
-    }
-    let hid;
-    if (hospitalId || hospitalId == 0) {
-      hid = hospitalId - 0;
-    } 
-		// else {
-  //     hid = this.hospital - 0;
-  //   }
-    let data = {
-      hosId: this.add ? this.tool.getCurrentHospital().id : hid,
-    };
-    this.maskFlag = this.message.loading("正在加载中..", {
-      nzDuration: 0,
-    }).messageId;
-    this.mainService
-      .coopData("getBuildingOrFloor", "building", data)
-      .subscribe((data) => {
-        this.buildings = data.data;
-        this.floors = [];
-        // ---------
-        if (obj) {
-          //编辑
-          let arr = this.buildings.map((item) => item.id);
-          if (obj.building.id && arr.includes(obj.building.id)) {
-            //有楼栋
-            this.changeBuilding(obj.building.id, obj);
-            this.validateForm.controls.building.setValue(obj.building.id + "");
-          } else {
-            //无楼栋
-            this.floors = [];
-            this.message.remove(this.maskFlag);
-            this.maskFlag = false;
-            this.modal = true;
-            this.validateForm.controls.building.setValue(null);
-            this.validateForm.controls.officeAddress.setValue(null);
-          }
-        } else {
-          //新增
-          this.message.remove(this.maskFlag);
-          this.maskFlag = false;
-          this.modal = true;
-        }
-        // ---------
-      });
-  }
-
-  // 切换楼栋信息
-  floors: Array<any> = []; //楼层
-  floorLoading: boolean = false;
-  changeBuilding(buildingId?, obj?) {
-    var that = this;
-    that.floors = [];
-    var bid;
-    if (buildingId || buildingId == 0) {
-      bid = buildingId - 0;
-    } else if (!that.add && that.validateForm.value.building) {
-      bid = that.validateForm.value.building - 0;
-    } else {
-      return;
-    }
-    let data = {
-      buildingId: bid,
-    };
-    this.floorLoading = true;
-    that.mainService
-      .coopData("getBuildingOrFloor", "floor", data)
-      .subscribe((data) => {
-        this.floorLoading = false;
-        this.message.remove(this.maskFlag);
-        this.maskFlag = false;
-        this.modal = true;
-        that.floors = data.data;
-        if (obj) {
-          let floorId = obj.floor.id;
-          let arr = that.floors.map((item) => item["id"]);
-          if (floorId && arr.includes(floorId)) {
-            this.validateForm.controls.floor.setValue(floorId + "");
-          } else {
-            this.validateForm.controls.floor.setValue(null);
-            this.validateForm.controls.officeAddress.setValue(null);
-          }
-        }
-      });
-  }
-
-  // 获取科室类型
-  types: Array<any> = [];
-  getType() {
-    var that = this;
-    that.mainService.getDictionary("list", "dept_type").subscribe((data) => {
-      console.log(data);
-      that.types = data;
-    });
-  }
-
   // 获取科室汇总交接类型
   deptHandoverTypes: Array<any> = [];
   getDeptHandoverType() {
@@ -480,13 +251,42 @@ export class DispensingBatchComponent implements OnInit {
       that.deptHandoverTypes = data;
     });
   }
-
+	
+	// 获取任务id
+	getTaskTypesId() {
+		this.mainService.getDictionary("list", "ordinary_field").subscribe((data) => {
+			this.taskTypeData = data.find(i=>i.value=='infusionSolutions')
+			this.getConfig();
+		});
+	}
+	
+	// 获取配置
+	getConfig() {
+	  let postData = {
+	    idx: 0,
+	    sum: 10,
+	    taskTypeConfig: {
+				hosId:this.hosId,
+				taskType:this.taskTypeData.id
+	    }
+	  };
+	  this.mainService
+		.getFetchDataList("simple/data", "taskTypeConfig", postData)
+		.subscribe((result) => {
+			if (result.status == 200) {
+				let data = result.list[0] || {};
+				this.validateForm.controls.department.setValue(data.pharmacyDept || '');
+				this.add = true;
+				this.modal = true;
+				this.isAddDeptsPhone = true;
+			}
+		});
+	}
+	
   // 新增弹框
   showModal() {
     this.initForm();
-    this.add = true;
-		this.modal = true;
-    this.isAddDeptsPhone = true;
+		this.getTaskTypesId()
   }
   hideModal() {
     this.coopItem = null;
@@ -499,80 +299,15 @@ export class DispensingBatchComponent implements OnInit {
   initForm() {
     this.validateForm = this.fb.group({
       dispensingTime: [null, [Validators.required]],
-      department: [null, [Validators.required]]
+      department: [null, [Validators.required]],
+			loadAllConsumeDept: [true,[]]
     });
 		let date = new Date();
 		this.loadStartTime = format(subDays(date, 1), "yyyy-MM-dd") +' '+'08:00:00'
 		this.loadEndTime = format(date, "yyyy-MM-dd") +' '+'08:00:00'
 		this.validateForm.controls.dispensingTime.setValue([this.loadStartTime, this.loadEndTime]);
   }
-  // 科室位置必填
-  buildValidator = (control: FormControl): { [s: string]: boolean } => {
-    if (
-      this.validateForm &&
-      this.validateForm.value &&
-      (!this.validateForm.value.building ||
-        !this.validateForm.value.floor ||
-        !this.validateForm.value.officeAddress)
-    ) {
-      return { required: true };
-    }
-  };
-  /**
-   * 生成一个从 start 到 end 的连续数组
-   * @param start
-   * @param end
-   */
-  generateArray(start, end) {
-    return Array.from(new Array(end).keys()).slice(start);
-  }
 
-  //服务时间选择
-  // 禁用的小时
-  startTime1Hourdis() {
-    return [];
-  }
-  endTime1Hourdis() {
-    return [];
-  }
-  startTime2Hourdis() {
-    return [];
-  }
-  endTime2Hourdis() {
-    return [];
-  }
-  // 禁用的分钟
-  startTime1Mindis() {
-    return [];
-  }
-  endTime1Mindis() {
-    return [];
-  }
-  startTime2Mindis() {
-    return [];
-  }
-  endTime2Mindis() {
-    return [];
-  }
-  timeChange(e: boolean, type: string, num: number) {
-    if (!e && this.validateForm.value[type + num]) {
-      let hour = new Date(this.validateForm.value[type + num]).getHours();
-      let minute = new Date(this.validateForm.value[type + num]).getMinutes();
-      if (type == "startTime" && num === 1) {
-        this.endTime1Hourdis = () => this.generateArray(0, hour);
-        this.endTime1Mindis = () => this.generateArray(0, minute + 1);
-      } else if (type == "startTime" && num === 2) {
-        this.endTime2Hourdis = () => this.generateArray(0, hour);
-        this.endTime2Mindis = () => this.generateArray(0, minute + 1);
-      } else if (type == "endTime" && num === 1) {
-        this.startTime1Hourdis = () => this.generateArray(hour + 1, 24);
-        this.startTime1Mindis = () => this.generateArray(minute, 60);
-      } else if (type == "endTime" && num === 2) {
-        this.startTime2Hourdis = () => this.generateArray(hour + 1, 24);
-        this.startTime2Mindis = () => this.generateArray(minute, 60);
-      }
-    }
-  }
   // 表单提交
   submitForm(): void {
     var that = this;
@@ -585,7 +320,8 @@ export class DispensingBatchComponent implements OnInit {
 			startTime:this.formStartDate?this.formStartDate:this.loadStartTime,//发起时间开始
 			endTime:this.formEndDate?this.formEndDate:this.loadEndTime,//发起时间结束
 			hosId:this.hosId,
-			pharmacy:this.validateForm.value.department
+			pharmacy:this.validateForm.value.department,
+			loadAllConsumeDept:this.validateForm.value.loadAllConsumeDept?1:0
     };
   
     if (!that.add) {
@@ -616,8 +352,14 @@ export class DispensingBatchComponent implements OnInit {
     this.coopItem = data;
     this.validateForm.controls.department.setValue(data.pharmacy);
     this.validateForm.controls.dispensingTime.setValue([data.startTime,data.endTime]);
+		if(data.loadAllConsumeDept==1){
+			this.validateForm.controls.loadAllConsumeDept.setValue(true);
+		}else{
+			this.validateForm.controls.loadAllConsumeDept.setValue(false);
+		}
 		this.loadStartTime = data.startTime
 		this.loadEndTime = data.endTime
+		console.log(11,this.validateForm.value)
 		this.modal = true
   }
 
@@ -676,34 +418,6 @@ export class DispensingBatchComponent implements OnInit {
 		this.router.navigateByUrl(`/dispensingDetail/${data.id}`);
   }
 
-  // 选中表格中科室
-  mapOfCheckedId: { [key: string]: boolean } = {};
-  checkedDepIds = []; //已选中科室id
-  refreshStatus(): void {
-    this.isAllDisplayDataChecked = this.listOfData.every(
-      (item) => this.mapOfCheckedId[item.id]
-    );
-    let arr = [];
-    for (var k in this.mapOfCheckedId) {
-      if (this.mapOfCheckedId[k]) {
-        arr.push(Number(k));
-      }
-    }
-    this.checkedDepIds = arr;
-    console.log(this.checkedDepIds);
-  }
-  //表格整行选中
-  selectedListData(id) {
-    this.mapOfCheckedId[id] = !this.mapOfCheckedId[id];
-    this.refreshStatus();
-  }
-  // 全选
-  isAllDisplayDataChecked = false; //当前页是否全选
-  checkAll(value: boolean): void {
-    this.listOfData.forEach((item) => (this.mapOfCheckedId[item.id] = value));
-    this.refreshStatus();
-  }
-
 	// 发药并打印
 	printData = []; 
 	print(e, data, id){
@@ -724,8 +438,8 @@ export class DispensingBatchComponent implements OnInit {
 							drugName:'合计',
 							specs:'',
 						},
-						actualCount:i.totalActual,
-						cartonNum:i.totalCarton,
+						expendCount:i.totalExpendCount,
+						addSub:i.totalAddSub,
 						deptName:''
 					})
 				}
@@ -735,7 +449,7 @@ export class DispensingBatchComponent implements OnInit {
 				that.printModal = false;
 		    setTimeout(() => {
 		      const printContent = document.getElementById("report");
-		      const WindowPrt = window.open("", "", "width=1000,height=900");
+		      const WindowPrt = window.open("", "", "width=1000,height=1200");
 		      WindowPrt.document.write(printContent.innerHTML);
 		      WindowPrt.document.close();
 		      WindowPrt.focus();

src/app/views/dispensing-detail/dispensing-detail.component.html

@@ -2,42 +2,44 @@
   <div class="list-template__content">
 		<div class="detail-title">
 			<h3 *ngIf="deptName">{{deptName}}-发药单</h3>
-			<button class="btn cancel right-btn" nz-button nzType="default" (click)="back()">取消</button>
+			<button class="btn right-btn" nz-button nzType="primary" (click)="back()">返回</button>
 		</div>
     <div class="list-template__bottom" style="padding: 0 !important;">
       <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
         [nzLoading]="loading1">
         <thead>
           <tr class="thead">
-						<th nzWidth="9%">药品标识</th>
-            <th nzWidth="9%">药品名称</th>
-            <th nzWidth="9%">规格</th>
-						<th nzWidth="9%">消耗数量</th>
-						<th nzWidth="9%">原库存数</th>
-						<th nzWidth="9%">包装规格</th>
-						<th nzWidth="9%">发药箱数</th>
-						<th nzWidth="9%">实发数量</th>
-            <th nzWidth="9%">计算后库存</th>
-						<th nzWidth="7%">增减</th>
-            <th nzWidth="11%">操作</th>
+            <th nzWidth="25%">药品名称</th>
+            <th nzWidth="16%">规格</th>
+						<th nzWidth="8%">消耗量</th>
+						<th nzWidth="6%">原库存</th>
+						<th nzWidth="8%">包装规格</th>
+						<th nzWidth="8%">发药箱数</th>
+						<th nzWidth="5%">实发</th>
+            <th nzWidth="6%">新库存</th>
+						<th nzWidth="5%">增减</th>
+            <th nzWidth="13%">操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData">
-						<td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugCode:'-' }}</td>
-            <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugName:'-' }}</td>
+            <td nz-tooltip [nzTooltipTitle]="data.drugsInfoDTO.drugCode" style="position: relative;">
+							<div class="sign" *ngIf="data.giveOutType.value=='1'"></div>
+							{{ data.drugsInfoDTO?data.drugsInfoDTO.drugName:'-' }}
+						</td>
             <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.specs:'-' }}</td>
             <td>{{ data.expendCount||'0' }}</td>
             <td>{{ data.formerInventory || '0' }}</td>
             <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.packingSpecs:'0' }}</td>
-						<td>{{ data.cartonNum||'0' }}</td>
+						<td>{{ data.cartonNum || 0 }}</td> 
 						<td>{{ data.actualCount||'0' }}</td>
 						<td>{{ data.afterInventory||'0' }}</td>
 						<td>{{ data.addSub||'0' }}</td>
             <td>
               <div class="coop">
-                <span (click)="itemClick($event,data.id, 'add')">增加</span>
-								<span (click)="itemClick($event,data.id, 'del')">减少</span>
+                <span (click)="itemClick($event, data, 'add')">增发</span>
+								<!-- <span (click)="itemClick($event, data, 'del')">减少</span> -->
+								<span (click)="grantClick($event, data)">{{data.giveOutType.value=='2'?'单发':'箱发'}}</span>
 							</div>
             </td>
           </tr>
@@ -50,7 +52,7 @@
 			<h3 class="title">快速添加发药科室</h3>
 			<div class="right-template">
 			  <span class="label">科室：</span>
-			  <nz-select class="formItem" (ngModelChange)="deptChange($event)" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event, 'dept')" nzServerSearch nzShowSearch nzPlaceHolder="请选择科室" [(ngModel)]="department">
+			  <nz-select class="formItem" (ngModelChange)="deptChange($event)" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择科室" [(ngModel)]="department">
 			    <ng-container *ngFor="let option of hospitals1">
 			      <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
 			    </ng-container>
@@ -87,27 +89,28 @@
   <!-- 增加/减少 -->
   <div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
     <div class="modalBody">
-      <div class="title">{{add ? '增加' : '减少'}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+      <div class="title">增发<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
       </div>
       <overlay-scrollbars #osComponentRef1 class="content">
        <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
        	<nz-form-item *ngIf="add">
-       	  <nz-form-label nzRequired nzFor="addNum">增加数量</nz-form-label>
-       	  <nz-form-control nzErrorTip="请选择增加数量!">
+       	  <nz-form-label nzRequired nzFor="addNum">增发数量<span class="color-stylr"> (支持负数)</span></nz-form-label>
+       	  <nz-form-control nzErrorTip="请选择增发数量!">
        	    <nz-input-group>
        				<nz-input-number
 								nz-input
        					formControlName="addNum"
-       					[nzMin]="0"
+       					[nzMin]="-999999"
        					[nzPrecision]="0"
        					[nzMax]="999999"
        					[nzStep]="1"
-       					[nzPlaceHolder]="'请填写增加数量'"
+       					[nzPlaceHolder]="'请填写增发数量'"
        				 ></nz-input-number>
        			</nz-input-group>
        	  </nz-form-control>
        	</nz-form-item>
-				<nz-form-item *ngIf="!add">
+				<div *ngIf="rowData.giveOutType.value=='2'" style="text-align: left;" [ngClass]="{'red': isRight == false, 'green': isRight == true}">(消耗数+原库存数 + 增发数量) / 包装规格 = 1 (计算后数量必须是整数) </div>
+		<!-- 		<nz-form-item *ngIf="!add">
 				  <nz-form-label nzRequired nzFor="delNum">减少数量</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择减少数量!">
 				    <nz-input-group>
@@ -122,7 +125,7 @@
 							 ></nz-input-number>
 						</nz-input-group>
 				  </nz-form-control>
-				</nz-form-item>
+				</nz-form-item> -->
        </form>
       </overlay-scrollbars>
       <div class="display_flex justify-content_flex-center">
@@ -131,7 +134,9 @@
       </div>
     </div>
   </div>
-
+	<div class="mask-style" *ngIf="isSpinning">
+		<nz-spin nzSimple class="spin-style"></nz-spin>
+	</div>
 </div>
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
@@ -140,3 +145,8 @@
 <!-- 删除模态框 -->
   <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
     (confirmDelEvent)="confirmDel()" content="您确认要删除发药科室吗？"></app-dialog-delete>
+
+<!-- 单发/箱发 -->
+  <app-dialog-delete [delModal]="delGrantModal" (hideDelModalEvent)="hideGrantModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmGrantDel()" [content]="content"></app-dialog-delete>
+

src/app/views/dispensing-detail/dispensing-detail.component.less

@@ -61,8 +61,7 @@ h3{
 		border-radius: 5px;
 		border: 1px solid #e5e5e5;
 		.list-template__bottom{
-			height: auto;
-			max-height: 550px;
+			height: calc(100vh - 70px);
 			overflow-y: auto;
 		}
 	}
@@ -119,8 +118,7 @@ h3{
 			}
 			.dept-box{
 				margin-top: 20px;
-				height: auto;
-				max-height: 393px;
+				height: calc(100vh - 232px);
 				overflow-y: auto;
 				.dept-item{
 					display: flex;
@@ -334,6 +332,9 @@ h3{
 				}
 				
         .addForm {
+					.color-stylr{
+						color:red;
+					}
           .ant-form-item {
             margin-bottom: 14px;
 
@@ -383,3 +384,32 @@ h3{
 		}
 	}
 }
+
+.mask-style{
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 999;
+	display: flex;
+	background: rgba(0,0,0,0.2);
+	align-items: center;
+	justify-content: center;
+}
+.spin-style{
+	z-index:9999;
+}
+.sign{
+	width: 8px;
+	height: 8px;
+	border-radius: 50%;
+	background: red;
+	display: inline-block;
+}
+.red{
+	color: red;
+}
+.green{
+	color: #34b349;
+}

src/app/views/dispensing-detail/dispensing-detail.component.ts

@@ -39,11 +39,7 @@ export class DispensingDetailComponent implements OnInit {
   ngOnInit() {
     this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
 			this.isDeptLoading = true;
-			if(e[1]=='dept'){
-				this.getDeparts(e[0]);
-			}else{
-				this.getBuilding(e[0]);
-			}
+			this.getBuilding(e[0]);
     });
 		this.detailId = this.route.snapshot.params.id;
 		this.hosId = this.tool.getCurrentHospital().id;
@@ -91,6 +87,9 @@ export class DispensingDetailComponent implements OnInit {
 	deptName:null;
   //搜索父级科室
 	isDeptLoading = false;
+	isSpinning = false;
+	delGrantModal = false;
+	showInsp = false;
   changeInp(e, type) {
     this.searchParentDeptSubject.next([e, type]);
   }
@@ -140,8 +139,9 @@ export class DispensingDetailComponent implements OnInit {
 		  .subscribe((res) => {
 				if(res.list.length==0){
 					this.message.error(`您选择的科室“	${deptData.dept}”时间段内没有消耗药品无法添加发药单。`)
+				}else{
+					this.getDeptData(e,'all','load')
 				}
-				this.getDeptData(e,'all','load')
 		  });
 	}
 	
@@ -196,6 +196,7 @@ export class DispensingDetailComponent implements OnInit {
 		this.deptName = null
 		this.deptIndex = null
 		this.listOfData=[]
+		this.showInsp = true
 		this.getDeptData(e,'','')
 	}
 	
@@ -218,9 +219,13 @@ export class DispensingDetailComponent implements OnInit {
 		}else{
 			data.drugsList.buildingId = e
 		}
+		if(this.showInsp){
+			this.isSpinning = true
+		}
 		that.mainService
 		  .getFetchDataList("data", "drugsList", data)
 		  .subscribe((res) => {
+				this.isSpinning = false
 		    that.deptList = res.list;
 				if(initial=='load'){
 					if(res.list.length>0){
@@ -242,6 +247,7 @@ export class DispensingDetailComponent implements OnInit {
 	// 添加科室
 	addDept(){
 		if(this.addDeptId){
+			this.showInsp = true
 			this.getDispensingDept(this.addDeptId,'dept')
 		}else{
 			this.message.error('请先选择发药科室')
@@ -269,39 +275,91 @@ export class DispensingDetailComponent implements OnInit {
 	}
 	
 	// 获取所有科室
-  getDeparts(dept) {
-    var that = this;
+  getDeparts() {
     let data = {
-      department: {
-        dept,
-        hospital: {
-          id: this.hosId
-        },
-      },
-      idx: 0,
-      sum: 20,
+      batchId:this.detailId
     };
-    that.mainService
-      .getFetchDataList("data", "department", data)
-      .subscribe((data) => {
-				setTimeout(_=>{
-					that.isDeptLoading = false;
-					this.hospitals1 = data.list
-				},500)
+    this.mainService
+      .getConsumeDept(data)
+      .subscribe((res) => {
+				this.isDeptLoading = false;
+				this.hospitals1 = res.data
       });
   }
 	
   // 获取所有院区
   getAllHospital() {
-		this.getDeparts('')
+		this.getDeparts()
 		this.getBuilding('')
 		this.getDeptData('','all','load')
+		this.getDicData()
   }
 	
+	// 获取单发箱发字典
+	dicData = [];
+	getDicData(){
+		this.mainService.getDictionary("list", "give_out_type").subscribe((res) => {
+			this.dicData = res
+		});
+	}
+	
+	// 单发/箱发
+	content = '';
+	giveName = '';
+	grantClick(e, data){
+		this.rowId = data.id
+		this.giveName = data.giveOutType.value
+		if(data.giveOutType.value==1){
+			this.content = `您确认要修改发药类型为箱发吗？`
+		}else{
+			this.content = `您确认要修改发药类型为单发吗？`
+		}
+		this.delGrantModal = true
+	}
+	
+	// 修改发放类型
+	confirmGrantDel(){
+		var that = this;
+		let list = null;
+		console.log(11,this.dicData)
+		if(this.giveName=='1'){
+			list = this.dicData.find(i=>i.value == '2')
+		}else{
+			list = this.dicData.find(i=>i.value == '1')
+		}
+		let data = {
+			id:this.rowId,
+			deptId:this.deptId,
+			giveOutType:{
+				id:list.id
+			}
+		};
+		that.btnLoading = true;
+		that.mainService
+		  .simplePost("addData", "drugsConfigure", data)
+		  .subscribe((data) => {
+		    that.btnLoading = false;
+		    that.hideGrantModal();
+				this.getList()
+		    if (data.status == 200) {
+		      that.showPromptModal("修改", true, "");
+		    } else {
+		      that.showPromptModal("修改", false, data.msg);
+		    }
+		  });
+	}
+	
+	hideGrantModal(){
+		this.delGrantModal = false;
+	}
+	
 	// 增加/减少
-	itemClick(e, id, type){
+	rowData = null;
+	itemClick(e, data, type){
+		this.isRight = null;
 		e.stopPropagation();
-		this.rowId = id
+		this.rowId = data.id
+		this.rowData = data
 		if(type=='add'){
 			this.add = true
 		}else{
@@ -312,6 +370,7 @@ export class DispensingDetailComponent implements OnInit {
 	}
 	
 	// 表单提交
+	isRight = null;
 	submitForm(): void {
 	  var that = this;
 		for (const i in that.validateForm.controls) {
@@ -320,12 +379,23 @@ export class DispensingDetailComponent implements OnInit {
 		}
 		if (that.validateForm.invalid) return;
 	  let data = {
-			addSub:this.add?this.validateForm.value.addNum:this.validateForm.value.delNum,
+			addSub:this.validateForm.value.addNum,
 			id:this.rowId,
 			hosId:this.hosId,
 			deptId:this.deptId,
-			upType:that.add ? 'add' : 'sub'
 	  };
+		if(this.rowData.giveOutType.value==2){
+			let num1 = Number(this.rowData.expendCount) + Number(this.rowData.formerInventory) + Number(data.addSub)
+			let num2 = num1 / this.rowData.drugsInfoDTO.packingSpecs
+			if(num2 % 1 === 0){
+				this.isRight = true
+			}else{
+				this.isRight = false
+				this.message.error('数量错误，请重新填写！')
+				return
+			}
+		}
+		that.btnLoading = true;
 	  that.mainService
 	    .simplePost("addData", "drugsConfigure", data)
 	    .subscribe((data) => {

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

@@ -187,6 +187,7 @@ export class DrugInfoComponent implements OnInit {
     }else{
 			delete data.id
 		}
+		that.btnLoading = true;
     that.mainService
       .simplePost("addData", "drugsInfo", data)
       .subscribe((data) => {

src/app/views/medical-waste-department-statistics/medical-waste-department-statistics.component.html

@@ -65,26 +65,39 @@
         <!-- <button nz-button class="btn default ml8" (click)='exportDetail()' [nzLoading]="loading3" [disabled]="!checkedDepIds.length">批量导出详细科室报表</button> -->
       </div>
     </div>
+		<div class="cont">
+		  <div>
+		    <span>总计</span>
+		    <span class="rate"></span>
+		  </div>
+		  <div>
+		    <span>科室数</span>
+		    <span>{{summary[0] || 0}}</span>
+		  </div>
+		  <div>
+		    <span>总重量(kg)</span>
+		    <span>{{summary[1] || 0}}</span>
+		  </div>
+		  <div *ngFor="let item of heads;let index=index;">
+		    <span>{{item}}(kg)</span>
+				<span>{{summary[index+2] || 0}}</span>
+		  </div>
+		</div>
     <div class="list-template__bottom">
       <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
         [nzLoading]="loading1">
         <thead (nzSortChange)="sort($event)" nzSingleSort>
           <tr class="thead">
-            <!-- <th nzWidth="5%" nzShowCheckbox [(nzChecked)]="isAllDisplayDataChecked"
-              (nzCheckedChange)="checkAll($event)"></th> -->
             <th>序号</th>
             <th>科室名称</th>
-            <th>总重量(kg)</th>
+            <th nzShowSort nzSortKey="totalWeight" [(nzSort)]="sortCurrent.totalWeight">总重量(kg)</th>
             <th *ngFor="let data of heads">{{data}}(kg)</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;" (click)="selectedListData(data)">
-            <!-- <td nzShowCheckbox [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="refreshStatus()"></td> -->
             <td>{{ index+(pageIndex-1) * pageSize + 1 }}</td>
-            <td>{{ data.dept }}</td>
-            <td>{{ data.totalWeight }}</td>
-            <td *ngFor="let weight of data.typeWeightList">{{ weight }}</td>
+            <td *ngFor="let item of data;">{{ item }}</td>
           </tr>
         </tbody>
       </nz-table>

src/app/views/medical-waste-department-statistics/medical-waste-department-statistics.component.less

@@ -4,6 +4,55 @@
   color: #fff !important;
 }
 
+.cont {
+  width: 100%;
+  border: 1px solid #dde1e5;
+  padding: 8px 16px;
+  border-radius: 2px;
+  margin-bottom: 8px;
+
+  &>div {
+    display: inline-block;
+    margin-right: 4px;
+
+    &:nth-child(1) {
+      position: relative;
+      padding-left: 10px;
+
+      &::before {
+        content: '';
+        position: absolute;
+        left: 0;
+        width: 4px;
+        height: 100%;
+        background: @primary-color;
+        margin-right: 8px;
+      }
+    }
+
+    span {
+      margin-right: 8px;
+
+      &:nth-child(1) {
+        font-size: 12px;
+        color: #999;
+      }
+
+      &:nth-child(2) {
+        color: #333;
+        font-weight: 500;
+      }
+
+      &.rate {
+        font-size: 18px;
+        color: @primary-color;
+      }
+    }
+
+
+  }
+}
+
 .save {
   position: fixed;
   left: 0;

src/app/views/medical-waste-department-statistics/medical-waste-department-statistics.component.ts

@@ -221,11 +221,7 @@ export class MedicalWasteDepartmentStatisticsComponent implements OnInit {
     this.sortCurrentKey = "";
     this.sortCurrentValue = "";
     this.sortCurrent = {
-      clothesTypeNum: null,
-      getOrder: null,
-      sendOrder: null,
-      sendClothesNum: null,
-      price: null,
+      totalWeight: null
     };
     this.searchDto = {
       dept: null,
@@ -261,8 +257,23 @@ export class MedicalWasteDepartmentStatisticsComponent implements OnInit {
     });
     this.refreshStatus();
   }
+	
+	// 列表排序
+	sortCurrent = {
+	  totalWeight: null,
+	};
+	sortCurrentKey: string = "";
+	sortCurrentValue: string | null = "";
+	sort(e) {
+	  const { key, value } = e;
+	  this.sortCurrentKey = key;
+	  this.sortCurrentValue = value;
+	  this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+	}
+	
   // 表格数据
   loading1 = false;
+	summary = {};
   getList(num?: number, field?: string, sort?: string) {
     this.mapOfCheckedId = {};
     this.checkedDepIds = [];
@@ -279,13 +290,14 @@ export class MedicalWasteDepartmentStatisticsComponent implements OnInit {
       buildingId: this.searchDto.building || undefined,
     };
     if (field && sort) {
-      postData.sort = sort === "ascend" ? field : `${field} desc`;
+      postData.sort = sort === "ascend" ? `${field} asc` : `${field} desc`;
     }
     this.loading1 = true;
     this.mainService
       .postCustom("report/medicalWaste", "dept", postData)
       .subscribe((result) => {
         this.loading1 = false;
+				this.summary = result.summary[0] || {}
         this.listOfData = result.list || [];
         this.heads = result.heads || [];
         this.listLength = result.totalNum;
@@ -592,20 +604,4 @@ export class MedicalWasteDepartmentStatisticsComponent implements OnInit {
     this.isLoading = true;
     this.searchTimerSubject.next([fun, e]);
   }
-  // 列表排序
-  sortCurrent = {
-    clothesTypeNum: null,
-    getOrder: null,
-    sendOrder: null,
-    sendClothesNum: null,
-    price: null,
-  };
-  sortCurrentKey: string = "";
-  sortCurrentValue: string | null = "";
-  sort(e) {
-    const { key, value } = e;
-    this.sortCurrentKey = key;
-    this.sortCurrentValue = value;
-    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
-  }
 }

src/app/views/medical-waste-hospital-statistics/medical-waste-hospital-statistics.component.html

@@ -55,22 +55,35 @@
         <div echarts class="echart" [options]='barChartOption'></div>
       </div>
     </div>
+		<div class="cont">
+		  <div>
+		    <span>总计</span>
+		    <span class="rate"></span>
+		  </div>
+		  <div>
+		    <span>{{dataType=='outbound'?'出库':'回收'}}总重量(kg)</span>
+		    <span>{{summary[0] || 0}}</span>
+		  </div>
+		  <div *ngFor="let item of heads;let index=index;">
+		    <span>{{item}}(kg)</span>
+		  	<span>{{summary[index+1] || 0}}</span>
+		  </div>
+		</div>
     <div class="list-template__bottom">
       <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
         [nzLoading]="loading1">
-        <!-- <thead (nzSortChange)="sort($event)" nzSingleSort> -->
         <thead>
           <tr class="thead">
             <th>序号</th>
             <th>日期</th>
+						<th>{{dataType=='outbound'?'出库':'回收'}}总重量(kg)</th>
             <th *ngFor="let data of heads">{{data}}(kg)</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;">
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.date }}</td>
-            <td *ngFor="let weight of data.typeWeightList">{{ weight }}</td>
+            <td *ngFor="let item of data;">{{ item }}</td>
           </tr>
         </tbody>
       </nz-table>

src/app/views/medical-waste-hospital-statistics/medical-waste-hospital-statistics.component.less

@@ -4,6 +4,55 @@
   color: #fff !important;
 }
 
+.cont {
+  width: 100%;
+  border: 1px solid #dde1e5;
+  padding: 8px 16px;
+  border-radius: 2px;
+  margin-bottom: 8px;
+
+  &>div {
+    display: inline-block;
+    margin-right: 4px;
+
+    &:nth-child(1) {
+      position: relative;
+      padding-left: 10px;
+
+      &::before {
+        content: '';
+        position: absolute;
+        left: 0;
+        width: 4px;
+        height: 100%;
+        background: @primary-color;
+        margin-right: 8px;
+      }
+    }
+
+    span {
+      margin-right: 8px;
+
+      &:nth-child(1) {
+        font-size: 12px;
+        color: #999;
+      }
+
+      &:nth-child(2) {
+        color: #333;
+        font-weight: 500;
+      }
+
+      &.rate {
+        font-size: 18px;
+        color: @primary-color;
+      }
+    }
+
+
+  }
+}
+
 .save {
   position: fixed;
   left: 0;

src/app/views/medical-waste-hospital-statistics/medical-waste-hospital-statistics.component.ts

@@ -316,6 +316,7 @@ export class MedicalWasteHospitalStatisticsComponent implements OnInit {
   loading1 = false;
   pieChart: any = [];
   barChart: any = [];
+	summary = {};
   getList(num?: number, field?: string, sort?: string) {
     let maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,
@@ -339,6 +340,7 @@ export class MedicalWasteHospitalStatisticsComponent implements OnInit {
       .subscribe((result) => {
         this.message.remove(maskFlag);
         this.loading1 = false;
+				this.summary = result.summary[0] || {}
         this.heads = result.heads || [];
         this.listOfData = result.list || [];
         this.listLength = result.totalNum;

src/app/views/medical-waste-personnel-statistics/medical-waste-personnel-statistics.component.html

@@ -58,16 +58,38 @@
         <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
       </div>
     </div>
+		<div class="cont">
+		  <div>
+		    <span>总计</span>
+		    <span class="rate"></span>
+		  </div>
+		  <div>
+		    <span>总人数</span>
+		    <span>{{summary.personalNum || 0}}</span>
+		  </div>
+		  <div>
+		    <span>总趟数</span>
+		    <span>{{summary.totalTrip || 0}}</span>
+		  </div>
+		  <div>
+		    <span>总单数</span>
+		    <span>{{summary.totalOrder || 0}}</span>
+		  </div>
+		  <div>
+		    <span>总重量</span>
+		    <span>{{summary.totalWeight || 0}}</span>
+		  </div>
+		</div>
     <div class="list-template__bottom">
       <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
         [nzLoading]="loading1">
         <thead (nzSortChange)="sort($event)" nzSingleSort>
           <tr class="thead">
-            <th nzWidth="5%">序号</th>
-            <th nzWidth="5%">人员姓名</th>
-            <th nzWidth="30%">总趟数</th>
-            <th nzWidth="30%">总单数</th>
-            <th nzWidth="30%">总重量(KG)</th>
+            <th nzWidth="6%">序号</th>
+            <th nzWidth="10%">人员姓名</th>
+            <th nzWidth="28%" nzShowSort nzSortKey="totalTrip" [(nzSort)]="sortCurrent.totalTrip">总趟数</th>
+            <th nzWidth="28%" nzShowSort nzSortKey="totalOrder" [(nzSort)]="sortCurrent.totalOrder">总单数</th>
+            <th nzWidth="28%" nzShowSort nzSortKey="totalWeight" [(nzSort)]="sortCurrent.totalWeight">总重量(KG)</th>
           </tr>
         </thead>
         <tbody>

src/app/views/medical-waste-personnel-statistics/medical-waste-personnel-statistics.component.less

@@ -4,6 +4,55 @@
   color: #fff !important;
 }
 
+.cont {
+  width: 100%;
+  border: 1px solid #dde1e5;
+  padding: 8px 16px;
+  border-radius: 2px;
+  margin-bottom: 8px;
+
+  &>div {
+    display: inline-block;
+    margin-right: 4px;
+
+    &:nth-child(1) {
+      position: relative;
+      padding-left: 10px;
+
+      &::before {
+        content: '';
+        position: absolute;
+        left: 0;
+        width: 4px;
+        height: 100%;
+        background: @primary-color;
+        margin-right: 8px;
+      }
+    }
+
+    span {
+      margin-right: 8px;
+
+      &:nth-child(1) {
+        font-size: 12px;
+        color: #999;
+      }
+
+      &:nth-child(2) {
+        color: #333;
+        font-weight: 500;
+      }
+
+      &.rate {
+        font-size: 18px;
+        color: @primary-color;
+      }
+    }
+
+
+  }
+}
+
 .save {
   position: fixed;
   left: 0;

src/app/views/medical-waste-personnel-statistics/medical-waste-personnel-statistics.component.ts

@@ -214,10 +214,7 @@ export class MedicalWastePersonnelStatisticsComponent implements OnInit {
     this.sortCurrent = {
       totalTrip: null,
       totalOrder: null,
-      getTrip: null,
-      getOrder: null,
-      sendTrip: null,
-      sendOrder: null,
+      totalWeight: null
     };
     this.searchDto = {
       group: null,
@@ -225,8 +222,30 @@ export class MedicalWastePersonnelStatisticsComponent implements OnInit {
     }
     this.changeDateType("day");
   }
+	
+	// 列表排序
+	sortCurrent = {
+	  totalTrip: null,
+	  totalOrder: null,
+	  totalWeight: null,
+	};
+	sortCurrentKey: string = "";
+	sortCurrentValue: string | null = "";
+	sort(e) {
+	  const { key, value } = e;
+	  this.sortCurrentKey = key;
+	  this.sortCurrentValue = value;
+	  this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+	}
+	
   // 表格数据
   loading1 = false;
+	summary = {
+		personalNum:null,
+		totalTrip:null,
+		totalOrder:null,
+		totalWeight:null,
+	};
   getList(num?: number, field?: string, sort?: string) {
     this.pageIndex = num;
     let postData: any = {
@@ -240,13 +259,14 @@ export class MedicalWastePersonnelStatisticsComponent implements OnInit {
       groupId: this.searchDto.group || undefined,
     };
     if (field && sort) {
-      postData.sort = sort === "ascend" ? field : `${field} desc`;
+      postData.sort = sort === "ascend" ? `${field} asc` : `${field} desc`;
     }
     this.loading1 = true;
     this.mainService
       .postCustom("report/medicalWaste", "personal", postData)
       .subscribe((result) => {
         this.loading1 = false;
+				this.summary = result.summary || {}
         this.listOfData = result.list || [];
         this.listLength = result.totalNum;
       });
@@ -500,21 +520,4 @@ export class MedicalWastePersonnelStatisticsComponent implements OnInit {
     this.isLoading = true;
     this.searchTimerSubject.next([fun, e]);
   }
-  // 列表排序
-  sortCurrent = {
-    totalTrip: null,
-    totalOrder: null,
-    getTrip: null,
-    getOrder: null,
-    sendTrip: null,
-    sendOrder: null,
-  };
-  sortCurrentKey: string = "";
-  sortCurrentValue: string | null = "";
-  sort(e) {
-    const { key, value } = e;
-    this.sortCurrentKey = key;
-    this.sortCurrentValue = value;
-    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
-  }
 }

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

@@ -24,7 +24,7 @@ export class OfficeDetailComponent implements OnInit {
     this.getDetail();
   }
   hideModal() {
-    this.router.navigateByUrl("/main/dispensingBatch");
+    this.router.navigateByUrl("/main/officeManagement");
   }
 
   // 获取详情

src/app/views/order-statistics/order-statistics.component.html

@@ -46,35 +46,24 @@
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
-            <th nzWidth="15%">时间</th>
-            <th nzWidth="10%">工单总量</th>
-            <th nzWidth="10%">标本数量</th>
-            <th nzWidth="10%">标本轮巡数量</th>
-            <th nzWidth="10%">患者陪检数量</th>
-            <th nzWidth="10%">药品数量</th>
-            <th nzWidth="10%">静配数量</th>
-            <th nzWidth="10%">患者转运数量</th>
-            <th nzWidth="10%">其他数量</th>
+            <th nzWidth="10%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date" (nzSortChange)="sort('date',$event)">时间</th>
+            <th nzShowSort nzSortKey="total" [(nzSort)]="sortCurrent.total" (nzSortChange)="sort('total',$event)">工单总量</th>
+						<th *ngFor="let item of listOfHeads; let index=index;" (nzSortChange)="sort(item.dataSort,$event)"
+							nzShowSort [(nzSort)]="item.sortName"
+							>{{item.name}}</th>
+            <th nzShowSort nzSortKey="other" [(nzSort)]="sortCurrent.other" (nzSortChange)="sort('other',$event)">其他数量</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;">
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.date }}</td>
-            <td>{{ data.total||0}}</td>
-            <td>{{data.speCount||0}}</td>
-            <td>{{data.spePlanCount||0}}</td>
-            <td>{{data.insCount||0}}</td>
-            <td>{{data.drugsCount||0}}</td>
-            <td>{{data.jpCount||0}}</td>
-            <td>{{data.transCount||0}}</td>
-            <td>{{data.otherCount||0}}</td>
+            <td *ngFor="let item of data;">{{ item }}</td>
           </tr>
         </tbody>
       </nz-table>
       <div class="list-template__pagination">
         <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
-          (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+          (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue,'forbid')" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue,'forbid')">
         </nz-pagination>
       </div>
     </div>

src/app/views/order-statistics/order-statistics.component.ts

@@ -155,11 +155,31 @@ export class OrderStatisticsComponent implements OnInit {
   reset() {
     this.changeDateType("day");
     this.changeDateRange("1");
+		this.sortCurrent = {
+		  date: null,
+		  total: null,
+			other: null,
+		};
     this.search();
   }
+	
+	// 列表排序
+	sortCurrent = {
+	  date: null,
+	  total: null,
+		other: null,
+	};
+	sortCurrentKey: string = "";
+	sortCurrentValue: string | null = "";
+	sort(name,e) {
+	  this.sortCurrentKey = name;
+	  this.sortCurrentValue = e || '';
+	  this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue,'forbid');
+	}
   // 表格数据
   loading1 = false;
-  getList(num?: number) {
+	listOfHeads = [];
+  getList(num?: number, field?: string, sort?: string, type?: string) {
     if (num !== undefined) {
       this.pageIndex = num;
     }
@@ -170,12 +190,24 @@ export class OrderStatisticsComponent implements OnInit {
       endTime: this.searchData.dateRange.end,
       hosId: this.searchData.hosId,
       type: this.dateType,
+			sort:null
     };
+		if (field && sort) {
+		  postData.sort = sort === "ascend" ? `${field} asc` : `${field} desc`;
+		}
     this.loading1 = true;
     this.mainService
       .postCustom("report", "workOrder", postData)
       .subscribe((result) => {
         this.loading1 = false;
+				let header = result.heads
+				if(!type){
+					for(let i in header){
+						header[i].dataSort = 'data'+i
+						header[i].sortName = null
+					}
+					this.listOfHeads = header || [];
+				}
         this.listOfData = result.list || [];
         this.listLength = result.totalNum;
       });

src/app/views/quilt-washing-department-statistics/quilt-washing-department-statistics.component.html

@@ -65,10 +65,40 @@
         <button nz-button class="btn default ml8" (click)='exportDetail()' [nzLoading]="loading3" [disabled]="!checkedDepIds.length">批量导出详细科室报表</button>
       </div>
     </div>
+		<div class="cont">
+		  <div>
+		    <span>总计</span>
+		    <span class="rate"></span>
+		  </div>
+		  <div>
+		    <span>科室数</span>
+		    <span>{{summary.deptNum || 0}}</span>
+		  </div>
+		  <div>
+		    <span>送回被服种类数</span>
+		    <span>{{summary.clothesTypeTotalNum || 0}}</span>
+		  </div>
+		  <div>
+		    <span>回收单数</span>
+		    <span>{{summary.getOrderTotal || 0}}</span>
+		  </div>
+		  <div>
+		    <span>送回单数</span>
+		    <span>{{summary.sendOrderTotal || 0}}</span>
+		  </div>
+		  <div>
+		    <span>洗涤被服数量</span>
+		    <span>{{summary.sendClothesTotalNum || 0}}</span>
+		  </div>
+		  <div>
+		    <span>总费用</span>
+		    <span>{{summary.totalPrice || 0}}</span>
+		  </div>
+		</div>
     <div class="list-template__bottom">
       <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
         [nzLoading]="loading1">
-        <thead (nzSortChange)="sort($event)" nzSingleSort>
+        <thead nzSingleSort>
           <tr class="thead">
             <th nzWidth="5%" nzShowCheckbox [(nzChecked)]="isAllDisplayDataChecked"
               (nzCheckedChange)="checkAll($event)"></th>
@@ -79,11 +109,11 @@
             <th nzShowSort nzWidth="15%" nzSortKey="sendOrder" [(nzSort)]="sortCurrent.sendOrder">送回单数</th>
             <th nzShowSort nzWidth="15%" nzSortKey="sendClothesNum" [(nzSort)]="sortCurrent.sendClothesNum">洗涤被服数量</th>
             <th nzShowSort nzWidth="15%" nzSortKey="price" [(nzSort)]="sortCurrent.price">费用(元)</th> -->
-            <th nzWidth="15%">送回被服种类数</th>
+            <th nzWidth="15%" nzShowSort nzSortKey="clothesTypeNum" [(nzSort)]="sortCurrent.clothesTypeNum" (nzSortChange)="sort('clothesTypeNum',$event)">送回被服种类数</th>
             <th nzWidth="15%">回收单数</th>
             <th nzWidth="15%">送回单数</th>
-            <th nzWidth="15%">洗涤被服数量</th>
-            <th nzWidth="15%">费用(元)</th>
+            <th nzWidth="15%" nzShowSort nzSortKey="sendBackNum" [(nzSort)]="sortCurrent.sendBackNum" (nzSortChange)="sort('sendBackNum',$event)">洗涤被服数量</th>
+            <th nzWidth="15%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice" (nzSortChange)="sort('totalPrice',$event)">费用(元)</th>
           </tr>
         </thead>
         <tbody>

src/app/views/quilt-washing-department-statistics/quilt-washing-department-statistics.component.less

@@ -4,6 +4,55 @@
   color: #fff !important;
 }
 
+.cont {
+  width: 100%;
+  border: 1px solid #dde1e5;
+  padding: 8px 16px;
+  border-radius: 2px;
+  margin-bottom: 8px;
+
+  &>div {
+    display: inline-block;
+    margin-right: 4px;
+
+    &:nth-child(1) {
+      position: relative;
+      padding-left: 10px;
+
+      &::before {
+        content: '';
+        position: absolute;
+        left: 0;
+        width: 4px;
+        height: 100%;
+        background: @primary-color;
+        margin-right: 8px;
+      }
+    }
+
+    span {
+      margin-right: 8px;
+
+      &:nth-child(1) {
+        font-size: 12px;
+        color: #999;
+      }
+
+      &:nth-child(2) {
+        color: #333;
+        font-weight: 500;
+      }
+
+      &.rate {
+        font-size: 18px;
+        color: @primary-color;
+      }
+    }
+
+
+  }
+}
+
 .save {
   position: fixed;
   left: 0;

src/app/views/quilt-washing-department-statistics/quilt-washing-department-statistics.component.ts

@@ -221,10 +221,8 @@ export class QuiltWashingDepartmentStatisticsComponent implements OnInit {
     this.sortCurrentValue = "";
     this.sortCurrent = {
       clothesTypeNum: null,
-      getOrder: null,
-      sendOrder: null,
-      sendClothesNum: null,
-      price: null,
+      sendBackNum: null,
+			totalPrice: null,
     };
     this.searchDto = {
       dept: null,
@@ -260,8 +258,31 @@ export class QuiltWashingDepartmentStatisticsComponent implements OnInit {
     });
     this.refreshStatus();
   }
+	
+	// 列表排序
+	sortCurrent = {
+		clothesTypeNum: null,
+		sendBackNum: null,
+		totalPrice: null,
+	};
+	sortCurrentKey: string = "";
+	sortCurrentValue: string | null = "";
+	sort(name,e) {
+		this.sortCurrentKey = name;
+		this.sortCurrentValue = e || '';
+		this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+	}
+	
   // 表格数据
   loading1 = false;
+	summary = {
+		deptNum:null,
+		clothesTypeTotalNum:null,
+		getOrderTotal:null,
+		sendOrderTotal:null,
+		sendClothesTotalNum:null,
+		totalPrice:null,
+	};
   getList(num?: number, field?: string, sort?: string) {
     this.mapOfCheckedId = {};
     this.checkedDepIds = [];
@@ -278,13 +299,14 @@ export class QuiltWashingDepartmentStatisticsComponent implements OnInit {
       buildingId: this.searchDto.building || undefined,
     };
     if (field && sort) {
-      postData.sort = sort === "ascend" ? field : `${field} desc`;
+      postData.sort = sort === "ascend" ? `${field} asc` : `${field} desc`;
     }
     this.loading1 = true;
     this.mainService
       .postCustom("report/clothes", "dept", postData)
       .subscribe((result) => {
         this.loading1 = false;
+				this.summary = result.summary || {}
         this.listOfData = result.list || [];
         this.listLength = result.totalNum;
       });
@@ -590,20 +612,4 @@ export class QuiltWashingDepartmentStatisticsComponent implements OnInit {
     this.isLoading = true;
     this.searchTimerSubject.next([fun, e]);
   }
-  // 列表排序
-  sortCurrent = {
-    clothesTypeNum: null,
-    getOrder: null,
-    sendOrder: null,
-    sendClothesNum: null,
-    price: null,
-  };
-  sortCurrentKey: string = "";
-  sortCurrentValue: string | null = "";
-  sort(e) {
-    const { key, value } = e;
-    this.sortCurrentKey = key;
-    this.sortCurrentValue = value;
-    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
-  }
 }

src/app/views/quilt-washing-hospital-statistics/quilt-washing-hospital-statistics.component.html

@@ -40,6 +40,36 @@
         <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
       </div>
     </div>
+		<div class="cont">
+		  <div>
+		    <span>总计</span>
+		    <span class="rate"></span>
+		  </div>
+		  <div>
+		    <span>送回科室数</span>
+		    <span>{{summary.deptNum || 0}}</span>
+		  </div>
+		  <div>
+		    <span>送回被服种类数</span>
+		    <span>{{summary.clothesTypeTotalNum || 0}}</span>
+		  </div>
+		  <div>
+		    <span>回收工单数</span>
+		    <span>{{summary.getOrderTotal || 0}}</span>
+		  </div>
+		  <div>
+		    <span>送回工单数</span>
+		    <span>{{summary.sendOrderTotal || 0}}</span>
+		  </div>
+		  <div>
+		    <span>洗涤数量</span>
+		    <span>{{summary.sendClothesTotalNum || 0}}</span>
+		  </div>
+		  <div>
+		    <span>总费用</span>
+		    <span>{{summary.totalPrice || 0}}</span>
+		  </div>
+		</div>
     <div class="list-template__bottom">
       <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
         [nzLoading]="loading1">

src/app/views/quilt-washing-hospital-statistics/quilt-washing-hospital-statistics.component.less

@@ -4,6 +4,55 @@
   color: #fff !important;
 }
 
+.cont {
+  width: 100%;
+  border: 1px solid #dde1e5;
+  padding: 8px 16px;
+  border-radius: 2px;
+  margin-bottom: 8px;
+
+  &>div {
+    display: inline-block;
+    margin-right: 4px;
+
+    &:nth-child(1) {
+      position: relative;
+      padding-left: 10px;
+
+      &::before {
+        content: '';
+        position: absolute;
+        left: 0;
+        width: 4px;
+        height: 100%;
+        background: @primary-color;
+        margin-right: 8px;
+      }
+    }
+
+    span {
+      margin-right: 8px;
+
+      &:nth-child(1) {
+        font-size: 12px;
+        color: #999;
+      }
+
+      &:nth-child(2) {
+        color: #333;
+        font-weight: 500;
+      }
+
+      &.rate {
+        font-size: 18px;
+        color: @primary-color;
+      }
+    }
+
+
+  }
+}
+
 .save {
   position: fixed;
   left: 0;

src/app/views/quilt-washing-hospital-statistics/quilt-washing-hospital-statistics.component.ts

@@ -168,6 +168,14 @@ export class QuiltWashingHospitalStatisticsComponent implements OnInit {
   }
   // 表格数据
   loading1 = false;
+	summary = {
+		deptNum:null,
+		clothesTypeTotalNum:null,
+		getOrderTotal:null,
+		sendOrderTotal:null,
+		sendClothesTotalNum:null,
+		totalPrice:null,
+	};
   getList(num?: number, field?: string, sort?: string) {
     this.pageIndex = num;
     let postData: any = {
@@ -186,6 +194,7 @@ export class QuiltWashingHospitalStatisticsComponent implements OnInit {
       .postCustom("report/clothes", "hospital", postData)
       .subscribe((result) => {
         this.loading1 = false;
+				this.summary = result.summary || {}
         this.listOfData = result.list || [];
         this.listLength = result.totalNum;
       });

src/app/views/quilt-washing-personnel-statistics/quilt-washing-personnel-statistics.component.html

@@ -58,21 +58,55 @@
         <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
       </div>
     </div>
+		<div class="cont">
+		  <div>
+		    <span>总计</span>
+		    <span class="rate"></span>
+		  </div>
+		  <div>
+		    <span>人员数量</span>
+		    <span>{{summary.personTotal || 0}}</span>
+		  </div>
+		  <div>
+		    <span>总趟数</span>
+		    <span>{{summary.tripTotal || 0}}</span>
+		  </div>
+		  <div>
+		    <span>总单数</span>
+		    <span>{{summary.orderTotal || 0}}</span>
+		  </div>
+		  <div>
+		    <span>回收趟数</span>
+		    <span>{{summary.getTripTotal || 0}}</span>
+		  </div>
+		  <div>
+		    <span>回收工单数</span>
+		    <span>{{summary.getOrderTotal || 0}}</span>
+		  </div>
+		  <div>
+		    <span>送回趟数</span>
+		    <span>{{summary.sendTripTotal || 0}}</span>
+		  </div>
+		  <div>
+		    <span>送回工单数</span>
+		    <span>{{summary.sendOrderTotal || 0}}</span>
+		  </div>
+		</div>
     <div class="list-template__bottom">
       <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
         [nzLoading]="loading1">
-        <thead (nzSortChange)="sort($event)" nzSingleSort>
+        <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
-            <th nzWidth="5%">人员姓名</th>
+            <th nzWidth="10%">人员姓名</th>
             <!-- <th nzShowSort nzWidth="15%" nzSortKey="totalTrip" [(nzSort)]="sortCurrent.totalTrip">总趟数</th>
             <th nzShowSort nzWidth="15%" nzSortKey="totalOrder" [(nzSort)]="sortCurrent.totalOrder">总单数</th>
             <th nzShowSort nzWidth="15%" nzSortKey="getTrip" [(nzSort)]="sortCurrent.getTrip">回收趟数</th>
             <th nzShowSort nzWidth="15%" nzSortKey="getOrder" [(nzSort)]="sortCurrent.getOrder">回收工单数</th>
             <th nzShowSort nzWidth="15%" nzSortKey="sendTrip" [(nzSort)]="sortCurrent.sendTrip">送回趟数</th>
             <th nzShowSort nzWidth="15%" nzSortKey="sendOrder" [(nzSort)]="sortCurrent.sendOrder">送回工单数</th> -->
-            <th nzWidth="15%">总趟数</th>
-            <th nzWidth="15%">总单数</th>
+            <th nzWidth="15%" nzShowSort nzSortKey="totalTrip" [(nzSort)]="sortCurrent.totalTrip" (nzSortChange)="sort('totalTrip',$event)">总趟数</th>
+            <th nzWidth="15%" nzShowSort nzSortKey=" totalOrder" [(nzSort)]="sortCurrent. totalOrder" (nzSortChange)="sort('totalOrder',$event)">总单数</th>
             <th nzWidth="15%">回收趟数</th>
             <th nzWidth="15%">回收工单数</th>
             <th nzWidth="15%">送回趟数</th>

src/app/views/quilt-washing-personnel-statistics/quilt-washing-personnel-statistics.component.less

@@ -4,6 +4,55 @@
   color: #fff !important;
 }
 
+.cont {
+  width: 100%;
+  border: 1px solid #dde1e5;
+  padding: 8px 16px;
+  border-radius: 2px;
+  margin-bottom: 8px;
+
+  &>div {
+    display: inline-block;
+    margin-right: 4px;
+
+    &:nth-child(1) {
+      position: relative;
+      padding-left: 10px;
+
+      &::before {
+        content: '';
+        position: absolute;
+        left: 0;
+        width: 4px;
+        height: 100%;
+        background: @primary-color;
+        margin-right: 8px;
+      }
+    }
+
+    span {
+      margin-right: 8px;
+
+      &:nth-child(1) {
+        font-size: 12px;
+        color: #999;
+      }
+
+      &:nth-child(2) {
+        color: #333;
+        font-weight: 500;
+      }
+
+      &.rate {
+        font-size: 18px;
+        color: @primary-color;
+      }
+    }
+
+
+  }
+}
+
 .save {
   position: fixed;
   left: 0;

src/app/views/quilt-washing-personnel-statistics/quilt-washing-personnel-statistics.component.ts

@@ -214,10 +214,6 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
     this.sortCurrent = {
       totalTrip: null,
       totalOrder: null,
-      getTrip: null,
-      getOrder: null,
-      sendTrip: null,
-      sendOrder: null,
     };
     this.searchDto = {
       group: null,
@@ -225,8 +221,29 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
     }
     this.changeDateType("day");
   }
+	// 列表排序
+	sortCurrent = {
+		totalTrip: null,
+		totalOrder: null,
+	};
+	sortCurrentKey: string = "";
+	sortCurrentValue: string | null = "";
+	sort(name,e) {
+		this.sortCurrentKey = name;
+		this.sortCurrentValue = e || '';
+		this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+	}
   // 表格数据
   loading1 = false;
+	summary = {
+		personTotal:null,
+		tripTotal:null,
+		orderTotal:null,
+		getTripTotal:null,
+		getOrderTotal:null,
+		sendTripTotal:null,
+		sendOrderTotal:null,
+	};
   getList(num?: number, field?: string, sort?: string) {
     this.pageIndex = num;
     let postData: any = {
@@ -237,16 +254,17 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
       hosId: this.searchData.hosId,
       type: this.dateType,
       userId: this.searchDto.user || undefined,
-      groupId: this.searchDto.group || undefined,
+      groupId: this.searchDto.group || undefined
     };
     if (field && sort) {
-      postData.sort = sort === "ascend" ? field : `${field} desc`;
+      postData.sort = sort === "ascend" ? `${field} asc` : `${field} desc`;
     }
     this.loading1 = true;
     this.mainService
       .postCustom("report/clothes", "personal", postData)
       .subscribe((result) => {
         this.loading1 = false;
+				this.summary = result.summary || {}
         this.listOfData = result.list || [];
         this.listLength = result.totalNum;
       });
@@ -500,21 +518,4 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
     this.isLoading = true;
     this.searchTimerSubject.next([fun, e]);
   }
-  // 列表排序
-  sortCurrent = {
-    totalTrip: null,
-    totalOrder: null,
-    getTrip: null,
-    getOrder: null,
-    sendTrip: null,
-    sendOrder: null,
-  };
-  sortCurrentKey: string = "";
-  sortCurrentValue: string | null = "";
-  sort(e) {
-    const { key, value } = e;
-    this.sortCurrentKey = key;
-    this.sortCurrentValue = value;
-    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
-  }
 }

src/app/views/worker-statistics/worker-statistics.component.html

@@ -75,12 +75,9 @@
             <th nzWidth="8%">姓名</th>
             <th nzWidth="8%" nzShowSort nzSortKey="byOrderNum" [(nzSort)]="sortCurrent.byOrderNum">工单总数</th>
             <th nzWidth="16%">五分钟内工单<br>特殊关闭数</th>
-            <!-- <th nzWidth="8%"></th> -->
             <th nzWidth="16%">平均到达时长<br>平均完成时长</th>
-            <!-- <th nzWidth="8%"></th> -->
-            <th nzWidth="8%">按时完成达标率</th>
+            <th nzWidth="8%" nzShowSort nzSortKey="completionRate" [(nzSort)]="sortCurrent.completionRate">按时完成达标率</th>
             <th nzWidth="8%">楼栋分<br>陪检方式分</th>
-            <!-- <th nzWidth="8%"></th> -->
             <th nzWidth="16%" nzShowSort nzSortKey="byIntegral" [(nzSort)]="sortCurrent.byIntegral">总积分</th>
             <th nzWidth="15%">操作</th>
           </tr>

src/app/views/worker-statistics/worker-statistics.component.ts

@@ -167,9 +167,16 @@ export class WorkerStatisticsComponent implements OnInit {
   }
   // 重置
   reset() {
+		this.sortCurrentKey = "";
+		this.sortCurrentValue = "";
+		this.sortCurrent = {
+		  byOrderNum: null,
+		  byIntegral: null,
+			completionRate: null,
+		};
     this.changeDateRange("1");
     this.group = 0;
-    // this.search();
+    // this.getList();
   }
   // 表格数据
   loading1 = false;
@@ -203,6 +210,7 @@ export class WorkerStatisticsComponent implements OnInit {
   sortCurrent = {
     byOrderNum: null,
     byIntegral: null,
+		completionRate: null,
   };
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";