From c8784a2501df08c7978228352572503cdec9627c Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 23 Aug 2022 09:37:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/BabyModel.java | 31 +++++++++++++++++----- .../operate/web/facade/BabyBookbuildingFacade.java | 10 +++++-- .../operate/web/facade/BabyCheckFacade.java | 2 ++ .../web/request/BabyBookbuildingAddRequest.java | 31 +++++++++++++++++----- .../operate/web/result/BabyBuildResult.java | 31 +++++++++++++++++----- .../operate/web/result/BabyPageResult.java | 27 ++++++++++++++----- 6 files changed, 105 insertions(+), 27 deletions(-) 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 0e8e933..9c9ca82 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 @@ -669,8 +669,11 @@ public class BabyModel extends BaseModel { private String mfileCode; //纸质档案编号 private String beforeName; //曾用名 private String nationId; //民族 - private String ownPhone; //本人电话 - private String fixPhone; //固定电话 + //private String mommyPhone; 本人电话 + private String fixPhone; // 固定电话 + private String cname; //联系人姓名 + private String cphone; //联系人电话 + private String remark;//备注 private String village;//村/居委会 private String smallArea; //小区 private String floor; //楼栋 @@ -752,12 +755,28 @@ public class BabyModel extends BaseModel { this.nationId = nationId; } - public String getOwnPhone() { - return ownPhone; + public String getCname() { + return cname; } - public void setOwnPhone(String ownPhone) { - this.ownPhone = ownPhone; + public void setCname(String cname) { + this.cname = cname; + } + + public String getCphone() { + return cphone; + } + + public void setCphone(String cphone) { + this.cphone = cphone; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; } public String getFixPhone() { 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 cb990e9..1871bd8 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 @@ -1435,8 +1435,11 @@ public class BabyBookbuildingFacade { bm.setMfileCode(b.getMfileCode()); bm.setBeforeName(b.getBeforeName()); bm.setNationId(b.getNationId()); - bm.setOwnPhone(b.getOwnPhone()); + //setOwnPhone(destModel.getOwnPhone()); bm.setFixPhone(b.getFixPhone()); + bm.setCname(b.getCname()); + bm.setCphone(b.getCphone()); + bm.setRemark(b.getRemark()); bm.setVillage(b.getVillage()); bm.setSmallArea(b.getSmallArea()); bm.setFloor(b.getFloor()); @@ -2194,8 +2197,11 @@ public class BabyBookbuildingFacade { result.setMfileCode(model.getMfileCode()); result.setBeforeName(model.getBeforeName()); result.setNationId(model.getNationId()); - result.setOwnPhone(model.getOwnPhone()); + //setOwnPhone(destModel.getOwnPhone()); result.setFixPhone(model.getFixPhone()); + result.setCname(model.getCname()); + result.setCphone(model.getCphone()); + result.setRemark(model.getRemark()); result.setVillage(model.getVillage()); result.setSmallArea(model.getSmallArea()); result.setFloor(model.getFloor()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index c3ff58c..05a86ff 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -2174,6 +2174,8 @@ public class BabyCheckFacade extends BaseServiceImpl { List hList = groupsFacade.findGroupHospital(userId, false); babyQuery.setHospitalIdList(hList); + // babyQuery.setHospitalId(hospitalId); + Map > listMap = new HashMap <>(); List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); 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 15e1d12..1bcf12e 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 @@ -458,8 +458,11 @@ public class BabyBookbuildingAddRequest { private String mfileCode; //纸质档案编号 private String beforeName; //曾用名 private String nationId; //民族 - private String ownPhone; //本人电话 - private String fixPhone; //固定电话 + //private String mommyPhone; 本人电话 + private String fixPhone; // 固定电话 + private String cname; //联系人姓名 + private String cphone; //联系人电话 + private String remark;//备注 private String village;//村/居委会 private String smallArea; //小区 private String floor; //楼栋 @@ -541,12 +544,28 @@ public class BabyBookbuildingAddRequest { this.nationId = nationId; } - public String getOwnPhone() { - return ownPhone; + public String getCname() { + return cname; } - public void setOwnPhone(String ownPhone) { - this.ownPhone = ownPhone; + public void setCname(String cname) { + this.cname = cname; + } + + public String getCphone() { + return cphone; + } + + public void setCphone(String cphone) { + this.cphone = cphone; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; } public String getFixPhone() { 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 587c658..bcdc47d 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 @@ -401,8 +401,11 @@ public class BabyBuildResult { private String mfileCode; //纸质档案编号 private String beforeName; //曾用名 private String nationId; //民族 - private String ownPhone; //本人电话 - private String fixPhone; //固定电话 + //private String mommyPhone; 本人电话 + private String fixPhone; // 固定电话 + private String cname; //联系人姓名 + private String cphone; //联系人电话 + private String remark;//备注 private String village;//村/居委会 private String smallArea; //小区 private String floor; //楼栋 @@ -481,12 +484,28 @@ public class BabyBuildResult { this.nationId = nationId; } - public String getOwnPhone() { - return ownPhone; + public String getCname() { + return cname; } - public void setOwnPhone(String ownPhone) { - this.ownPhone = ownPhone; + public void setCname(String cname) { + this.cname = cname; + } + + public String getCphone() { + return cphone; + } + + public void setCphone(String cphone) { + this.cphone = cphone; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; } public String getFixPhone() { 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 e513d34..bf136c7 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 @@ -391,8 +391,10 @@ public class BabyPageResult implements IBasicResultConvert