智能药盒代码提交

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/kit/KitService.java

@@ -263,8 +263,6 @@ public class KitService extends BaseService {
     */
    public List<Map<String,Object>> getUseDrugRecordInfo(String patientCode,Integer recordType,String startTime,String endTime,Integer page,Integer pageSize) throws Exception{
        Date startDate = DateUtil.strToDate(startTime);
        Date endDate = DateUtil.strToDate(endTime);
        Specification specification = new Specification<KitDrugUseRecord>() {
            @Override
@@ -275,9 +273,11 @@ public class KitService extends BaseService {
                    predicates.add(criteriaBuilder.equal(root.get("recordType"), recordType));
                }
                if(!StringUtils.isEmpty(startTime)){
                    Date startDate = DateUtil.strToDate(startTime);
                    predicates.add(criteriaBuilder.greaterThanOrEqualTo(root.get("useTime"), startDate));
                }
                if(!StringUtils.isEmpty(endTime)){
                    Date endDate = DateUtil.strToDate(endTime);
                    predicates.add(criteriaBuilder.lessThanOrEqualTo(root.get("useTime"), endDate));
                }
                criteriaQuery.orderBy(criteriaBuilder.desc(root.get("useTime")));//按时间降序排序