|
@ -3391,18 +3391,19 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
|
|
|
if(StringUtils.isNotBlank(iswork)&&"1".equals(iswork)){
|
|
|
logger.info("iswork:"+iswork);
|
|
|
String startDate = DateUtil.dateToStr(new Date(),"yyyy-MM-dd"+" 00:00:00");
|
|
|
String endDate = DateUtil.dateToStr(new Date(),"yyyy-MM-dd")+" 23:59:59";
|
|
|
sql+=" AND EXISTS ( " +
|
|
|
String date = DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss");
|
|
|
sql+=" AND (" +
|
|
|
" EXISTS ( " +
|
|
|
" SELECT " +
|
|
|
" 1 " +
|
|
|
" FROM " +
|
|
|
" wlyy_doctor_work_time t " +
|
|
|
" WHERE " +
|
|
|
" t.doctor = d.id " +
|
|
|
" AND t.start_time >='" +startDate+"'" +
|
|
|
" AND t.start_time <='"+endDate+"'"+
|
|
|
" )";
|
|
|
" AND t.start_time <='" +date+"'" +
|
|
|
" AND t.end_time >='"+date+"'"+
|
|
|
" ) OR " +
|
|
|
" d.consult_status = '1') ";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(orgCode)){
|
|
|
sql += " AND h.org_code = '"+orgCode+"'";
|