|  | @ -2903,8 +2903,18 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
 | 
												
													
														
															|  |         if(StringUtils.isNotBlank(workingTime)){
 |  |         if(StringUtils.isNotBlank(workingTime)){
 | 
												
													
														
															|  |             sql+=" JOIN wlyy_doctor_work_time wk on wk.doctor = d.id ";
 |  |             sql+=" JOIN wlyy_doctor_work_time wk on wk.doctor = d.id ";
 | 
												
													
														
															|  |         }
 |  |         }
 | 
												
													
														
															|  |         sql +=  " WHERE  " +
 |  | 
 | 
												
													
														
															|  |                 " d.charge_type is not null ";
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  |         sql +=  " WHERE  1=1 ";
 | 
												
													
														
															|  | 
 |  |         if(StringUtils.isBlank(chargType)){
 | 
												
													
														
															|  | 
 |  |             sql +=" AND d.charge_type is not null ";
 | 
												
													
														
															|  | 
 |  |         }
 | 
												
													
														
															|  | 
 |  |         if(StringUtils.isNotBlank(chargType)){
 | 
												
													
														
															|  | 
 |  |             if("all".equals(chargType)){
 | 
												
													
														
															|  | 
 |  |                 //不过滤
 | 
												
													
														
															|  | 
 |  |             }else{
 | 
												
													
														
															|  | 
 |  |                 sql+=" AND d.charge_type = '"+chargType+"'";
 | 
												
													
														
															|  | 
 |  |             }
 | 
												
													
														
															|  | 
 |  |         }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |         if(StringUtils.isNotBlank(iswork)&&"1".equals(iswork)){
 |  |         if(StringUtils.isNotBlank(iswork)&&"1".equals(iswork)){
 | 
												
													
														
															|  |             logger.info("iswork:"+iswork);
 |  |             logger.info("iswork:"+iswork);
 | 
												
											
												
													
														
															|  | @ -2922,7 +2932,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
 | 
												
													
														
															|  |                     " )";
 |  |                     " )";
 | 
												
													
														
															|  |         }
 |  |         }
 | 
												
													
														
															|  |         if(StringUtils.isNotBlank(orgCode)){
 |  |         if(StringUtils.isNotBlank(orgCode)){
 | 
												
													
														
															|  |             sql += " and  h.org_code = '"+orgCode+"'";
 |  | 
 | 
												
													
														
															|  | 
 |  |             sql += " AND  h.org_code = '"+orgCode+"'";
 | 
												
													
														
															|  |         }
 |  |         }
 | 
												
													
														
															|  |         if(StringUtils.isNotBlank(diseaseKey)){
 |  |         if(StringUtils.isNotBlank(diseaseKey)){
 | 
												
													
														
															|  |             sql+=" AND d.expertise like '%"+diseaseKey+"%'";
 |  |             sql+=" AND d.expertise like '%"+diseaseKey+"%'";
 | 
												
											
												
													
														
															|  | @ -2972,11 +2982,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
 | 
												
													
														
															|  |             sql+=" AND d.consult_status = '"+consultStatus+"' ";
 |  |             sql+=" AND d.consult_status = '"+consultStatus+"' ";
 | 
												
													
														
															|  |         }
 |  |         }
 | 
												
													
														
															|  |     
 |  |     
 | 
												
													
														
															|  |     
 |  | 
 | 
												
													
														
															|  |         if(StringUtils.isNotBlank(chargType)){
 |  | 
 | 
												
													
														
															|  |             sql+=" AND d.charge_type = '"+chargType+"'";
 |  | 
 | 
												
													
														
															|  |         }
 |  | 
 | 
												
													
														
															|  |     
 |  | 
 | 
												
													
														
															|  |         sql += " and d.del='1' order by a.total "+ consutlSort +" limit "+page * pagesize +","+pagesize;
 |  |         sql += " and d.del='1' order by a.total "+ consutlSort +" limit "+page * pagesize +","+pagesize;
 | 
												
													
														
															|  |         
 |  |         
 | 
												
													
														
															|  |         List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
 |  |         List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
 |