Commit 9a2eecba01eed5d307a93cf18a38b7bf578a2425

Authored by liquanyu
1 parent 89487df76a

测量

Showing 2 changed files with 24 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java View file @ 9a2eecb
... ... @@ -411,6 +411,11 @@
411 411 query.setCertNo(measureInfoRequest.getCertNo());
412 412 query.setCertType(measureInfoRequest.getCertType());
413 413 query.setValueType(measureInfoRequest.getValueType());
  414 + if (StringUtils.isNotEmpty(measureInfoRequest.getHospitalId()))
  415 + {
  416 + query.setHospitalId(measureInfoRequest.getHospitalId());
  417 + }
  418 +
414 419 List<MeasureDataInfoModel> list = mysqlMeasureDataInfoService.queryMeasureList(query);
415 420  
416 421 if (CollectionUtils.isNotEmpty(list)) {
... ... @@ -460,6 +465,11 @@
460 465 MeasureUserInfoQuery queryUser = new MeasureUserInfoQuery();
461 466 queryUser.setCertNo(measureInfoRequest.getCertNo());
462 467 queryUser.setCertType(measureInfoRequest.getCertType());
  468 + if (StringUtils.isNotEmpty(measureInfoRequest.getHospitalId()))
  469 + {
  470 + queryUser.setHospitalId(measureInfoRequest.getHospitalId());
  471 + }
  472 +
463 473 List<MeasureUserInfoModel> listUsers = mysqlMeasureUserInfoService.queryMeasureUserInfoList(queryUser);
464 474 if (CollectionUtils.isNotEmpty(listUsers))
465 475 {
... ... @@ -500,6 +510,10 @@
500 510 MeasureUserInfoQuery queryUser = new MeasureUserInfoQuery();
501 511 queryUser.setCertNo(measureInfoRequest.getCertNo());
502 512 queryUser.setCertType(measureInfoRequest.getCertType());
  513 + if (StringUtils.isNotEmpty(measureInfoRequest.getHospitalId()))
  514 + {
  515 + queryUser.setHospitalId(measureInfoRequest.getHospitalId());
  516 + }
503 517 List<MeasureUserInfoModel> listUsers = mysqlMeasureUserInfoService.queryMeasureUserInfoList(queryUser);
504 518 if (CollectionUtils.isNotEmpty(listUsers))
505 519 {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 9a2eecb
... ... @@ -1426,18 +1426,18 @@
1426 1426  
1427 1427 public static void main(String[] args) {
1428 1428 PatientWeightServiceImpl patientWeightService = new PatientWeightServiceImpl();
1429   - String bmi = patientWeightService.getBmi("44", "1.58");
1430   - Map<String,String> map = patientWeightService.getComputeKul(44 , 50, 9, Double.parseDouble(bmi));
  1429 + String bmi = patientWeightService.getBmi("63", "1.6");
  1430 + Map<String,String> map = patientWeightService.getComputeKul(64 , 63, 11, Double.parseDouble(bmi));
1431 1431 System.out.println(map);
1432 1432  
1433   - double kulStart = 750;
1434   - int k1 = ((int)kulStart/100)*100;
1435   - double k2 = kulStart - k1;
1436   - if (k2 > 50)
1437   - {
1438   - k1+=100;
1439   - }
1440   - System.out.println(k1);
  1433 +// double kulStart = 750;
  1434 +// int k1 = ((int)kulStart/100)*100;
  1435 +// double k2 = kulStart - k1;
  1436 +// if (k2 > 50)
  1437 +// {
  1438 +// k1+=100;
  1439 +// }
  1440 +// System.out.println(k1);
1441 1441 }
1442 1442 }