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 67214b1..5093093 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 @@ -198,8 +198,17 @@ public class MeasureInfoFacade { public BaseObjectResponse getMeasureBaseInfo(String certType, String certNo, String hospitalId) { MeasureBaseInfoResult result = new MeasureBaseInfoResult(); MeasureUserInfoQuery query = new MeasureUserInfoQuery(); - query.setCertType(certType); - query.setCertNo(certNo); + query.setHospitalId(hospitalId); + if ("1".equals(certType)) + { + query.setVcCardNo(certNo); + } + else + { + query.setCertType(certType); + query.setCertNo(certNo); + } + query.setNeed("true"); query.setSort(" created desc "); List models = mysqlMeasureUserInfoService.queryMeasureUserInfoList(query); @@ -224,8 +233,19 @@ public class MeasureInfoFacade { else { PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setPcerteTypeId(certType); - patientsQuery.setCardNo(certNo); + patientsQuery.setHospitalId(hospitalId); + + if ("1".equals(certType)) + { + patientsQuery.setVcCardNo(certNo); + } + else + { + patientsQuery.setPcerteTypeId(certType); + patientsQuery.setCardNo(certNo); + } + + List patientsList = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(patientsList)) { @@ -247,7 +267,7 @@ public class MeasureInfoFacade { } else { - if ("216".equals(hospitalId)) + if ("216".equals(hospitalId) && !"1".equals(certType)) { result = getPatientZyInfo(" and ZJH='"+certNo+"'",certType,hospitalId); } @@ -578,8 +598,16 @@ public class MeasureInfoFacade { public BaseObjectResponse getMeasurePatientInfo(String certType, String certNo, String hospitalId) { MeasureBaseInfoResult result = new MeasureBaseInfoResult(); MeasureUserInfoQuery query = new MeasureUserInfoQuery(); - query.setCertType(certType); - query.setCertNo(certNo); + if ("1".equals(certType)) + { + query.setVcCardNo(certNo); + } + else + { + query.setCertType(certType); + query.setCertNo(certNo); + } + query.setHospitalId(hospitalId); query.setNeed("true"); query.setSort(" created desc ");