药盒的代码提交

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/patient/PatientDeviceDao.java

@@ -20,7 +20,7 @@ public interface PatientDeviceDao extends PagingAndSortingRepository<PatientDevi
    @Query("select a from PatientDevice a where a.user = ?1 ")
    List<PatientDevice> findByPatient(String user);
    @Query("select a from PatientDevice a where a.user = ?1 and a.del=0 ")
    @Query("select a from PatientDevice a where a.user = ?1 and a.del=0 and a.deviceName like '%药盒%'")
    List<PatientDevice> findByPatientAndDel(String user);
    @Query("select a from PatientDevice a where a.user = ?1 and a.deviceSn=?2 ")

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

@@ -254,7 +254,7 @@ public class KitService extends BaseService {
     * @param startTime 时间搜索的开始时间
     * @param endTime 时间搜索的结束时间
     */
    public List<KitDrugUseRecord> getUseDrugRecordInfo(String patientCode,Integer recordType,String startTime,String endTime,Integer page,Integer pageSize) throws Exception{
    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);
@@ -278,15 +278,26 @@ public class KitService extends BaseService {
                return criteriaQuery.getRestriction();
            }
        };
        List<Map<String,Object>> reuslt = new ArrayList<>();
        List<KitDrugUseRecord> resutlList = null;
        if(page!=null&&pageSize!=null){
            page = page-1;
            Pageable pageRequest = new PageRequest(page, pageSize);
            Page<KitDrugUseRecord> resutlList = kitDrugUseRecordDao.findAll(specification,pageRequest);
            return resutlList.getContent();
            Page<KitDrugUseRecord> resutlTemp = kitDrugUseRecordDao.findAll(specification,pageRequest);
            resutlList = resutlTemp.getContent();
//            return resutlList.getContent();
        }else{
            List<KitDrugUseRecord> resutlList = kitDrugUseRecordDao.findAll(specification);
            return resutlList;
            resutlList = kitDrugUseRecordDao.findAll(specification);
//            return resutlList;
        }
        for(KitDrugUseRecord one :resutlList){
            Map<String,Object> map = new HashMap<>();
            map.put("useTime",one.getUseTime());
            map.put("recordType",one.getRecordType());
            map.put("drugDetail",JSONArray.fromObject(one.getDrugDetail()));
            reuslt.add(map);
        }
        return reuslt;
    }
    /**
@@ -420,7 +431,7 @@ public class KitService extends BaseService {
            @Override
            public int compare(Map<String,Object> o1, Map<String,Object> o2) {
                Long day1 =  DateUtil.strToDate(o1.get("day").toString(), "MM-dd").getTime();
                Long day2 =  DateUtil.strToDate(o1.get("day").toString(), "MM-dd").getTime();
                Long day2 =  DateUtil.strToDate(o2.get("day").toString(), "MM-dd").getTime();
                if(day1-day2>0){
                    return -1;
                }else if(day1-day2<0){
@@ -429,9 +440,9 @@ public class KitService extends BaseService {
                return 0;
            }
        });
        resultMap.put("onTimeCount",onTimeCount);
        resultMap.put("overTimeCount",overTimeCount);
        resultMap.put("leakageCount",leakageCount);
        resultMap.put("onTimeCount",onTimeCount);//按时
        resultMap.put("overTimeCount",overTimeCount);//超时
        resultMap.put("leakageCount",leakageCount);//漏用
        resultMap.put("resultList",resultList);
        return resultMap;
    }
@@ -470,7 +481,7 @@ public class KitService extends BaseService {
        for(KitDrugUseRecord one:list){
            Map<String,Object> temp = new HashMap<>();
            temp.put("useTime",DateUtil.dateToStr(one.getUseTime(),"HH:mm"));
            temp.put("drugDetail",one.getDrugDetail());
            temp.put("drugDetail",JSONArray.fromObject(one.getDrugDetail()));
            resultList.add(temp);
        }
        return resultList;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/kit/DoctorKitController.java

@@ -38,7 +38,7 @@ public class DoctorKitController extends BaseController {
            @ApiParam(name = "pageSize", value = "每页总数", required = false) @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<KitDrugUseRecord> result = kitService.getUseDrugRecordInfo(patientCode,recordType,startTime,endTime,page,pageSize);
            List<Map<String,Object>> result = kitService.getUseDrugRecordInfo(patientCode,recordType,startTime,endTime,page,pageSize);
            return write(200,"获取信息成功！","data",result);
        }catch (Exception e) {
            e.printStackTrace();