大输液优化暂存

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

@@ -256,6 +256,9 @@
 							{{ data.cartonNum }} {{data.giveOutType && data.giveOutType.value==1?
 							data.drugsInfoDTO.unit:'箱'}}
 						</span>
+						<span *ngIf="data.drugsInfoDTO.drugName=='合计'">
+							{{ data.cartonActual}}
+						</span>
 					</div>
 					
 				</div>

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

@@ -323,16 +323,22 @@ export class AdminOfficePrescriptionComponent implements OnInit{
   // snum = 0;
   getDeparts(dept) {
     var that = this;
-    let data = {
+    let data:any = {
       department: {
         dept,
-        hospital: {
-          id: this.hosId
-        },
+        hosIds: this.hosId,
       },
       idx: 0,
       sum: 20,
     };
+		if(this.isParentData==1){
+			if(this.tool.getCurrentUserInfo().currentHospital &&
+			this.tool.getCurrentUserInfo().currentHospital.parent){
+				data.department.hosIds = this.hosId +','+this.tool.getCurrentUserInfo().currentHospital.parent.id
+			}else{
+				data.department.hosIds = this.hosId
+			}
+		}
     that.mainService
 		.getFetchDataList("data", "department", data)
 		.subscribe((data) => {
@@ -344,9 +350,29 @@ export class AdminOfficePrescriptionComponent implements OnInit{
   }
 
   // 获取所有院区
+	isParentData:any = null;
   getAllHospital() {
-		this.getDeparts('')
-    this.getList();
+		this.mainService.getDictionary("list", "ordinary_field").subscribe((data) => {
+			let taskTypeData = data.find(i=>i.value=='infusionSolutions')
+			let postData = {
+			  idx: 0,
+			  sum: 10,
+			  taskTypeConfig: {
+					hosId:this.hosId,
+					taskType:taskTypeData.id
+			  }
+			};
+			this.mainService
+			  .getFetchDataList("simple/data", "taskTypeConfig", postData)
+			  .subscribe((result) => {
+			    if (result.status == 200) {
+						let data = result.list[0] || {};
+						this.isParentData = data.quoteParentData;
+						this.getDeparts('')
+						this.getList();
+			    }
+			  });
+		});
   }
 
   // 切换院区选项
@@ -850,7 +876,8 @@ export class AdminOfficePrescriptionComponent implements OnInit{
 					},
 					expendCount:res.data.totalExpendCount,
 					addSub:res.data.totalAddSub,
-					deptName:''
+					deptName:'',
+					cartonActual:res.data.cartonActual
 				})
         that.codes = arr
         that.printLoading = false;

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

@@ -11,6 +11,10 @@
     <div class="list" *ngIf="!loading">
       <!-- 特性配置 -->
       <div *ngIf="tabModalName=='characteristics'">
+				<div class="display_flex align-items_center mb8">
+					<nz-form-label class="label">是否引用父级院区数据</nz-form-label>
+					<nz-checkbox-group [(ngModel)]="quoteParentData" (ngModelChange)="parentChange($event)"></nz-checkbox-group>
+				</div>
        <!-- 任务类型 -->
        <div class="display_flex align-items_center mb8">
          <nz-form-label class="label" nzRequired>任务类型</nz-form-label>

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

@@ -25,6 +25,9 @@ export class BigTransfusionSetComponent implements OnInit {
   // 苏醒室科室
   recoveryDeptId:any;
   recoveryDepts:any[] = [];
+	quoteParentData:any[] = [
+    {label:'是否开启',value: 0}
+  ];
   // 自动建单
   autoCreateOrders:any[] = [
     {label:'是否开启',value: 0}
@@ -79,6 +82,7 @@ export class BigTransfusionSetComponent implements OnInit {
 	];
   // 配置
   configs:any = {};
+	isParentData:any = null;
   searchTimerSubject = new Subject();
 	searchParentDeptSubject = new Subject();
   constructor(private mainService: MainService,private tool: ToolService,private msg: NzMessageService) {}
@@ -94,9 +98,8 @@ export class BigTransfusionSetComponent implements OnInit {
 			this.isLoading = true;
 			this.getDeparts(e,'search');
 		});
-		
-    this.getTaskTypes('', true, 'load');
-		this.getDeparts('','load')
+		this.getTaskTypesId()
+
   }
 
   // 切换tab
@@ -119,7 +122,8 @@ export class BigTransfusionSetComponent implements OnInit {
 			timingOrder:0,//定时建单
 			printOrder:0,// 打印并建单
 			executeTime:'',// 定时建单-选择时分
-			autoCreate:0
+			autoCreate:0,
+			quoteParentData:0
     };
 		if(this.editId){
 			editData.id = this.editId
@@ -133,6 +137,11 @@ export class BigTransfusionSetComponent implements OnInit {
 			delete editData.autoCreate
 		}
 		
+		if(this.quoteParentData[0].checked){
+			editData.quoteParentData = 1
+		}else{
+			delete editData.quoteParentData
+		}
 		if(this.radioValue=='1'){
 			editData.timingOrder = 1
 			editData.executeTime = this.executeTime ? format(startOfMinute(this.executeTime), "yyyy-MM-dd HH:mm:ss") : undefined
@@ -190,11 +199,17 @@ export class BigTransfusionSetComponent implements OnInit {
 					key: 'association_types',
 					value: 'other'
 				},
-        hosId: {
-          id: this.hosId
-        }
+        hosIds: this.hosId
       }
     };
+		if(this.quoteParentData[0].checked){
+			if(this.tool.getCurrentUserInfo().currentHospital &&
+			this.tool.getCurrentUserInfo().currentHospital.parent){
+				postData.taskType.hosIds = this.hosId +','+this.tool.getCurrentUserInfo().currentHospital.parent.id
+			}else{
+				postData.taskType.hosIds = this.hosId
+			}
+		}
     this.isLoading = true;
     this.mainService
       .getFetchDataList("simple/data", "taskType", postData)
@@ -202,9 +217,9 @@ export class BigTransfusionSetComponent implements OnInit {
         this.isLoading = false;
         if (result.status == 200) {
           this.taskTypes1 = result.list || [];
-					if(type=='load'){
-						this.getTaskTypesId();
-					}
+					// if(type=='load'){
+					// 	this.getTaskTypesId();
+					// }
         }
       });
   }
@@ -223,9 +238,7 @@ export class BigTransfusionSetComponent implements OnInit {
 	  let data = {
 	    department: {
 	      dept,
-	      hospital: {
-	        id: this.hosId
-	      },
+	      hosIds: this.hosId,
 				type:{
 					id:''
 				}
@@ -233,6 +246,14 @@ export class BigTransfusionSetComponent implements OnInit {
 	    idx: 0,
 	    sum: 20,
 	  };
+		if(this.quoteParentData[0].checked){
+			if(this.tool.getCurrentUserInfo().currentHospital &&
+			this.tool.getCurrentUserInfo().currentHospital.parent){
+				data.department.hosIds = this.hosId +','+this.tool.getCurrentUserInfo().currentHospital.parent.id
+			}else{
+				data.department.hosIds = this.hosId
+			}
+		}
 		that.mainService.getDictionary("list", "dept_type").subscribe((res) => {
 		  let typeData = res.find(i=>i.value=='pharmacyRoom');
 			if(typeData){
@@ -248,12 +269,17 @@ export class BigTransfusionSetComponent implements OnInit {
 						},500)
 					}else{
 						this.hospitals = data.list
-						that.isLoading = false;
+						that.loading  = false;
 					}
 			  });
 		});
 	}
 	
