diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java index 99f43f0..28a2edc 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java @@ -66,7 +66,7 @@ public class SieveService { sieveQuery.mysqlBuild((int)iSieveDao.count(sieveQuery.convertToQuery())); mongoQuery.start(sieveQuery.getOffset()).end(sieveQuery.getLimit()); } - return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.DESC, "created")); + return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.DESC, "modified")); } /** diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java index 8bd13cf..1f00690 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java @@ -74,11 +74,50 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati */ private Date lastMensesStart; + private Date revicedStart; + private Date revicedEnd; + + private Date transferredStart; + + private Date transferredEnd; + /** * 末次月经 */ private Date lastMensesEnd; + public Date getRevicedEnd() { + return revicedEnd; + } + + public void setRevicedEnd(Date revicedEnd) { + this.revicedEnd = revicedEnd; + } + + public Date getRevicedStart() { + return revicedStart; + } + + public void setRevicedStart(Date revicedStart) { + this.revicedStart = revicedStart; + } + + public Date getTransferredEnd() { + return transferredEnd; + } + + public void setTransferredEnd(Date transferredEnd) { + this.transferredEnd = transferredEnd; + } + + public Date getTransferredStart() { + return transferredStart; + } + + public void setTransferredStart(Date transferredStart) { + this.transferredStart = transferredStart; + } + public String getPid() { return pid; } @@ -277,10 +316,7 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati condition=condition.and("hospitalId",hospitalId, MongoOper.IS); } - /* //需要修改 - if(null!=dueDateEnd){ - condition=condition.and("dueWeek",dueDateEnd, MongoOper.IS); - }*/ + if(null!=rLevel){ condition=condition.and("rLevel",rLevel, MongoOper.IS); } @@ -299,7 +335,18 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati } isAddStart = Boolean.TRUE; } - + if (null != revicedStart) { + c = Criteria.where("received").gte(revicedStart); + isAddStart = Boolean.TRUE; + } + if (null != revicedEnd) { + if (isAddStart) { + c = c.lte(revicedEnd); + } else { + c = Criteria.where("received").lte(revicedEnd); + } + isAddStart = Boolean.TRUE; + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index d59553e..519ec99 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -412,7 +412,15 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setPage(applyOrderQueryRequest.getPage()); referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit()); referralApplyOrderQuery.setNeed("1"); - + if(StringUtils.isNotEmpty(applyOrderQueryRequest.getReviced())){ + String[] str= applyOrderQueryRequest.getReviced().split(" - "); + if(str.length>1){ + referralApplyOrderQuery.setRevicedStart(DateUtil.parseYMD(str[0])); + } + if(str.length==2){ + referralApplyOrderQuery.setRevicedEnd(DateUtil.parseYMD(str[1])); + } + } List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); if (CollectionUtils.isNotEmpty(orderModels)) { @@ -423,7 +431,7 @@ public class ApplyOrderFacade { String zhuanchu = applyOrderModel.getOutHospitalId(); String zhuanru = applyOrderModel.getTransferredHospital(); - babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname); + // List diagnoseList = babyCheckFacade.getBabyLastDiagnose(applyOrderModel.getPid()); List diagnoseList = applyOrderModel.getrRisk(); @@ -451,6 +459,7 @@ public class ApplyOrderFacade { babyApplyOrderResult.setRecDoctor(users.getName()); } } + babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname); String diagnose = ""; if (CollectionUtils.isNotEmpty(diagnoseList)) { diagnose = ""; @@ -577,7 +586,7 @@ public class ApplyOrderFacade { zhuanRname = zhuanc1.getName(); } } - applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname); + if (NumberUtils.isNumber(orderModel.getApplyDoctor())) { Users users = usersService.getUsers(NumberUtils.toInt(orderModel.getApplyDoctor())); if (null != users) { @@ -600,6 +609,7 @@ public class ApplyOrderFacade { stringBuilder.append(orderModel.getOtherHighRisk()); } } + applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname); applyOrderResult.setrRisk(stringBuilder.toString()); applyOrderResult.setScore(orderModel.getScore()); applyOrderResult.setrLevel(highScoreResult.getLevelStr());