代码修改

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -7178,17 +7178,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if (StringUtils.isNotBlank(consultStatus)) {
            sql += " AND d.consult_status = :consultStatus ";
            params.put("consultStatus", consultStatus);
        }
        String groupBy = " group by d.id,d.photo , d.name, d.expertise ,d.introduce ," +
                "d.job_title_code ,  d.job_title_name , d.charge_type ," +
                "h.dept_name , dw.workTotal , d.consult_status ," +
                "d.outpatient_type , a.total , h.org_name ," +
                "h.org_code ";//同一个医生在不同科室的时候只展示一个
        if(StringUtils.isNoneBlank(patientid)){
            groupBy+=" , follow.id" ;
        }
        groupBy += ", evaluate.score ,a.total ";
        String groupBy = " group by d.id ";
        WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("isSort").orElse(null);//isSort：1按照后台顺序，0按照系统排序
        if (hospitalSysDictDO!=null&&hospitalSysDictDO.getDictValue().equalsIgnoreCase("1")){
            sql +=" and d.del='1' "+groupBy+" order by d.sort asc  ";