|
|
@ -481,7 +481,10 @@ public class RehabilitationManageService {
|
|
|
" where d.plan_id in ("+planCondition+" )AND d.execute_time IS NOT NULL and d.execute_time <>'' " ;
|
|
|
if(searchTask!=null){
|
|
|
if(searchTask==8){//
|
|
|
sql+="and d.doctor='"+doctorCode+"' ";
|
|
|
if(StringUtils.isNotBlank(doctorCode)){
|
|
|
sql+=" and d.doctor='"+doctorCode+"' ";
|
|
|
}
|
|
|
sql+=" and i.code="+searchTask+" " ;
|
|
|
}else {
|
|
|
sql+=" and i.code="+searchTask+" " ;
|
|
|
}/*else if(searchTask==5){
|
|
|
@ -518,7 +521,7 @@ public class RehabilitationManageService {
|
|
|
|
|
|
list = jdbcTemplate.queryForList(cfxfSql);
|
|
|
}
|
|
|
if (6 == searchTask){ //随访
|
|
|
if (6 == searchTask || searchTask == 8){ //随访
|
|
|
String sfSql = "SELECT DISTINCT DATE_FORMAT(wf.followup_date,'%Y/%m/%d %H:%i') followupDate,DATE_FORMAT(wf.followup_plan_date,'%Y/%m/%d %H:%i') executeTime,wf.doctor_code doctorCode,wf.followup_class followupClass, " +
|
|
|
" wf.patient_code AS patientCode,wf.patient_name AS patientName,wf.doctor_name doctorName,wf.`status` AS `status`,wf.org_name orgName," +
|
|
|
" wf.org_code orgCode,sd.value AS `value`, wf.followup_type followupType,wf.id AS id, 6 AS code,2 as flag FROM wlyy.wlyy_followup wf " +
|
xiaoyunquan