diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 9dfcd49..8c18a63 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -523,6 +523,59 @@ public class AntExChuModel extends BaseModel { public String ctpoab; //秦皇岛定制字段:是否产筛 0:未产筛 1:已产筛 public Integer productionSieveType; + /** + * 公卫2.0-新增第一次产前随访(产前检查初诊) + */ + //各厂商对接时,再确定具体的值 + private Integer isAppCreate; + //本次随访医师id + private String followupDoctorId; + //本次随访医师姓名 + private String followupDoctorName; + //本人姓名 + private String name; + //本次随访日期 + private String followupDate; + + public Integer getIsAppCreate() { + return isAppCreate; + } + + public void setIsAppCreate(Integer isAppCreate) { + this.isAppCreate = isAppCreate; + } + + public String getFollowupDoctorId() { + return followupDoctorId; + } + + public void setFollowupDoctorId(String followupDoctorId) { + this.followupDoctorId = followupDoctorId; + } + + public String getFollowupDoctorName() { + return followupDoctorName; + } + + public void setFollowupDoctorName(String followupDoctorName) { + this.followupDoctorName = followupDoctorName; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getFollowupDate() { + return followupDate; + } + + public void setFollowupDate(String followupDate) { + this.followupDate = followupDate; + } public List getJmxspg() { return jmxspg; 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 de9e13a..fbbe8fa 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 @@ -2567,7 +2567,11 @@ public class ViewFacade { map.put("teamName",doctorTeam.getTeamName()); } } - + map.put("isAppCreate",data.getIsAppCreate()); + map.put("followupDoctorId",data.getFollowupDoctorId()); + map.put("followupDoctorName",data.getFollowupDoctorName()); + map.put("name",data.getName()); + map.put("followupDate",data.getFollowupDate()); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java index 617d1af..8ab526e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java @@ -537,6 +537,59 @@ public class AntExcAddRequest implements IBasicRequestConvert { public String ctpoab; //秦皇岛定制字段:是否产筛 0:未产筛 1:已产筛 public Integer productionSieveType; + /** + * 公卫2.0-新增第一次产前随访(产前检查初诊) + */ + //各厂商对接时,再确定具体的值 + private Integer isAppCreate; + //本次随访医师id + private String followupDoctorId; + //本次随访医师姓名 + private String followupDoctorName; + //本人姓名 + private String name; + //本次随访日期 + private String followupDate; + + public Integer getIsAppCreate() { + return isAppCreate; + } + + public void setIsAppCreate(Integer isAppCreate) { + this.isAppCreate = isAppCreate; + } + + public String getFollowupDoctorId() { + return followupDoctorId; + } + + public void setFollowupDoctorId(String followupDoctorId) { + this.followupDoctorId = followupDoctorId; + } + + public String getFollowupDoctorName() { + return followupDoctorName; + } + + public void setFollowupDoctorName(String followupDoctorName) { + this.followupDoctorName = followupDoctorName; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getFollowupDate() { + return followupDate; + } + + public void setFollowupDate(String followupDate) { + this.followupDate = followupDate; + } public Integer getProductionSieveType() { return productionSieveType; @@ -2599,6 +2652,11 @@ public class AntExcAddRequest implements IBasicRequestConvert { if(null!=productionSieveType) { antExChuModel.setProductionSieveType(productionSieveType); } + antExChuModel.setIsAppCreate(isAppCreate); + antExChuModel.setFollowupDoctorId(followupDoctorId); + antExChuModel.setFollowupDoctorName(followupDoctorName); + antExChuModel.setName(name); + antExChuModel.setFollowupDate(followupDate); return antExChuModel; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index 7e2a5cf..9f82047 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -729,6 +729,60 @@ public class AntexChuResult { //秦皇岛定制字段:是否产筛 0:未产筛 1:已产筛 public Integer productionSieveType; + /** + * 公卫2.0-新增非首次产前随访(产前检查复诊 ) + */ + //各厂商对接时,再确定具体的值 + private Integer isAppCreate; + //本次随访医师id + private String followupDoctorId; + //本次随访医师姓名 + private String followupDoctorName; + //本次随访日期 + private String followupDate; + //本人姓名 + private String name; + + public Integer getIsAppCreate() { + return isAppCreate; + } + + public void setIsAppCreate(Integer isAppCreate) { + this.isAppCreate = isAppCreate; + } + + public String getFollowupDoctorId() { + return followupDoctorId; + } + + public void setFollowupDoctorId(String followupDoctorId) { + this.followupDoctorId = followupDoctorId; + } + + public String getFollowupDoctorName() { + return followupDoctorName; + } + + public void setFollowupDoctorName(String followupDoctorName) { + this.followupDoctorName = followupDoctorName; + } + + public String getFollowupDate() { + return followupDate; + } + + public void setFollowupDate(String followupDate) { + this.followupDate = followupDate; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + public Integer getProductionSieveType() { return productionSieveType; } @@ -2473,7 +2527,11 @@ public class AntexChuResult { setJmxspg(antExChuModel.getJmxspg()); setJmxsScore(antExChuModel.getJmxsScore()); setJmxsLevel(antExChuModel.getJmxsLevel()); - + setIsAppCreate(antExChuModel.getIsAppCreate()); + setFollowupDoctorId(antExChuModel.getFollowupDoctorId()); + setFollowupDoctorName(antExChuModel.getFollowupDoctorName()); + setFollowupDate(antExChuModel.getFollowupDate()); + setName(antExChuModel.getName()); } return this; }