大输液管理开发

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

@@ -19,7 +19,7 @@
         </div>
         <div class="list-template__searchItem">
           <span class="label">创建时间：</span>
-          <nz-range-picker [(ngModel)]="dateRange" [nzShowTime]="{ nzFormat: 'HH:mm:ss' }" nzFormat="yyyy-MM-dd HH:mm:ss"
+          <nz-range-picker [(ngModel)]="dateRange" nzFormat="yyyy-MM-dd"
 					(ngModelChange)="changeDate($event)"></nz-range-picker>
         </div>
       </div>
@@ -46,18 +46,18 @@
             <th nzWidth="18%">操作</th>
           </tr>
         </thead>
-        <tbody>
+        <tbody v-if="listOfData && listOfData.length>0">
           <tr *ngFor="let data of listOfData" (click)="selectedListData(data.id)">
             <td>
 							<div>{{ data.packingNo}}</div>
 							<div>{{ data.createTime|date:'yyyy-MM-dd HH:mm'}}</div>
 						</td>
             <td>{{ data.batch?data.batch.batchNo:'-' }}</td>
-            <td>{{ data.applyDept||'无' }}</td>
-            <td>{{ data.totalCount||'无' }}</td>
-            <td>{{data.kindCount||'无'}}</td>
-            <td>{{ data.expendPrice }}</td>
-            <td>{{ data.actualPrice }}</td>
+            <td>{{ data.applyDeptDTO?data.applyDeptDTO.dept :'-' }}</td>
+            <td>{{ data.totalCount||'0' }}</td>
+            <td>{{data.kindCount||'0'}}</td>
+            <td>{{ data.expendPrice ||'0' }}</td>
+            <td>{{ data.actualPrice || '0'}}</td>
             <td>{{ data.pharmacyDTO?data.pharmacyDTO.dept:'-'}}</td>
 						<td>{{ data.createOrder==1?'是':'否'}}</td>
 						<td>{{ data.orderState.name}}</td>
@@ -65,7 +65,7 @@
               <div class="coop">
                 <span *ngIf="coopBtns.look" (click)="detail($event,data.id)">查看</span>
                 <span *ngIf="coopBtns.print" (click)="print($event, data, data.id)">打印</span>
-                <span *ngIf="coopBtns.establish && data.createOrder=='0'" (click)="addDateModal(data)">配送建单</span>
+                <span *ngIf="coopBtns.establish && ( data.createOrder=='0' || data.createOrder==null)" (click)="addDateModal(data)">配送建单</span>
               </div>
             </td>
           </tr>
@@ -90,8 +90,9 @@
             [nzLoading]="loading1">
             <thead>
               <tr class="thead">
-                <th nzWidth="15%">药品名称</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>
@@ -103,15 +104,16 @@
             </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||'无' }}</td>
-                <td>{{ data.actualCount||'无' }}</td>
-                <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.packingSpecs:'无' }}</td>
-                <td>{{ data.cartonNum || '无' }}</td>
-                <td>{{ data.formerInventory || '无' }}</td>
-                <td>{{ data.afterInventory || '-'}}</td>
-        				<td>{{ data.addSub || '无' }}</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>
@@ -138,6 +140,7 @@
   <!-- 打印 -->
   <div id="report" style="display: none;">
 		<div class="monad" 
+				*ngIf="rowData"
 				style="padding: 10px;
 				border: 1px solid #e7e7e7;
 				border-radius: 5px;">
@@ -147,7 +150,7 @@
 				font-size: 16px;
 				border-bottom: 1px solid #e7e7e7;
 				padding-bottom: 10px;">
-				大输液发药单-{{rowData.pharmacyDTO?rowData.pharmacyDTO.dept:''}}
+				大输液发药单-{{rowData.applyDeptDTO?rowData.applyDeptDTO.dept:''}}
 			</div>
 			<div class="monad-sign" style="display: flex;line-height: 40px;font-size: 14px;">
 				<div style="margin-right: 15px;">日期：{{rowData.createTime|date:'yyyy-MM-dd HH:mm'}}</div>
@@ -156,7 +159,7 @@
 			</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: 20%;height: 40px;
+					<div style="text-align: center;width: 40%;height: 40px;
 					line-height: 40px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">药品名称</div>
@@ -166,21 +169,21 @@
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">规格</div>
 					