+	parentChange(e){
+		this.getTaskTypes('', true, 'load');
+		this.getDeparts('','load')
+	}
+	
   // 获取配置
   getConfig() {
     this.loading = true;
@@ -271,10 +297,14 @@ export class BigTransfusionSetComponent implements OnInit {
         this.loading = false;
         if (result.status == 200) {
     			let data = result.list[0] || {};
+					this.isParentData = data.quoteParentData;
 					this.editId = data.id
 					this.autoCreateOrders[0].checked = data.autoCreate == 1;
+					this.quoteParentData[0].checked = data.quoteParentData == 1;
     			this.infusionSolutionsTypeId = data.infusionSolutionsTypeId
 					this.pharmacyDept = data.pharmacyDept
+					this.getTaskTypes('', true, 'load');
+					this.getDeparts('','load')
 					if(data.timingOrder=='1'){
 						this.radioValue = '1'
 						this.executeTime = data.executeTime ? new Date(data.executeTime) : null;

src/app/views/dept-all-statistics/dept-all-statistics-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { DeptAllStatisticsComponent } from './dept-all-statistics.component';
+
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DeptAllStatisticsComponent
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class DeptAllStatisticsRoutingModule { }

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

@@ -0,0 +1,380 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzLg='18' class="list-template__searchBox">
+        <div class="list-template__searchItem searchItem-100">
+          <span class="label">发药时间区间：</span>
+          <nz-range-picker [(ngModel)]="dateRange" nzFormat="yyyy-MM-dd HH:mm:ss"
+					(ngModelChange)="changeDate($event)"></nz-range-picker>
+        </div>
+				<div class="list-template__searchItem">
+				  <span class="label">科室名称：</span>
+				  <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event,'dept')" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择申请科室" [(ngModel)]="department">
+				    <ng-container *ngFor="let option of hospitals1">
+				      <nz-option *ngIf="!loading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+				    </ng-container>
+				    <nz-option *ngIf="loading" nzDisabled nzCustomContent>
+				      <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+				    </nz-option>
+				  </nz-select>
+				</div>
+				<div class="list-template__searchItem">
+				  <span class="label">药品名称：</span>
+					<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event,'commodity')" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择商品名称" [(ngModel)]="commodity">
+					  <ng-container *ngFor="let option of commodityData">
+					    <nz-option *ngIf="!loading" [nzLabel]="option.drugName + '('+option.specs+')'" [nzValue]="option.id"></nz-option>
+					  </ng-container>
+					  <nz-option *ngIf="loading" nzDisabled nzCustomContent>
+					    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+					  </nz-option>
+					</nz-select>
+				</div>
+				
+				<div class="list-template__searchItem">
+				  <span class="label">批次号：</span>
+					<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event,'batch')" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择批次号" [(ngModel)]="batch">
+					  <ng-container *ngFor="let option of batchData">
+					    <nz-option *ngIf="!loading" [nzLabel]="option.batchNo" [nzValue]="option.id"></nz-option>
+					  </ng-container>
+					  <nz-option *ngIf="loading" nzDisabled nzCustomContent>
+					    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+					  </nz-option>
+					</nz-select>
+				</div>
+      </div>
+      <div nz-col nzLg="6" class="list-template__btns">
+        <button class="btn default" (click)='search()'>搜索</button>
+        <button class="btn default ml8" (click)='reset()'>重置</button>
+				<button *ngIf="coopBtns.export" class="btn default ml8" (click)='excelExport()'>导出</button>
+      </div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead>
+          <tr class="thead">
+            <th>批次号|科室</th>
+						<th>商品名称|规格</th>
+            <th>消耗量+增发+原库存=实发量</th>
+            <th>包装规格</th>
+            <th>发药箱数</th>
+            <th>新库存</th>
+            <th>发药日期</th>
+						<th>操作</th>
+          </tr>
+        </thead>
+        <tbody v-if="listOfData && listOfData.length>0">
+          <tr *ngFor="let data of listOfData" (click)="selectedListData(data.id)">
+            <td>
+							<div>{{ data['0'] }}</div>
+							<div>{{ data['1'] }}</div>
+						</td>
+						<td>
+							<div>{{ data['2']}}</div>
+							<div>{{ data['3']}}</div>
+						</td>
+            <td>{{ data['4']}} + {{data['5']}} +
+						 {{data['6'] }} = {{data.num}}</td>
+						 
+            <td>{{ data['7']}}</td>
+            <td>{{ data['8']==0 ? '-' : data['8']}}</td>
+						<td>{{ data['9']}}</td>
+						<td>{{ data['10']}}</td>
+						<td>
+						  <div class="coop">
+						    <span *ngIf="coopBtns.look" (click)="detail(data.id)">发药详情</span>
+						  </div>
+						</td>
+          </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>
+  </div>
+
+  <!-- 新增/编辑模态框 -->
+  <div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
+    <div class="modalBody">
+      <div class="title">科室发药单-查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+      </div>
+      <overlay-scrollbars #osComponentRef1 class="content">
+        <div class="list-template__bottom">
+          <nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="detailsLoading">
+            <thead>
+              <tr class="thead">
+								<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="10%">增减</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of viewData">
+								<td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugCode:'无' }}</td>
+                <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugName:'无' }}</td>
+                <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.specs:'无' }}</td>
+                <td>{{ data.expendCount||'0' }}</td>
+                <td>{{ data.actualCount||'0' }}</td>
+                <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.packingSpecs:'0' }}</td>
+                <td>{{ data.cartonNum || '0' }}</td>
+                <td>{{ data.formerInventory || '0' }}</td>
+                <td>{{ data.afterInventory || '0'}}</td>
+        				<td>{{ data.addSub || '0' }}</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </overlay-scrollbars>
+      <div class="display_flex justify-content_flex-center">
+        <button class="btn" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- 打印 -->
+  <div id="report" style="display: none;">
+		<div class="monad" 
+				*ngIf="rowData"
+				style="padding: 10px;
+				border: 1px solid #e7e7e7;
+				border-radius: 5px;">
+			<div class="monad-title" 
+				style="text-align: center;
+				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: 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 class="monad-sign" style="display: flex;line-height: 23px;font-size: 14px;">
+				<div style="margin-right: 15px;">取药药房：{{rowData.pharmacyDTO?rowData.pharmacyDTO.dept:'-'}}</div>
+			</div>
+			<div style="border: 1px solid #e7e7e7;border-bottom: none;font-size: 14px;">
+				<div class="thead" style="display: flex;">
+					<div style="width: 40%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">药品名称</div>
+					
+					<div style="width: 20%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">规格</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">15日消耗</div>
+					
+					<div style="width: 8%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">包规</div>
+					
+					<div style="width: 8%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">实消</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">临时增发</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-bottom: 1px solid #e7e7e7;">箱数</div>
+				</div>
+				<div *ngFor="let data of codes" style="display: flex;">
+					<div style="width: 40%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.drugName }}</div>
+					
+					<div style="width: 20%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.specs }}</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">15日消耗</div>
+					
+					<div style="width: 8%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.packingSpecs }}</div>
+					
+					<div style="width: 8%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.expendCount }}</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.addSub || 0 }}</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-bottom: 1px solid #e7e7e7;">
+						<span *ngIf="data.drugsInfoDTO.drugName!='合计'">
+							{{ data.cartonNum }} {{data.giveOutType && data.giveOutType.value==1?
+							data.drugsInfoDTO.unit:'箱'}}
+						</span>
+					</div>
+					
+				</div>
+			</div>
+		</div>
+		
+		<div class="monad"
+				style="padding: 10px;
+				border: 1px solid #e7e7e7;
+				border-radius: 5px;margin-bottom: 40px;">
+			<div class="monad-title" 
+				style="text-align: center;
+				font-size: 18px;
+				border-bottom: 1px solid #e7e7e7;
+				padding-bottom: 10px;">
+				大输液批次消耗汇总单
+			</div>
+			<div class="monad-sign" style="display: flex;line-height: 23px;font-size: 14px;">
+				<div style="margin-right: 15px;">日期：666</div>
+				<div style="margin-right: 15px;">批次号：777</div>
+			</div>
+			<div style="border: 1px solid #e7e7e7;border-bottom: none;font-size: 14px;">
+				<div class="thead" style="display: flex;">
+					<div style="width: 40%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">药品名称</div>
+					
+					<div style="width: 20%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">药品规格</div>
+					
+					<div style="width: 13%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">包装规格</div>
+					
+					<div style="width: 13%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">发药总量</div>
+		
+					<div style="width: 14%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-bottom: 1px solid #e7e7e7;">箱数合计</div>
+					
+				</div>
+				<div style="display: flex;">
+					<div style="width: 40%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">葡萄胎</div>
+					
+					<div style="width: 20%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">100ml*1</div>
+					
+					<div style="width: 13%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">100</div>
+					
+					<div style="width: 13%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">200</div>
+					
+					
+					<div style="width: 14%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-bottom: 1px solid #e7e7e7;">
+					<span>
+						20箱
+					</span>
+					</div>
+					
+				</div>
+			</div>
+		</div>
+  </div>
+
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>

