diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyOralCheckService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyOralCheckService.java index d68534e..c11efc4 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyOralCheckService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyOralCheckService.java @@ -9,10 +9,14 @@ import com.lyms.platform.pojo.BabyKindergartenCheckModel; import com.lyms.platform.pojo.BabyOralCheck; import com.lyms.platform.query.BabyKindergartenCheckQuery; import com.lyms.platform.query.BabyOralCheckQuery; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; +import sun.security.util.ArrayUtil; +import java.util.Arrays; import java.util.List; /** @@ -45,20 +49,24 @@ public class BabyOralCheckService extends BaseMongoDAOImpl { /** * * @param babyQuery 查询条件 - * @param sortkey 按什么字段排序(如null必须sort也为null表示不排序) + * @param sortkeys 按什么字段排序(如null必须sort也为null表示不排序) * @param sort 排序 ASC/DESC * Need 给这个字段赋值代表需要分页,null不需要分页 * @return */ - public List queryList(BabyOralCheckQuery babyQuery,Sort.Direction sort,String sortkey) { + public List queryList(BabyOralCheckQuery babyQuery,Sort.Direction sort,String[] sortkeys) { MongoQuery query = babyQuery.convertToQuery(); + if (StringUtils.isNotEmpty(babyQuery.getNeed())) {//是否需要分页 babyQuery.mysqlBuild((int)count(babyQuery.convertToQuery().convertToMongoQuery())); query.start(babyQuery.getOffset()).end(babyQuery.getLimit()); } - if(StringUtils.isNotEmpty(sortkey) && null!=sort){ - query.addOrder(sort, sortkey); + if(ArrayUtils.isNotEmpty(sortkeys) && null!=sort){ + for (String sortkey : sortkeys) { + query.addOrder(sort, sortkey); + } } + System.out.println(query.convertToMongoQuery().toString()); return find(query.convertToMongoQuery()); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LhBabyEyeCheckService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LhBabyEyeCheckService.java index be0fcf0..0cc5b29 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LhBabyEyeCheckService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LhBabyEyeCheckService.java @@ -7,6 +7,7 @@ import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.pojo.LhBabyEyeCheck; import com.lyms.platform.query.LhBabyEyelCheckQuery; +import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; @@ -44,19 +45,21 @@ public class LhBabyEyeCheckService extends BaseMongoDAOImpl { /** * * @param babyQuery 查询条件 - * @param sortkey 按什么字段排序(如null必须sort也为null表示不排序) + * @param sortkeys 按什么字段排序(如null必须sort也为null表示不排序) * @param sort 排序 ASC/DESC * Need 给这个字段赋值代表需要分页,null不需要分页 * @return */ - public List queryList(LhBabyEyelCheckQuery babyQuery, Sort.Direction sort, String sortkey) { + public List queryList(LhBabyEyelCheckQuery babyQuery, Sort.Direction sort, String[] sortkeys) { MongoQuery query = babyQuery.convertToQuery(); if (StringUtils.isNotEmpty(babyQuery.getNeed())) {//是否需要分页 babyQuery.mysqlBuild((int)count(babyQuery.convertToQuery().convertToMongoQuery())); query.start(babyQuery.getOffset()).end(babyQuery.getLimit()); } - if(StringUtils.isNotEmpty(sortkey) && null!=sort){ - query.addOrder(sort, sortkey); + if(ArrayUtils.isNotEmpty(sortkeys) && null!=sort){ + for (String sortkey : sortkeys) { + query.addOrder(sort, sortkey); + } } return find(query.convertToMongoQuery()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java index a8a98e8..27f6417 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java @@ -105,7 +105,7 @@ public class BabyOralCheckFacade { BabyOralCheckQuery checkQuery=new BabyOralCheckQuery(); checkQuery.setYn(YnEnums.YES.getId()); checkQuery.setBabyId(babyOralCheck.getBabyId()); - List babyOralChecks=babyOralCheckService.queryList(checkQuery,Sort.Direction.DESC,"created"); + List babyOralChecks=babyOralCheckService.queryList(checkQuery,Sort.Direction.DESC,new String[]{"oralCheckTime", "created"}); //修改最新的记录才会同步儿童档案,新增也会同步到儿童档案 if( CollectionUtils.isNotEmpty(babyOralChecks) && babyOralChecks.get(0).getId().equals(babyOralCheck.getId())){ Update update = new Update(); @@ -144,7 +144,7 @@ public class BabyOralCheckFacade { BabyOralCheckQuery checkQuery=new BabyOralCheckQuery(); checkQuery.setYn(YnEnums.YES.getId()); checkQuery.setBabyId(oralCheck.getBabyId()); - List babyOralChecks=babyOralCheckService.queryList(checkQuery,Sort.Direction.DESC,"created"); + List babyOralChecks=babyOralCheckService.queryList(checkQuery,Sort.Direction.DESC,new String[]{"oralCheckTime", "created"}); Update update = new Update(); //删除唯一的检查记录 if( CollectionUtils.isEmpty(babyOralChecks)){ @@ -206,7 +206,7 @@ public class BabyOralCheckFacade { BabyOralCheckQuery checkQuery=new BabyOralCheckQuery(); checkQuery.setBabyId(babyId); checkQuery.setYn(YnEnums.YES.getId()); - List babyOralChecks=babyOralCheckService.queryList(checkQuery,Sort.Direction.ASC,"created"); + List babyOralChecks=babyOralCheckService.queryList(checkQuery,Sort.Direction.ASC, new String[]{"oralCheckTime", "created"}); for (BabyOralCheck babyOralCheck : babyOralChecks) { Map temp = new HashMap<>(); temp.put("id", babyOralCheck.getId()); @@ -253,7 +253,7 @@ public class BabyOralCheckFacade { request.setBirthStart(DateUtil.getBirthStart(request.getQueryMonthAgeEnd())); request.setBirthEnd(DateUtil.getBirthEnd(request.getQueryMonthAgeStart())); } - List babyOralChecks=babyOralCheckService.queryList(request,Sort.Direction.DESC,"created"); + List babyOralChecks=babyOralCheckService.queryList(request,Sort.Direction.DESC,new String[]{"oralCheckTime", "created"}); List result=new ArrayList<>(); for (BabyOralCheck babyOralCheck : babyOralChecks) { Map map=ReflectionUtils.beanToMap(babyOralCheck);//对象转map diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java index 9d8622a..fb42d7c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java @@ -103,7 +103,7 @@ public class LhBabyEyeCheckFacade { LhBabyEyelCheckQuery checkQuery=new LhBabyEyelCheckQuery(); checkQuery.setYn(YnEnums.YES.getId()); checkQuery.setBabyId(babyCheck.getBabyId()); - List babyChecks=lhBabyEyeCheckService.queryList(checkQuery,Sort.Direction.DESC,"created"); + List babyChecks=lhBabyEyeCheckService.queryList(checkQuery,Sort.Direction.DESC,new String[]{"eyeCheckTime","created"}); //修改最新的记录才会同步儿童档案,新增也会同步到儿童档案 if( CollectionUtils.isNotEmpty(babyChecks) && babyChecks.get(0).getId().equals(babyCheck.getId()) ){ Update update = new Update(); @@ -139,7 +139,7 @@ public class LhBabyEyeCheckFacade { LhBabyEyelCheckQuery checkQuery=new LhBabyEyelCheckQuery(); checkQuery.setYn(YnEnums.YES.getId()); checkQuery.setBabyId(babyCheck.getBabyId()); - List babyChecks=lhBabyEyeCheckService.queryList(checkQuery,Sort.Direction.DESC,"created"); + List babyChecks=lhBabyEyeCheckService.queryList(checkQuery,Sort.Direction.DESC,new String[]{"eyeCheckTime","created"}); Update update = new Update(); //删除唯一的检查记录 if( CollectionUtils.isEmpty(babyChecks)){ @@ -202,7 +202,7 @@ public class LhBabyEyeCheckFacade { LhBabyEyelCheckQuery checkQuery=new LhBabyEyelCheckQuery(); checkQuery.setBabyId(babyId); checkQuery.setYn(YnEnums.YES.getId()); - List babyChecks=lhBabyEyeCheckService.queryList(checkQuery,Sort.Direction.ASC,"created"); + List babyChecks=lhBabyEyeCheckService.queryList(checkQuery,Sort.Direction.ASC,new String[]{"eyeCheckTime","created"}); for (LhBabyEyeCheck babyCheck : babyChecks) { Map temp = new HashMap<>(); temp.put("id", babyCheck.getId()); @@ -254,7 +254,7 @@ public class LhBabyEyeCheckFacade { request.setChuPositiveType("2"); request.setPositiveType("1"); } - List babyEyeChecks=lhBabyEyeCheckService.queryList(request,Sort.Direction.DESC,"created"); + List babyEyeChecks=lhBabyEyeCheckService.queryList(request,Sort.Direction.DESC,new String[]{"eyeCheckTime","created"}); List result=new ArrayList<>(); for (LhBabyEyeCheck babyCheck : babyEyeChecks) { Map map=ReflectionUtils.beanToMap(babyCheck);//对象转map