From b8a5bba0ad3d611e64336c591e0c290214a633c9 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 17 Jan 2017 10:10:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=8A=B5?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=8C=89=E5=8C=BA=E5=9F=9F=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/BookbuildingFacade.java | 4 ++-- .../lyms/platform/operate/web/facade/PatientCheckTicketFacade.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) 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); -- 1.8.3.1