diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java index 4ca0d53..94af3fe 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java @@ -25,6 +25,9 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative //出生日期 private Date birthdayStart; private Date birthdayEnd; + //建档时间 + private Date buildDateStart; + private Date buildDateEnd; //国籍 private String countryId; //民族Id @@ -208,6 +211,15 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative c1 = c1.lte(birthdayEnd); } } + + if (null != buildDateStart && null != buildDateEnd) { + if (null != c1) { + c1 = c1.where("buildDay").gte(buildDateStart).lte(buildDateEnd); + } else { + c1 = Criteria.where("buildDay").gte(buildDateStart).lte(buildDateEnd); + } + } + if (null != ageMin) { c1 = Criteria.where("age").gte(ageMin); } @@ -631,4 +643,20 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative public void setPublishName(String publishName) { this.publishName = publishName; } + + public Date getBuildDateStart() { + return buildDateStart; + } + + public void setBuildDateStart(Date buildDateStart) { + this.buildDateStart = buildDateStart; + } + + public Date getBuildDateEnd() { + return buildDateEnd; + } + + public void setBuildDateEnd(Date buildDateEnd) { + this.buildDateEnd = buildDateEnd; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java index 9ab9ca4..723c68c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java @@ -914,7 +914,7 @@ public class BabySieveFacede { if(-1 == dex){ continue; } - String name = fileName.substring(dex-5,dex); + String name = fileName.substring(dex-4,dex); //读文件 List list = FileUtils.readLines(new File(fileName)); //文件的名称有两种一种是NTSHS.*,另一种是PKUH.*,判断名称分类字段数据保存 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index a86fce1..c11cd3b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -439,7 +439,7 @@ public class ResidentsArchiveFacade{ } } - trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord); + trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord); } @@ -611,6 +611,14 @@ public class ResidentsArchiveFacade{ if (hospitalId!=null){ query.setHospitalId(hospitalId); } + if(StringUtils.isNotEmpty(queryRequest.getBuildDate())){ + try { + query.setBuildDateStart(DateUtil.getSNDate(queryRequest.getBuildDate())[0]); + query.setBuildDateEnd(DateUtil.getSNDate(queryRequest.getBuildDate())[1]); + } catch (Exception e) { + e.printStackTrace(); + } + } //只查询女性 query.setSex(SystemConfig.WOMAN_ID); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java index 63ec96f..4357216 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java @@ -53,6 +53,16 @@ public class ResidentsArchiveQueryRequest extends BasePageQueryRequest{ private String queryNo; //1-需要隐藏姓名、电话、地址 private int showDetail; + //建档时间 + private String buildDate; + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } public int getShowDetail() { return showDetail;