|
|
@ -10815,13 +10815,15 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
sql+=" and t.is_success ="+isSuccess;
|
|
|
}
|
|
|
|
|
|
if (StringUtils.isNoneBlank(isSuccess)){
|
|
|
sql+=" and t.appointment_time ="+isSuccess;
|
|
|
}
|
|
|
|
|
|
if (StringUtils.isNoneBlank(appointmentTime)){
|
|
|
sql+=" and t.appointment_time >='"+appointmentTime+" 00:00:00'";
|
|
|
sql+=" and t.appointment_time <='"+appointmentTime+" 23:59:59'";
|
|
|
if ("xm_ykyy_wx".equalsIgnoreCase(wechatId)){
|
|
|
sql+=" and t.appointment_time >= to_date('" + appointmentTime + " 00:00:00', 'yyyy-mm-dd hh24:mi:ss')";
|
|
|
sql+=" and t.appointment_time <= to_date('" + appointmentTime + " 23:59:59', 'yyyy-mm-dd hh24:mi:ss')";
|
|
|
}else {
|
|
|
sql+=" and t.appointment_time >='"+appointmentTime+" 00:00:00'";
|
|
|
sql+=" and t.appointment_time <='"+appointmentTime+" 23:59:59'";
|
|
|
}
|
|
|
}
|
|
|
|
|
|
sql+=" order by t.appointment_time desc ";
|
|
|
@ -10872,11 +10874,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
if ("1".equalsIgnoreCase(addressFlag)){
|
|
|
sql+="select t.province_name as \"provinceName\" from base_address_mapping t group by t.province_name ";
|
|
|
}else if("2".equalsIgnoreCase(addressFlag)){
|
|
|
sql+="select t.city_name as \"cityName\" from base_address_mapping t where t.province_name ='"+parentName+"' and city_name <> '' and city_name is not null group by t.city_name ";
|
|
|
sql+="select t.city_name as \"cityName\" from base_address_mapping t where t.province_name ='"+parentName+"' and city_name is not null group by t.city_name ";
|
|
|
}else if("3".equalsIgnoreCase(addressFlag)){
|
|
|
sql+="select t.town_name as \"townName\" from base_address_mapping t where t.city_name ='"+parentName+"' and town_name <> '' and town_name is not null group by t.town_name";
|
|
|
sql+="select t.town_name as \"townName\" from base_address_mapping t where t.city_name ='"+parentName+"' and town_name is not null group by t.town_name";
|
|
|
}else if("4".equalsIgnoreCase(addressFlag)){
|
|
|
sql+="select t.street_name as \"streetName\" from base_address_mapping t where t.town_name ='"+parentName+"' and street_name <> '' and street_name is not null";
|
|
|
sql+="select t.street_name as \"streetName\" from base_address_mapping t where t.town_name ='"+parentName+"' and street_name is not null";
|
|
|
}
|
|
|
List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql);
|
|
|
list.stream().forEach(one->{
|
