Commit 7a234f0532ef397776ebc7b545760d78aa4b5c49
1 parent
925ad3c04a
Exists in
master
and in
3 other branches
commit
Showing 1 changed file with 12 additions and 15 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
7a234f0
| ... | ... | @@ -28,7 +28,7 @@ |
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | 30 | * 产前检查接口 |
| 31 | - * <p> | |
| 31 | + * <p/> | |
| 32 | 32 | * Created by Administrator on 2016/6/16 0016. |
| 33 | 33 | */ |
| 34 | 34 | @Component |
| ... | ... | @@ -99,7 +99,7 @@ |
| 99 | 99 | Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); |
| 100 | 100 | patients.setLastCheckEmployeeId(antExAddRequest.getCheckDoctor()); |
| 101 | 101 | model.setPid(patients.getPid()); |
| 102 | - if(StringUtils.isNotEmpty(patients.getEnable()) && "0".equals(patients.getEnable())){ | |
| 102 | + if (StringUtils.isNotEmpty(patients.getEnable()) && "0".equals(patients.getEnable())) { | |
| 103 | 103 | patients.setEnable("1"); |
| 104 | 104 | } |
| 105 | 105 | patientsService.updatePatient(patients); |
| ... | ... | @@ -181,7 +181,7 @@ |
| 181 | 181 | Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); |
| 182 | 182 | patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor()); |
| 183 | 183 | |
| 184 | - if(StringUtils.isNotEmpty(patients.getEnable()) && "0".equals(patients.getEnable())){ | |
| 184 | + if (StringUtils.isNotEmpty(patients.getEnable()) && "0".equals(patients.getEnable())) { | |
| 185 | 185 | patients.setEnable("1"); |
| 186 | 186 | } |
| 187 | 187 | //修改患者风险等级 |
| ... | ... | @@ -436,7 +436,7 @@ |
| 436 | 436 | |
| 437 | 437 | /** |
| 438 | 438 | * 获取最后一次高危产检的高危信息 |
| 439 | - * <p> | |
| 439 | + * <p/> | |
| 440 | 440 | * 先取复诊最后一条，在取初诊 |
| 441 | 441 | * |
| 442 | 442 | * @return |
| ... | ... | @@ -450,7 +450,7 @@ |
| 450 | 450 | List<MaternalDeliverModel> modelList = matDeliverService.query(matDeliverQuery); |
| 451 | 451 | if (CollectionUtils.isNotEmpty(modelList)) { |
| 452 | 452 | for (MaternalDeliverModel model : modelList) { |
| 453 | - if(null!=model.getDueDate()){ | |
| 453 | + if (null != model.getDueDate()) { | |
| 454 | 454 | listDate.add(new SortIn(model)); |
| 455 | 455 | } |
| 456 | 456 | } |
| ... | ... | @@ -463,7 +463,7 @@ |
| 463 | 463 | List<StopPregModel> stopPregs = stopPregnancyService.queryStopPreg(query); |
| 464 | 464 | if (CollectionUtils.isNotEmpty(stopPregs)) { |
| 465 | 465 | for (StopPregModel stopPregModel : stopPregs) { |
| 466 | - if(null!=stopPregModel.getStopDate()){ | |
| 466 | + if (null != stopPregModel.getStopDate()) { | |
| 467 | 467 | listDate.add(new SortIn(stopPregModel)); |
| 468 | 468 | } |
| 469 | 469 | } |
| ... | ... | @@ -1372,12 +1372,9 @@ |
| 1372 | 1372 | |
| 1373 | 1373 | HighScoreResult highScoreResult = findLastRisk(patients.getPid(), true); |
| 1374 | 1374 | patients1.setRiskScore(highScoreResult.getScore()); |
| 1375 | - if (CollectionUtils.isNotEmpty(highScoreResult.getHighId())) { | |
| 1376 | - patients1.setRiskFactorId(highScoreResult.getHighId()); | |
| 1377 | - } | |
| 1378 | - if (CollectionUtils.isNotEmpty(highScoreResult.getLevelId())) { | |
| 1379 | - patients1.setRiskLevelId(JsonUtil.array2JsonString(highScoreResult.getLevelId())); | |
| 1380 | - } | |
| 1375 | + patients1.setRiskFactorId(highScoreResult.getHighId()); | |
| 1376 | + patients1.setRiskLevelId(JsonUtil.array2JsonString(highScoreResult.getLevelId())); | |
| 1377 | + | |
| 1381 | 1378 | patientsService.findAndModify(patientsQuery1, patients1); |
| 1382 | 1379 | } |
| 1383 | 1380 | |
| ... | ... | @@ -1421,7 +1418,7 @@ |
| 1421 | 1418 | |
| 1422 | 1419 | /** |
| 1423 | 1420 | * 查看是否满足产筛申请条件 |
| 1424 | - * <p> | |
| 1421 | + * <p/> | |
| 1425 | 1422 | * 1.孕周 15周-到20 周 并且没有做过产筛 |
| 1426 | 1423 | * |
| 1427 | 1424 | * @param date |
| ... | ... | @@ -1598,7 +1595,7 @@ |
| 1598 | 1595 | if (null != antExChuModel1.getHospitalId()) { |
| 1599 | 1596 | organization = organizationService.getOrganization(Integer.valueOf(antExChuModel1.getHospitalId())); |
| 1600 | 1597 | } |
| 1601 | - if(null!=patients){ | |
| 1598 | + if (null != patients) { | |
| 1602 | 1599 | dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "", patients.getLastMenses())); |
| 1603 | 1600 | } |
| 1604 | 1601 | } |
| ... | ... | @@ -1609,7 +1606,7 @@ |
| 1609 | 1606 | organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId())); |
| 1610 | 1607 | } |
| 1611 | 1608 | Patients patients = patientsService.findOnePatientById(model.getParentId()); |
| 1612 | - if(null!=patients) { | |
| 1609 | + if (null != patients) { | |
| 1613 | 1610 | dataList.add(new AntData(model, null != organization ? organization.getName() : "", patients.getLastMenses())); |
| 1614 | 1611 | } |
| 1615 | 1612 | } |