| 
					
				 | 
			
			
				@@ -302,7 +302,7 @@ public class MzPharmacyServiceImpl implements MzPharmacyService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             cal.setTime(date); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             cal.add(Calendar.DAY_OF_MONTH, -15); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //            String addTime = DateUtil.fomart(cal.getTime(), "yyyy-MM-dd") + " 00:00:00"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            String addTime = "2023-04-19 00:00:00"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            String addTime = "2023-04-12 00:00:00"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             List<Map<String, Object>> listAdd = mzPharmacyMapper.selectRadSendStatAdd(addTime, DateUtil.fomart(DateUtil.getPrevDayLastSecond(date), "yyyy-MM-dd HH:mm:ss")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if(listAdd.size() > 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 for(Map<String, Object> m1 : listAdd){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -350,7 +350,7 @@ public class MzPharmacyServiceImpl implements MzPharmacyService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         cal.setTime(date); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         cal.add(Calendar.DAY_OF_MONTH, -15); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //        String addTime = DateUtil.fomart(cal.getTime(), "yyyy-MM-dd") + " 00:00:00"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        String addTime = "2023-04-19 00:00:00"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        String addTime = "2023-04-12 00:00:00"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<MzChargeDetail> mzChargeDetailsAdd = mzPharmacyMapper.selectRadSendPrescriptionAdd(addTime, DateUtil.fomart(DateUtil.getPrevDayLastSecond(date), "yyyy-MM-dd HH:mm:ss")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(mzChargeDetailsAdd.size() > 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             mzChargeDetails.addAll(mzChargeDetailsAdd); 
			 |