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 9fc26f9..bf61276 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 @@ -1095,7 +1095,7 @@ public class AntenatalExaminationFacade { * @return */ public BaseResponse queryAntenatalExamination(AntenatalExaminationQueryRequest queryRequest, Integer userId) { - + String hospitalId = autoMatchFacade.getHospitalId(userId); Patients patients = null; if (!StringUtils.isEmpty(queryRequest.getPatientId())) { PatientsQuery patientsQuery = new PatientsQuery(); @@ -1107,13 +1107,9 @@ public class AntenatalExaminationFacade { patients = list.get(0); } } else { - List list1 = autoMatchFacade.matchOrgId(userId); - String hospital = null; - if (CollectionUtils.isNotEmpty(list1)) { - hospital = list1.get(0) + ""; - } + //查询产妇数据 - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital, 1, false, null); + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null); } if (null == patients) { @@ -1176,8 +1172,45 @@ public class AntenatalExaminationFacade { antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId())); antexListResult.setRiskFactor(highScoreResult.getHighRisk()); antexListResult.setRiskScore(highScoreResult.getScoreStr()); + + //获取最后一次检查的记录 + AntExQuery antExQuery1=new AntExQuery(); + antExQuery1.setHospitalId(hospitalId); + antExQuery1.setPid(patients.getPid()); + antExQuery1.setYn(YnEnums.YES.getId()); + List examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery1.convertToQuery().addOrder(Sort.Direction.DESC, "created")); + + String lastTime =""; + + if(CollectionUtils.isNotEmpty(examinationModelList)){ + lastTime= DateUtil.getyyyy_MM_dd(examinationModelList.get(0).getCheckDate()); + }else{ + AntExChuQuery antExChuQuery1=new AntExChuQuery(); + antExChuQuery1.setPid(patients.getPid()); + antExChuQuery1.setHospitalId(hospitalId); + antExChuQuery1.setYn(YnEnums.YES.getId()); + + List antExChuModels= antenatalExaminationService.queryAntExChu(antExChuQuery1); + + if(CollectionUtils.isNotEmpty(antExChuModels)){ + lastTime =DateUtil.getyyyy_MM_dd(antExChuModels.get(0).getCheckTime()); + }else{ + PatientsQuery patientsQuery1=new PatientsQuery(); + patientsQuery1.setYn(YnEnums.YES.getId()); + patientsQuery1.setPid(patients.getPid()); + patientsQuery1.setHospitalId(hospitalId); + List patientses = patientsService.queryPatient(patientsQuery1); + + if(CollectionUtils.isNotEmpty(patientses)){ + lastTime = DateUtil.getyyyy_MM_dd(patientses.get(0).getBookbuildingDate()); + } + } + } + + + antexListResult.setLastBuildTime(lastTime); int days = DateUtil.getDays(patients.getLastMenses(), new Date()); -// 28孕周(28+1—28+6) + //28孕周(28+1—28+6) if ((days >= 197) && days <= 202) { antexListResult.setIsH("1"); } @@ -1326,6 +1359,8 @@ public class AntenatalExaminationFacade { return new BaseObjectResponse().setData(object).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + + public HighScoreResult queryRisk(List id, boolean n) { HighScoreResult highScoreResult = new HighScoreResult(); BasicConfigQuery diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java index 99f507f..259e767 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java @@ -38,6 +38,9 @@ public class AntexListResult { private String lastMenses; //建档时间 private String buildTime; + //最后一次建档时间 + private String lastBuildTime; + private String birth; private String cardNo; @@ -47,6 +50,14 @@ public class AntexListResult { // + public String getLastBuildTime() { + return lastBuildTime; + } + + public void setLastBuildTime(String lastBuildTime) { + this.lastBuildTime = lastBuildTime; + } + public String getIsH() { return isH; }