Commit 4fdde41a2d656823f455c9e1f06ca3693fe1adf4
1 parent
b4f5fd9871
Exists in
master
and in
6 other branches
改字段
Showing 1 changed file with 14 additions and 12 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
4fdde41
| ... | ... | @@ -1941,19 +1941,8 @@ |
| 1941 | 1941 | antExChuQuery.setStart(max); |
| 1942 | 1942 | //获取初诊记录 |
| 1943 | 1943 | List<AntExChuModel> antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); |
| 1944 | - if (CollectionUtils.isNotEmpty(antExChulist)) { | |
| 1945 | - AntExChuModel latelyAntExChuModel = null; /** 最近的一次初诊 */ | |
| 1946 | - for (AntExChuModel antExChuModel : antExChulist) { | |
| 1947 | - if(latelyAntExChuModel == null || antExChuModel.getCheckTime().getTime() > latelyAntExChuModel.getCheckTime().getTime()) { | |
| 1948 | - latelyAntExChuModel = antExChuModel; | |
| 1949 | - } | |
| 1950 | - } | |
| 1951 | - antexListResult.setPregnancyTimes(latelyAntExChuModel.getPregnancyTimes()); // 孕次 | |
| 1952 | - antexListResult.setProdTime(latelyAntExChuModel.getProdTime()); // 产次 | |
| 1953 | - antexListResult.setAbortion(latelyAntExChuModel.getAbortion()); // 流产 | |
| 1954 | - antexListResult.setSurvFetus(latelyAntExChuModel.getSurvFetus()); // 存活胎儿数 | |
| 1955 | - } | |
| 1956 | 1944 | |
| 1945 | + | |
| 1957 | 1946 | HighScoreResult highScoreResult = findLastRisk(patients.getPid(), false); |
| 1958 | 1947 | AntExQuery antExQuery = new AntExQuery(); |
| 1959 | 1948 | antExQuery.setYn(YnEnums.YES.getId()); |
| ... | ... | @@ -2021,6 +2010,19 @@ |
| 2021 | 2010 | } |
| 2022 | 2011 | if ((days >= 253) && days <= 258) { |
| 2023 | 2012 | antexListResult.setIsH("1"); |
| 2013 | + } | |
| 2014 | + | |
| 2015 | + if (CollectionUtils.isNotEmpty(antExChulist)) { | |
| 2016 | + AntExChuModel latelyAntExChuModel = null; /** 最近的一次初诊 */ | |
| 2017 | + for (AntExChuModel antExChuModel : antExChulist) { | |
| 2018 | + if(latelyAntExChuModel == null || antExChuModel.getCheckTime().getTime() > latelyAntExChuModel.getCheckTime().getTime()) { | |
| 2019 | + latelyAntExChuModel = antExChuModel; | |
| 2020 | + } | |
| 2021 | + } | |
| 2022 | + antexListResult.setPregnancyTimes(latelyAntExChuModel.getPregnancyTimes()); // 孕次 | |
| 2023 | + antexListResult.setProdTime(latelyAntExChuModel.getProdTime()); // 产次 | |
| 2024 | + antexListResult.setAbortion(latelyAntExChuModel.getAbortion()); // 流产 | |
| 2025 | + antexListResult.setSurvFetus(latelyAntExChuModel.getSurvFetus()); // 存活胎儿数 | |
| 2024 | 2026 | } |
| 2025 | 2027 | |
| 2026 | 2028 |