From dae87252677b2c1f3b30f1812cc3bc5d8b00df71 Mon Sep 17 00:00:00 2001 From: jishenfei Date: Mon, 17 Apr 2023 21:04:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B0=E5=AE=81=E9=9C=80=E6=B1=82=E6=9D=91?= =?UTF-8?q?=E7=BA=A7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/pojo/Patients.java | 4 ++-- .../java/com/lyms/platform/query/PatientsQuery.java | 19 +++++++++++++++++++ .../platform/operate/web/facade/PatientFacade.java | 2 ++ .../operate/web/request/RiskPatientsQueryRequest.java | 18 ++++++++++++++++++ 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 14f759a..96bb50e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -132,7 +132,7 @@ public class Patients extends BaseModel { private String hprovinceRegisterId; private String hcityRegisterId; private String hareaRegisterId; - private String hstreetRegisterId; + private String hstreetRegisterId; /** * 丈夫居住地 */ @@ -141,7 +141,7 @@ public class Patients extends BaseModel { private String hareaId; private String hstreetId; //村 - private String hvillage; + private String hvillage; private String haddress; /******add by lqy end *********/ diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 72a557e..13bac3d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -113,6 +113,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String cityRegisterId; private String areaRegisterId; private String streetRegisterId; + private String villageRegister; private List streetRegisterIds; private String noProvinceRegisterId; @@ -123,6 +124,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String cityId; private String areaId; private String streetId; + private String villageId; //医院id @@ -356,6 +358,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String areaPostRestId; private String streetPostRestId; + private String pcensusTypeId; //乡镇卫生院id private String townOrgId; @@ -418,6 +421,22 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String currentAreaId; private Integer isComplete; + public String getVillageRegister() { + return villageRegister; + } + + public void setVillageRegister(String villageRegister) { + this.villageRegister = villageRegister; + } + + public String getVillageId() { + return villageId; + } + + public void setVillageId(String villageId) { + this.villageId = villageId; + } + public Integer getIsComplete() { return isComplete; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index b2ec76a..e99cdca 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -430,12 +430,14 @@ public class PatientFacade extends BaseServiceImpl { patientsQuery.setCityRegisterId(riskPatientsQueryRequest.getCityId()); patientsQuery.setProvinceRegisterId(riskPatientsQueryRequest.getProvinceId()); patientsQuery.setStreetRegisterId(riskPatientsQueryRequest.getStreetId()); + patientsQuery.setVillageId(riskPatientsQueryRequest.getHvillage()); //户籍地 patientsQuery.setAreaId(riskPatientsQueryRequest.getAreaRegisterId()); patientsQuery.setProvinceId(riskPatientsQueryRequest.getProvinceRegisterId()); patientsQuery.setCityId(riskPatientsQueryRequest.getCityRegisterId()); patientsQuery.setStreetId(riskPatientsQueryRequest.getStreetRegisterId()); + patientsQuery.setVillageRegister(riskPatientsQueryRequest.getVillageRegisterId()); List hospitalList = null; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java index a1788fa..3528a33 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java @@ -99,12 +99,14 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { private String cityRegisterId; private String areaRegisterId; private String streetRegisterId; + private String villageRegisterId; //居住地 private String provinceId; private String cityId; private String areaId; private String streetId; + private String hvillage; //产检医院 private String cprovinceId; @@ -192,6 +194,22 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { //体重异常管理-接收建档时间筛选用 private String buildDate; + public String getVillageRegisterId() { + return villageRegisterId; + } + + public void setVillageRegisterId(String villageRegisterId) { + this.villageRegisterId = villageRegisterId; + } + + public String getHvillage() { + return hvillage; + } + + public void setHvillage(String hvillage) { + this.hvillage = hvillage; + } + //秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛 public Integer productionSieveType; -- 1.8.3.1