| 
					
				 | 
			
			
				@ -584,7 +584,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public JSONObject checkOutpatient(String patient,String cardNo)throws Exception{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public JSONObject checkOutpatient(String patient)throws Exception{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //-1卡余额不足,,-2 存在未结束的诊断热 1成功 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        JSONObject rs = new JSONObject(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //1.余额判断改到前端判断 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1361,13 +1361,16 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public Map<String,Object> findDoctorInfo(String doctor){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        BaseDoctorDO doctorDO = baseDoctorDao.findOne(doctor); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        Map<String,Object> rs = new HashedMap(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        rs.put("doctor",doctor); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        rs.put("doctor",doctorDO.getName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        rs.put("job",doctorDO.getJobTitleCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        rs.put("jobName",doctorDO.getJobTitleName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        rs.put("chargeType",doctorDO.getChargeType()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        rs.put("photo",doctorDO.getPhoto()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if(doctorDO!=null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            rs.put("doctor",doctor); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            rs.put("doctor",doctorDO.getName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            rs.put("job",doctorDO.getJobTitleCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            rs.put("jobName",doctorDO.getJobTitleName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            rs.put("chargeType",doctorDO.getChargeType()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            rs.put("photo",doctorDO.getPhoto()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        return rs; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 |