Commit 8da901c0d39c4dd76d9cfeb370d7eaca957aeb61
1 parent
c57fc6b039
Exists in
master
and in
7 other branches
分娩作废产检劵
Showing 1 changed file with 6 additions and 53 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
8da901c
| ... | ... | @@ -412,9 +412,11 @@ |
| 412 | 412 | |
| 413 | 413 | //初诊,修改产检管理 |
| 414 | 414 | // antenatalExaminationService.updateAntExRecord(antExChuModel.getId(), 1); |
| 415 | - if (StringUtils.isNotEmpty(antExChuModel.getPid())) { | |
| 415 | + /* if (StringUtils.isNotEmpty(antExChuModel.getPid())) { | |
| 416 | 416 | recordService.handExRecord(antExChuModel.getPid()); |
| 417 | - } | |
| 417 | + }*/ | |
| 418 | + antenatalExaminationService.updateAntExRecord(antExChuModel.getId(), 1); | |
| 419 | + | |
| 418 | 420 | } else { |
| 419 | 421 | AntExChuQuery antExChuQuery1 = new AntExChuQuery(); |
| 420 | 422 | antExChuQuery1.setParentId(excAddRequest.getParentId()); |
| ... | ... | @@ -472,9 +474,8 @@ |
| 472 | 474 | //修改本院最后一次定义高危 |
| 473 | 475 | updateLastRhTime(patients.getId(), hospitalId); |
| 474 | 476 | setLashCTimes(antExChuModel.getParentId()); |
| 475 | - if (StringUtils.isNotEmpty(antExChuModel.getPid())) { | |
| 476 | - recordService.handExRecord(antExChuModel.getPid()); | |
| 477 | - } | |
| 477 | + | |
| 478 | + antenatalExaminationService.updateAntExRecord(antExChuModel.getId(), 1); | |
| 478 | 479 | if (null != patients.getBuildType() && patients.getBuildType() == 3) { |
| 479 | 480 | Patients patients1 = new Patients(); |
| 480 | 481 | patients1.setEnable("1"); |
| ... | ... | @@ -1491,27 +1492,6 @@ |
| 1491 | 1492 | |
| 1492 | 1493 | parentId = localAntModel.getParentId(); |
| 1493 | 1494 | |
| 1494 | - /*AntExQuery antExQuery = new AntExQuery(); | |
| 1495 | - antExQuery.setId(antExQueryRequest.getId()); | |
| 1496 | - antExQuery.setYn(YnEnums.YES.getId()); | |
| 1497 | - antExQuery.setHospitalId(hospital); | |
| 1498 | - List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); | |
| 1499 | - //TODO 需要根据时间去查询是否是本院最后一条记录 | |
| 1500 | - if (CollectionUtils.isNotEmpty(list)) { | |
| 1501 | - antExQuery.setStart(new Date(list.get(0).getCheckDate().getTime() + 40000)); | |
| 1502 | - antExQuery.setParentId(list.get(0).getParentId()); | |
| 1503 | - } | |
| 1504 | - antExQuery.setId(null); | |
| 1505 | - list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); | |
| 1506 | - if (CollectionUtils.isNotEmpty(list)) { | |
| 1507 | - for (int i = 0; i < list.size(); i++) { | |
| 1508 | - if (list.get(i).getId().equals(antExQueryRequest.getId())) { | |
| 1509 | - list.remove(i); | |
| 1510 | - } | |
| 1511 | - } | |
| 1512 | - }*/ | |
| 1513 | - | |
| 1514 | -// if (CollectionUtils.isEmpty(list)) { | |
| 1515 | 1495 | if (deleteProcessHandler.deleteAntEx(localAntModel.getPid(), localAntModel.getCheckDate(), hospital, true)) { |
| 1516 | 1496 | antenatalExaminationService.updateOneAnt(antEx, antExQueryRequest.getId()); |
| 1517 | 1497 | |
| ... | ... | @@ -1536,33 +1516,6 @@ |
| 1536 | 1516 | |
| 1537 | 1517 | parentId = antExChuModel11.getParentId(); |
| 1538 | 1518 | |
| 1539 | - | |
| 1540 | - /*AntExChuQuery antExQuery = new AntExChuQuery(); | |
| 1541 | - antExQuery.setId(antExQueryRequest.getId()); | |
| 1542 | - antExQuery.setYn(YnEnums.YES.getId()); | |
| 1543 | - antExQuery.setHospitalId(hospital); | |
| 1544 | - | |
| 1545 | - List<AntExChuModel> list = antenatalExaminationService.queryAntExChu(antExQuery); | |
| 1546 | - | |
| 1547 | - //TODO 需要根据时间去查询是否是本院最后一条记录 | |
| 1548 | - if (CollectionUtils.isNotEmpty(list)) { | |
| 1549 | - antExQuery.setStart(new Date(list.get(0).getCheckTime().getTime() + 40000)); | |
| 1550 | - antExQuery.setParentId(list.get(0).getParentId()); | |
| 1551 | - } | |
| 1552 | - | |
| 1553 | - antExQuery.setId(null); | |
| 1554 | - | |
| 1555 | - list = antenatalExaminationService.queryAntExChu(antExQuery); | |
| 1556 | - | |
| 1557 | - if (CollectionUtils.isNotEmpty(list)) { | |
| 1558 | - for (int i = 0; i < list.size(); i++) { | |
| 1559 | - if (list.get(i).getId().equals(antExQueryRequest.getId())) { | |
| 1560 | - list.remove(i); | |
| 1561 | - } | |
| 1562 | - } | |
| 1563 | - }*/ | |
| 1564 | - | |
| 1565 | -// if (CollectionUtils.isEmpty(list)) { | |
| 1566 | 1519 | if (deleteProcessHandler.deleteAntExChu(antExChuModel11.getPid(), antExChuModel11.getCheckTime(), hospital, true, antExQueryRequest.getId())) { |
| 1567 | 1520 | antenatalExaminationService.updateAntExChu(antExChuModel, antExQueryRequest.getId()); |
| 1568 | 1521 |