Commit bfd76b913ab80aabe89651763ac0ae3678f6d8d9
1 parent
ae4c96159f
Exists in
master
and in
2 other branches
1
Showing 1 changed file with 20 additions and 16 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
bfd76b9
| ... | ... | @@ -111,11 +111,12 @@ |
| 111 | 111 | |
| 112 | 112 | /** |
| 113 | 113 | * 根据患者的建档ID，查询还未使用的免费产检查券 |
| 114 | + * | |
| 114 | 115 | * @param patientId |
| 115 | 116 | * @return |
| 116 | 117 | */ |
| 117 | 118 | public BaseListResponse getTicketList(String patientId) { |
| 118 | - List<PatientCheckTicket> list = patientCheckTicketService.queryTicket(patientId,null,null,1); | |
| 119 | + List<PatientCheckTicket> list = patientCheckTicketService.queryTicket(patientId, null, null, 1); | |
| 119 | 120 | return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(list).setPageInfo(new PageInfo()); |
| 120 | 121 | } |
| 121 | 122 | |
| ... | ... | @@ -252,17 +253,20 @@ |
| 252 | 253 | createBuildSms(p); |
| 253 | 254 | } |
| 254 | 255 | |
| 255 | - // 建档成功后，给孕妇造五个条形码 | |
| 256 | - String ticketPid = autoIncermentService.nextPatientTicketId(); | |
| 257 | - for (Integer i=1;i<=5;i++) { | |
| 258 | - PatientCheckTicket ticket = new PatientCheckTicket(); | |
| 259 | - ticket.setStatus(1); | |
| 260 | - ticket.setHospitalId(p.getHospitalId()); | |
| 261 | - ticket.setPatientId(p.getId()); | |
| 262 | - ticket.setCreated(new Date()); | |
| 263 | - ticket.setId("0335" + ticketPid + i); | |
| 264 | - ticket.setPid(p.getPid()); | |
| 265 | - patientCheckTicketService.addTicket(ticket); | |
| 256 | + | |
| 257 | + if (p.getType()!=null&&p.getType() == 1) { | |
| 258 | + // 建档成功后，给孕妇造五个条形码 | |
| 259 | + String ticketPid = autoIncermentService.nextPatientTicketId(); | |
| 260 | + for (Integer i = 1; i <= 5; i++) { | |
| 261 | + PatientCheckTicket ticket = new PatientCheckTicket(); | |
| 262 | + ticket.setStatus(1); | |
| 263 | + ticket.setHospitalId(p.getHospitalId()); | |
| 264 | + ticket.setPatientId(p.getId()); | |
| 265 | + ticket.setCreated(new Date()); | |
| 266 | + ticket.setId("0335" + ticketPid + i); | |
| 267 | + ticket.setPid(p.getPid()); | |
| 268 | + patientCheckTicketService.addTicket(ticket); | |
| 269 | + } | |
| 266 | 270 | } |
| 267 | 271 | |
| 268 | 272 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
| ... | ... | @@ -527,7 +531,7 @@ |
| 527 | 531 | patientsQuery.setVcCardNo(bookbuildingQueryRequest.getVcCardNo()); |
| 528 | 532 | |
| 529 | 533 | //区域模式 |
| 530 | - patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId,false)); | |
| 534 | + patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId, false)); | |
| 531 | 535 | |
| 532 | 536 | List<Patients> patientsVc = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); |
| 533 | 537 | if (CollectionUtils.isNotEmpty(patientsVc)) { |
| 534 | 538 | |
| 535 | 539 | |
| ... | ... | @@ -552,14 +556,14 @@ |
| 552 | 556 | typeMap.put("hisPatient", qhdfyHisService.getPatientInfoList(bookbuildingQueryRequest.getVcCardNo())); |
| 553 | 557 | } |
| 554 | 558 | } |
| 555 | - }else if(!StringUtils.isEmpty(bookbuildingQueryRequest.getId())){ | |
| 559 | + } else if (!StringUtils.isEmpty(bookbuildingQueryRequest.getId())) { | |
| 556 | 560 | // id，HuJiaqi添加，为了建档管理里面的查看单条使用 |
| 557 | 561 | patients.add(yunBookbuildingService.findOneById(bookbuildingQueryRequest.getId())); |
| 558 | - }else if(StringUtils.isNotEmpty(bookbuildingQueryRequest.getPid())){ | |
| 562 | + } else if (StringUtils.isNotEmpty(bookbuildingQueryRequest.getPid())) { | |
| 559 | 563 | patientsQuery.setPid(bookbuildingQueryRequest.getPid()); |
| 560 | 564 | |
| 561 | 565 | //区域模式 |
| 562 | - patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId,false)); | |
| 566 | + patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId, false)); | |
| 563 | 567 | |
| 564 | 568 | List<Patients> patientsVc = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); |
| 565 | 569 | if (CollectionUtils.isNotEmpty(patientsVc)) { |