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

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/RehabilitationManageService.java

@@ -1271,10 +1271,12 @@ public class RehabilitationManageService {
                "  d.expense," +
                "  r.doctor_code," +
                "  r.doctor_name," +
                "  r.complete_time" +
                "  r.complete_time, " +
                "  s.item_type " +
                "  FROM" +
                "  wlyy_rehabilitation_plan_detail d" +
                "  LEFT JOIN wlyy_hospital_service_item i ON d.hospital_service_item_id = i.id" +
                "  LEFT JOIN wlyy_hospital_service_item i ON d.hospital_service_item_id = i.id  " +
                "  LEFT JOIN wlyy_service_item s ON i.service_item_id = s.id " +
                "  LEFT JOIN wlyy_rehabilitation_operate_records r ON d.id = r.rehabilitation_detail_id" +
                "  WHERE" +
                "  r.`status` = 1" +