LAPTOP-KB9HII50\70708 пре 11 месеци
родитељ
комит
490b5be03b

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

@ -7296,8 +7296,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    "  t.doctor = d.id " +
                    " AND t.start_time <=:startTime" +
                    " AND t.end_time >=:endTime" +
                    " ) OR " +
                    " d.consult_status = '1') ";
                    " ) ) ";
            params.put("startTime", date);
            params.put("endTime", date);
        }
@ -7378,7 +7377,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                }
            }else {
                sql += " and d.del='1' "+groupBy+" order by workTotal DESC,consultStatus DESC ,score desc," +
                        "total " + consutlSort+",dhd.saas_id, d.job_title_code desc";
                        "total " + consutlSort+", d.job_title_code desc";
            }
        }

+ 0 - 2
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/WorkTimeService.java

@ -137,7 +137,6 @@ public class WorkTimeService {
                                "  AND t.start_time <=:startTime " +
                                "  AND t.end_time >=:endTime" +
                                " ) " +
                                " OR d.consult_status = '1' " +
                                ")";
                        Map<String,Object> params = new HashedMap();
                        params.put("doctor",doctor);
@ -181,7 +180,6 @@ public class WorkTimeService {
                            "  AND t.start_time <=:startTime " +
                            "  AND t.end_time >=:endTime" +
                            " ) " +
                            " OR d.consult_status = '1' " +
                            ")";
                    Map<String,Object> params = new HashedMap();
                    params.put("doctor",doctor);