代码修改

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/followup/service/FollowUpService.java

@@ -469,7 +469,7 @@ public class FollowUpService {
                "h.dept_code deptCode,h.dept_name deptName,f.`status`,date_format(f.followup_date, '%Y-%m-%d %H:%i:%s') followupDate,'诊后康复' businessSource," +
                "date_format(f.followup_plan_date, '%Y-%m-%d %H:%i:%s') followupPlanDate,date_format(pl.create_time, '%Y-%m-%d %H:%i:%s') turnDownDate," +
                "if(i.from_source=2,i.doctor_name,pl.plan_doctor_name) planDoctorName,if(i.from_source=2,i.dept_name,(SELECT GROUP_CONCAT(dept_name) FROM base_doctor_hospital WHERE doctor_code=pl.plan_doctor AND del = 1)) turnDownDeptName, " +
                "f.followup_form_type followupFormType,d.dict_value followupFormTypeValue, d2.dict_value followupTypeValue  ";
                "f.followup_form_type followupFormType,d.dict_value followupFormTypeValue, d2.dict_value followupTypeValue,d3.dict_value followupManagerStatusValue ";
        String countSql = "select count(DISTINCT f.id) ";
        String filter = " from wlyy_followup f " +
                "LEFT JOIN base_service_item_plan ip on  f.id = ip.relation_code and ip.relation_type='6' " +
@@ -480,6 +480,7 @@ public class FollowUpService {
                //"LEFT JOIN base_doctor_hospital h2 on pl.plan_doctor=h2.doctor_code and h2.del=1 " +
                "LEFT JOIN wlyy_hospital_sys_dict d ON d.dict_name='followup_form_type' AND d.dict_code=f.followup_form_type " +
                "LEFT JOIN wlyy_hospital_sys_dict d2 ON d2.dict_name='FOLLOWUP_WAY_DICT' AND d2.dict_code=f.followup_type " +
                "LEFT JOIN wlyy_hospital_sys_dict d3 ON d3.dict_name='FOLLOWUP_MANAGER_STATUS' AND d3.dict_code=f.followup_manager_status " +
                "WHERE 1=1 ";
        if(StringUtils.isNotBlank(businessType)){
            if(businessType.contains(",")){
@@ -560,7 +561,7 @@ public class FollowUpService {
                "h.dept_code deptCode,h.dept_name deptName,f.`status`,if(f.`status`=1,date_format(f.followup_date, '%Y-%m-%d %H:%i:%s'),'') followupDate," +
                "'诊后康复' businessSource,date_format(f.followup_plan_date, '%Y-%m-%d %H:%i:%s') followupPlanDate," +
                "date_format(pl.create_time, '%Y-%m-%d %H:%i:%s') turnDownDate,pl.plan_doctor_name planDoctorName,(SELECT GROUP_CONCAT(dept_name) FROM base_doctor_hospital WHERE doctor_code=pl.plan_doctor AND del = 1) turnDownDeptName, " +
                "f.followup_form_type followupFormType,d.dict_value followupFormTypeValue, d2.dict_value followupTypeValue ";
                "f.followup_form_type followupFormType,d.dict_value followupFormTypeValue, d2.dict_value followupTypeValue, d3.dict_value followupManagerStatusValue ";
        String filter = " from wlyy_followup f " +
                "INNER JOIN base_service_item_plan ip on  f.id = ip.relation_code and ip.relation_type='6' " +
                "LEFT JOIN wlyy_patient_rehabilitation_plan pl on pl.id = ip.plan_id " +
@@ -569,7 +570,9 @@ public class FollowUpService {
                // "LEFT JOIN base_doctor_hospital h2 on pl.plan_doctor=h2.doctor_code and h2.del=1 " +
                "LEFT JOIN wlyy_hospital_sys_dict d ON d.dict_name='followup_form_type' AND d.dict_code=f.followup_form_type " +
                "LEFT JOIN wlyy_hospital_sys_dict d2 ON d2.dict_name='FOLLOWUP_WAY_DICT' AND d2.dict_code=f.followup_type " +
                "LEFT JOIN wlyy_hospital_sys_dict d3 ON d3.dict_name='FOLLOWUP_MANAGER_STATUS' AND d3.dict_code=f.followup_manager_status " +
                "WHERE 1=1 ";
        if(StringUtils.isNotBlank(businessType)){
            if(businessType.contains(",")){
                businessType = businessType.replace(",","','");