From 6d654e8bdf4e50dc091e059e7f6be8e4d43be35b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 20 Apr 2020 09:13:06 +0800 Subject: [PATCH] update --- .../platform/biz/dal/impl/YunBookbuildingDaoImpl.java | 2 +- .../platform/operate/web/facade/ApplyOrderFacade.java | 16 +++++++++++----- .../platform/operate/web/request/HuadaCallbackModel.java | 8 ++++++++ .../web/service/impl/BabyEyeCheckServiceImpl.java | 6 +++--- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/YunBookbuildingDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/YunBookbuildingDaoImpl.java index 81e530d..cb64931 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/YunBookbuildingDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/YunBookbuildingDaoImpl.java @@ -66,7 +66,7 @@ public class YunBookbuildingDaoImpl extends BaseMongoDAOImpl implement @Override public FilePathModel findFilePathByBabyId(String babyId) { - return mongoTemplate.findOne(Query.query(Criteria.where("babyId").is(babyId)),FilePathModel.class); + return mongoTemplate.findOne(Query.query(Criteria.where("babyEyeId").is(babyId)),FilePathModel.class); } @Override diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index c6f6a96..d284da4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -1858,14 +1858,20 @@ public class ApplyOrderFacade { map21.put("valueOne", split21[0]); map21.put("valueTwo", split21[1]); map21.put("valueKey", huadaCallbackModel.getZ21ZScore());*/ - newModel.setSbstValue(new HashMap(){{ - put("valueOne", split18[0]);put("valueTwo", split18[1]);put("valueKey", huadaCallbackModel.getZ18ZScore()); }}); - newModel.setStzhz13Value(new HashMap(){{ - put("valueOne", split13[0]);put("valueTwo", split13[1]);put("valueKey", huadaCallbackModel.getZ13ZScore()); }}); + newModel.setSbstValue(new HashMap() {{ + put("valueOne", split18[0]); + put("valueTwo", split18[1]); + put("valueKey", huadaCallbackModel.getZ18ZScore()); + }}); + newModel.setStzhz13Value(new HashMap() {{ + put("valueOne", split13[0]); + put("valueTwo", split13[1]); + put("valueKey", huadaCallbackModel.getZ13ZScore()); + }}); newModel.setTszhzValue(new HashMap(){{ put("valueOne", split21[0]);put("valueTwo", split21[1]);put("valueKey", huadaCallbackModel.getZ21ZScore()); }}); - String reportTypeStr = huadaGetReportType(newModel.getSampleReportId()); + String reportTypeStr = StringUtils.isNotEmpty(huadaCallbackModel.getReportType()) ? huadaCallbackModel.getReportType() : huadaGetReportType(newModel.getSampleReportId()); String reportType = "1"; if ("正式报告".equals(reportTypeStr)) { reportType = "1"; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaCallbackModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaCallbackModel.java index 13868f5..0797448 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaCallbackModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaCallbackModel.java @@ -51,6 +51,14 @@ public class HuadaCallbackModel { private String reportType; //报告类型 正式报告、失败报告、重取样报告 + public String getReportType() { + return reportType; + } + + public void setReportType(String reportType) { + this.reportType = reportType; + } + public String getZ13ZScore() { return z13ZScore; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index c4b66e2..2689fa4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -178,7 +178,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC } FilePathModel filePath = babyEyeCheck.getFilePath(); if (filePath != null && filePath.getId() == null) { - filePath.setBabyEyeId(babyEyeCheck.getBabyId()); + filePath.setBabyEyeId(babyEyeCheck.getId()); yunBookbuildingService.addFilePath(filePath); } else if (filePath != null) @@ -314,7 +314,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC map.put("y2", "yang".equals(babyEyeCheck.getY2()) ? "医生判定阳性" : ""); map.put("refraction2", "yang".equals(babyEyeCheck.getRefraction2()) ? "医生判定阳性" : ""); - FilePathModel filePath = yunBookbuildingService.findFilePathByBabyId(babyEyeCheck.getBabyId()); + FilePathModel filePath = yunBookbuildingService.findFilePathByBabyId(babyEyeCheck.getId()); map.put("filePath", filePath); // CollectionUtils.removeNullValue(map); @@ -353,7 +353,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC map.put("checkMonthId", babyEyeCheck.getCheckMonthId() + ""); } - FilePathModel filePath = yunBookbuildingService.findFilePathByBabyId(babyEyeCheck.getBabyId()); + FilePathModel filePath = yunBookbuildingService.findFilePathByBabyId(babyEyeCheck.getId()); map.put("filePath", filePath); map.put("nextCheckTime", DateUtil.getYyyyMmDd(babyEyeCheck.getNextCheckTime())); -- 1.8.3.1