diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 98fab86..7c5d67e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -277,7 +277,7 @@ public class BookbuildingFacade { if (null != areaCode&&StringUtils.isNotEmpty(areaCode.getAreaCode())) { // 建档成功后,给孕妇造五个条形码 String ticketPid = autoIncermentService.nextPatientTicketId(areaCode.getAreaCode()); - for (Integer i = 1; i <= 5; i++) { + for (Integer i = PatientCheckTicketFacade.complyCurrentDay(p.getLastMenses()); i <= 5; i++) { PatientCheckTicket ticket = new PatientCheckTicket(); ticket.setStatus(1); ticket.setHospitalId(p.getHospitalId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCheckTicketFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCheckTicketFacade.java index 9337b6b..b39bf50 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCheckTicketFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCheckTicketFacade.java @@ -206,6 +206,9 @@ public class PatientCheckTicketFacade { * @return */ public static int complyCurrentDay(Date lastMess) { + if(null==lastMess){ + return 0; + } int day = DateUtil.getDays(lastMess, new Date()); if (day <= 12 * 7 + 6) return 1;