-					<div style="text-align: center;width: 20%;height: 40px;
+					<div style="text-align: center;width: 10%;height: 40px;
 					line-height: 40px;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">总量（实发数量）</div>
+					border-bottom: 1px solid #e7e7e7;">总量</div>
 					
-					<div style="text-align: center;width: 20%;height: 40px;
+					<div style="text-align: center;width: 10%;height: 40px;
 					line-height: 40px;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">箱数（发药箱数）</div>
+					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>
 				<div *ngFor="let data of codes" style="display: flex;">
-					<div style="text-align: center;width: 20%;height: 40px;
+					<div style="text-align: center;width: 40%;height: 40px;
 					line-height: 40px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.drugName }}</div>
@@ -190,12 +193,12 @@
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.specs }}</div>
 					
-					<div style="text-align: center;width: 20%;height: 40px;
+					<div style="text-align: center;width: 10%;height: 40px;
 					line-height: 40px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.actualCount }}</div>
 					
-					<div style="text-align: center;width: 20%;height: 40px;
+					<div style="text-align: center;width: 10%;height: 40px;
 					line-height: 40px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.cartonNum }}</div>

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

@@ -10,7 +10,7 @@ import {
 import { MainService } from "../../services/main.service";
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { ToolService } from "../../services/tool.service";
-import { format } from "date-fns";
+import { format, startOfDay, endOfDay } from "date-fns";
 import { NzMessageService } from "ng-zorro-antd";
 import { Subject } from "rxjs";
 import { debounceTime, filter } from "rxjs/operators";
@@ -315,22 +315,8 @@ export class AdminOfficePrescriptionComponent implements OnInit{
 	    this.startDate = this.endDate = "";
 	    return;
 	  }
-	  this.startDate =
-	    result[0].getFullYear() +
-	    "-" +
-	    (result[0].getMonth() + 1) +
-	    "-" +
-	    result[0].getDate() +
-	    " " +
-	    "00:00:00";
-	  this.endDate =
-	    result[1].getFullYear() +
-	    "-" +
-	    (result[1].getMonth() + 1) +
-	    "-" +
-	    result[1].getDate() +
-	    " " +
-	    "23:59:59";
+	  this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+	  this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
 	}
 	
 	// 获取所有科室
