diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index ada460d..6862b1d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -166,6 +166,12 @@ public class MeasureInfoFacade { query.setNeed("true"); query.setSort(" created desc "); List models = mysqlMeasureUserInfoService.queryMeasureUserInfoList(query); + + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setPcerteTypeId(certType); + patientsQuery.setCardNo(certNo); + List patientsList = patientsService.queryPatient1(patientsQuery, "created"); + if (CollectionUtils.isNotEmpty(models)) { MeasureUserInfoModel userInfoModel = models.get(0); @@ -186,10 +192,6 @@ public class MeasureInfoFacade { } else { - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setPcerteTypeId(certType); - patientsQuery.setCardNo(certNo); - List patientsList = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(patientsList)) { Patients patients = patientsList.get(0); @@ -217,6 +219,15 @@ public class MeasureInfoFacade { } } + if (CollectionUtils.isNotEmpty(patientsList)) { + Patients patients = patientsList.get(0); + result.setPatientId(patients.getId()); + } + else + { + result.setPatientId(""); + } + BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(result);