| 
					
				 | 
			
			
				@@ -1372,7 +1372,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (realIcdText == null && (StringUtils.isBlank(mzPrescriptionVo.getTcmIcdText()) || StringUtils.isBlank(mzPrescriptionVo.getTcmIcdText().replaceAll(",","")))) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             throw new MzException("标准诊断或中医诊断不能为同时为空!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (mzPrescriptionVo.getMzZyReq() !=null || CollUtil.isNotEmpty(mzPrescriptionVo.getMzYjReqList())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        /*if (mzPrescriptionVo.getMzZyReq() !=null || CollUtil.isNotEmpty(mzPrescriptionVo.getMzYjReqList())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (mzPrescriptionVo.getMzBlRecord().getEmrChiefComplaint() == null || StringUtils.isBlank(mzPrescriptionVo.getMzBlRecord().getEmrChiefComplaint())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 throw new MzException("请完善主诉内容!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1385,7 +1385,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (mzPrescriptionVo.getMzBlRecord().getEmrPe() == null || StringUtils.isBlank(mzPrescriptionVo.getMzBlRecord().getEmrPe())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 throw new MzException("请完善体格检查内容!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				          boolean checkWpFlag = wpMzPrescriptionService.checkMzPrescription(mzPrescriptionVo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(!checkWpFlag){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             throw new MzException("外配处方不能和其他处方组合开具,只能单独开!"); 
			 |