@@ -870,7 +856,7 @@ export class AdminOfficePrescriptionComponent implements OnInit{
         that.printLoading = false;
         setTimeout(() => {
           const printContent = document.getElementById("report");
-          const WindowPrt = window.open("", "", "width=800,height=900");
+          const WindowPrt = window.open("", "", "width=1000,height=900");
           WindowPrt.document.write(printContent.innerHTML);
           WindowPrt.document.close();
           WindowPrt.focus();

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

@@ -19,7 +19,7 @@ export class BigTransfusionSetComponent implements OnInit {
   // 接手术关联任务类型
   infusionSolutionsTypeId:Number;
   taskTypes1:any[] = [];
-  taskTypeData:any[] = [];
+  taskTypeData:{id:''};
   // 苏醒室科室
   recoveryDeptId:any;
   recoveryDepts:any[] = [];
@@ -75,7 +75,6 @@ export class BigTransfusionSetComponent implements OnInit {
       fun.call(this, v[1], v[2], v[3]);
     });
     this.getTaskTypes('', true);
-		this.getTaskTypesId(true);
   }
 
   // 切换tab
@@ -91,7 +90,7 @@ export class BigTransfusionSetComponent implements OnInit {
     }
     let editData = {
 			id:'',
-			taskType:this.taskTypeData[0].id,
+			taskType:this.taskTypeData.id,
 			hosId: this.hosId,
 			infusionSolutionsTypeId:this.infusionSolutionsTypeId, //任务类型参数
 			autoCreate:0
@@ -156,37 +155,17 @@ export class BigTransfusionSetComponent implements OnInit {
         this.isLoading = false;
         if (result.status == 200) {
           this.taskTypes1 = result.list || [];
-          isFirst && this.getConfig();
+					this.getTaskTypesId();
         }
       });
   }
 	
 	// 获取任务id
-	getTaskTypesId( isFirst:boolean = false) {
-	  isFirst && (this.loading = true);
-	  let postData:any = {
-	    idx: 0,
-	    sum: 9999,
-	    taskType: {
-	      simpleQuery: true,
-				ordinaryField: {
-					key: 'ordinary_field',
-					value: 'infusionSolutions'
-				},
-	      hosId: {
-	        id: this.hosId
-	      }
-	    }
-	  };
-	  this.isLoading = true;
-	  this.mainService
-	    .getFetchDataList("simple/data", "taskType", postData)
-	    .subscribe((result) => {
-	      this.isLoading = false;
-	      if (result.status == 200) {
-	        this.taskTypeData = result.list || [];
-	      }
-	    });
+	getTaskTypesId() {
+		this.mainService.getDictionary("list", "ordinary_field").subscribe((data) => {
+			this.taskTypeData = data.find(i=>i.value=='infusionSolutions')
+			this.getConfig();
+		});
 	}
 	
   // 获取配置
@@ -196,15 +175,8 @@ export class BigTransfusionSetComponent implements OnInit {
       idx: 0,
       sum: 10,
       taskTypeConfig: {
-				taskTypeDTO: {
-				  hosId: {
-				    id: this.hosId
-				  },
-				  ordinaryField: {
-				    key: 'ordinary_field',
-				    value: 'infusionSolutions'
-				  }
-				}
+				hosId:this.hosId,
+				taskType:this.taskTypeData.id
       }
     };
     this.mainService

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

@@ -8,7 +8,7 @@
         </div>
         <div class="list-template__searchItem">
           <span class="label">创建时间：</span>
-          <nz-range-picker [(ngModel)]="dateRange" [nzShowTime]="{ nzFormat: 'HH:mm:ss' }" nzFormat="yyyy-MM-dd HH:mm:ss"
+          <nz-range-picker [(ngModel)]="dateRange" nzFormat="yyyy-MM-dd"
 					(ngModelChange)="changeDate($event)"></nz-range-picker>
         </div>
       </div>
@@ -44,17 +44,17 @@
 							<div>{{ data.endTime|date:'yyyy-MM-dd HH:mm' }}</div>
 						</td>
             <td>{{ data.pharmacyDTO?data.pharmacyDTO.dept:'-' }}</td>
-            <td>{{ data.deptNum || '-' }}</td>
-            <td>{{ data.drugNum || '-'}}</td>
-						<td>{{ data.cartonNum || '-' }}</td>
-						<td>{{ data.totalPrice || '-' }}</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.print && data.batchState.name=='已发药'" (click)="dispensingPrint($event,data, data.id)">打印</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>
@@ -129,7 +129,7 @@
 				font-size: 16px;
 				border-bottom: 1px solid #e7e7e7;
 				padding-bottom: 10px;">
-				大输液发药单-{{item.pharmacyDTO.dept}}
+				大输液发药单-{{item.applyDeptDTO.dept}}
 			</div>
 			<div class="monad-sign" style="display: flex;line-height: 40px;font-size: 14px;">
 				<div style="margin-right: 15px;">日期：{{item.createTime|date:'yyyy-MM-dd HH:mm'}}</div>
@@ -138,7 +138,7 @@
 			</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: 20%;height: 40px;
+					<div style="text-align: center;width: 40%;height: 40px;
 					line-height: 40px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">药品名称</div>
@@ -148,21 +148,21 @@
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">规格</div>
 					
-					<div style="text-align: center;width: 20%;height: 40px;
+					<div style="text-align: center;width: 10%;height: 40px;
 					line-height: 40px;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">总量（实发数量）</div>
+					border-bottom: 1px solid #e7e7e7;">总量</div>
 					
-					<div style="text-align: center;width: 20%;height: 40px;
+					<div style="text-align: center;width: 10%;height: 40px;
 					line-height: 40px;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">箱数（发药箱数）</div>
+					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>
 				<div *ngFor="let data of item.drugsConfigureDTOS" style="display: flex;">
-					<div style="text-align: center;width: 20%;height: 40px;
+					<div style="text-align: center;width: 40%;height: 40px;
 					line-height: 40px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.drugName }}</div>
@@ -172,12 +172,12 @@
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.specs }}</div>
 					
-					<div style="text-align: center;width: 20%;height: 40px;
+					<div style="text-align: center;width: 10%;height: 40px;
 					line-height: 40px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.actualCount }}</div>
 					
-					<div style="text-align: center;width: 20%;height: 40px;
+					<div style="text-align: center;width: 10%;height: 40px;
 					line-height: 40px;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.cartonNum }}</div>
@@ -194,6 +194,10 @@
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo"></app-prompt-modal>
 
+ <!-- 模态框 -->
+<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

