jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2b0f5715e39d4f3fa7fe9aeb91d89f343211fcdd

Authored by liquanyu
1 parent 91980fe15d
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

code update

Showing 1 changed file with 52 additions and 20 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 2b0f571
... ... @@ -1570,33 +1570,65 @@
1570 1570 PatientsQuery patientsQuery = new PatientsQuery();
1571 1571 patientsQuery.setYn(YnEnums.YES.getId());
1572 1572  
1573   - if (!StringUtils.isEmpty(cardNo));
  1573 + if (StringUtils.isNotEmpty(cardNo));
1574 1574 {
1575   - patientsQuery.setCardNo(cardNo);
1576   - List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
1577   - if (CollectionUtils.isNotEmpty(patients))
  1575 +
  1576 +
  1577 + BabyModelQuery babyQuery = new BabyModelQuery();
  1578 + babyQuery.setYn(YnEnums.YES.getId());
  1579 + babyQuery.setMcertNo(cardNo);
  1580 + //获取最近一次的建档记录
  1581 + List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
  1582 + if (CollectionUtils.isNotEmpty(models))
1578 1583 {
1579   - Patients patient = patients.get(0);
1580   - if (patients != null)
  1584 + BabyModel babyModel = models.get(0);
  1585 +
  1586 + result = new BabyBuildResult();
  1587 + result.setMommyName(babyModel.getMname());
  1588 + result.setMommyCertificateTypeId(babyModel.getMcertTypeId());
  1589 + result.setMommyCertificateNum(babyModel.getMcertNo());
  1590 + result.setMommyBirthday(DateUtil.getyyyy_MM_dd(babyModel.getMbirth()));
  1591 +
  1592 + result.setMommyProfessionTypeId(babyModel.getMproTypeId());
  1593 + result.setMommyPhone(babyModel.getMphone());
  1594 + result.setFatherName(babyModel.getFname());
  1595 + result.setFatherPhone(babyModel.getFphone());
  1596 + result.setFatherBirthday(DateUtil.getyyyy_MM_dd(babyModel.getFbirth()));
  1597 + result.setFatherLevelId(babyModel.getfLevelId());
  1598 + result.setServiceStatus(String.valueOf(babyModel.getServiceStatus()));
  1599 + result.setServiceType(String.valueOf(babyModel.getServiceType()));
  1600 +
  1601 +
  1602 + result.setFatherProfessionTypeId(babyModel.getFproTypeId());
  1603 + }
  1604 + else
  1605 + {
  1606 + patientsQuery.setCardNo(cardNo);
  1607 + List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
  1608 + if (CollectionUtils.isNotEmpty(patients))
1581 1609 {
  1610 + Patients patient = patients.get(0);
  1611 + if (patients != null)
  1612 + {
1582 1613  
1583   - result = new BabyBuildResult();
1584   - result.setMommyName(patient.getUsername());
1585   - result.setMommyCertificateTypeId(patient.getPcerteTypeId());
1586   - result.setMommyCertificateNum(patient.getCardNo());
1587   - result.setMommyBirthday(DateUtil.getyyyy_MM_dd(patient.getBirth()));
  1614 + result = new BabyBuildResult();
  1615 + result.setMommyName(patient.getUsername());
  1616 + result.setMommyCertificateTypeId(patient.getPcerteTypeId());
  1617 + result.setMommyCertificateNum(patient.getCardNo());
  1618 + result.setMommyBirthday(DateUtil.getyyyy_MM_dd(patient.getBirth()));
1588 1619  
1589   - result.setMommyProfessionTypeId(patient.getProvinceId());
1590   - result.setMommyPhone(patient.getPhone());
1591   - result.setFatherName(patient.getHusbandName());
1592   - result.setFatherPhone(patient.getHusbandPhone());
1593   - result.setFatherBirthday(DateUtil.getyyyy_MM_dd(patient.getHusbandBirth()));
1594   - result.setFatherLevelId(patient.getHlevelTypeId());
1595   - result.setServiceStatus(String.valueOf(patient.getServiceStatus()));
1596   - result.setServiceType(String.valueOf(patient.getServiceType()));
  1620 + result.setMommyProfessionTypeId(patient.getProvinceId());
  1621 + result.setMommyPhone(patient.getPhone());
  1622 + result.setFatherName(patient.getHusbandName());
  1623 + result.setFatherPhone(patient.getHusbandPhone());
  1624 + result.setFatherBirthday(DateUtil.getyyyy_MM_dd(patient.getHusbandBirth()));
  1625 + result.setFatherLevelId(patient.getHlevelTypeId());
  1626 + result.setServiceStatus(String.valueOf(patient.getServiceStatus()));
  1627 + result.setServiceType(String.valueOf(patient.getServiceType()));
1597 1628  
1598 1629  
1599   - result.setFatherProfessionTypeId(patient.getHprofessionTypeId());
  1630 + result.setFatherProfessionTypeId(patient.getHprofessionTypeId());
  1631 + }
1600 1632 }
1601 1633 }
1602 1634 }