src/app/views/dept-all-statistics/dept-all-statistics.component.less

@@ -0,0 +1,238 @@
+@import "../../../../src/theme.less";
+:host {
+  .add-button {
+    margin: 0 auto 16px !important;
+  }
+  .targetDept {
+    overflow: hidden;
+    // width: 90px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .dynamic {
+    margin-bottom: 16px;
+    display: flex;
+    align-items: center;
+    input {
+      width: 90%;
+    }
+    i {
+      margin-left: 8px;
+      cursor: pointer;
+      font-size: 18px;
+    }
+  }
+}
+
+.searchItem-100{
+	.label{
+		width: 100px !important;
+	}
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .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: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 80%;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+				
+				.list-template__bottom {
+				  background: #f9fafb;
+				  border: 1px solid #e5e9ed;
+				  border-radius: 8px;
+				  padding-bottom: 56px;
+				  position: relative;
+				  .list-template__nzTable {
+				    padding: 16px 16px 0;
+				
+				    .thead {
+				      background-image: linear-gradient(to right, @bg-start, @bg-end);
+				
+				      th {
+				        background: transparent;
+				        color: #fff;
+				        text-align: center;
+				      }
+				    }
+				
+				    .ant-table-body {
+				      border-bottom: 1px solid #e5e9ed;
+				    }
+				
+				    .ant-table-tbody {
+				      tr {
+				        text-align: center;
+				        color: #333;
+				
+				        td {
+				          border: none;
+				
+				          &.tab_hover:hover{
+				            text-decoration: underline;
+				            cursor: pointer;
+				          }
+				
+				          .coop {
+				            button{
+				              color: #333;
+				            }
+				            span,button {
+				              display: inline-block;
+				              padding: 0 8px;
+				              cursor: pointer;
+				              position: relative;
+				
+				              &::after {
+				                content: "|";
+				                position: absolute;
+				                top: 0;
+				                right: 0;
+				              }
+				
+				              &:hover,
+				              &:active {
+				                color: @primary-color;
+				              }
+				
+				              &:nth-last-child(1) {
+				                &::after {
+				                  content: "";
+				                }
+				              }
+				            }
+				          }
+				        }
+				      }
+				    }
+				  }
+				  .list-template__pagination {
+				    height: 56px;
+				    display: flex;
+				    align-items: center;
+				    position: absolute;
+				    right: 8px;
+				  }
+				}
+				
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+              text-align: left;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}
+

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

