diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java index 5fdac85..2585f4a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java @@ -6,7 +6,6 @@ import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; -import java.util.Map; /** * 居民健康档案(妇女健康 )模型 @@ -831,6 +830,7 @@ public class ResidentsArchiveModel extends BaseModel { record.setStatus(1); record.setSex(sex); record.setTrackType(TrackDownDateEnums.A.getId()); + record.setWomanBuildTime(buildDay); return record; } } 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 9e443c9..d2d6fe3 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 @@ -46,6 +46,7 @@ public class TrackDownRecord extends BaseModel { private String parentId; //妇女建档id private String residentsArchiveId; + private Date womanBuildTime; private String pid; private Date modified; private String hospitalId; @@ -65,6 +66,14 @@ public class TrackDownRecord extends BaseModel { //是否终止流程 private String stop; + public Date getWomanBuildTime() { + return womanBuildTime; + } + + public void setWomanBuildTime(Date womanBuildTime) { + this.womanBuildTime = womanBuildTime; + } + public String getStop() { return stop; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java index b40993e..d629152 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java @@ -412,16 +412,16 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ if (null != foundStart) { if (null != c1) { - c1 = c1.and("created").gte(foundStart); + c1 = c1.and("womanBuildTime").gte(foundStart); } else { - c1 = Criteria.where("created").gte(foundStart); + c1 = Criteria.where("womanBuildTime").gte(foundStart); } } if (null != foundEnd) { if (c1 != null) { c1 = c1.lte(foundEnd); } else { - c1 = Criteria.where("created").lte(foundEnd); + c1 = Criteria.where("womanBuildTime").lte(foundEnd); } } 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 eaabcfb..0f2c7cc 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 @@ -471,7 +471,7 @@ public class TrackDownFacade { downRecordQuery.setNeed("1"); // downRecordQuery.setSort("modified desc"); downRecordQuery.setHospitalId(hospitalId); - System.out.println("====>" + downRecordQuery.convertToQuery().convertToMongoQuery()); + return downRecordQuery; } @@ -637,10 +637,6 @@ public class TrackDownFacade { List downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery); List data = new ArrayList<>(); TrackDownTypeHandler downTypeHandler = trackDownTypeHandlerMap.get(downQueryRequest.getTrackType()); - /**临时处理*/ - if (null == downQueryRequest.getEncryption()) { - downQueryRequest.setEncryption(0); - } if (CollectionUtils.isNotEmpty(downRecordList) && null != downTypeHandler) { for (TrackDownRecord trackDownRecord : downRecordList) { //追访类型 @@ -821,7 +817,7 @@ public class TrackDownFacade { // 预约时间 temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); //孕妇建档日期 - temp.put("womanCreatedTime", downRecord.getCreated()); + temp.put("womanCreatedTime", downRecord.getWomanBuildTime()); return temp; } } @@ -857,7 +853,7 @@ public class TrackDownFacade { //孕妇建档时间 - temp.put("womanCreatedTime", DateUtil.getyyyy_MM_dd(downRecord.getCreated())); + temp.put("womanCreatedTime", downRecord.getWomanBuildTime() == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getWomanBuildTime())); return temp; } } 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 6f73862..90bc2be 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 @@ -51,7 +51,7 @@ public class TrackDownQueryRequest extends BasePageQueryRequest { */ //妇女建档开始日期 private Date foundDateStart; - //结束日期 + //妇女建档结束日期 private Date foundDateEnd; //预约开始追访日期