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 3012862..5c43c2e 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 @@ -411,6 +411,11 @@ public class MeasureInfoFacade { query.setCertNo(measureInfoRequest.getCertNo()); query.setCertType(measureInfoRequest.getCertType()); query.setValueType(measureInfoRequest.getValueType()); + if (StringUtils.isNotEmpty(measureInfoRequest.getHospitalId())) + { + query.setHospitalId(measureInfoRequest.getHospitalId()); + } + List list = mysqlMeasureDataInfoService.queryMeasureList(query); if (CollectionUtils.isNotEmpty(list)) { @@ -460,6 +465,11 @@ public class MeasureInfoFacade { MeasureUserInfoQuery queryUser = new MeasureUserInfoQuery(); queryUser.setCertNo(measureInfoRequest.getCertNo()); queryUser.setCertType(measureInfoRequest.getCertType()); + if (StringUtils.isNotEmpty(measureInfoRequest.getHospitalId())) + { + queryUser.setHospitalId(measureInfoRequest.getHospitalId()); + } + List listUsers = mysqlMeasureUserInfoService.queryMeasureUserInfoList(queryUser); if (CollectionUtils.isNotEmpty(listUsers)) { @@ -500,6 +510,10 @@ public class MeasureInfoFacade { MeasureUserInfoQuery queryUser = new MeasureUserInfoQuery(); queryUser.setCertNo(measureInfoRequest.getCertNo()); queryUser.setCertType(measureInfoRequest.getCertType()); + if (StringUtils.isNotEmpty(measureInfoRequest.getHospitalId())) + { + queryUser.setHospitalId(measureInfoRequest.getHospitalId()); + } List listUsers = mysqlMeasureUserInfoService.queryMeasureUserInfoList(queryUser); if (CollectionUtils.isNotEmpty(listUsers)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 86558da..fe83c52 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -1426,17 +1426,17 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient public static void main(String[] args) { PatientWeightServiceImpl patientWeightService = new PatientWeightServiceImpl(); - String bmi = patientWeightService.getBmi("44", "1.58"); - Map map = patientWeightService.getComputeKul(44 , 50, 9, Double.parseDouble(bmi)); + String bmi = patientWeightService.getBmi("63", "1.6"); + Map map = patientWeightService.getComputeKul(64 , 63, 11, Double.parseDouble(bmi)); System.out.println(map); - double kulStart = 750; - int k1 = ((int)kulStart/100)*100; - double k2 = kulStart - k1; - if (k2 > 50) - { - k1+=100; - } - System.out.println(k1); +// double kulStart = 750; +// int k1 = ((int)kulStart/100)*100; +// double k2 = kulStart - k1; +// if (k2 > 50) +// { +// k1+=100; +// } +// System.out.println(k1); } }