Browse Source

Merge branch 'dev' of liubing/wlyy2.0 into dev

liubing 2 years ago
parent
commit
6ffc56dfd0

+ 1 - 1
svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/CapacityAssessmentRecordService.java

@ -138,7 +138,7 @@ public class CapacityAssessmentRecordService extends BaseJpaService<CapacityAsse
                " WHERE sr.id = r.sign_id and sr.status=1 and r.service_package_id = i.service_package_id " +
                " and i.del = 1 and m.team_code = r.team_code and ar.patient = sr.patient and ar.label_type = 1 " +
                " and m.doctor_code = '"+doctorId+"' and m.del = '1' and sr.`status`=1  " +
                " GROUP BY ar.patient ORDER BY ar.czrq desc)A " +
                " GROUP BY ar.patient ORDER BY ar.czrq desc)A INNER JOIN base_patient p on A.patient = p.id and p.del=1  " +
                " GROUP BY a.level_conclusion " ;
        List<Map<String,Object>> countMapList = jdbcTemplate.queryForList(sql);
        for(Map<String,Object> map:countMapList){