diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java index ac0de68..20a9d2c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java @@ -39,7 +39,7 @@ public class TrackDownRecord extends BaseModel{ private String cityRegisterId; private String areaRegisterId; private String streetRegisterId; - + //孕妇建档id private String parentId; //妇女建档id private String residentsArchiveId; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/GuidelinesQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/GuidelinesQuery.java index 63c1c03..055d754 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/GuidelinesQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/GuidelinesQuery.java @@ -38,10 +38,9 @@ public class GuidelinesQuery extends BaseQuery implements IConvertToNativeQuery } if (null != number) { condition = condition.and("number", number, MongoOper.IS); - } - /*else{ + }else{ condition = condition.and("number", false, MongoOper.EXISTS); - }*/ + } return condition.toMongoQuery(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/GuideLineController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/GuideLineController.java index 4b367f0..d1cc499 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/GuideLineController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/GuideLineController.java @@ -33,6 +33,7 @@ public class GuideLineController extends BaseController { guidelinesQuery.setMaxStart(guideQuery.getNum()); guidelinesQuery.setMinEnd(guideQuery.getNum()); guidelinesQuery.setNumber(guideQuery.getTnum()); + // System.out.println("指导意见查询条件："+guidelinesQuery.convertToQuery().convertToMongoQuery()); List list = guidelinesService.queryGuidelines(guidelinesQuery); StringBuilder stringBuilder=new StringBuilder(128); if(CollectionUtils.isNotEmpty(list)){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index c8f95f5..eabe545 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -138,6 +138,44 @@ public class TrackDownFacade { * @return */ private TrackDownRecordQuery convertNaviteQuery(TrackDownQueryRequest downQueryRequest, Integer userId) { + if(downQueryRequest.getStartCheckTime()!=null){//产检开始日期 + + } + if(downQueryRequest.getEndCheckTime()!=null){//产检结束日期 + + } + if(downQueryRequest.getStartNextCheckTime()!=null){//下次产检开始日期 + + } + if(downQueryRequest.getEndNextCheckTime()!=null){//下次产检结束日期 + + } + if(downQueryRequest.getStartFmTime()!=null){//分娩开始日期 + + } + if(downQueryRequest.getEndFmTime()!=null){//分娩结束日期 + + } + if(downQueryRequest.getStartDueDate()!=null){//预产期开始日期 + + } + if(downQueryRequest.getStartDueDate()!=null){//预产期结束日期 + + } + if(downQueryRequest.getIsHightRisk()!=null){//是否高危 + + } + if(downQueryRequest.getLevel()!=null){//高危等级 + + } + if(downQueryRequest.getRiskFactorId()!=null){//高危因素 + + } + if(downQueryRequest.getCheckDoctor()!=null){//产检医生 + + } + + TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setAreaId(downQueryRequest.getAreaId()); downRecordQuery.setProvinceId(downQueryRequest.getProvinceId()); @@ -315,6 +353,8 @@ public class TrackDownFacade { public BaseObjectResponse list(TrackDownQueryRequest downQueryRequest, Integer userId) { //转换为本地的查询条件 TrackDownRecordQuery downRecordQuery = convertNaviteQuery(downQueryRequest, userId); + + List downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery); List data = new ArrayList<>(); TrackDownTypeHandler downTypeHandler = trackDownTypeHandlerMap.get(downQueryRequest.getTrackType()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java index c7ff64d..a4981eb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java @@ -1,5 +1,7 @@ package com.lyms.platform.operate.web.request; +import java.util.Date; + /** * 添加类的一句话简单描述。 *

@@ -8,7 +10,6 @@ package com.lyms.platform.operate.web.request; * 示例代码 * 

  *
- * * @author JIAZHI.JIANG * @version BME V100R001 2018-01-17 17:05 * @since BME V100R001C40B104 @@ -20,6 +21,126 @@ public class TrackDownQueryRequest extends BasePageQueryRequest{ private String streetId; private String key; private Integer trackType; + //开始产检开始日期 + private Date startCheckTime; + //结束产检开始日期 + private Date endCheckTime; + //结束预约下次产检日期 + private Date startNextCheckTime; + //结束预约下次产检日期 + private Date endNextCheckTime; + //是否高危 + private Integer isHightRisk; + //高危等级 + private String level; + //高危因素 + private String riskFactorId; + //分娩结束日期 + private Date startFmTime; + //分娩结束日期 + private Date endFmTime; + //产检医生 + private String checkDoctor; + //开始预产期 + private Date startDueDate; + //开始预产期 + private Date endDueDate; + + public String getCheckDoctor() { + return checkDoctor; + } + + public void setCheckDoctor(String checkDoctor) { + this.checkDoctor = checkDoctor; + } + + public Date getStartCheckTime() { + return startCheckTime; + } + + public void setStartCheckTime(Date startCheckTime) { + this.startCheckTime = startCheckTime; + } + + public Date getEndCheckTime() { + return endCheckTime; + } + + public void setEndCheckTime(Date endCheckTime) { + this.endCheckTime = endCheckTime; + } + + public Date getStartNextCheckTime() { + return startNextCheckTime; + } + + public void setStartNextCheckTime(Date startNextCheckTime) { + this.startNextCheckTime = startNextCheckTime; + } + + public Date getEndNextCheckTime() { + return endNextCheckTime; + } + + public void setEndNextCheckTime(Date endNextCheckTime) { + this.endNextCheckTime = endNextCheckTime; + } + + public Integer getIsHightRisk() { + return isHightRisk; + } + + public void setIsHightRisk(Integer isHightRisk) { + this.isHightRisk = isHightRisk; + } + + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } + + public String getRiskFactorId() { + return riskFactorId; + } + + public void setRiskFactorId(String riskFactorId) { + this.riskFactorId = riskFactorId; + } + + public Date getStartFmTime() { + return startFmTime; + } + + public void setStartFmTime(Date startFmTime) { + this.startFmTime = startFmTime; + } + + public Date getEndFmTime() { + return endFmTime; + } + + public void setEndFmTime(Date endFmTime) { + this.endFmTime = endFmTime; + } + + public Date getStartDueDate() { + return startDueDate; + } + + public void setStartDueDate(Date startDueDate) { + this.startDueDate = startDueDate; + } + + public Date getEndDueDate() { + return endDueDate; + } + + public void setEndDueDate(Date endDueDate) { + this.endDueDate = endDueDate; + } public String getProvinceId() { return provinceId;