Commit 6f0af894f42bb173b49d3ac927504434155cab9f
1 parent
0358ce0f7f
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 27 additions and 13 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
6f0af89
| ... | ... | @@ -2765,8 +2765,16 @@ |
| 2765 | 2765 | data.put("CollectionDate", sive.getCollectionDate());//采样日期(采血日期) |
| 2766 | 2766 | data.put("ReceivedDate", sive.getSendTime());//送检日期 |
| 2767 | 2767 | data.put("ScanDate", sive.getBcCheckDate());//B超日期(B超检查日期)必填 |
| 2768 | - data.put("CRL", sive.getCrl());//B超信息 CRL | |
| 2769 | - data.put("BPD", sive.getBpd());//B超信息 bpd | |
| 2768 | + if(StringUtils.isNotEmpty(sive.getCrl()) && !" ".equals(sive.getCrl()) ){ | |
| 2769 | + Integer crl = Integer.parseInt(sive.getCrl()); | |
| 2770 | + crl = (crl * 10); | |
| 2771 | + data.put("CRL", crl.toString());//B超信息 CRL | |
| 2772 | + } | |
| 2773 | + if(StringUtils.isNotEmpty(sive.getBpd()) && !" ".equals(sive.getBpd()) ){ | |
| 2774 | + Integer bpdint = Integer.parseInt(sive.getBpd()); | |
| 2775 | + bpdint = (bpdint * 10); | |
| 2776 | + data.put("BPD", bpdint.toString());//B超信息 bpd | |
| 2777 | + } | |
| 2770 | 2778 | data.put("HC", sive.gethC()); |
| 2771 | 2779 | data.put("NasalBone", sive.getNasalBone());//鼻骨 |
| 2772 | 2780 | data.put("MannualEntry", sive.getMannualEntry());//B超孕天 |
| ... | ... | @@ -2925,11 +2933,14 @@ |
| 2925 | 2933 | map.put("valueTwo", importResult.getT21风险值()); |
| 2926 | 2934 | sieveAddRequest.setTszhzValue(map); |
| 2927 | 2935 | } |
| 2928 | - if (StringUtils.isNotEmpty(importResult.getT21风险结果())) { | |
| 2929 | - if ("低风险".equals(importResult.getT21风险结果())) { | |
| 2930 | - sieveAddRequest.setTszhz("0"); | |
| 2931 | - } else if ("高风险".equals(importResult.getT21风险结果())) { | |
| 2932 | - sieveAddRequest.setTszhz("2"); | |
| 2936 | + if (StringUtils.isNotEmpty(importResult.getT21风险值()) && !" ".equals(importResult.getT21风险值())) { | |
| 2937 | + Integer t21 = Integer.parseInt(importResult.getT21风险值()); | |
| 2938 | + if (t21 <= 270) { | |
| 2939 | + sieveAddRequest.setTszhz("0");//低风险 | |
| 2940 | + } else if (t21 > 270 && t21< 1000) { | |
| 2941 | + sieveAddRequest.setTszhz("1");//临界值 | |
| 2942 | + }else if (t21 > 1000) { | |
| 2943 | + sieveAddRequest.setTszhz("2");//高风险 | |
| 2933 | 2944 | } |
| 2934 | 2945 | } |
| 2935 | 2946 | if (StringUtils.isNotEmpty(importResult.getT18风险值())) {//18-三体 T18风险结果 |
| ... | ... | @@ -2938,11 +2949,14 @@ |
| 2938 | 2949 | map.put("valueTwo", importResult.getT18风险值()); |
| 2939 | 2950 | sieveAddRequest.setSbstValue(map); |
| 2940 | 2951 | } |
| 2941 | - if (StringUtils.isNotEmpty(importResult.getT18风险结果())) { | |
| 2942 | - if ("低风险".equals(importResult.getT18风险结果())) { | |
| 2943 | - sieveAddRequest.setSbst("0"); | |
| 2944 | - } else if ("高风险".equals(importResult.getT18风险结果())) { | |
| 2945 | - sieveAddRequest.setSbst("2"); | |
| 2952 | + if (StringUtils.isNotEmpty(importResult.getT18风险值())) { | |
| 2953 | + Integer t18 = Integer.parseInt(importResult.getT18风险值()); | |
| 2954 | + if (t18 <= 350) { | |
| 2955 | + sieveAddRequest.setSbst("0");//低风险 | |
| 2956 | + } else if (t18 > 350 && t18<1000) { | |
| 2957 | + sieveAddRequest.setSbst("1");//临界值 | |
| 2958 | + }else if (t18 > 1000) { | |
| 2959 | + sieveAddRequest.setSbst("2");//高风险 | |
| 2946 | 2960 | } |
| 2947 | 2961 | } |
| 2948 | 2962 | sieveAddRequest.setStzhz13Value(null); //13-三体 导入的excel表格中没有该字段 |
| ... | ... | @@ -3080,7 +3094,7 @@ |
| 3080 | 3094 | SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); |
| 3081 | 3095 | sieveApplyOrderQuery1.setNumber(importResult.get样本编号()); |
| 3082 | 3096 | sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); |
| 3083 | - // sieveApplyOrderQuery1.setHospitalId(hospitalId); | |
| 3097 | + // sieveApplyOrderQuery1.setHospitalId(hospitalId); | |
| 3084 | 3098 | List<SieveApplyOrderModel> list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); |
| 3085 | 3099 | |
| 3086 | 3100 | System.out.println("list1.size(): "+list1.size()); |