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 68d0623..1770b39 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 @@ -232,7 +232,12 @@ public class BabyCheckFacade { for (BabyCheckModel cmodel : checkModels) { Map checkRecord = new HashMap<>(); Date checkDate = cmodel.getCheckDate(); - String monthAge = DateUtil.getBabyMonthAge(babyBirth, checkDate); + String monthAge = ""; + if(babyBirth == null || checkDate == null) + { + monthAge = DateUtil.getBabyMonthAge(babyBirth, checkDate); + } + checkRecord.put("id", cmodel.getId()); checkRecord.put("checkDate", DateUtil.getyyyy_MM_dd(checkDate)); checkRecord.put("monthAge", monthAge); 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 0b6bf82..ce948df 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 @@ -18,6 +18,8 @@ public class BabyBookbuildingAddRequest { private String id; //母亲名称 + @FormParam + @NotEmpty(message = "母亲名称不能为空") private String mommyName; //证件号号 @@ -25,6 +27,8 @@ public class BabyBookbuildingAddRequest { @NotEmpty(message = "母亲证件号不能为空") private String mommyCertificateNum; //证件类型 + @FormParam + @NotEmpty(message = "母亲证件类型不能为空") private String mommyCertificateTypeId; //母亲生日 @@ -37,6 +41,8 @@ public class BabyBookbuildingAddRequest { private String mommyProfessionTypeId; //母亲联系方式 + @FormParam + @NotEmpty(message = "母亲联系方式不能为空") private String mommyPhone; //母亲备注 @@ -63,6 +69,8 @@ public class BabyBookbuildingAddRequest { /***********儿童信息***********/ //儿童名称 + @FormParam + @NotEmpty(message = "母亲儿童名称不能为空") private String babyName; //儿童性别 @@ -109,6 +117,8 @@ public class BabyBookbuildingAddRequest { //建档医生 + @FormParam + @NotEmpty(message = "建档医生不能为空") private String buildDoctor; //建档日期 @@ -126,6 +136,7 @@ public class BabyBookbuildingAddRequest { private String vcCardNo; @FormParam + @NotEmpty(message = "医院ID不能为空") private String hospitalId; //体验会员 0非体验会员 1体验会员 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 89dfb9b..d9e7446 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 @@ -206,6 +206,8 @@ public class BabyCheckRequest { private String guideSuggest; //产检医生 + @FormParam + @NotEmpty(message = "检查医生不能为空") private String checkDoctor; //下次预约 @@ -213,7 +215,9 @@ public class BabyCheckRequest { //是否高危儿童 0 非高危 1高危 private Integer highRisk; - + //建档ID + @FormParam + @NotEmpty(message = "检查日期不能为空") private String checkDate; private String monthAge;