@@ -10,7 +10,7 @@ import {
 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 { format, startOfDay, endOfDay, subDays} from "date-fns";
 import { NzMessageService } from "ng-zorro-antd";
 import { Subject } from "rxjs";
 import { debounceTime, filter } from "rxjs/operators";
@@ -200,8 +200,8 @@ export class DispensingBatchComponent implements OnInit {
 		}
 		if (that.validateForm.invalid) return;
     let data: any = {
-			startTime:this.formStartDate,//发起时间开始
-			endTime:this.formEndDate,//发起时间结束
+			startTime:this.formStartDate?this.formStartDate:this.loadStartTime,//发起时间开始
+			endTime:this.formEndDate?this.formEndDate:this.loadEndTime,//发起时间结束
 			hosId:this.hosId,
 			pharmacy:this.validateForm.value.department,
 			id:that.coopId
@@ -327,8 +327,8 @@ export class DispensingBatchComponent implements OnInit {
 		  this.formStartDate = this.formEndDate = "";
 		  return;
 		}
-		this.formStartDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
-		this.formEndDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+		this.formStartDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+		this.formEndDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
 	}
 	
 	// 获取所有科室
@@ -340,18 +340,27 @@ export class DispensingBatchComponent implements OnInit {
         hospital: {
           id: this.hosId
         },
+				type:{
+					id:''
+				}
       },
       idx: 0,
       sum: 20,
     };
-    that.mainService
-      .getFetchDataList("data", "department", data)
-      .subscribe((data) => {
-				setTimeout(_=>{
-					this.hospitals1 = data.list
-					that.isDeptLoading = false;
-				},500)
-      });
+		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) => {
+					setTimeout(_=>{
+						this.hospitals1 = data.list
+						that.isDeptLoading = false;
+					},500)
+			  });
+		});
   }
 	
   // 获取所有院区
@@ -485,11 +494,17 @@ export class DispensingBatchComponent implements OnInit {
     this.initForm();
   }
   // 初始化新增form表单
+	loadStartTime = '';
+	loadEndTime = '';
   initForm() {
     this.validateForm = this.fb.group({
       dispensingTime: [null, [Validators.required]],
       department: [null, [Validators.required]]
     });
+		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 } => {
@@ -567,8 +582,8 @@ export class DispensingBatchComponent implements OnInit {
 		}
 		if (that.validateForm.invalid) return;
     let data: any = {
-			startTime:this.formStartDate,//发起时间开始
-			endTime:this.formEndDate,//发起时间结束
+			startTime:this.formStartDate?this.formStartDate:this.loadStartTime,//发起时间开始
+			endTime:this.formEndDate?this.formEndDate:this.loadEndTime,//发起时间结束
 			hosId:this.hosId,
 			pharmacy:this.validateForm.value.department
     };
@@ -601,6 +616,8 @@ export class DispensingBatchComponent implements OnInit {
     this.coopItem = data;
     this.validateForm.controls.department.setValue(data.pharmacy);
     this.validateForm.controls.dispensingTime.setValue([data.startTime,data.endTime]);
+		this.loadStartTime = data.startTime
+		this.loadEndTime = data.endTime
 		this.modal = true
   }
 
@@ -689,7 +706,7 @@ export class DispensingBatchComponent implements OnInit {
 
 	// 发药并打印
 	printData = []; 
-	dispensingPrint(e, data, id?){
+	print(e, data, id){
 		this.rowData = data
 		e.stopPropagation();
 		let that = this;
@@ -714,15 +731,40 @@ export class DispensingBatchComponent implements OnInit {
 				}
 		    that.printData = arr;
 		    that.printLoading = false;
+				that.btnLoading = false;
+				that.printModal = false;
 		    setTimeout(() => {
 		      const printContent = document.getElementById("report");
-		      const WindowPrt = window.open("", "", "width=800,height=900");
+		      const WindowPrt = window.open("", "", "width=1000,height=900");
 		      WindowPrt.document.write(printContent.innerHTML);
 		      WindowPrt.document.close();
 		      WindowPrt.focus();
 		      WindowPrt.print();
 		      WindowPrt.close();
+					setTimeout(()=>{
+						this.getList();
+					},200)
 		    }, 500);
 		  });
 	}
+	
+	printModal = false;
+	printE = '';
+	printItemData = '';
+	printItemId = '';
+	dispensingPrint(e, data, id){
+		this.printModal = true
+		this.printE = e
+		this.printItemData = data
+		this.printItemId = id
+	}
+	
+	confirmPrintDel(){
+		this.btnLoading = true;
+		this.print(this.printE, this.printItemData, this.printItemId)
+	}
+	
+	hidePrintModal(){
+		this.printModal = false
+	}
 }

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

