diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index a35ab3b..33614c1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -28,7 +28,7 @@ import java.util.*; /** * 产前检查接口 - *

+ *

* Created by Administrator on 2016/6/16 0016. */ @Component @@ -99,7 +99,7 @@ public class AntenatalExaminationFacade { Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); patients.setLastCheckEmployeeId(antExAddRequest.getCheckDoctor()); model.setPid(patients.getPid()); - if(StringUtils.isNotEmpty(patients.getEnable()) && "0".equals(patients.getEnable())){ + if (StringUtils.isNotEmpty(patients.getEnable()) && "0".equals(patients.getEnable())) { patients.setEnable("1"); } patientsService.updatePatient(patients); @@ -181,7 +181,7 @@ public class AntenatalExaminationFacade { Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor()); - if(StringUtils.isNotEmpty(patients.getEnable()) && "0".equals(patients.getEnable())){ + if (StringUtils.isNotEmpty(patients.getEnable()) && "0".equals(patients.getEnable())) { patients.setEnable("1"); } //修改患者风险等级 @@ -436,7 +436,7 @@ public class AntenatalExaminationFacade { /** * 获取最后一次高危产检的高危信息 - *

+ *

* 先取复诊最后一条,在取初诊 * * @return @@ -450,7 +450,7 @@ public class AntenatalExaminationFacade { List modelList = matDeliverService.query(matDeliverQuery); if (CollectionUtils.isNotEmpty(modelList)) { for (MaternalDeliverModel model : modelList) { - if(null!=model.getDueDate()){ + if (null != model.getDueDate()) { listDate.add(new SortIn(model)); } } @@ -463,7 +463,7 @@ public class AntenatalExaminationFacade { List stopPregs = stopPregnancyService.queryStopPreg(query); if (CollectionUtils.isNotEmpty(stopPregs)) { for (StopPregModel stopPregModel : stopPregs) { - if(null!=stopPregModel.getStopDate()){ + if (null != stopPregModel.getStopDate()) { listDate.add(new SortIn(stopPregModel)); } } @@ -1372,12 +1372,9 @@ public class AntenatalExaminationFacade { HighScoreResult highScoreResult = findLastRisk(patients.getPid(), true); patients1.setRiskScore(highScoreResult.getScore()); - if (CollectionUtils.isNotEmpty(highScoreResult.getHighId())) { - patients1.setRiskFactorId(highScoreResult.getHighId()); - } - if (CollectionUtils.isNotEmpty(highScoreResult.getLevelId())) { - patients1.setRiskLevelId(JsonUtil.array2JsonString(highScoreResult.getLevelId())); - } + patients1.setRiskFactorId(highScoreResult.getHighId()); + patients1.setRiskLevelId(JsonUtil.array2JsonString(highScoreResult.getLevelId())); + patientsService.findAndModify(patientsQuery1, patients1); } @@ -1421,7 +1418,7 @@ public class AntenatalExaminationFacade { /** * 查看是否满足产筛申请条件 - *

+ *

* 1.孕周 15周-到20 周 并且没有做过产筛 * * @param date @@ -1598,7 +1595,7 @@ public class AntenatalExaminationFacade { if (null != antExChuModel1.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(antExChuModel1.getHospitalId())); } - if(null!=patients){ + if (null != patients) { dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "", patients.getLastMenses())); } } @@ -1609,7 +1606,7 @@ public class AntenatalExaminationFacade { organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId())); } Patients patients = patientsService.findOnePatientById(model.getParentId()); - if(null!=patients) { + if (null != patients) { dataList.add(new AntData(model, null != organization ? organization.getName() : "", patients.getLastMenses())); } }