jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 46c103b6d566db268dadf26353a03cb0aec4be79

Authored by yangfei
2 parents 2027385afa eb0aaa3b80
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java View file @ 46c103b
... ... @@ -276,7 +276,9 @@
276 276 if (patInfo != null && (StringUtils.isNotEmpty(patInfo.getPhone()) || StringUtils.isNotEmpty(patInfo.getCardNo()))) {
277 277 PatientsQuery query = new PatientsQuery();
278 278 query.setYn(YnEnums.YES.getId());
279   - query.setType(1); //孕妇
  279 + query.setDesc(" desc");
  280 + query.setSort(" created ");
  281 + //query.setType(1); //孕妇
280 282 query.setDueStatus(0); //未终止妊娠
281 283 ExceptionUtils.catchException("phone="+patInfo.getPhone()+" cardNo="+ patInfo.getCardNo());
282 284 String[] strs = new String[]{patInfo.getPhone(),patInfo.getCardNo()};
... ... @@ -473,7 +475,9 @@
473 475 {
474 476 PatientsQuery query = new PatientsQuery();
475 477 query.setYn(YnEnums.YES.getId());
476   - query.setType(1); //孕妇
  478 + query.setDesc(" desc");
  479 + query.setSort(" created ");
  480 + //query.setType(1); //孕妇
477 481 query.setDueStatus(0); //未终止妊娠
478 482 String[] strs = new String[]{patInfo.getPhone(),patInfo.getCardNo()};
479 483 query.setPc(strs);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java View file @ 46c103b
... ... @@ -732,6 +732,7 @@
732 732 beforeWeight = weight.getBeforeWeight() == null ? "" : weight.getBeforeWeight();
733 733 beforeHeight = weight.getBeforeHeight() == null ? "" : weight.getBeforeHeight();
734 734 lastWeight = weight.getNowWeight() == null ? "" : weight.getNowWeight();
  735 + tireNumber = weight.getBregmatic() == null ? "" : (Integer.valueOf(weight.getBregmatic()) < 3 ? weight.getBregmatic() : weight.getBregmaticOther());
735 736 }
736 737 else
737 738 {
... ... @@ -820,6 +821,15 @@
820 821 patientWeight.setPatientId(patients.getId());
821 822 patientWeight.setBeforeWeight(nutritionInfoRequest.getBeforeWeight());
822 823 patientWeight.setBeforeHeight(nutritionInfoRequest.getBeforeHeight());
  824 + if (nutritionInfoRequest.getTireNumber() != null && Integer.valueOf(nutritionInfoRequest.getTireNumber()) < 3)
  825 + {
  826 + patientWeight.setBregmatic(nutritionInfoRequest.getTireNumber());
  827 + }
  828 + else
  829 + {
  830 + patientWeight.setBregmatic(3+"");
  831 + patientWeight.setBregmaticOther(nutritionInfoRequest.getTireNumber());
  832 + }
823 833  
824 834 dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), currentWeight);
825 835 patientWeight.setPid(patients.getPid());
... ... @@ -828,7 +838,7 @@
828 838 // patientWeight.setOperaterId(userId.toString());
829 839 patientWeight.setCreated(new Date());
830 840 if(StringUtils.isNotBlank(currentWeight) && nutritionInfoRequest.getBeforeHeight() != null) {
831   - patientWeight.setBmi(patientWeightService.getBmi(currentWeight, nutritionInfoRequest.getBeforeHeight()));
  841 + patientWeight.setBmi(patientWeightService.getBmi(nutritionInfoRequest.getBeforeWeight(), nutritionInfoRequest.getBeforeHeight()));
832 842 }
833 843 patientWeight.setYn("1");
834 844