@@ -9,29 +9,31 @@
         [nzLoading]="loading1">
         <thead>
           <tr class="thead">
-            <th nzWidth="10%">药品名称</th>
-            <th nzWidth="10%">规格</th>
+						<th nzWidth="9%">药品标识</th>
+            <th nzWidth="9%">药品名称</th>
+            <th nzWidth="9%">规格</th>
 						<th nzWidth="9%">消耗数量</th>
 						<th nzWidth="9%">原库存数</th>
-						<th nzWidth="10%">包装规格</th>
+						<th nzWidth="9%">包装规格</th>
 						<th nzWidth="9%">发药箱数</th>
 						<th nzWidth="9%">实发数量</th>
-            <th nzWidth="10%">计算后库存</th>
-						<th nzWidth="10%">增减</th>
-            <th nzWidth="14%">操作</th>
+            <th nzWidth="9%">计算后库存</th>
+						<th nzWidth="7%">增减</th>
+            <th nzWidth="11%">操作</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>{{ data.drugsInfoDTO?data.drugsInfoDTO.specs:'-' }}</td>
-            <td>{{ data.expendCount||'-' }}</td>
-            <td>{{ data.formerInventory || '-' }}</td>
-            <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.packingSpecs:'-' }}</td>
-						<td>{{ data.cartonNum||'-' }}</td>
-						<td>{{ data.actualCount||'-' }}</td>
-						<td>{{ data.afterInventory||'-' }}</td>
-						<td>{{ data.addSub||'-' }}</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.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>
@@ -45,7 +47,7 @@
   </div>
 	<div class="right-content">
 		<div class="right-top">
-			<h3 class="title">快速搜索发药科室</h3>
+			<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">
@@ -56,6 +58,7 @@
 			      <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
 			    </nz-option>
 			  </nz-select>
+				<span (click)='addDept()' class="icon_transport transport-tag27fuben add-class"></span>
 			</div>
 		</div>
 		<div class="right-bottom">

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

@@ -83,11 +83,16 @@ h3{
 				align-items: center;
 				margin-top: 10px;
 				.label{
-					width:50px;
+					width:55px;
 				}
 				.ant-select{
 					width: 100%;
 				}
+				.add-class{
+					margin-left: 10px;
+					cursor: pointer;
+					color: #34b349;
+				}
 			}
 			
 		}

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

@@ -104,7 +104,7 @@ export class DispensingDetailComponent implements OnInit {
     	sum: 9999,
     	drugsConfigure: {
     	  hosId: this.hosId,
-				deptId :this.deptId,
+				deptId :this.deptId?this.deptId:null,
     	  batchId: this.detailId
     	}
     };
@@ -134,10 +134,14 @@ export class DispensingDetailComponent implements OnInit {
 		}else{
 			delete data.drugsConfigure.batchId
 		}
+		let deptData = this.hospitals1.find(i=>i.id==e)
 		that.mainService
 		  .getFetchDataList("data", "drugsConfigure", data)
 		  .subscribe((res) => {
-				this.getDeptData(e,'all','')
+				if(res.list.length==0){
+					this.message.error(`您选择的科室“	${deptData.dept}”时间段内没有消耗药品无法添加发药单。`)
+				}
+				this.getDeptData(e,'all','load')
 		  });
 	}
 	
