Commit b802ece66a26a14998fb6f46f11a7620916db4d1
1 parent
c77e83898e
Exists in
master
and in
6 other branches
1
Showing 1 changed file with 47 additions and 50 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
b802ece
| ... | ... | @@ -1505,7 +1505,7 @@ |
| 1505 | 1505 | |
| 1506 | 1506 | if (CollectionUtils.isNotEmpty(organizationList)) { |
| 1507 | 1507 | for (Organization organization : organizationList) { |
| 1508 | - | |
| 1508 | +// patientsQuery1.setPid("59e8552e0cf25dc5fc6554a4"); | |
| 1509 | 1509 | patientsQuery1.setHospitalId(organization.getId() + ""); |
| 1510 | 1510 | List<Patients> pats = patientsService.queryPatient(patientsQuery1); |
| 1511 | 1511 | |
| 1512 | 1512 | |
| 1513 | 1513 | |
| 1514 | 1514 | |
| 1515 | 1515 | |
| 1516 | 1516 | |
| 1517 | 1517 | |
| 1518 | 1518 | |
| 1519 | 1519 | |
| 1520 | 1520 | |
| ... | ... | @@ -1562,70 +1562,67 @@ |
| 1562 | 1562 | } |
| 1563 | 1563 | |
| 1564 | 1564 | antExChuModelList.clear(); |
| 1565 | - | |
| 1566 | - // 查询复诊 | |
| 1567 | - AntExQuery antExQuery = new AntExQuery(); | |
| 1568 | - antExQuery.setYn(YnEnums.YES.getId()); | |
| 1569 | - antExQuery.setParentId(pat.getId()); | |
| 1570 | - antExQuery.setHospitalId(pat.getHospitalId()); | |
| 1571 | - List<AntenatalExaminationModel> antenatalExaminationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); | |
| 1572 | - if (CollectionUtils.isNotEmpty(antenatalExaminationModelList)) { | |
| 1573 | - for (AntenatalExaminationModel fmodel : antenatalExaminationModelList) { | |
| 1574 | - String highriskStr = fmodel.getRiskFactor(); | |
| 1575 | - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(highriskStr)) { | |
| 1576 | - List<String> highrisks = JsonUtil.toList(highriskStr, String.class); | |
| 1577 | - if (CollectionUtils.isNotEmpty(highrisks)) { | |
| 1578 | - if (CollectionUtils.isNotEmpty(highrisks)) { | |
| 1579 | - int modCount = doRiskHandle(highrisks); | |
| 1580 | - if (modCount > 0) { | |
| 1581 | - fmodel.setRiskFactor(JsonUtil.array2JsonString(highrisks)); | |
| 1582 | - antenatalExaminationService.updateOneAnt(fmodel, fmodel.getId()); | |
| 1583 | - } | |
| 1584 | - } | |
| 1565 | + } | |
| 1566 | + // 查询复诊 | |
| 1567 | + AntExQuery antExQuery = new AntExQuery(); | |
| 1568 | + antExQuery.setYn(YnEnums.YES.getId()); | |
| 1569 | + antExQuery.setParentId(pat.getId()); | |
| 1570 | + antExQuery.setHospitalId(pat.getHospitalId()); | |
| 1571 | + List<AntenatalExaminationModel> antenatalExaminationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); | |
| 1572 | + if (CollectionUtils.isNotEmpty(antenatalExaminationModelList)) { | |
| 1573 | + for (AntenatalExaminationModel fmodel : antenatalExaminationModelList) { | |
| 1574 | + String highriskStr = fmodel.getRiskFactor(); | |
| 1575 | + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(highriskStr)) { | |
| 1576 | + List highrisks = JsonUtil.toList(highriskStr, List.class); | |
| 1577 | + if (CollectionUtils.isNotEmpty(highrisks)) { | |
| 1578 | + int modCount = doRiskHandle(highrisks); | |
| 1579 | + if (modCount > 0) { | |
| 1580 | + fmodel.setRiskFactor(JsonUtil.array2JsonString(highrisks)); | |
| 1581 | + antenatalExaminationService.updateOneAnt(fmodel, fmodel.getId()); | |
| 1585 | 1582 | } |
| 1586 | 1583 | } |
| 1587 | 1584 | } |
| 1588 | 1585 | } |
| 1586 | + } | |
| 1589 | 1587 | |
| 1590 | - antenatalExaminationModelList.clear(); | |
| 1588 | + antenatalExaminationModelList.clear(); | |
| 1591 | 1589 | |
| 1592 | 1590 | |
| 1593 | - //初诊复诊冗余记录 | |
| 1594 | - AntExRecordQuery query = new AntExRecordQuery(); | |
| 1595 | - query.setParentId(pat.getId()); | |
| 1596 | - List<AntExRecordModel> antExRecordModels = recordService.queryAntExRecords(query); | |
| 1597 | - if (CollectionUtils.isNotEmpty(antExRecordModels)) { | |
| 1598 | - for (AntExRecordModel model : antExRecordModels) { | |
| 1599 | - List<String> highrisks = model.gethRisk(); | |
| 1591 | + //初诊复诊冗余记录 | |
| 1592 | + AntExRecordQuery query = new AntExRecordQuery(); | |
| 1593 | + query.setParentId(pat.getId()); | |
| 1594 | + List<AntExRecordModel> antExRecordModels = recordService.queryAntExRecords(query); | |
| 1595 | + if (CollectionUtils.isNotEmpty(antExRecordModels)) { | |
| 1596 | + for (AntExRecordModel model : antExRecordModels) { | |
| 1597 | + List<String> highrisks = model.gethRisk(); | |
| 1598 | + if (CollectionUtils.isNotEmpty(highrisks)) { | |
| 1600 | 1599 | if (CollectionUtils.isNotEmpty(highrisks)) { |
| 1601 | - if (CollectionUtils.isNotEmpty(highrisks)) { | |
| 1602 | - int modCount = doRiskHandle(highrisks); | |
| 1603 | - if (modCount > 0) { | |
| 1604 | - model.sethRisk(highrisks); | |
| 1605 | - recordService.updateOne(model, model.getId()); | |
| 1606 | - } | |
| 1600 | + int modCount = doRiskHandle(highrisks); | |
| 1601 | + if (modCount > 0) { | |
| 1602 | + model.sethRisk(highrisks); | |
| 1603 | + recordService.updateOne(model, model.getId()); | |
| 1607 | 1604 | } |
| 1608 | 1605 | } |
| 1609 | 1606 | } |
| 1610 | 1607 | } |
| 1608 | + } | |
| 1611 | 1609 | |
| 1612 | - antExRecordModels.clear(); | |
| 1610 | + antExRecordModels.clear(); | |
| 1613 | 1611 | |
| 1614 | - ReferralApplyOrderQuery applyOrderQuery = new ReferralApplyOrderQuery(); | |
| 1615 | - applyOrderQuery.setParentId(pat.getId()); | |
| 1616 | - if (applyOrderService.queryCount(applyOrderQuery) > 0) { | |
| 1617 | - ReferralApplyOrderModel referralApplyOrderModel = new ReferralApplyOrderModel(); | |
| 1618 | - referralApplyOrderModel.setrRisk(Arrays.asList(commonService.resloveFactor(loa.getRiskFactorId()).split(","))); | |
| 1619 | - referralApplyOrderModel.setOtherHighRisk(loa.getoRiskFactor()); | |
| 1620 | - List<String> rlevel=Collections.emptyList(); | |
| 1621 | - if(StringUtils.isNotEmpty(loa.getRiskLevelId())&&!"[]".equals(loa.getRiskLevelId())){ | |
| 1622 | - rlevel= JsonUtil.jkstr2Obj(loa.getRiskLevelId(), List.class); | |
| 1612 | + ReferralApplyOrderQuery applyOrderQuery = new ReferralApplyOrderQuery(); | |
| 1613 | + applyOrderQuery.setParentId(pat.getId()); | |
| 1614 | + if (applyOrderService.queryCount(applyOrderQuery) > 0) { | |
| 1615 | + ReferralApplyOrderModel referralApplyOrderModel = new ReferralApplyOrderModel(); | |
| 1616 | + referralApplyOrderModel.setrRisk(Arrays.asList(commonService.resloveFactor(loa.getRiskFactorId()).split(","))); | |
| 1617 | + referralApplyOrderModel.setOtherHighRisk(loa.getoRiskFactor()); | |
| 1618 | + List<String> rlevel = Collections.emptyList(); | |
| 1619 | + if (StringUtils.isNotEmpty(loa.getRiskLevelId()) && !"[]".equals(loa.getRiskLevelId())) { | |
| 1620 | + rlevel = JsonUtil.jkstr2Obj(loa.getRiskLevelId(), List.class); | |
| 1623 | 1621 | |
| 1624 | - com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel,true); | |
| 1625 | - } | |
| 1626 | - referralApplyOrderModel.setrLevel(rlevel); | |
| 1627 | - applyOrderService.updateByParentId(applyOrderQuery, referralApplyOrderModel); | |
| 1622 | + com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel, true); | |
| 1628 | 1623 | } |
| 1624 | + referralApplyOrderModel.setrLevel(rlevel); | |
| 1625 | + applyOrderService.updateByParentId(applyOrderQuery, referralApplyOrderModel); | |
| 1629 | 1626 | } |
| 1630 | 1627 | } |
| 1631 | 1628 | } |
| ... | ... | @@ -1650,7 +1647,7 @@ |
| 1650 | 1647 | if (!patientRisk.contains(highRisks.get(key))) { |
| 1651 | 1648 | patientRisk.add(highRisks.get(key)); |
| 1652 | 1649 | //骨盆狭窄或产道畸形 |
| 1653 | - if(key.equals("4ec114d7-9c78-4dfc-878c-1139ef3ff04c")){ | |
| 1650 | + if (key.equals("4ec114d7-9c78-4dfc-878c-1139ef3ff04c")) { | |
| 1654 | 1651 | patientRisk.add("5a40c747422b03d4ad2bf7c0"); |
| 1655 | 1652 | } |
| 1656 | 1653 | modCount++; |