| 
					
				 | 
			
			
				@@ -1166,6 +1166,15 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         boolean flag = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         int pid = 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         for(YpSummaryPrint ypPrint : summaryData){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ypPrint.setId(String.valueOf(System.currentTimeMillis())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ypPrint.setSort(pid); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            pid ++; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ypPrint.setCreateDate(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ypPrint.setPageNo(pageNo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ypPrint.setPageClass(vo.getPageClass()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ypPrint.setSubmitFlag(String.valueOf(vo.getSubmitFlag())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ypPrint.setPrintFlag(vo.getPrintFlag()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             String chargeCode = ypPrint.getChargeCode(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             String serial = ypPrint.getSerial(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             BigDecimal printAmount = ypPrint.getAmount(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1189,16 +1198,8 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 ypPrint.setResult("正常,实际发药数量: " + realAmount + ", 打印数量: " + printAmount); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ypPrint.setId(String.valueOf(System.currentTimeMillis())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ypPrint.setSort(pid); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ypPrint.setPageNo(pageNo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ypPrint.setPageClass(vo.getPageClass()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ypPrint.setSubmitFlag(String.valueOf(vo.getSubmitFlag())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ypPrint.setPrintFlag(vo.getPrintFlag()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 医嘱实际发药量 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ypPrint.setRealAmount(realAmount); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ypPrint.setCreateDate(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            pid ++; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(StringUtils.isNotBlank(msg)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             log.info(msg); 
			 |