From 657d9997aa1e6b547786939c56ecf056db6cd1e4 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 22 Aug 2016 11:53:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/pojo/ReferralApplyOrderModel.java | 8 ++--- .../platform/query/ReferralApplyOrderQuery.java | 35 ++++++++++++++---- .../operate/web/facade/ApplyOrderFacade.java | 23 +++++++++--- .../operate/web/result/ApplyOrderOutResult.java | 4 ++- .../operate/web/result/BabyApplyOrderResult.java | 42 +++++++++++----------- 5 files changed, 74 insertions(+), 38 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java index abc2dde..d76eadd 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java @@ -28,8 +28,8 @@ public class ReferralApplyOrderModel { private String phone; //生日 private Date birth; - //申请孕周、申请月龄 - private String dueWeek; + //申请孕周、申请月龄(多少天) + private Integer dueWeek; //身份证号 private String cardNo; @@ -106,11 +106,11 @@ public class ReferralApplyOrderModel { this.expVip = expVip; } - public String getDueWeek() { + public Integer getDueWeek() { return dueWeek; } - public void setDueWeek(String dueWeek) { + public void setDueWeek(Integer dueWeek) { this.dueWeek = dueWeek; } 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 115ad1d..6348bb9 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 @@ -41,9 +41,9 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati //年龄 private String age; //孕周 - private String dueDateStart; + private Integer dueDateStart; //孕周 - private Date dueDateEnd; + private Integer dueDateEnd; //风险等级 private String rLevel; private Integer scoreStart; @@ -79,9 +79,6 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati */ private Date lastMensesEnd; - public void setDueDateStart(String dueDateStart) { - this.dueDateStart = dueDateStart; - } public Integer getScoreEnd() { return scoreEnd; @@ -211,14 +208,21 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati this.id = id; } - public Date getDueDateEnd() { + public Integer getDueDateEnd() { return dueDateEnd; } - public void setDueDateEnd(Date dueDateEnd) { + public void setDueDateEnd(Integer dueDateEnd) { this.dueDateEnd = dueDateEnd; } + public Integer getDueDateStart() { + return dueDateStart; + } + + public void setDueDateStart(Integer dueDateStart) { + this.dueDateStart = dueDateStart; + } @Override public MongoQuery convertToQuery() { @@ -309,6 +313,23 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); } + + if (null != dueDateStart) { + c = Criteria.where("dueWeek").gte(dueDateStart); + isAddStart = Boolean.TRUE; + } + if (null != dueDateEnd) { + if (isAddStart) { + c = c.lte(dueDateEnd); + } else { + c = Criteria.where("dueWeek").lte(dueDateEnd); + } + isAddStart = Boolean.TRUE; + } + if (isAddStart) { + return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); + } + if (null != lastMensesStart) { c = Criteria.where("lastMenses").gte(lastMensesStart); 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 6eb465d..a46e8c8 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 @@ -118,7 +118,7 @@ public class ApplyOrderFacade { referralApplyOrderModel.setScore(highScoreResult.getScore()); referralApplyOrderModel.setrLevel(highScoreResult.getLevelId()); referralApplyOrderModel.setPid(patients.getPid()); - referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days)); + referralApplyOrderModel.setDueWeek(days); if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) { PatientsQuery patientsQuery1 = new PatientsQuery(); @@ -141,8 +141,8 @@ public class ApplyOrderFacade { if (null != babyModel) { if (null != babyModel.getBirth()) { referralApplyOrderModel.setAge(DateUtil.getAge(babyModel.getBirth())); + referralApplyOrderModel.setDueWeek(DateUtil.getDays(babyModel.getBirth(), new Date())); } - referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()))); Patients patients = patientsService.findOnePatientById(babyModel.getParentId()); referralApplyOrderModel.setParentId(babyModel.getId()); referralApplyOrderModel.setMname(patients.getUsername()); @@ -345,6 +345,17 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setExpVip(1); } + + /* if(null!=applyOrderQueryRequest.getStartScore()){ + referralApplyOrderQuery.setScoreStart(applyOrderQueryRequest.getStartScore()); + } + + if(null!=applyOrderQueryRequest.getEndScore()){ + referralApplyOrderQuery.setScoreEnd(applyOrderQueryRequest.getEndScore()); + }*/ + + + List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); if (CollectionUtils.isNotEmpty(orderModels)) { String zhuanCName = ""; @@ -405,11 +416,13 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setBirthEnd(date); } //根据孕周 - if(null!=applyOrderQueryRequest.getEndDueWeek()){ - + if(null!=applyOrderQueryRequest.getEndDueWeek() &&NumberUtils.isNumber(applyOrderQueryRequest.getEndDueWeek())){ + int i = NumberUtils.toInt(applyOrderQueryRequest.getEndDueWeek())*7; + referralApplyOrderQuery.setDueDateEnd(i); } if(null!=applyOrderQueryRequest.getStartDueWeek()){ - + int i = NumberUtils.toInt(applyOrderQueryRequest.getStartDueWeek())*7; + referralApplyOrderQuery.setDueDateStart(i); } if(null!=applyOrderQueryRequest.getStartScore()){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java index 1c78370..62b6959 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java @@ -310,7 +310,9 @@ public class ApplyOrderOutResult { this.cDueWeek= StringUtils.dueWeek(days); } setPid(destModel.getPid()); - setDueWeek(destModel.getDueWeek()); + if(null!=destModel.getDueWeek()){ + setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(destModel.getDueWeek())); + } setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); setApplyDoctor(destModel.getApplyDoctor()); setCreated(DateUtil.getyyyy_MM_dd(destModel.getCreated())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java index 26f9ca4..24c77b8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java @@ -14,7 +14,7 @@ import java.util.Date; * Created by Administrator on 2016/7/14 0014. */ public class BabyApplyOrderResult { - public static final String SPIT="-"; + public static final String SPIT = "-"; private String id; private String pid; //名字 @@ -103,7 +103,7 @@ public class BabyApplyOrderResult { this.babyId = babyId; } - public BabyApplyOrderResult convert(ReferralApplyOrderModel referralApplyOrderModel, String zhuanCName,String zhuanRname) { + public BabyApplyOrderResult convert(ReferralApplyOrderModel referralApplyOrderModel, String zhuanCName, String zhuanRname) { setPid(referralApplyOrderModel.getPid()); setZhuanRname(zhuanRname); setZhuanCName(zhuanCName); @@ -117,11 +117,13 @@ public class BabyApplyOrderResult { if (null != referralApplyOrderModel.getReceived()) { setReceived(DateUtil.getyyyy_MM_dd(referralApplyOrderModel.getReceived())); } - if(null!=referralApplyOrderModel.getBirth()){ + if (null != referralApplyOrderModel.getBirth()) { setBirth(DateUtil.getyyyy_MM_dd(referralApplyOrderModel.getBirth())); setCyl(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(referralApplyOrderModel.getBirth(), new Date()))); } - setYl(referralApplyOrderModel.getDueWeek()); + if (null != referralApplyOrderModel.getBirth()) { + setYl(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getBabyMonthAge(referralApplyOrderModel.getBirth(), referralApplyOrderModel.getCreated()))); + } if (null != referralApplyOrderModel.getCreated()) { setCreated(DateUtil.getyyyy_MM_dd(referralApplyOrderModel.getCreated())); } @@ -134,7 +136,7 @@ public class BabyApplyOrderResult { public String getApplyDoctor() { - if(null==applyDoctor){ + if (null == applyDoctor) { return SPIT; } return applyDoctor; @@ -145,7 +147,7 @@ public class BabyApplyOrderResult { } public String getBirth() { - if(null==birth){ + if (null == birth) { return SPIT; } @@ -158,7 +160,7 @@ public class BabyApplyOrderResult { public String getCreated() { - if(null==created){ + if (null == created) { return SPIT; } return created; @@ -169,7 +171,7 @@ public class BabyApplyOrderResult { } public String gethRisk() { - if(null==hRisk){ + if (null == hRisk) { return SPIT; } @@ -190,7 +192,7 @@ public class BabyApplyOrderResult { public String getmName() { - if(null==mName){ + if (null == mName) { return SPIT; } return mName; @@ -201,7 +203,7 @@ public class BabyApplyOrderResult { } public String getName() { - if(null==name){ + if (null == name) { return SPIT; } @@ -214,7 +216,7 @@ public class BabyApplyOrderResult { public String getPhone() { - if(null==phone){ + if (null == phone) { return SPIT; } return phone; @@ -225,7 +227,7 @@ public class BabyApplyOrderResult { } public String getPotentialRisk() { - if(null==potentialRisk){ + if (null == potentialRisk) { return SPIT; } @@ -238,7 +240,7 @@ public class BabyApplyOrderResult { public String getReceived() { - if(null==received){ + if (null == received) { return SPIT; } return received; @@ -250,7 +252,7 @@ public class BabyApplyOrderResult { public String getSex() { - if(null==sex){ + if (null == sex) { return SPIT; } return sex; @@ -261,7 +263,7 @@ public class BabyApplyOrderResult { } public String getTransferredDisease() { - if(null==transferredDisease){ + if (null == transferredDisease) { return SPIT; } @@ -272,9 +274,8 @@ public class BabyApplyOrderResult { this.transferredDisease = transferredDisease; } - public String getTransferredHospital() - { - if(null==transferredHospital){ + public String getTransferredHospital() { + if (null == transferredHospital) { return SPIT; } return transferredHospital; @@ -284,9 +285,8 @@ public class BabyApplyOrderResult { this.transferredHospital = transferredHospital; } - public String getYl() - { - if(null==yl){ + public String getYl() { + if (null == yl) { return SPIT; } return yl; -- 1.8.3.1