From 6f0af894f42bb173b49d3ac927504434155cab9f Mon Sep 17 00:00:00 2001 From: wtt Date: Mon, 29 Jun 2020 18:42:02 +0800 Subject: [PATCH] update --- .../platform/operate/web/facade/SieveFacade.java | 40 +++++++++++++++------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 56771a8..cd57e57 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -2765,8 +2765,16 @@ public class SieveFacade { data.put("CollectionDate", sive.getCollectionDate());//采样日期(采血日期) data.put("ReceivedDate", sive.getSendTime());//送检日期 data.put("ScanDate", sive.getBcCheckDate());//B超日期(B超检查日期)必填 - data.put("CRL", sive.getCrl());//B超信息 CRL - data.put("BPD", sive.getBpd());//B超信息 bpd + if(StringUtils.isNotEmpty(sive.getCrl()) && !" ".equals(sive.getCrl()) ){ + Integer crl = Integer.parseInt(sive.getCrl()); + crl = (crl * 10); + data.put("CRL", crl.toString());//B超信息 CRL + } + if(StringUtils.isNotEmpty(sive.getBpd()) && !" ".equals(sive.getBpd()) ){ + Integer bpdint = Integer.parseInt(sive.getBpd()); + bpdint = (bpdint * 10); + data.put("BPD", bpdint.toString());//B超信息 bpd + } data.put("HC", sive.gethC()); data.put("NasalBone", sive.getNasalBone());//鼻骨 data.put("MannualEntry", sive.getMannualEntry());//B超孕天 @@ -2925,11 +2933,14 @@ public class SieveFacade { map.put("valueTwo", importResult.getT21风险值()); sieveAddRequest.setTszhzValue(map); } - if (StringUtils.isNotEmpty(importResult.getT21风险结果())) { - if ("低风险".equals(importResult.getT21风险结果())) { - sieveAddRequest.setTszhz("0"); - } else if ("高风险".equals(importResult.getT21风险结果())) { - sieveAddRequest.setTszhz("2"); + if (StringUtils.isNotEmpty(importResult.getT21风险值()) && !" ".equals(importResult.getT21风险值())) { + Integer t21 = Integer.parseInt(importResult.getT21风险值()); + if (t21 <= 270) { + sieveAddRequest.setTszhz("0");//低风险 + } else if (t21 > 270 && t21< 1000) { + sieveAddRequest.setTszhz("1");//临界值 + }else if (t21 > 1000) { + sieveAddRequest.setTszhz("2");//高风险 } } if (StringUtils.isNotEmpty(importResult.getT18风险值())) {//18-三体 T18风险结果 @@ -2938,11 +2949,14 @@ public class SieveFacade { map.put("valueTwo", importResult.getT18风险值()); sieveAddRequest.setSbstValue(map); } - if (StringUtils.isNotEmpty(importResult.getT18风险结果())) { - if ("低风险".equals(importResult.getT18风险结果())) { - sieveAddRequest.setSbst("0"); - } else if ("高风险".equals(importResult.getT18风险结果())) { - sieveAddRequest.setSbst("2"); + if (StringUtils.isNotEmpty(importResult.getT18风险值())) { + Integer t18 = Integer.parseInt(importResult.getT18风险值()); + if (t18 <= 350) { + sieveAddRequest.setSbst("0");//低风险 + } else if (t18 > 350 && t18<1000) { + sieveAddRequest.setSbst("1");//临界值 + }else if (t18 > 1000) { + sieveAddRequest.setSbst("2");//高风险 } } sieveAddRequest.setStzhz13Value(null); //13-三体 导入的excel表格中没有该字段 @@ -3080,7 +3094,7 @@ public class SieveFacade { SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); sieveApplyOrderQuery1.setNumber(importResult.get样本编号()); sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); - // sieveApplyOrderQuery1.setHospitalId(hospitalId); + // sieveApplyOrderQuery1.setHospitalId(hospitalId); List list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); System.out.println("list1.size(): "+list1.size()); -- 1.8.3.1