liquanyu / regional-platform

Download as
Browse Code »

Commit 6d654e8bdf4e50dc091e059e7f6be8e4d43be35b

Authored by liquanyu
1 parent 6ce26ebf8b
Exists in master and in 1 other branch dev

update

Showing 4 changed files with 23 additions and 9 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/YunBookbuildingDaoImpl.java View file @ 6d654e8
... ... @@ -66,7 +66,7 @@
66 66  
67 67 @Override
68 68 public FilePathModel findFilePathByBabyId(String babyId) {
69   - return mongoTemplate.findOne(Query.query(Criteria.where("babyId").is(babyId)),FilePathModel.class);
  69 + return mongoTemplate.findOne(Query.query(Criteria.where("babyEyeId").is(babyId)),FilePathModel.class);
70 70 }
71 71  
72 72 @Override
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 6d654e8
... ... @@ -1858,14 +1858,20 @@
1858 1858 map21.put("valueOne", split21[0]);
1859 1859 map21.put("valueTwo", split21[1]);
1860 1860 map21.put("valueKey", huadaCallbackModel.getZ21ZScore());*/
1861   - newModel.setSbstValue(new HashMap<String, String>(){{
1862   - put("valueOne", split18[0]);put("valueTwo", split18[1]);put("valueKey", huadaCallbackModel.getZ18ZScore()); }});
1863   - newModel.setStzhz13Value(new HashMap<String, String>(){{
1864   - put("valueOne", split13[0]);put("valueTwo", split13[1]);put("valueKey", huadaCallbackModel.getZ13ZScore()); }});
  1861 + newModel.setSbstValue(new HashMap<String, String>() {{
  1862 + put("valueOne", split18[0]);
  1863 + put("valueTwo", split18[1]);
  1864 + put("valueKey", huadaCallbackModel.getZ18ZScore());
  1865 + }});
  1866 + newModel.setStzhz13Value(new HashMap<String, String>() {{
  1867 + put("valueOne", split13[0]);
  1868 + put("valueTwo", split13[1]);
  1869 + put("valueKey", huadaCallbackModel.getZ13ZScore());
  1870 + }});
1865 1871 newModel.setTszhzValue(new HashMap<String, String>(){{
1866 1872 put("valueOne", split21[0]);put("valueTwo", split21[1]);put("valueKey", huadaCallbackModel.getZ21ZScore()); }});
1867 1873  
1868   - String reportTypeStr = huadaGetReportType(newModel.getSampleReportId());
  1874 + String reportTypeStr = StringUtils.isNotEmpty(huadaCallbackModel.getReportType()) ? huadaCallbackModel.getReportType() : huadaGetReportType(newModel.getSampleReportId());
1869 1875 String reportType = "1";
1870 1876 if ("正式报告".equals(reportTypeStr)) {
1871 1877 reportType = "1";
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaCallbackModel.java View file @ 6d654e8
... ... @@ -51,6 +51,14 @@
51 51  
52 52 private String reportType; //报告类型 正式报告、失败报告、重取样报告
53 53  
  54 + public String getReportType() {
  55 + return reportType;
  56 + }
  57 +
  58 + public void setReportType(String reportType) {
  59 + this.reportType = reportType;
  60 + }
  61 +
54 62 public String getZ13ZScore() {
55 63 return z13ZScore;
56 64 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java View file @ 6d654e8
... ... @@ -178,7 +178,7 @@
178 178 }
179 179 FilePathModel filePath = babyEyeCheck.getFilePath();
180 180 if (filePath != null && filePath.getId() == null) {
181   - filePath.setBabyEyeId(babyEyeCheck.getBabyId());
  181 + filePath.setBabyEyeId(babyEyeCheck.getId());
182 182 yunBookbuildingService.addFilePath(filePath);
183 183 }
184 184 else if (filePath != null)
... ... @@ -314,7 +314,7 @@
314 314 map.put("y2", "yang".equals(babyEyeCheck.getY2()) ? "医生判定阳性" : "");
315 315 map.put("refraction2", "yang".equals(babyEyeCheck.getRefraction2()) ? "医生判定阳性" : "");
316 316  
317   - FilePathModel filePath = yunBookbuildingService.findFilePathByBabyId(babyEyeCheck.getBabyId());
  317 + FilePathModel filePath = yunBookbuildingService.findFilePathByBabyId(babyEyeCheck.getId());
318 318 map.put("filePath", filePath);
319 319 //
320 320 CollectionUtils.removeNullValue(map);
... ... @@ -353,7 +353,7 @@
353 353 map.put("checkMonthId", babyEyeCheck.getCheckMonthId() + "");
354 354 }
355 355  
356   - FilePathModel filePath = yunBookbuildingService.findFilePathByBabyId(babyEyeCheck.getBabyId());
  356 + FilePathModel filePath = yunBookbuildingService.findFilePathByBabyId(babyEyeCheck.getId());
357 357 map.put("filePath", filePath);
358 358  
359 359 map.put("nextCheckTime", DateUtil.getYyyyMmDd(babyEyeCheck.getNextCheckTime()));