From f561594f681d810d857d4081c9df59decab45702 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Tue, 29 Mar 2022 11:32:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96-=E5=84=BF=E7=AB=A5=E5=BB=BA?= =?UTF-8?q?=E6=A1=A3=E5=A2=9E=E5=8A=A0=E6=88=B7=E7=B1=8D=E5=9C=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/BabyModel.java | 65 ++++++++++++++++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 13 ++++ .../platform/operate/web/facade/ViewFacade.java | 4 ++ .../web/request/BabyBookbuildingAddRequest.java | 64 +++++++++++++++++++ .../operate/web/result/BabyBuildResult.java | 63 +++++++++++++++++++ .../operate/web/result/BabyPageResult.java | 71 +++++++++++++++++++++- 6 files changed, 279 insertions(+), 1 deletion(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index f37ebfa..892c60f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -858,6 +858,71 @@ public class BabyModel extends BaseModel { */ private List lhEyeHighRisk; + /********************************************/ + + //隆化-儿童建档户籍地 + + /** + *省 + */ + private String babyProvinceId; + /** + *市 + */ + private String babyCityId; + /** + *县 + */ + private String babyAreaId; + /** + *乡镇街道 + */ + private String babyStreetId; + /** + *详细地址 + */ + private String babyAddress; + + public String getBabyProvinceId() { + return babyProvinceId; + } + + public void setBabyProvinceId(String babyProvinceId) { + this.babyProvinceId = babyProvinceId; + } + + public String getBabyCityId() { + return babyCityId; + } + + public void setBabyCityId(String babyCityId) { + this.babyCityId = babyCityId; + } + + public String getBabyAreaId() { + return babyAreaId; + } + + public void setBabyAreaId(String babyAreaId) { + this.babyAreaId = babyAreaId; + } + + public String getBabyStreetId() { + return babyStreetId; + } + + public void setBabyStreetId(String babyStreetId) { + this.babyStreetId = babyStreetId; + } + + public String getBabyAddress() { + return babyAddress; + } + + public void setBabyAddress(String babyAddress) { + this.babyAddress = babyAddress; + } + public String getLhChuEyePositiveType() { return lhChuEyePositiveType; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 6313f19..f8a11ac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1574,6 +1574,13 @@ public class BabyBookbuildingFacade { //滦平-儿童建档下次检查项 bm.setNextCheckItem(b.getNextCheckItem()); + //隆化-儿童建档户籍地 + bm.setBabyProvinceId(b.getBabyProvinceId()); + bm.setBabyCityId(b.getBabyCityId()); + bm.setBabyAreaId(b.getBabyAreaId()); + bm.setBabyStreetId(b.getBabyStreetId()); + bm.setBabyAddress(b.getBabyAddress()); + return bm; } @@ -2001,6 +2008,12 @@ public class BabyBookbuildingFacade { // } } result.setWcOtherHighRisk(model.getWcOtherHighRisk()); + //隆化-儿童建档户籍地 + result.setBabyProvinceId(model.getBabyProvinceId()); + result.setBabyCityId(model.getBabyCityId()); + result.setBabyAreaId(model.getBabyAreaId()); + result.setBabyStreetId(model.getBabyStreetId()); + result.setBabyAddress(model.getBabyAddress()); return result; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 55b020f..7fef015 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -5526,6 +5526,10 @@ public class ViewFacade { String homeAddress = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService); result.setHomeAddress(homeAddress); + //隆化-儿童建档户籍地 + String babyAddress = CommonsHelper.getResidence(model.getBabyProvinceId(), model.getBabyCityId(), + model.getBabyAreaId(), model.getBabyStreetId(), model.getBabyAddress(), basicConfigService); + result.setBabyAddress(babyAddress); result.setMommyCertificateType(getBasicConfig(model.getMcertTypeId())); result.setMommyLevel(getBasicConfig(model.getmLevelId())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index 55c1b9e..f038d61 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -422,6 +422,70 @@ public class BabyBookbuildingAddRequest { //滦平儿童建档下次检查项 private String nextCheckItem; + /********************************************/ + + //隆化-儿童建档户籍地 + + /** + *省 + */ + private String babyProvinceId; + /** + *市 + */ + private String babyCityId; + /** + *县 + */ + private String babyAreaId; + /** + *乡镇街道 + */ + private String babyStreetId; + /** + *详细地址 + */ + private String babyAddress; + + public String getBabyProvinceId() { + return babyProvinceId; + } + + public void setBabyProvinceId(String babyProvinceId) { + this.babyProvinceId = babyProvinceId; + } + + public String getBabyCityId() { + return babyCityId; + } + + public void setBabyCityId(String babyCityId) { + this.babyCityId = babyCityId; + } + + public String getBabyAreaId() { + return babyAreaId; + } + + public void setBabyAreaId(String babyAreaId) { + this.babyAreaId = babyAreaId; + } + + public String getBabyStreetId() { + return babyStreetId; + } + + public void setBabyStreetId(String babyStreetId) { + this.babyStreetId = babyStreetId; + } + + public String getBabyAddress() { + return babyAddress; + } + + public void setBabyAddress(String babyAddress) { + this.babyAddress = babyAddress; + } public String getNextCheckItem() { return nextCheckItem; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java index d44005d..7ebad1a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java @@ -364,7 +364,70 @@ public class BabyBuildResult { //滦平儿童建档下次检查项 private String nextCheckItem; +/********************************************/ + //隆化-儿童建档户籍地 + + /** + *省 + */ + private String babyProvinceId; + /** + *市 + */ + private String babyCityId; + /** + *县 + */ + private String babyAreaId; + /** + *乡镇街道 + */ + private String babyStreetId; + /** + *详细地址 + */ + private String babyAddress; + + public String getBabyProvinceId() { + return babyProvinceId; + } + + public void setBabyProvinceId(String babyProvinceId) { + this.babyProvinceId = babyProvinceId; + } + + public String getBabyCityId() { + return babyCityId; + } + + public void setBabyCityId(String babyCityId) { + this.babyCityId = babyCityId; + } + + public String getBabyAreaId() { + return babyAreaId; + } + + public void setBabyAreaId(String babyAreaId) { + this.babyAreaId = babyAreaId; + } + + public String getBabyStreetId() { + return babyStreetId; + } + + public void setBabyStreetId(String babyStreetId) { + this.babyStreetId = babyStreetId; + } + + public String getBabyAddress() { + return babyAddress; + } + + public void setBabyAddress(String babyAddress) { + this.babyAddress = babyAddress; + } public String getNextCheckItem() { return nextCheckItem; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java index 5404fed..810beff 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java @@ -357,6 +357,70 @@ public class BabyPageResult implements IBasicResultConvert