@@ -0,0 +1,312 @@
+import { Component, OnInit, ViewChild} from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import {
+  FormBuilder,
+  Validators,
+  FormGroup,
+  FormControl,
+} from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { ToolService } from "../../services/tool.service";
+import { format, startOfDay, endOfDay } from "date-fns";
+import { NzMessageService } from "ng-zorro-antd";
+import { Subject } from "rxjs";
+import { debounceTime, filter } from "rxjs/operators";
+import host from "../../../assets/js/http";
+import { HttpRequest, HttpResponse, HttpClient } from '@angular/common/http';
+
+@Component({
+  selector: "app-dept-all-statistics",
+  templateUrl: "./dept-all-statistics.component.html",
+  styleUrls: ["./dept-all-statistics.component.less"],
+})
+export class DeptAllStatisticsComponent implements OnInit{
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  constructor(
+    private message: NzMessageService,
+    private fb: FormBuilder,
+    private route: ActivatedRoute,
+    private router: Router,
+    private mainService: MainService,
+    private tool: ToolService,
+    private http: HttpClient,
+  ) {}
+	
+  ngOnInit() {
+    this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
+     if(e[1]=='dept'){
+			 this.getDeparts(e[0]);
+		 }else if(e[1]=='commodity'){
+			 this.getCommodityData(e[0])
+		 }else{
+			 this.getBathData(e[0])
+		 }
+
+    });
+		this.hosId = this.tool.getCurrentHospital().id;
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.getAllquest();
+  }
+  listOfData: any[] = []; //表格数据
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopId: number; //表格中执行操作的id
+  department: ""; //所属科室
+	batch:any = null;
+	commodity:any = null;
+	hosId: number; 
+	dateRange;//时间
+  batchNumber; //批次号
+  num; //编码
+  deptalias; //别名
+  type; //类型
+  deptHandoverType; //类型
+  pageIndex: number = 1; //页码
+  listLength: number = 10; //总条数
+  pageSize: number = 10; //每页条数
+  btnLoading: boolean = false; //确认按钮loading状态
+  printLoading: boolean = false; //批量打印按钮loading状态
+  deptPhones: any = []; //新添加的科室电话列表
+  isAddDeptsPhone = true; //添加新的科室电话是否禁用
+  deptsPhoneId = 1; //科室电话自增id
+  allParentdepart: any = []; //所有的父级科室列表
+  hospitals1: any = []; //科室列表(搜索)
+	rowData: object = {}; //打印选择列表
+  searchParentDeptSubject = new Subject();
+  // 初始化增删改按钮
+  coopBtns: any = {};
+	viewData: any = []; //科室单查看数据
+	commodityData:any = [];
+	batchData:any = [];
+	maskFlag:any = null;
+	
+	
+  // 导出
+  excelExport(){
+    this.maskFlag = this.message.loading("正在导出..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService.exportReport("dispensingMedicine", {
+			deptId:this.department,
+			batchId:this.batch,
+			startTime: this.startDate,
+			endTime: this.endDate,
+			drugId:this.commodity,
+			hosId:this.hosId
+		}).subscribe(
+      (data) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        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('导出失败');
+      }
+    );
+  }
+
+  //搜索父级科室
+	loading = false;
+  changeInp(e,type) {
+		this.loading = true
+    this.searchParentDeptSubject.next([e,type]);
+  }
+	
+	// 查看
+	detailsLoading:Boolean = false;
+	detail(id) {
+		var that = this;
+		let data = {
+			idx: 0,
+			sum: 9999,
+			drugsConfigure: {
+			  hosId: this.hosId,
+			  drugListId: id
+			}
+		};
+		this.detailsLoading = true;
+		that.mainService
+		  .getFetchDataList("data", "drugsConfigure", data)
+		  .subscribe((data) => {
+		    this.detailsLoading = false;
+				this.modal = true
+		    that.viewData = data.list;
+		    that.listLength = data.totalNum;
+		  });
+	}
+	
+  // 搜索
+  search() {
+    this.pageIndex = 1;
+    this.getList();
+  }
+  // 重置
+  reset() {
+    this.pageIndex = 1;
+    this.department = null;
+		this.batch = null;
+		this.commodity = null;
+    this.batchNumber = "";
+		this.dateRange = [];
+		this.startDate = "";
+		this.endDate = "";
+    this.getList();
+  }
+  // 表格数据
+  loading1 = false;
+  getList() {
+    var that = this;
+    let data = {
+      idx: that.pageIndex - 1,
+      sum: that.pageSize,
+			deptId:this.department,
+			batchId:this.batch,
+			startTime: this.startDate,
+			endTime: this.endDate,
+			drugId:this.commodity,
+			hosId:this.hosId
+    };
+		this.loading1 = true;
+		this.mainService
+			.drugsInfo(data).subscribe((res:any) => {
+				this.loading1 = false;
+				for(let i of res.list){
+					i.num = i['4'] + i['5'] + i['6']
+				}
+				this.listOfData = res.list
+				that.listLength = res.totalNum;
+			});
+  }
+	
+	// 日期选择
+	startDate: string; //发起时间开始
+	endDate: string; //发起时间结束
+	changeDate(result?): void {
+	  if (result.length==0) {
+	    this.startDate = this.endDate = null;
+	    return;
+	  }
+	  this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+	  this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+		this.dateRange = [this.startDate,this.endDate]
+	}
+	
+	// 获取所有科室
+  getDeparts(dept) {
+    var that = this;
+    let data:any = {
+      department: {
+        dept,
+        hosIds: this.hosId,
+      },
+      idx: 0,
+      sum: 20,
+    };
+		if(this.isParentData==1){
+			if(this.tool.getCurrentUserInfo().currentHospital &&
+			this.tool.getCurrentUserInfo().currentHospital.parent){
+				data.department.hosIds = this.hosId +','+this.tool.getCurrentUserInfo().currentHospital.parent.id
+			}else{
+				data.department.hosIds = this.hosId
+			}
+		}
+    that.mainService
+		.getFetchDataList("data", "department", data)
+		.subscribe((data) => {
+			this.loading = false
+			this.hospitals1 = data.list
+		});
+  }
+	
+	// 获取药品
+	getCommodityData(name) {
+	  let data = {
+	    drugsInfo: {
+	      drugName: name || "",
+	      hosId: this.hosId || "" ,
+	    	drugType:{
+	    		id:'20327'
+	    	}
+	    },
+	    idx: 0,
+	    sum: 10,
+	  };
+	  this.mainService
+		.getFetchDataList("data", "drugsInfo", data)
+		.subscribe((data) => {
+			this.loading = false
+			this.commodityData = data.list
+		});
+	}
+	
+	// 获取批次号
+	getBathData(name) {
+	  let data = {
+	    drugsBatch: {
+	    	batchNo:name,
+	    	hosId: this.hosId,
+				batchStatus:{
+					value:2
+				}
+	    },
+	    idx: 0,
+	    sum: 10,
+	  };
+	  this.mainService
+		.getFetchDataList("data", "drugsBatch", data)
+		.subscribe((data) => {
+			this.loading = false
+			this.batchData = data.list
+		});
+	}
+	
+	isParentData:any = null;
+  getAllquest() {
+		this.mainService.getDictionary("list", "ordinary_field").subscribe((data) => {
+			let taskTypeData = data.find(i=>i.value=='infusionSolutions')
+			let postData = {
+			  idx: 0,
+			  sum: 10,
+			  taskTypeConfig: {
+					hosId:this.hosId,
+					taskType:taskTypeData.id
+			  }
+			};
+			this.mainService
+			  .getFetchDataList("simple/data", "taskTypeConfig", postData)
+			  .subscribe((result) => {
+			    if (result.status == 200) {
+						let data = result.list[0] || {};
+						this.isParentData = data.quoteParentData;
+						this.getDeparts('')
+			    }
+			  });
+		});
+		this.getCommodityData('')
+		this.getBathData('')
+    this.getList();
+  }
+}

