大输液优化

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

@@ -196,6 +196,7 @@ export class ConfigurationDeptUserComponent implements OnInit {
     this.validatePriorityForm.controls.department.setValue(deptArr);
     this.validatePriorityForm.controls.handleGroup.setValue(data.handleGroupDTO.id);
 		this.validatePriorityForm.controls.binding.setValue(data.handleUserDTO?'1':'0')
+		this.getUser(data.handleGroupDTO.id)
 		if(data.handleUserDTO){
 			this.validatePriorityForm.controls.handleUser.setValue(data.handleUserDTO.id);
 		}

src/app/services/main.service.ts

@@ -993,4 +993,11 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
+	
+	// 大输液-科室汇总统计
+	summaryData(data) {
+	  return this.http.post(host.host + `/infusion/solutions/dept/summary`,data, {
+	    headers: this.headers,
+	  });
+	}
 }

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

@@ -113,6 +113,10 @@ export class BigTransfusionSetComponent implements OnInit {
       this.msg.create("warning", "请选择任务类型！");
       return;
     }
+		if(!this.pharmacyDept){
+		  this.msg.create("warning", "请选择默认发药科室！");
+		  return;
+		}
     let editData = {
 			id:'',
 			taskType:this.taskTypeData.id,
@@ -277,7 +281,9 @@ export class BigTransfusionSetComponent implements OnInit {
 	
 	parentChange(e){
 		this.getTaskTypes('', true, 'load');
-		this.getDeparts('','load')
+		this.getDeparts('','load');
+		this.infusionSolutionsTypeId = null;
+		this.pharmacyDept = null;
 	}
 	
   // 获取配置

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

@@ -30,7 +30,7 @@
 					</nz-select>
 				</div>
 				
-				<div class="list-template__searchItem">
+	<!-- 			<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">
@@ -40,7 +40,7 @@
 					    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
 					  </nz-option>
 					</nz-select>
-				</div>
+				</div> -->
       </div>
       <div nz-col nzLg="6" class="list-template__btns">
         <button class="btn default" (click)='search()'>搜索</button>
@@ -53,36 +53,28 @@
         [nzLoading]="loading1">
         <thead>
           <tr class="thead">
-            <th>批次号|科室</th>
-						<th>商品名称|规格</th>
-            <th>消耗量+增发+原库存=实发量</th>
-            <th>包装规格</th>
-            <th>发药箱数</th>
-            <th>新库存</th>
-            <th>发药日期</th>
+            <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>
-						 
+          <tr *ngFor="let data of listOfData">
+            <td>{{ data['2'] }}</td>
+						<td>{{ data['3'] }} {{data['4']}}</td>
+						<td>{{ data['5']}}</td>
+						<td>{{ data['6']}}</td>
             <td>{{ data['7']}}</td>
-            <td>{{ data['8']==0 ? '-' : data['8']}}</td>
-						<td>{{ data['9']}}</td>
-						<td>{{ data['10']}}</td>
+            <td>{{ data['8']}}</td>
+            <td>{{ data['9']}}</td>
 						<td>
 						  <div class="coop">
-						    <span *ngIf="coopBtns.look" (click)="detail(data.id)">发药详情</span>
+						    <span *ngIf="coopBtns.look" (click)="detail(data['0'],data['1'])">发药详情</span>
 						  </div>
 						</td>
           </tr>
@@ -99,7 +91,7 @@
   <!-- 新增/编辑模态框 -->
   <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 class="title">发药详情<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
       </div>
       <overlay-scrollbars #osComponentRef1 class="content">
         <div class="list-template__bottom">
@@ -107,33 +99,40 @@
             [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>
+                <th>批次号|科室</th>
+              	<th>商品名称|规格</th>
+                <th>消耗量+增发+原库存=实发量</th>
+                <th>包装规格</th>
+                <th>发药箱数</th>
+                <th>新库存</th>
+                <th>发药日期</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>
+								<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>
               </tr>
             </tbody>
           </nz-table>
+					<div class="list-template__pagination">
+					  <nz-pagination [(nzPageIndex)]="pageDetailIndex" [(nzTotal)]="listDetailLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+					    (nzPageIndexChange)="detailList()" (nzPageSizeChange)="detailList()">
+					  </nz-pagination>
+					</div>
         </div>
       </overlay-scrollbars>
       <div class="display_flex justify-content_flex-center">

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

@@ -45,7 +45,7 @@ export class DeptAllStatisticsComponent implements OnInit{
 		 }else if(e[1]=='commodity'){
 			 this.getCommodityData(e[0])
 		 }else{
-			 this.getBathData(e[0])
+			 // this.getBathData(e[0])
 		 }
 
     });
@@ -72,6 +72,7 @@ export class DeptAllStatisticsComponent implements OnInit{
   deptalias; //别名
   type; //类型
   deptHandoverType; //类型
+	pageDetailIndex: number = 1; //页码
   pageIndex: number = 1; //页码
   listLength: number = 10; //总条数
   pageSize: number = 10; //每页条数
@@ -94,12 +95,15 @@ export class DeptAllStatisticsComponent implements OnInit{
 	
   // 导出
   excelExport(){
+		if(!this.startDate && !this.endDate){
+			this.message.error('您必须填写发药日期，才能执行导出')
+			return
+		}
     this.maskFlag = this.message.loading("正在导出..", {
       nzDuration: 0,
     }).messageId;
-    this.mainService.exportReport("dispensingMedicine", {
+    this.mainService.exportReport("infusionSolutionsDeptSummary", {
 			deptId:this.department,
-			batchId:this.batch,
 			startTime: this.startDate,
 			endTime: this.endDate,
 			drugId:this.commodity,
@@ -116,7 +120,7 @@ export class DeptAllStatisticsComponent implements OnInit{
         var a = document.createElement("a");
         a.href = fileURL;
         a.target = "_blank";
-        a.download = "发药信息详情.xls";
+        a.download = "科室汇总统计.xls";
         document.body.appendChild(a);
         a.click();
       },
@@ -137,29 +141,68 @@ export class DeptAllStatisticsComponent implements OnInit{
 	
 	// 查看
 	detailsLoading:Boolean = false;
-	detail(id) {
-		var that = this;
+	listDetailLength:any;
+	detailDeptId:any;
+	detailDrugId:any;
+	detail(id1,id2) {
+		this.detailDeptId = id1
+		this.detailDrugId = id2
 		let data = {
-			idx: 0,
-			sum: 9999,
-			drugsConfigure: {
-			  hosId: this.hosId,
-			  drugListId: id
+			idx: this.pageDetailIndex - 1,
+			sum: this.pageSize,
+			deptId:id1,
+			startTime: this.startDate,
+			endTime: this.endDate,
+			drugId:id2,
+			hosId:this.hosId
+		};
+		this.detailsLoading = true;
+		this.mainService
+		.drugsInfo(data).subscribe((res:any) => {
+			this.detailsLoading = false;
+			for(let i of res.list){
+				i.num = i['4'] + i['5'] + i['6']
 			}
+			this.modal = true
+			this.viewData = res.list;
+			this.listDetailLength = res.totalNum;
+		});
+	}
+	
+	// 详情分页
+	detailList(){
+		let data = {
+			idx: this.pageDetailIndex - 1,
+			sum: this.pageSize,
+			deptId:this.detailDeptId,
+			startTime: this.startDate,
+			endTime: this.endDate,
+			drugId:this.detailDrugId,
+			hosId:this.hosId
 		};
 		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;
-		  });
+		this.mainService
+		.drugsInfo(data).subscribe((res:any) => {
+			this.detailsLoading = false;
+			for(let i of res.list){
+				i.num = i['4'] + i['5'] + i['6']
+			}
+			this.viewData = res.list;
+			this.listDetailLength = res.totalNum;
+		});
+	}
+	
+	hideModal(){
+		this.pageDetailIndex = 1
+		this.modal = false
 	}
 	
   // 搜索
   search() {
+		if(!this.startDate && !this.endDate){
+			this.message.error('您必须填写发药日期，才能执行搜索')
+			return
+		}
     this.pageIndex = 1;
     this.getList();
   }
@@ -167,13 +210,15 @@ export class DeptAllStatisticsComponent implements OnInit{
   reset() {
     this.pageIndex = 1;
     this.department = null;
-		this.batch = null;
+		// this.batch = null;
 		this.commodity = null;
     this.batchNumber = "";
 		this.dateRange = [];
 		this.startDate = "";
 		this.endDate = "";
-    this.getList();
+		this.listOfData = [];
+		this.listLength = 0;
+    // this.getList();
   }
   // 表格数据
   loading1 = false;
@@ -183,7 +228,6 @@ export class DeptAllStatisticsComponent implements OnInit{
       idx: that.pageIndex - 1,
       sum: that.pageSize,
 			deptId:this.department,
-			batchId:this.batch,
 			startTime: this.startDate,
 			endTime: this.endDate,
 			drugId:this.commodity,
@@ -191,11 +235,8 @@ export class DeptAllStatisticsComponent implements OnInit{
     };
 		this.loading1 = true;
 		this.mainService
-			.drugsInfo(data).subscribe((res:any) => {
+			.summaryData(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;
 			});
@@ -306,7 +347,7 @@ export class DeptAllStatisticsComponent implements OnInit{
 			  });
 		});
 		this.getCommodityData('')
-		this.getBathData('')
-    this.getList();
+		// this.getBathData('')
+    // this.getList();
   }
 }

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

@@ -1,84 +1,85 @@
-<div class="list-template">
-  <div class="list-template__content">
-    <div class="list-template__top" nz-row>
-      <div nz-col nzLg='16' class="list-template__searchBox">
-        <div class="list-template__searchItem">
-          <span class="label">批次号：</span>
-          <input nz-input class="formItem" [(ngModel)]="batchNumber" placeholder="请输入批次号" nzSize="default" />
-        </div>
-        <div class="list-template__searchItem">
-          <span class="label">创建时间：</span>
-          <nz-range-picker [(ngModel)]="dateRange" nzFormat="yyyy-MM-dd"
-					(ngModelChange)="changeDate($event)"></nz-range-picker>
-        </div>
-      </div>
-			<div nz-col nzLg='2' class="autoUpdate">{{ logTime }}秒</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.add" class="btn default ml8" (click)='showModal()'>新增</button>
-      </div>
-    </div>
-    <div class="list-template__bottom">
-      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
-        [nzLoading]="loading1">
-        <thead>
-          <tr class="thead">
-            <th nzWidth="13%">批次号</th>
-            <th nzWidth="13%">创建时间</th>
-            <th nzWidth="13%">发药时间区间</th>
-            <th nzWidth="7%">发药科室</th>
-            <th nzWidth="7%">科室数</th>
-            <th nzWidth="7%">发药量</th>
-            <th nzWidth="7%">箱数</th>
-            <th nzWidth="10%">药品总价</th>
-						<th nzWidth="7%">状态</th>
-            <th nzWidth="16%">操作</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr *ngFor="let data of listOfData">
-            <td>{{ data.batchNo || '-' }}</td>
-            <td>{{ data.createTime|date:'yyyy-MM-dd HH:mm' }}</td>
-            <td>
-							<div>{{ data.startTime|date:'yyyy-MM-dd HH:mm' }}至</div>
-							<div>{{ data.endTime|date:'yyyy-MM-dd HH:mm' }}</div>
-						</td>
-            <td>{{ data.pharmacyDTO?data.pharmacyDTO.dept:'-' }}</td>
-            <td>{{ data.deptNum || '0' }}</td>
-            <td>{{ data.drugNum || '0'}}</td>
-						<td>{{ data.cartonNum || '0' }}</td>
-						<td>{{ data.totalPrice || '0' }}</td>
-						<td>{{ data.batchState?data.batchState.name : '-' }}</td>
-            <td>
-              <div class="coop">
-								<span *ngIf="coopBtns.edit && data.batchState.name=='未发药'" (click)="edit($event,data)">编辑</span>
-								<span *ngIf="coopBtns.del && data.batchState.name=='未发药'" (click)="showDelModal($event,data.id)">删除</span>
-                <span *ngIf="coopBtns.config && data.batchState.name=='未发药'" (click)="detail($event,data)">配置</span>
-								<span *ngIf="coopBtns.dispensingGross && data.batchState.name=='已发药'" (click)="dispensingGross($event, data)">发药总量</span>
-                <span *ngIf="coopBtns.dispensingInfo && data.batchState.name=='已发药'" (click)="dispensingInfo($event, data)">发药信息</span>
-								<span *ngIf="coopBtns.export && data.batchState.name=='已发药'" (click)="exportPc($event, data)">导出</span>
-								<span *ngIf="coopBtns.print && data.batchState.name=='已发药'" (click)="print($event,data, data.id)">打印</span>
-                <span *ngIf="coopBtns.batchPrint && data.batchState.name=='未发药'" (click)="dispensingPrint($event, data, 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>
+	<div class="list-template">
+		<div class="list-template__content">
+			<div class="list-template__top" nz-row>
+				<div nz-col nzLg='16' class="list-template__searchBox">
+					<div class="list-template__searchItem">
+						<span class="label">批次号：</span>
+						<input nz-input class="formItem" [(ngModel)]="batchNumber" placeholder="请输入批次号" nzSize="default" />
+					</div>
+					<div class="list-template__searchItem">
+						<span class="label">创建时间：</span>
+						<nz-range-picker [(ngModel)]="dateRange" nzFormat="yyyy-MM-dd"
+						(ngModelChange)="changeDate($event)"></nz-range-picker>
+					</div>
+				</div>
+				<div nz-col nzLg='2' class="autoUpdate">{{ logTime }}秒</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.add" class="btn default ml8" (click)='showModal()'>新增</button>
+				</div>
+			</div>
+			<div class="list-template__bottom">
+				<nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+					[nzLoading]="loading1">
+					<thead>
+						<tr class="thead">
+							<th nzWidth="13%">批次号</th>
+							<th nzWidth="13%">创建时间</th>
+							<th nzWidth="13%">发药时间区间</th>
+							<th nzWidth="7%">发药科室</th>
+							<th nzWidth="7%">科室数</th>
+							<th nzWidth="7%">发药量</th>
+							<th nzWidth="7%">箱数</th>
+							<th nzWidth="10%">药品总价</th>
+							<th nzWidth="7%">状态</th>
+							<th nzWidth="16%">操作</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr *ngFor="let data of listOfData">
+							<td>{{ data.batchNo || '-' }}</td>
+							<td>{{ data.createTime|date:'yyyy-MM-dd HH:mm' }}</td>
+							<td>
+								<div>{{ data.startTime|date:'yyyy-MM-dd HH:mm' }}至</div>
+								<div>{{ data.endTime|date:'yyyy-MM-dd HH:mm' }}</div>
+							</td>
+							<td>{{ data.pharmacyDTO?data.pharmacyDTO.dept:'-' }}</td>
+							<td>{{ data.deptNum || '0' }}</td>
+							<td>{{ data.drugNum || '0'}}</td>
+							<td>{{ data.cartonNum || '0' }}</td>
+							<td>{{ data.totalPrice || '0' }}</td>
+							<td>{{ data.batchState?data.batchState.name : '-' }}</td>
+							<td>
+								<div class="coop">
+									<span *ngIf="coopBtns.edit && data.batchState.name=='未发药'" (click)="edit($event,data)">编辑</span>
+									<span *ngIf="coopBtns.del && data.batchState.name=='未发药'" (click)="showDelModal($event,data.id)">删除</span>
+									<span *ngIf="coopBtns.config && data.batchState.name=='未发药'" (click)="detail($event,data)">配置</span>
+									<span *ngIf="coopBtns.dispensingGross && data.batchState.name=='已发药'" (click)="dispensingGross($event, data)">发药总量</span>
+									<span *ngIf="coopBtns.dispensingInfo && data.batchState.name=='已发药'" (click)="dispensingInfo($event, data)">发药信息</span>
+									<span *ngIf="coopBtns.export && data.batchState.name=='已发药'" (click)="exportPc($event, data)">导出</span>
+									<span *ngIf="coopBtns.print && data.batchState.name=='已发药'" (click)="print($event,data, data.id)">打印</span>
+									<span *ngIf="coopBtns.batchPrint && data.batchState.name=='未发药'" (click)="dispensingPrint($event, data, 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>
   <!-- 新增/编辑模态框 -->
   <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>
-      <overlay-scrollbars #osComponentRef1 class="content">
+      <div class="content">
        <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
        	<nz-form-item>
        	  <nz-form-label nzRequired nzFor="dispensingTime">发药时间区间</nz-form-label>
@@ -114,7 +115,7 @@
 					</nz-form-control>
 				</nz-form-item>
        </form>
-      </overlay-scrollbars>
+      </div>
       <div class="display_flex justify-content_flex-center">
         <button class="btn" nz-button nzType="primary" (click)="submitForm()" [nzLoading]="btnLoading">{{add ? '保存并配置' : '保存'}}</button>
 				<button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>

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

@@ -27,6 +27,9 @@
 .autoUpdate{
 	text-align: right;
 }
+.list-template .ant-calendar-picker{
+	width: auto !important; 
+}
 .save {
   position: fixed;
   left: 0;

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

@@ -50,7 +50,7 @@ export class DispensingBatchComponent implements OnInit, OnDestroy {
 		this.hosId = this.tool.getCurrentHospital().id;
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.initForm();
-		this.getAddDeparts('')
+		this.getTaskTypesId();
     this.getAllHospital();
     this.getDeptHandoverType();
 		this.autoUpdate(true)
@@ -247,12 +247,10 @@ export class DispensingBatchComponent implements OnInit, OnDestroy {
 	// 获取药房科室
 	getAddDeparts(dept) {
 		var that = this;
-		let data = {
+		let data:any = {
 			department: {
 				dept,
-				hospital: {
-					id: this.hosId
-				},
+				hosIds: this.hosId,
 				type:{
 					id:''
 				}
@@ -260,6 +258,14 @@ export class DispensingBatchComponent implements OnInit, OnDestroy {
 			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.getDictionary("list", "dept_type").subscribe((res) => {
 			let typeData = res.find(i=>i.value=='pharmacyRoom');
 			if(typeData){
@@ -293,12 +299,12 @@ export class DispensingBatchComponent implements OnInit, OnDestroy {
 	getTaskTypesId() {
 		this.mainService.getDictionary("list", "ordinary_field").subscribe((data) => {
 			this.taskTypeData = data.find(i=>i.value=='infusionSolutions')
-			this.getConfig();
 		});
 	}
 	
 	// 获取配置
-	getConfig() {
+	isParentData:any;
+	getConfig(type) {
 	  let postData = {
 	    idx: 0,
 	    sum: 10,
@@ -312,10 +318,14 @@ export class DispensingBatchComponent implements OnInit, OnDestroy {
 		.subscribe((result) => {
 			if (result.status == 200) {
 				let data = result.list[0] || {};
-				this.validateForm.controls.addDepartment.setValue(data.pharmacyDept || '');
-				this.add = true;
+				this.isParentData = data.quoteParentData;
+				if(type=='add'){
+					this.add = true;
+					this.isAddDeptsPhone = true;
+					this.validateForm.controls.addDepartment.setValue(data.pharmacyDept || '');
+				}
+				this.getAddDeparts('')
 				this.modal = true;
-				this.isAddDeptsPhone = true;
 			}
 		});
 	}
@@ -323,7 +333,7 @@ export class DispensingBatchComponent implements OnInit, OnDestroy {
   // 新增弹框
   showModal() {
     this.initForm();
-		this.getTaskTypesId()
+		this.getConfig('add');
   }
   hideModal() {
     this.coopItem = null;
@@ -384,6 +394,7 @@ export class DispensingBatchComponent implements OnInit, OnDestroy {
   coopItem: any = null;
   edit(e, data) {
     e.stopPropagation();
+		this.getConfig('edit');
     this.add = false;
     this.coopId = data.id;
     this.coopItem = data;
@@ -396,7 +407,6 @@ export class DispensingBatchComponent implements OnInit, OnDestroy {
 		}
 		this.loadStartTime = data.startTime
 		this.loadEndTime = data.endTime
-		console.log(11,this.validateForm.value)
 		this.modal = true
   }
 

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

@@ -245,7 +245,7 @@ export class DispensingInfoDetailComponent implements OnInit{
 	    drugsBatch: {
 	    	batchNo:name,
 	    	hosId: this.hosId,
-				batchStatus:{
+				batchState:{
 					value:2
 				}
 	    },

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

@@ -60,9 +60,11 @@ export class InspectStatisticsComponent implements OnInit {
  // 重置
  reset() {
   this.pageIndex = 1;
-  this.startDate = null;
- 	this.endDate = null;
- 	this.dateRange = [];
+	const todayStart = startOfToday();
+	const formattedTodayStart = format(todayStart, 'yyyy-MM-dd');
+	this.startDate = formattedTodayStart+' '+'00:00:00';
+	this.endDate = formattedTodayStart+' '+'23:59:59';
+	this.dateRange = [this.startDate,this.endDate];
   this.getList();
  }
  // 表格数据