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 ed4c779..7d8c45c 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 @@ -111,11 +111,12 @@ public class BookbuildingFacade { /** * 根据患者的建档ID,查询还未使用的免费产检查券 + * * @param patientId * @return */ public BaseListResponse getTicketList(String patientId) { - List list = patientCheckTicketService.queryTicket(patientId,null,null,1); + List list = patientCheckTicketService.queryTicket(patientId, null, null, 1); return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(list).setPageInfo(new PageInfo()); } @@ -252,17 +253,20 @@ public class BookbuildingFacade { createBuildSms(p); } - // 建档成功后,给孕妇造五个条形码 - String ticketPid = autoIncermentService.nextPatientTicketId(); - for (Integer i=1;i<=5;i++) { - PatientCheckTicket ticket = new PatientCheckTicket(); - ticket.setStatus(1); - ticket.setHospitalId(p.getHospitalId()); - ticket.setPatientId(p.getId()); - ticket.setCreated(new Date()); - ticket.setId("0335" + ticketPid + i); - ticket.setPid(p.getPid()); - patientCheckTicketService.addTicket(ticket); + + if (p.getType()!=null&&p.getType() == 1) { + // 建档成功后,给孕妇造五个条形码 + String ticketPid = autoIncermentService.nextPatientTicketId(); + for (Integer i = 1; i <= 5; i++) { + PatientCheckTicket ticket = new PatientCheckTicket(); + ticket.setStatus(1); + ticket.setHospitalId(p.getHospitalId()); + ticket.setPatientId(p.getId()); + ticket.setCreated(new Date()); + ticket.setId("0335" + ticketPid + i); + ticket.setPid(p.getPid()); + patientCheckTicketService.addTicket(ticket); + } } br.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -527,7 +531,7 @@ public class BookbuildingFacade { patientsQuery.setVcCardNo(bookbuildingQueryRequest.getVcCardNo()); //区域模式 - patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId,false)); + patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId, false)); List patientsVc = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (CollectionUtils.isNotEmpty(patientsVc)) { @@ -552,14 +556,14 @@ public class BookbuildingFacade { typeMap.put("hisPatient", qhdfyHisService.getPatientInfoList(bookbuildingQueryRequest.getVcCardNo())); } } - }else if(!StringUtils.isEmpty(bookbuildingQueryRequest.getId())){ + } else if (!StringUtils.isEmpty(bookbuildingQueryRequest.getId())) { // id,HuJiaqi添加,为了建档管理里面的查看单条使用 patients.add(yunBookbuildingService.findOneById(bookbuildingQueryRequest.getId())); - }else if(StringUtils.isNotEmpty(bookbuildingQueryRequest.getPid())){ + } else if (StringUtils.isNotEmpty(bookbuildingQueryRequest.getPid())) { patientsQuery.setPid(bookbuildingQueryRequest.getPid()); //区域模式 - patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId,false)); + patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId, false)); List patientsVc = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (CollectionUtils.isNotEmpty(patientsVc)) {