diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java index c24b0be..64c0c6c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java @@ -81,6 +81,7 @@ public class BabyBookbuildingController extends BaseController{ return babyBookbuildingFacade.queryBabyBuildById(id); } + /** * 查询儿童建档就诊卡号,母亲身份证 * @param cardNo diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java index 44f96bf..47b46d9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java @@ -3,16 +3,13 @@ package com.lyms.platform.operate.web.controller; import javax.validation.Valid; -import com.lyms.platform.biz.service.AntenatalExaminationService; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; import com.lyms.platform.operate.web.request.AntenatalExaminationQueryRequest; -import com.lyms.platform.operate.web.request.BabyManageRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import com.lyms.platform.biz.service.BabyBookbuildingService; import com.lyms.platform.biz.service.YunBookbuildingService; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.constants.ErrorCodeConstants; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java index 87cc642..46de4fd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java @@ -209,8 +209,10 @@ public class SmsTemplateFacade { String dateRange = temp.getStart() == null ? "" : (temp.getStart() + " "+ temp.getEnd()); + String date = temp.getSendDate() == null ? "" : DateUtil.getyyyy_MM_dd(temp.getSendDate()); + String splDate = temp.getSpecialDateType() == null ? "" : SpecialDateEnums.getNameById(temp.getSpecialDateType()); - String str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate+" "+splDate+ " " +dateRange; + String str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate +" "+ date+" "+splDate+ " " +dateRange;