diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index 802c649..ea063ba 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -1240,7 +1240,7 @@ public class SmsServiceImpl implements SmsService{ { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); - //1孕妇 + //1孕妇 3产妇 patientsQuery.setType(3); patientsQuery = getServicePatientQuery(serviceType, serviceStatus, patientsQuery); @@ -1672,7 +1672,7 @@ public class SmsServiceImpl implements SmsService{ if (startDate != null) { //把时间格式化成 yyyy_MM_dd 的日期 - startDate = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(startDate)); + startDate = DateUtil.formatDate(startDate); } List models = babyBookbuildingService.queryBabyOrder(startDate, tempHid, pid); for (BabyCheckModel model : models) 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 9f2899d..37cf748 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 @@ -1267,7 +1267,7 @@ public class BabyBookbuildingFacade { } else { result.setHighRisk("高危"); } - result.setSex(SexTypeEnums.getTitleById(model.getSex())); + result.setSex(SexEnum.getTextById(model.getSex())); result.setBabyName(model.getName()); result.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth())); result.setMommyName(model.getMname());