From 773c0b64ad67be4c675a084dfab3f290de571579 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Wed, 14 Sep 2022 16:06:12 +0800 Subject: [PATCH] update --- .../main/java/com/lyms/platform/pojo/BabyCheckModel.java | 6 +++--- .../platform/operate/web/facade/BabyCheckFacade.java | 1 + .../platform/operate/web/request/BabyCheckRequest.java | 7 ++++--- .../platform/operate/web/result/BabyCheckPageResult.java | 6 +++--- .../platform/operate/web/result/BabyCheckResult.java | 16 +++++++++++++--- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java index f71e7d5..6950184 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java @@ -757,7 +757,7 @@ public class BabyCheckModel extends BaseModel { //儿童健康检查表单编号 private String childHealthExamFormNo; //儿童随访类型 1.新生儿家庭访视，2.一岁以内随访，3.1~2岁随访，4.3~6岁随访 - private String visitType; + private Integer visitType; //选项指标记录 private List recordChoice; @@ -817,11 +817,11 @@ public class BabyCheckModel extends BaseModel { this.childHealthExamFormNo = childHealthExamFormNo; } - public String getVisitType() { + public Integer getVisitType() { return visitType; } - public void setVisitType(String visitType) { + public void setVisitType(Integer visitType) { this.visitType = visitType; } 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 1ce1851..c082a8e 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 @@ -2878,6 +2878,7 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setFollowupVisitDoctorName(checkModel.getFollowupVisitDoctorName()); model.setChildHealthExamFormNo(checkModel.getChildHealthExamFormNo()); model.setVisitType(checkModel.getVisitType()); + model.setRecordChoice(checkModel.getRecordChoice()); return model; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java index 4cb0d1d..685e550 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java @@ -726,7 +726,7 @@ public class BabyCheckRequest { //儿童健康检查表单编号 private String childHealthExamFormNo; //儿童随访类型 1.新生儿家庭访视，2.一岁以内随访，3.1~2岁随访，4.3~6岁随访 - private String visitType; + private Integer visitType; //选项指标记录 private List recordChoice; @@ -786,13 +786,14 @@ public class BabyCheckRequest { this.childHealthExamFormNo = childHealthExamFormNo; } - public String getVisitType() { + public Integer getVisitType() { return visitType; } - public void setVisitType(String visitType) { + public void setVisitType(Integer visitType) { this.visitType = visitType; } + public String getSf() { return sf; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java index 1894932..3ed4873 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java @@ -990,7 +990,7 @@ public class BabyCheckPageResult { //儿童健康检查表单编号 private String childHealthExamFormNo; //儿童随访类型 1.新生儿家庭访视，2.一岁以内随访，3.1~2岁随访，4.3~6岁随访 - private String visitType; + private Integer visitType; //选项指标记录 private List recordChoice; @@ -1050,11 +1050,11 @@ public class BabyCheckPageResult { this.childHealthExamFormNo = childHealthExamFormNo; } - public String getVisitType() { + public Integer getVisitType() { return visitType; } - public void setVisitType(String visitType) { + public void setVisitType(Integer visitType) { this.visitType = visitType; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java index 8db1b12..04283d6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java @@ -55,7 +55,9 @@ public class BabyCheckResult { //儿童健康检查表单编号 private String childHealthExamFormNo; //儿童随访类型 1.新生儿家庭访视，2.一岁以内随访，3.1~2岁随访，4.3~6岁随访 - private String visitType; + private Integer visitType; + //选项指标记录 + private List recordChoice; public Integer getIsAppCreate() { return isAppCreate; @@ -105,14 +107,22 @@ public class BabyCheckResult { this.childHealthExamFormNo = childHealthExamFormNo; } - public String getVisitType() { + public Integer getVisitType() { return visitType; } - public void setVisitType(String visitType) { + public void setVisitType(Integer visitType) { this.visitType = visitType; } + public List getRecordChoice() { + return recordChoice; + } + + public void setRecordChoice(List recordChoice) { + this.recordChoice = recordChoice; + } + public String getEljy() { return eljy; } -- 1.8.3.1