src/app/views/dept-all-statistics/dept-all-statistics.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { DeptAllStatisticsRoutingModule } from './dept-all-statistics-routing.module';
+import { DeptAllStatisticsComponent } from './dept-all-statistics.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    DeptAllStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    DeptAllStatisticsRoutingModule,
+    ShareModule
+  ]
+})
+export class DeptAllStatisticsModule { }

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

@@ -357,6 +357,9 @@
 						{{data.giveOutType && data.giveOutType.value==1?
 						data.drugsInfoDTO.unit:'箱'}}
 					</span>
+					<span *ngIf="data.drugsInfoDTO.drugName=='合计'">
+						{{ data.cartonActual}}
+					</span>
 					</div>
 					
 				</div>

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

@@ -580,7 +580,8 @@ export class DispensingBatchComponent implements OnInit, OnDestroy {
 						},
 						expendCount:i.totalExpendCount,
 						addSub:i.totalAddSub,
-						deptName:''
+						deptName:'',
+						cartonActual:i.cartonActual
 					})
 				}
 		    that.printData = arr;

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

@@ -194,16 +194,22 @@ export class DispensingInfoDetailComponent implements OnInit{
 	// 获取所有科室
   getDeparts(dept) {
     var that = this;
-    let data = {
+    let data:any = {
       department: {
         dept,
-        hospital: {
-          id: this.hosId
-        },
+        hosIds: this.hosId,
       },
       idx: 0,
       sum: 20,
     };
+		if(this.isParentData==1){
+			if(this.tool.getCurrentUserInfo().currentHospital &&
+			this.tool.getCurrentUserInfo().currentHospital.parent){
+				data.department.hosIds = this.hosId +','+this.tool.getCurrentUserInfo().currentHospital.parent.id
+			}else{
+				data.department.hosIds = this.hosId
+			}
+		}
     that.mainService
 		.getFetchDataList("data", "department", data)
 		.subscribe((data) => {
@@ -253,8 +259,29 @@ export class DispensingInfoDetailComponent implements OnInit{
 			this.batchData = data.list
 		});
 	}
+	
+	isParentData:any = null;
   getAllquest() {
-		this.getDeparts('')
+		this.mainService.getDictionary("list", "ordinary_field").subscribe((data) => {
+			let taskTypeData = data.find(i=>i.value=='infusionSolutions')
+			let postData = {
+			  idx: 0,
+			  sum: 10,
+			  taskTypeConfig: {
+					hosId:this.hosId,
+					taskType:taskTypeData.id
+			  }
+			};
+			this.mainService
+			  .getFetchDataList("simple/data", "taskTypeConfig", postData)
+			  .subscribe((result) => {
+			    if (result.status == 200) {
+						let data = result.list[0] || {};
+						this.isParentData = data.quoteParentData;
+						this.getDeparts('')
+			    }
+			  });
+		});
 		this.getCommodityData('')
 		this.getBathData('')
     this.getList();

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

@@ -189,16 +189,22 @@ export class DrugCloudComponent implements OnInit {
 	// 获取所有科室
   getDeparts(dept) {
     var that = this;
-    let data = {
+    let data:any = {
       department: {
         dept,
-        hospital: {
-          id: this.hosId
-        },
+        hosIds: this.hosId,
       },
       idx: 0,
       sum: 20,
     };
+		if(this.isParentData==1){
+			if(this.tool.getCurrentUserInfo().currentHospital &&
+			this.tool.getCurrentUserInfo().currentHospital.parent){
+				data.department.hosIds = this.hosId +','+this.tool.getCurrentUserInfo().currentHospital.parent.id
+			}else{
+				data.department.hosIds = this.hosId
+			}
+		}
     that.mainService
       .getFetchDataList("data", "department", data)
       .subscribe((data) => {
@@ -210,9 +216,29 @@ export class DrugCloudComponent implements OnInit {
   }
 	
   // 获取所有院区
+	isParentData:any = null;
   getAllHospital() {
-		this.getDeparts('')
-    this.getDrugType();
+		this.mainService.getDictionary("list", "ordinary_field").subscribe((data) => {
+			let taskTypeData = data.find(i=>i.value=='infusionSolutions')
+			let postData = {
+			  idx: 0,
+			  sum: 10,
+			  taskTypeConfig: {
+					hosId:this.hosId,
+					taskType:taskTypeData.id
+			  }
+			};
+			this.mainService
+			  .getFetchDataList("simple/data", "taskTypeConfig", postData)
+			  .subscribe((result) => {
+			    if (result.status == 200) {
+						let data = result.list[0] || {};
+						this.isParentData = data.quoteParentData;
+						this.getDeparts('')
+						this.getDrugType();
+			    }
+			  });
+		});
   }
 
 

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

@@ -603,6 +603,11 @@ const routes: Routes = [
 			  path: "dispensingInfoDetail",
 			  loadChildren: () => import("../dispensing-info-detail/dispensing-info-detail.module").then((m) => m.DispensingInfoDetailModule),
 			},
+			// 科室汇总统计
+			{
+			  path: "deptAllStatistics",
+			  loadChildren: () => import("../dept-all-statistics/dept-all-statistics.module").then((m) => m.DeptAllStatisticsModule),
+			},
     ],
   },
 ];