| 
					
				 | 
			
			
				@ -1732,12 +1732,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               BaseOrgDO org = baseOrgDao.findByCode(hospitalDOs.get(0).getOrgCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               rs.put("winNo",org.getWinNo()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               rs.put("deptName",hospitalDOs.get(0).getDeptName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                rs.put("deptCode",hospitalDOs.get(0).getDeptCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                rs.put("dept",hospitalDOs.get(0).getDeptCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            }else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               rs.put("hospital",null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               rs.put("winNo",null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               rs.put("deptName",null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                rs.put("deptCode",null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                rs.put("dept",null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -2331,7 +2331,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if(StringUtils.isNotBlank(outpatientType)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            sql+=" AND d.outpatient_type like '%"+outpatientType+"%' "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            sql+=" AND d.outpatient_type = '"+outpatientType+"' "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if(StringUtils.isNotBlank(keyName)){ 
			 |