jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d870bea329f6c0da18aea0979760d6317e0022d0

Authored by jiangjiazhi
1 parent aee12ce050
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

修改产检删除

Showing 2 changed files with 23 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ d870bea
... ... @@ -1762,7 +1762,19 @@
1762 1762 if (CollectionUtils.isNotEmpty(list)) {
1763 1763 patients = list.get(0);
1764 1764 }
1765   - } else {
  1765 + } else if(StringUtils.isNotEmpty(queryRequest.getBarCode())){
  1766 + PatientCheckTicket checkTicket =patientCheckTicketService.getTicket(queryRequest.getBarCode());
  1767 + if(null!=checkTicket){
  1768 + Patients patients1 = patientsService.findOnePatientById(checkTicket.getPatientId());
  1769 + if(null!=patients1){
  1770 + if(StringUtils.isNotEmpty(patients1.getSource())){
  1771 + patients= patientsService.findOnePatientById(patients1.getSource());
  1772 + }else{
  1773 + patients=patients1;
  1774 + }
  1775 + }
  1776 + }
  1777 + }else {
1766 1778 patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId,false), 1, false, null, og.getbStatus() == 1);
1767 1779 //查询产妇数据
1768 1780 // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, false);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java View file @ d870bea
... ... @@ -23,6 +23,16 @@
23 23  
24 24 private String patientId;
25 25  
  26 + private String barCode;
  27 +
  28 + public String getBarCode() {
  29 + return barCode;
  30 + }
  31 +
  32 + public void setBarCode(String barCode) {
  33 + this.barCode = barCode;
  34 + }
  35 +
26 36 public String getPatientId() {
27 37 return patientId;
28 38 }