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 4e0157e..4625425 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 @@ -274,9 +274,9 @@ public class BookbuildingFacade { if (CollectionUtils.isNotEmpty(code)) { areaCode = code.get(0); } - if (null != areaCode) { + if (null != areaCode&&StringUtils.isNotEmpty(areaCode.getAreaCode())) { // 建档成功后,给孕妇造五个条形码 - String ticketPid = autoIncermentService.nextPatientTicketId(p.getHospitalId()); + String ticketPid = autoIncermentService.nextPatientTicketId(areaCode.getAreaCode()); for (Integer i = 1; i <= 5; i++) { PatientCheckTicket ticket = new PatientCheckTicket(); ticket.setStatus(1); 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 14f180c..abca956 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 @@ -8,6 +8,7 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.ExceptionUtils; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.worker.WorkHR; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; @@ -109,9 +110,9 @@ public class PatientCheckTicketFacade { if (CollectionUtils.isNotEmpty(code)) { areaCode = code.get(0); } - if (null != areaCode) { + if (null != areaCode&& StringUtils.isNotEmpty(areaCode.getAreaCode())) { // 建档成功后,给孕妇造五个条形码 - String ticketPid = autoIncermentService.nextPatientTicketId(p.getHospitalId()); + String ticketPid = autoIncermentService.nextPatientTicketId(areaCode.getAreaCode()); for (Integer i = 1; i <= 5; i++) { PatientCheckTicket ticket = new PatientCheckTicket(); ticket.setStatus(1);