| 
					
				 | 
			
			
				@@ -489,7 +489,6 @@ public class MzPharmacyController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         MzOrderDetail mzOrderDetail = mzOrderDetailService.queryByEntity(MzOrderDetail.builder() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 .patientId(mzChargeDetail.getPatientId()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 .times(mzChargeDetail.getTimes()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                .receiptNo(mzChargeDetail.getReceiptNo()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 .build()).stream().findFirst().orElse(null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                          
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         if (mzOrderDetail != null) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -582,7 +581,6 @@ public class MzPharmacyController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     MzOrderDetail mzOrderDetail = mzOrderDetailService.queryByEntity(MzOrderDetail.builder() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             .patientId(chargeDetailInfoVo.getPatientId()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             .times(chargeDetailInfoVo.getTimes()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            .receiptNo(chargeDetailInfoVo.getReceiptNo()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             .build()).stream().findFirst().orElse(null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                      
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     if (mzOrderDetail != null) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -767,7 +765,6 @@ public class MzPharmacyController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 MzOrderDetail mzOrderDetail = mzOrderDetailService.queryByEntity(MzOrderDetail.builder() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         .patientId(mzSendMedicineVo.getPatientId()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         .times(mzSendMedicineVo.getTimes()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        .receiptNo(mzSendMedicineVo.getReceiptNo()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         .build()).stream().findFirst().orElse(null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (mzOrderDetail != null) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2159,7 +2156,6 @@ public class MzPharmacyController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     MzOrderDetail mzOrderDetail = mzOrderDetailService.queryByEntity(MzOrderDetail.builder() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             .patientId(patientId) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             .times(times) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            .receiptNo(receiptNo) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             .build()).stream().findFirst().orElse(null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                      
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     String mdtrtSetlType = "2"; // 默认自费结算 
			 |