@@ -175,7 +179,10 @@ export class DispensingDetailComponent implements OnInit {
 		  .subscribe((res) => {
 				that.btnLoading = false;
 				that.delModal = false;
-				this.getDispensingDept('','')
+				this.deptId = null
+				this.deptName = null
+				this.deptIndex = null
+				this.getDeptData('','all','load')
 				if (res.status==200) {
 				  that.showPromptModal("删除", true, "");
 				} else {
@@ -185,6 +192,10 @@ export class DispensingDetailComponent implements OnInit {
 	}
 	// 选择楼栋
 	buildingChange(e){
+		this.deptId = null
+		this.deptName = null
+		this.deptIndex = null
+		this.listOfData=[]
 		this.getDeptData(e,'','')
 	}
 	
@@ -210,24 +221,31 @@ export class DispensingDetailComponent implements OnInit {
 		that.mainService
 		  .getFetchDataList("data", "drugsList", data)
 		  .subscribe((res) => {
-				// this.deptId = null
-				// this.deptName = null
-				// this.deptIndex = null
 		    that.deptList = res.list;
 				if(initial=='load'){
 					if(res.list.length>0){
-						this.deptId = res.list[0].id
+						this.deptId = res.list[0].applyDeptDTO.id
 						this.deptName = res.list[0].applyDeptDTO.dept
 						this.deptIndex = 0
-						this.getList()
 					}
+					this.getList()
 				}
 		  });
 	}
 	
 	// 选择科室
+	addDeptId=''
 	deptChange(e){
-		this.getDispensingDept(e,'dept')
+		this.addDeptId = e
+		
+	}
+	// 添加科室
+	addDept(){
+		if(this.addDeptId){
+			this.getDispensingDept(this.addDeptId,'dept')
+		}else{
+			this.message.error('请先选择发药科室')
+		}
 	}
 	
 	// 获取楼栋
@@ -313,6 +331,7 @@ export class DispensingDetailComponent implements OnInit {
 	    .subscribe((data) => {
 	      that.btnLoading = false;
 	      that.hideModal();
+				this.getList()
 	      if (data.status == 200) {
 	        that.showPromptModal(that.add ? "增加" : "减少", true, "");
 	      } else {
@@ -358,7 +377,6 @@ export class DispensingDetailComponent implements OnInit {
     setTimeout(() => {
       this.promptModalShow = true;
     }, 100);
-    this.getList();
   }
 
   delModal: boolean = false; //删除模态框

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

@@ -35,7 +35,8 @@
         [nzLoading]="loading1">
         <thead>
           <tr class="thead">
-						<th nzWidth="20%">科室名称</th>
+						<th nzWidth="10%">科室名称</th>
+						<th nzWidth="10%">药品标识</th>
             <th nzWidth="20%">药品名称</th>
             <th nzWidth="10%">规格</th>
             <th nzWidth="20%">库存数量（正负值）</th>
@@ -45,14 +46,15 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData" (click)="selectedListData(data.id)">
-            <td>{{ data.departmentDTO?data.departmentDTO.dept:'无' }}</td>
-            <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugName:'无' }}</td>
-            <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.specs:'无' }}</td>
-            <td>{{ data.inventoryNum || '无' }}</td>
-            <td>{{ data.inventoryPrice || '无' }}</td>
+            <td>{{ data.departmentDTO?data.departmentDTO.dept:'-' }}</td>
+						<td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugCode:'-' }}</td>
+            <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugName:'-' }}</td>
+            <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.specs:'0' }}</td>
+            <td>{{ data.inventoryNum || '0' }}</td>
+            <td>{{ data.inventoryPrice || '0' }}</td>
             <td>
               <div class="coop">
-                <span *ngIf="coopBtns.historyRecord" (click)="detail($event,data.id)">历史记录</span>
+                <span *ngIf="coopBtns.historyRecord" (click)="detail($event,data)">历史记录</span>
               </div>
             </td>
           </tr>
@@ -94,13 +96,13 @@
                 <td>{{ data.createTime|date:'yyyy-MM-dd HH:mm'}}</td>
                 <td>{{ data.drugsList?data.drugsList.batch.batchNo : '无' }}</td>
                 <td>{{ data.drugsList?data.drugsList.packingNo : '无' }}</td>
-								<td>{{ data.drugsConfig?data.drugsConfig.expendCount:'无' }}</td>
-								<td>{{ data.drugsConfig?data.drugsConfig.formerInventory:'无' }}</td>
-								<td>{{ data.drugsConfig?data.drugsConfig.addSub:'无' }}</td>
-                <td>{{ data.drugsInfo?data.drugsInfo.packingSpecs:'无' }}</td>
-                <td>{{ data.drugsConfig?data.drugsConfig.cartonNum : '无' }}</td>
-                <td>{{ data.drugsConfig?data.drugsConfig.actualCount : '无'}}</td>
-        				<td>{{ data.drugsConfig?data.drugsConfig.afterInventory : '无' }}</td>
+								<td>{{ data.drugsConfig?data.drugsConfig.expendCount:'0' }}</td>
+								<td>{{ data.drugsConfig&&data.drugsConfig.formerInventory?data.drugsConfig.formerInventory:'0' }}</td>
+								<td>{{ data.drugsConfig&&data.drugsConfig.addSub?data.drugsConfig.addSub:'0' }}</td>
+                <td>{{ data.drugsInfo?data.drugsInfo.packingSpecs:'0' }}</td>
+                <td>{{ data.drugsConfig?data.drugsConfig.cartonNum : '0' }}</td>
+                <td>{{ data.drugsConfig?data.drugsConfig.actualCount : '0'}}</td>
+        				<td>{{ data.drugsConfig?data.drugsConfig.afterInventory : '0' }}</td>
               </tr>
             </tbody>
           </nz-table>
