|  | @ -25,6 +25,7 @@ import com.yihu.jw.util.date.DateUtil;
 | 
	
		
			
				|  |  | import com.yihu.jw.wlyy.wlyyhttp.WlyyHttpService;
 | 
	
		
			
				|  |  | import org.apache.commons.collections.map.HashedMap;
 | 
	
		
			
				|  |  | import org.apache.commons.lang.StringUtils;
 | 
	
		
			
				|  |  | import org.hibernate.boot.jaxb.SourceType;
 | 
	
		
			
				|  |  | import org.slf4j.Logger;
 | 
	
		
			
				|  |  | import org.slf4j.LoggerFactory;
 | 
	
		
			
				|  |  | import org.springframework.beans.factory.annotation.Autowired;
 | 
	
	
		
			
				|  | @ -311,10 +312,10 @@ public class DoctorSchemeService {
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         //疾病类型,-1全部,0健康,1高血压,2糖尿病,3高血压+糖尿病
 | 
	
		
			
				|  |  |         if (-1 == disease) {
 | 
	
		
			
				|  |  |             sql += " AND a.disease IN ('1','2','1,2','2,1') ";
 | 
	
		
			
				|  |  |             sql += " AND a.disease IN ('1','2','1,2','2,1' ,'3') ";
 | 
	
		
			
				|  |  |         } else {
 | 
	
		
			
				|  |  |             if (disease == 3) {
 | 
	
		
			
				|  |  |                 sql += " AND a.disease IN ('1,2','2,1') ";
 | 
	
		
			
				|  |  |                 sql += " AND a.disease IN ('1,2','2,1','3') ";
 | 
	
		
			
				|  |  |             } else {
 | 
	
		
			
				|  |  |                 sql += " and a.disease ='" + disease + "' ";
 | 
	
		
			
				|  |  |             }
 | 
	
	
		
			
				|  | @ -336,6 +337,7 @@ public class DoctorSchemeService {
 | 
	
		
			
				|  |  |         if (StringUtils.isNotBlank(trackFlag) && "1".equals(trackFlag)) {
 | 
	
		
			
				|  |  |             sql += " AND tp.del='1' AND tp.doctor_code = '" + doctorcode + "' ";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         System.out.println("sql==>"+sql);
 | 
	
		
			
				|  |  |         List<String> result = jdbcTemplate.queryForList(sql, new Object[]{}, String.class);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         return result;
 | 
	
	
		
			
				|  | @ -604,7 +606,7 @@ public class DoctorSchemeService {
 | 
	
		
			
				|  |  |                 "	base_patient a \n" +
 | 
	
		
			
				|  |  |                 "	INNER JOIN wlyy_outpatient b ON a.id=b.patient\n" +
 | 
	
		
			
				|  |  |                 "WHERE 1=1\n" +
 | 
	
		
			
				|  |  |                 "AND a.disease IN ('1','2','1,2','2,1')\n" +
 | 
	
		
			
				|  |  |                 "AND a.disease IN ('1','2','1,2','2,1','3')\n" +
 | 
	
		
			
				|  |  |                 "AND b.doctor ='" + doctorcode + "'";
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         patients = jdbcTemplate.query(patientsql, new BeanPropertyRowMapper(PatientVO.class));
 | 
	
	
		
			
				|  | @ -2433,6 +2435,7 @@ public class DoctorSchemeService {
 | 
	
		
			
				|  |  |             sql += " and t.create_time >='"+startDate+"' ";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         sql += " LIMIT  " + (page - 1) * pageSize + "," + pageSize + "";
 | 
	
		
			
				|  |  |         System.out.println("sql==>"+sql);
 | 
	
		
			
				|  |  |         List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
 | 
	
		
			
				|  |  |         return list;
 | 
	
		
			
				|  |  |     }
 |