diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 6c700fb..cafaac0 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -614,7 +614,7 @@ public class PatientsService { if (null != patients && null != patients.getLastMenses()) { int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); //判断是否在区间 - if (days >= 105 && days <= 146) { + if (days >= 84 && days <= 160) { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setYn(YnEnums.YES.getId()); sieveQuery.setParentId(patients.getId()); @@ -735,7 +735,8 @@ public class PatientsService { sieveModel.setCityId(patients.getCityId()); sieveModel.setAreaId(patients.getAreaId()); sieveModel.setStreetId(patients.getStreetId()); - + sieveModel.setAddress(patients.getAddress()); + AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setNeed("1"); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java index 5fa485f..7d10617 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java @@ -88,6 +88,7 @@ public class SieveModel extends BaseModel { private String cityId; private String areaId; private String streetId; + private String address; // 2019/8/24 12:00 dongqing 冗余产筛类型、收费类型、报告类型 /** @@ -106,6 +107,13 @@ public class SieveModel extends BaseModel { private String reportType; + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } public String getProvinceId() { return provinceId; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveHistory.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveHistory.java index e255df4..d83617c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveHistory.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveHistory.java @@ -37,6 +37,7 @@ public class SieveHistory implements Callable { sieveModel.setCityId(patients.getCityId()); sieveModel.setAreaId(patients.getAreaId()); sieveModel.setStreetId(patients.getStreetId()); + sieveModel.setAddress(patients.getAddress()); sieveService.updateOneChanQianDiaSieve(sieveModel); i++; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java index dc38b3f..a6a24ff 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java @@ -125,8 +125,8 @@ public class SieveWorker implements Callable> { sieveListResult.setApplyHospital(organization.getName()); } //省市区 - sieveListResult.setCensusAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), - patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); + sieveListResult.setCensusAddress(CommonsHelper.getResidence(sieveModel.getProvinceId(), sieveModel.getCityId(), + sieveModel.getAreaId(), sieveModel.getStreetId(), sieveModel.getAddress(), basicConfigService)); //查询产前诊断 int a = 0; List> mList = new ArrayList>();