@@ -121,6 +123,5 @@
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo"></app-prompt-modal>
-<!-- 遮罩 -->
-<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/drug-cloud/drug-cloud.component.ts

@@ -298,7 +298,7 @@ export class DrugCloudComponent implements OnInit {
   }
 
   // 查看
-  detail(e, id) {
+  detail(e, item) {
     e.stopPropagation();
 		var that = this;
 		let data = {
@@ -306,7 +306,8 @@ export class DrugCloudComponent implements OnInit {
 			sum: 9999,
 			drugsLog: {
 			  hosId: this.hosId,
-			  drugListId: id
+			  drugId: item.drugId,
+				deptId: item.deptId
 			}
 		};
 		this.loading1 = true;

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

@@ -24,14 +24,14 @@
           <tr class="thead">
             <th nzWidth="5%">序号</th>
             <th nzWidth="10%">药品标识</th>
-            <th nzWidth="10%">药品名称</th>
-            <th nzWidth="5%">规格</th>
-            <th nzWidth="10%">单位</th>
-            <th nzWidth="15%">单价</th>
-            <th nzWidth="15%">包装规格</th>
-            <th nzWidth="10%">低舍</th>
-						<th nzWidth="10%">高入</th>
-            <th nzWidth="20%">操作</th>
+            <th nzWidth="20%">药品名称</th>
+            <th nzWidth="10%">规格</th>
+            <th nzWidth="9%">单位</th>
+            <th nzWidth="9%">单价</th>
+            <th nzWidth="9%">包装规格</th>
+            <th nzWidth="9%">低舍</th>
+						<th nzWidth="9%">高入</th>
+            <th nzWidth="10%">操作</th>
           </tr>
         </thead>
         <tbody>
@@ -135,6 +135,7 @@
 				  <nz-form-control nzErrorTip="请填写低舍!">
 				    <nz-input-group>
 							<nz-input-number
+								(ngModelChange)="lowerChange($event)"
 								formControlName="lowerRound"
 								[nzMin]="0"
 								[nzPrecision]="0"
@@ -151,6 +152,7 @@
 				    <nz-input-group>
 							<nz-input-number
 								formControlName="upperRound"
+								[nzDisabled]="true"
 								[nzMin]="0"
 								[nzPrecision]="0"
 								[nzMax]="999999"
@@ -169,7 +171,7 @@
   </div>
 </div>
 <!-- 删除模态框 -->
-<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" [cancenlLoading]="cancenlLoading"
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" 
   (confirmDelEvent)="confirmDel()" (cancelDelEvent)="cancelDel()" content="是否删除药品信息？" confirmTxt="是" cancelTxt="否">
 </app-dialog-delete>
 
@@ -180,5 +182,3 @@
 <!-- 查看详情 -->
 <router-outlet (deactivate)="getList()"></router-outlet>
 
-<!-- 遮罩 -->
-<app-mask *ngIf="maskFlag"></app-mask>

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

@@ -63,7 +63,6 @@ export class DrugInfoComponent implements OnInit {
   wxRequired = false; //新增或编辑用户的时候，微信号是否必填
   changeInpSubject = new Subject(); //防抖
   changeInpHospitalSubject = new Subject(); //防抖
-	
   ngOnInit() {
     this.coopBtns = this.tool.initCoopBtns(this.route);
 		this.hosId = this.tool.getCurrentHospital().id;
@@ -117,6 +116,11 @@ export class DrugInfoComponent implements OnInit {
 			this.getList();
 		});
 	}
+	
+	lowerChange(e){
+		this.validateForm.controls.upperRound.setValue(e+1);
+	}
+	
 	// 监听标识输入
 	handleInput(event: KeyboardEvent){
 		const input = event.target as HTMLInputElement;