liquanyu / regional-platform

Download as
Browse Code »

Commit ac48d5f6f4afc71288f3b10d73587cf8c2b6313f

Authored by wangbo
1 parent 0d8de86d22
Exists in master and in 1 other branch dev

儿童体重测量对接bug修改

Showing 3 changed files with 6 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ ac48d5f
... ... @@ -885,13 +885,11 @@
885 885 if (StringUtils.isNotEmpty(model.getId()) && StringUtils.isNotEmpty(model.getHospitalId())) {
886 886 MeasureBabyDataInfoQuery measureBabyDataInfoQuery = new MeasureBabyDataInfoQuery();
887 887 measureBabyDataInfoQuery.setBabyId(model.getId());
888   - System.out.println(model.getId());
889   - System.out.println(model.getHospitalId());
890 888 measureBabyDataInfoQuery.setHospitalId(model.getHospitalId());
891 889 MeasureBabyInfoModel measureBabyInfoModel = measureDataInfoService.queryOneMeasureBaby(measureBabyDataInfoQuery);
892 890 if (null != measureBabyInfoModel) {
893   - base.setBabyHeight(measureBabyInfoModel.getValueOne());
894   - base.setBabyWeight(measureBabyInfoModel.getValueTwo());
  891 + base.setBabyHeight(measureBabyInfoModel.getValueTwo());
  892 + base.setBabyWeight(measureBabyInfoModel.getValueOne());
895 893 }
896 894 }
897 895  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java View file @ ac48d5f
... ... @@ -131,8 +131,8 @@
131 131 List<MeasureBabyInfoModel> models = mysqlMeasureDataInfoService.queryMeasureBabyInfoList(query);
132 132 if (CollectionUtils.isNotEmpty(models)) {
133 133 MeasureBabyInfoModel model = models.get(0);
134   - map.put("weight", model.getValueTwo());
135   - map.put("hegiht", model.getValueOne());
  134 + map.put("weight", model.getValueOne());
  135 + map.put("hegiht", model.getValueTwo());
136 136 map.put("lastTime", DateUtil.getyyyy_MM_dd(model.getModified()));
137 137 }
138 138 return map;
... ... @@ -933,7 +933,7 @@
933 933 healthChargeQuery.setYn(YnEnums.YES.getId());
934 934 healthChargeQuery.setHospitalId(request.getHospitalId());
935 935 healthChargeQuery.setStatus(1);
936   - if (request.getStartTime() == null){
  936 + if (request.getStartTime() == null) {
937 937 Date startDate = areaCountFacade.getStartDate();
938 938 healthChargeQuery.setCreatedStart(startDate);
939 939 healthChargeQuery.setCreatedEnd(new Date());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java View file @ ac48d5f
... ... @@ -1399,7 +1399,7 @@
1399 1399 if ("2".equals(certType)) {
1400 1400 query.setVcCardNo(certNo);
1401 1401 } else {
1402   - query.setMcertNo(certNo);
  1402 + query.setPhoneOrcardNo(certNo);
1403 1403 }
1404 1404  
1405 1405 List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(query);