From 75d14c4b339566fdc214b4ba0cd7e49cd4130bad Mon Sep 17 00:00:00 2001 From: wtt Date: Wed, 1 Jul 2020 08:30:28 +0800 Subject: [PATCH] update --- .../platform/operate/web/facade/SieveFacade.java | 296 +++++++++++---------- 1 file changed, 157 insertions(+), 139 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 adabefa..c0fa760 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 @@ -157,11 +157,11 @@ public class SieveFacade { public void addOrUpdateSieveModel(SieveAddRequest sieveAddRequest, Integer userId, SieveResultModel sieveResultModel) { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setParentId(sieveAddRequest.getParentId()); - if(StringUtils.isNotEmpty(sieveAddRequest.getLymsSieveId())){ + if (StringUtils.isNotEmpty(sieveAddRequest.getLymsSieveId())) { sieveQuery.setId(sieveAddRequest.getLymsSieveId()); } - if(StringUtils.isNotEmpty(sieveAddRequest.getSiveType())){ + if (StringUtils.isNotEmpty(sieveAddRequest.getSiveType())) { sieveQuery.setSieveType(sieveAddRequest.getSiveType()); } sieveQuery.setYn(YnEnums.YES.getId()); @@ -467,18 +467,15 @@ public class SieveFacade { sieveQuery.setName(cqSieveQueryRequest.getName()); sieveQuery.setCardNo(cqSieveQueryRequest.getCardNo()); - if (StringUtils.isNotEmpty(cqSieveQueryRequest.getVcCardNo())) - { + if (StringUtils.isNotEmpty(cqSieveQueryRequest.getVcCardNo())) { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setHospitalId(hospitalId); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setVcCardNo(cqSieveQueryRequest.getVcCardNo()); List localPatients = patientsService.queryPatient(patientsQuery); - if (CollectionUtils.isNotEmpty(localPatients)) - { + if (CollectionUtils.isNotEmpty(localPatients)) { List ids = new ArrayList<>(); - for (Patients pat : localPatients) - { + for (Patients pat : localPatients) { ids.add(pat.getId()); } sieveQuery.setParentIds(ids); @@ -968,6 +965,7 @@ public class SieveFacade { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult); } + public BaseResponse querySievePatientInfo(String cardNo, String vcCardNo, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -1011,7 +1009,7 @@ public class SieveFacade { /* 20200608 产筛修改 wtt ,去掉已申请过产筛限制，可以多次申请产筛*/ - SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); sieveApplyOrderQuery1.setParentId(pat.getId()); sieveApplyOrderQuery1.setHospitalId(hospitalId); sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); @@ -1175,7 +1173,7 @@ public class SieveFacade { result.put("patientID", sieveApply.getPatientID()); result.put("applicationNo", sieveApply.getApplicationNo()); result.put("smoking", sieveApply.getSmoking()); - if(sieveApply.getInsulin()!=null){ + if (sieveApply.getInsulin() != null) { result.put("insulin", sieveApply.getInsulin().toString()); } result.put("hC", sieveApply.gethC()); @@ -1190,14 +1188,14 @@ public class SieveFacade { result.put("transferDate", DateUtil.getyyyy_MM_dd(sieveApply.getTransferDate())); result.put("donorBirthDate", DateUtil.getyyyy_MM_dd(sieveApply.getDonorBirthDate())); result.put("nasalBone", sieveApply.getNasalBone()); - if(sieveApply.getMonozygous()!=null){ + if (sieveApply.getMonozygous() != null) { result.put("monozygous", sieveApply.getMonozygous().toString()); } result.put("patientType", sieveApply.getPatientType()); - if( pat!= null && StringUtils.isEmpty(sieveApply.getCaiyangyunzhou())){ - yunZhouMth(sieveApply,pat); + if (pat != null && StringUtils.isEmpty(sieveApply.getCaiyangyunzhou())) { + yunZhouMth(sieveApply, pat); result.put("caiyangyunzhou", sieveApply.getCaiyangyunzhou()); - }else { + } else { result.put("caiyangyunzhou", sieveApply.getCaiyangyunzhou()); } result.put("id", sieveApply.getId()); @@ -1240,10 +1238,10 @@ public class SieveFacade { result.put("fetusNum", sieveApply.getFetusNum()); result.put("fetusAbnormalInfo", sieveApply.getFetusAbnormalInfo()); result.put("sieveModel", sieveApply.getSieveModel()); - if(pat!=null && StringUtils.isEmpty(sieveApply.getUltrasonicNtWeek())){ - yunZhouMth(sieveApply,pat); + if (pat != null && StringUtils.isEmpty(sieveApply.getUltrasonicNtWeek())) { + yunZhouMth(sieveApply, pat); result.put("ultrasonicNtWeek", sieveApply.getUltrasonicNtWeek()); - }else { + } else { result.put("ultrasonicNtWeek", sieveApply.getUltrasonicNtWeek()); } result.put("ultrasonicNtVal", sieveApply.getUltrasonicNtVal()); @@ -1333,15 +1331,15 @@ public class SieveFacade { sieveResultInfo.put("sampleReportId", sieveResultModel.getSampleReportId()); sieveResultInfo.put("hasReport", sieveResultModel.getHasReport()); - sieveResultInfo.put("uE3",sieveResultModel.getuE3() != null ? sieveResultModel.getuE3() + "ng/ml" : ""); - sieveResultInfo.put("uE3Mom",sieveResultModel.getuE3Mom() != null ? sieveResultModel.getuE3Mom() : ""); - if(sieveResultModel.getTszhzValue()!=null && !sieveResultModel.getTszhzValue().isEmpty()){//21-三体 + sieveResultInfo.put("uE3", sieveResultModel.getuE3() != null ? sieveResultModel.getuE3() + "ng/ml" : ""); + sieveResultInfo.put("uE3Mom", sieveResultModel.getuE3Mom() != null ? sieveResultModel.getuE3Mom() : ""); + if (sieveResultModel.getTszhzValue() != null && !sieveResultModel.getTszhzValue().isEmpty()) {//21-三体 sieveResultInfo.put("tszhzValue", sieveResultModel.getTszhzValue()); } - if(sieveResultModel.getSbstValue()!=null &&!sieveResultModel.getSbstValue().isEmpty()){//18-三体 + if (sieveResultModel.getSbstValue() != null && !sieveResultModel.getSbstValue().isEmpty()) {//18-三体 sieveResultInfo.put("sbstValue", sieveResultModel.getSbstValue()); } - if(sieveResultModel.getStzhz13Value()!=null &&!sieveResultModel.getStzhz13Value().isEmpty()){// 神经管畸形 NTD + if (sieveResultModel.getStzhz13Value() != null && !sieveResultModel.getStzhz13Value().isEmpty()) {// 神经管畸形 NTD sieveResultInfo.put("stzhz13Value", sieveResultModel.getStzhz13Value()); } @@ -1372,6 +1370,9 @@ public class SieveFacade { String valueTwo = sieveResultModel.getSjgjxValue().get("valueTwo"); sjgjx = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getSjgjx()) ? "低风险" : "1".equals(sieveResultModel.getSjgjx()) ? "临界值" : "高风险"); } + if("".equals(sjgjx)){ + sjgjx = sieveResultModel.getSjgjx(); + } sieveResultInfo.put("sjgjx", sjgjx); String stzhz13 = ""; @@ -1396,14 +1397,15 @@ public class SieveFacade { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map); } + private void yunZhouMth(SieveApplyOrderModel sieveApplyOrderModel, Patients p) { //打印需要 根据采样时间算出采样孕周 - if(sieveApplyOrderModel.getCollectionDate()!=null && p.getLastMenses()!=null){ - sieveApplyOrderModel.setCaiyangyunzhou(DateUtil.getWeekDesc(p.getLastMenses(),sieveApplyOrderModel.getCollectionDate())); + if (sieveApplyOrderModel.getCollectionDate() != null && p.getLastMenses() != null) { + sieveApplyOrderModel.setCaiyangyunzhou(DateUtil.getWeekDesc(p.getLastMenses(), sieveApplyOrderModel.getCollectionDate())); } // 根据B超时间算出B超孕周 - if(sieveApplyOrderModel.getBcCheckDate()!=null && p.getLastMenses()!=null){ - sieveApplyOrderModel.setUltrasonicNtWeek(DateUtil.getWeekDesc(p.getLastMenses(),sieveApplyOrderModel.getBcCheckDate())); + if (sieveApplyOrderModel.getBcCheckDate() != null && p.getLastMenses() != null) { + sieveApplyOrderModel.setUltrasonicNtWeek(DateUtil.getWeekDesc(p.getLastMenses(), sieveApplyOrderModel.getBcCheckDate())); } } @@ -2727,90 +2729,97 @@ public class SieveFacade { if (CollectionUtils.isNotEmpty(list)) { for (SieveListResult2 sive : list) { - Map data = new HashMap<>(); - if(StringUtils.isEmpty(sive.getNumber())){ - continue; - } - data.put("ApplicationNo", "");//新增 - data.put("SampleID", sive.getNumber());//样本号(标本号) - data.put("LastName", sive.getName());//姓名 - data.put("FirstName", "");//姓名2 - data.put("PatientID", sive.getPatientID());//孕妇编号 -// data.put("ApplicationNo", sive.getPatientID());//申请单号 - data.put("BirthDate", sive.getBirthday());//生日 -// data.put("Address", sive.getPlaceDomicile());//地址 - data.put("Address", "");//地址 - data.put("Phone", sive.getPhone());//电话 try { - if(sive.getNoOfFetuses() == null || sive.getNoOfFetuses()==0 ){ + Map data = new HashMap<>(); + if (StringUtils.isEmpty(sive.getNumber())) { + continue; + } + data.put("ApplicationNo", "");//新增 + data.put("SampleID", sive.getNumber());//样本号(标本号) + data.put("LastName", sive.getName());//姓名 + data.put("FirstName", "");//姓名2 + data.put("PatientID", sive.getPatientID());//孕妇编号 + // data.put("ApplicationNo", sive.getPatientID());//申请单号 + data.put("BirthDate", sive.getBirthday());//生日 + // data.put("Address", sive.getPlaceDomicile());//地址 + data.put("Address", "");//地址 + data.put("Phone", sive.getPhone());//电话 + try { + if (sive.getNoOfFetuses() == null || sive.getNoOfFetuses() == 0) { + data.put("NoOfFetuses", 1); + } else { + data.put("NoOfFetuses", sive.getNoOfFetuses());//胎儿数(胎数) + } + } catch (Exception e) { + e.printStackTrace(); data.put("NoOfFetuses", 1); - }else { - data.put("NoOfFetuses", sive.getNoOfFetuses());//胎儿数(胎数) } - } catch (Exception e) { - e.printStackTrace(); - data.put("NoOfFetuses",1); - } - data.put("LMPDate", sive.getLastMenstrual());//末次月经必填 + data.put("LMPDate", sive.getLastMenstrual());//末次月经必填 - try { - if(sive.getSmoking() == 0 || sive.getSmoking() == 1){ - data.put("Smoking", sive.getSmoking());//吸烟 - }else { - data.put("Smoking", 0);//吸烟 + try { + if (sive.getSmoking() == 0 || sive.getSmoking() == 1) { + data.put("Smoking", sive.getSmoking());//吸烟 + } else { + data.put("Smoking", 0);//吸烟 + } + } catch (Exception e) { + data.put("Smoking", 0); } - } catch (Exception e) { - data.put("Smoking", 0); - } - - - data.put("Weight", sive.getWeight());//体重 - data.put("Insulin", sive.getInsulin());//I-型糖尿病 - data.put("CollectionDate", sive.getCollectionDate());//采样日期(采血日期) - data.put("ReceivedDate", sive.getSendTime());//送检日期 - data.put("ScanDate", sive.getBcCheckDate());//B超日期(B超检查日期)必填 - 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 - } - if(sive.gethC() !=null && sive.gethC()!=0){ - data.put("HC", sive.gethC() * 10); - } - data.put("NasalBone", sive.getNasalBone());//鼻骨 - data.put("MannualEntry", sive.getMannualEntry());//B超孕天 - - if(sive.getnT() !=null && sive.getnT()!=0){ - data.put("NT", sive.getnT() * 10); - } - data.put("ResponsibleCode", sive.getResponsibleCode());//送检单位编号(送检医院) - data.put("T21", sive.getT21());//既往T21 - data.put("T18", sive.getT18());//既往T18 - data.put("NTD", sive.getnTD());//既往NTD - data.put("ARMethod", sive.getaRMethod());//辅助生殖方法 - data.put("ExtractionDate", sive.getExtractionDate());//辅助生殖之提取日期 - data.put("TransferDate", sive.getTransferDate());//辅助生殖之移植日期 - data.put("DonorBirthDate", sive.getDonorBirthDate());//辅助生殖之捐赠者生日 - data.put("PatientType", sive.getPatientType());//孕妇筛查类型PatientType - data.put("Monozygous", sive.getMonozygous());//单卵 - data.put("RecordID", "");//新增 - /* data.put("Ethnicity", sive.getEthnicity());//种族(名族) - data.put("IdCard", sive.getCardNo());//身份证号 - */ - if(StringUtils.isEmpty(sive.getSieveApplyOrderModelId())){ + + + data.put("Weight", sive.getWeight());//体重 + data.put("Insulin", sive.getInsulin());//I-型糖尿病 + data.put("CollectionDate", sive.getCollectionDate());//采样日期(采血日期) + data.put("ReceivedDate", sive.getSendTime());//送检日期 + data.put("ScanDate", sive.getBcCheckDate());//B超日期(B超检查日期)必填 + + if (StringUtils.isNotEmpty(sive.getCrl()) && !" ".equals(sive.getCrl())) { + Double crl = Double.parseDouble(sive.getCrl()); + crl = (crl * 10); + data.put("CRL", crl.toString());//B超信息 CRL + } + if (StringUtils.isNotEmpty(sive.getBpd()) && !" ".equals(sive.getBpd())) { + Double bpdint = Double.parseDouble(sive.getBpd().trim()); + bpdint = (bpdint * 10); + data.put("BPD", bpdint.toString());//B超信息 bpd + } + if (sive.gethC() != null && sive.gethC() != 0) { + data.put("HC", sive.gethC() * 10); + } + data.put("NasalBone", sive.getNasalBone());//鼻骨 + data.put("MannualEntry", sive.getMannualEntry());//B超孕天 + + if (sive.getnT() != null && sive.getnT() != 0) { + data.put("NT", sive.getnT() * 10); + } + data.put("ResponsibleCode", sive.getResponsibleCode());//送检单位编号(送检医院) + data.put("T21", sive.getT21());//既往T21 + data.put("T18", sive.getT18());//既往T18 + data.put("NTD", sive.getnTD());//既往NTD + data.put("ARMethod", sive.getaRMethod());//辅助生殖方法 + data.put("ExtractionDate", sive.getExtractionDate());//辅助生殖之提取日期 + data.put("TransferDate", sive.getTransferDate());//辅助生殖之移植日期 + data.put("DonorBirthDate", sive.getDonorBirthDate());//辅助生殖之捐赠者生日 + data.put("PatientType", sive.getPatientType());//孕妇筛查类型PatientType + data.put("Monozygous", sive.getMonozygous());//单卵 + data.put("RecordID", "");//新增 + /* data.put("Ethnicity", sive.getEthnicity());//种族(名族) + data.put("IdCard", sive.getCardNo());//身份证号 + */ + if (StringUtils.isEmpty(sive.getSieveApplyOrderModelId())) { + continue; + } + SieveApplyOrderModel sieveApplyOrderModel = new SieveApplyOrderModel(); + sieveApplyOrderModel.setId(sive.getSieveApplyOrderModelId()); + sieveApplyOrderModel.setIeStatus(1);//1导出，没有该字段没有导出 + applyOrderService.updateSieve(sieveApplyOrderModel); + + datas.add(data); + + } catch (NumberFormatException e) { + e.printStackTrace(); continue; } - SieveApplyOrderModel sieveApplyOrderModel = new SieveApplyOrderModel(); - sieveApplyOrderModel.setId(sive.getSieveApplyOrderModelId()); - sieveApplyOrderModel.setIeStatus(1);//1导出，没有该字段没有导出 - applyOrderService.updateSieve(sieveApplyOrderModel); - - datas.add(data); } } OutputStream out = response.getOutputStream(); @@ -2869,6 +2878,7 @@ public class SieveFacade { /** * 功能描述 产筛导入3.0版 血清学筛查 excle 2003 + * * @author 武涛涛 * @date 2020/6/15 */ @@ -2903,7 +2913,7 @@ public class SieveFacade { } list.add(importResult); //1 根据标本号更新数据 - if (StringUtils.isEmpty(importResult.get样本编号()) ) { + if (StringUtils.isEmpty(importResult.get样本编号())) { continue; } String hospitalId = autoMatchFacade.getHospitalId(id); @@ -2912,7 +2922,7 @@ public class SieveFacade { sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); sieveApplyOrderQuery1.setHospitalId(hospitalId); List list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); - if (CollectionUtils.isEmpty(list1) ) { + if (CollectionUtils.isEmpty(list1)) { continue; } SieveApplyOrderModel sieveApplyOrderModel1 = list1.get(0); @@ -2946,9 +2956,9 @@ public class SieveFacade { Integer t21 = Integer.parseInt(importResult.getT21风险值()); if (t21 <= 270) { sieveAddRequest.setTszhz("0");//低风险 - } else if (t21 > 270 && t21< 1000) { + } else if (t21 > 270 && t21 < 1000) { sieveAddRequest.setTszhz("1");//临界值 - }else if (t21 > 1000) { + } else if (t21 > 1000) { sieveAddRequest.setTszhz("2");//高风险 } } @@ -2962,9 +2972,9 @@ public class SieveFacade { Integer t18 = Integer.parseInt(importResult.getT18风险值()); if (t18 <= 350) { sieveAddRequest.setSbst("0");//低风险 - } else if (t18 > 350 && t18<1000) { + } else if (t18 > 350 && t18 < 1000) { sieveAddRequest.setSbst("1");//临界值 - }else if (t18 > 1000) { + } else if (t18 > 1000) { sieveAddRequest.setSbst("2");//高风险 } } @@ -2998,10 +3008,10 @@ public class SieveFacade { if (StringUtils.isNotEmpty(importResult.getAFP校正MOM值())) {//AFP校正MOM值 sieveAddRequest.setHafpMom(importResult.getAFP校正MOM值()); } - if(StringUtils.isNotEmpty(importResult.getuE3UPDCN浓度())){ //uE3 + if (StringUtils.isNotEmpty(importResult.getuE3UPDCN浓度())) { //uE3 sieveAddRequest.setuE3(importResult.getuE3UPDCN浓度()); } - if(StringUtils.isNotEmpty(importResult.getuE3UPDCN校正MOM值())){ //uE3MOM + if (StringUtils.isNotEmpty(importResult.getuE3UPDCN校正MOM值())) { //uE3MOM sieveAddRequest.setuE3(importResult.getuE3UPDCN校正MOM值()); } //sieveAddRequest.setCheckerId(); @@ -3013,7 +3023,7 @@ public class SieveFacade { sieveResultQuery.setLymsSieveId(sieveApplyOrderModel1.getLymsSieveId()); sieveResultQuery.setParentId(sieveApplyOrderModel1.getParentId()); List sieveResultModellist = sieveService.queryListSieveResult(sieveResultQuery); - if(CollectionUtils.isNotEmpty(sieveResultModellist)){ + if (CollectionUtils.isNotEmpty(sieveResultModellist)) { SieveResultModel sieveResultModel = sieveResultModellist.get(0); sieveAddRequest.setId(sieveResultModel.getId()); addOneSieve(sieveAddRequest, id); @@ -3022,11 +3032,10 @@ public class SieveFacade { sieveAddRequest.setCheckerId(String.valueOf(id)); //检验者 addOneSieve(sieveAddRequest, id); //记录一下添加成功内容 - operateLogFacade.addModifyOptLog(id, Integer.parseInt(hospitalId),sieveAddRequest, sieveAddRequest, OptActionEnums.UPDATE.getId(), "导入添加产筛信息"); + operateLogFacade.addModifyOptLog(id, Integer.parseInt(hospitalId), sieveAddRequest, sieveAddRequest, OptActionEnums.UPDATE.getId(), "导入添加产筛信息"); } - } } catch (Exception e) { e.printStackTrace(); @@ -3035,8 +3044,10 @@ public class SieveFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + /** * 功能描述 是读取2007 excle的方法 + * * @author 武涛涛 * @date 2020/6/23 */ @@ -3094,9 +3105,9 @@ public class SieveFacade { } list.add(importResult); System.out.println("list: " + list.size()); - System.out.println("importResult.toString(): "+importResult.toString()); + System.out.println("importResult.toString(): " + importResult.toString()); //1 根据标本号更新数据 - if (StringUtils.isEmpty(importResult.get样本编号()) ) { + if (StringUtils.isEmpty(importResult.get样本编号())) { continue; } String hospitalId = autoMatchFacade.getHospitalId(id); @@ -3106,12 +3117,12 @@ public class SieveFacade { // sieveApplyOrderQuery1.setHospitalId(hospitalId); List list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); - System.out.println("list1.size(): "+list1.size()); - if (CollectionUtils.isEmpty(list1) ) { + System.out.println("list1.size(): " + list1.size()); + if (CollectionUtils.isEmpty(list1)) { continue; } SieveApplyOrderModel sieveApplyOrderModel1 = list1.get(0); - System.out.println("sieveApplyOrderModel1 : "+sieveApplyOrderModel1.toString()); + System.out.println("sieveApplyOrderModel1 : " + sieveApplyOrderModel1.toString()); //判断如果没有LymsSieveId就更新上 if (StringUtils.isEmpty(sieveApplyOrderModel1.getLymsSieveId())) { SieveQuery sieveQuery = new SieveQuery(); @@ -3138,11 +3149,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("2");//高风险 + } else if (t21 > 270 && t21 < 1000) { + sieveAddRequest.setTszhz("1");//临界值 + } else if (t21 > 1000) { + sieveAddRequest.setTszhz("0");//低风险 } } if (StringUtils.isNotEmpty(importResult.getT18风险值())) {//18-三体 T18风险结果 @@ -3151,11 +3165,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("2");//高风险 + } else if (t18 > 350 && t18 < 1000) { + sieveAddRequest.setSbst("1");//临界值 + } else if (t18 > 1000) { + sieveAddRequest.setSbst("0");//低风险 } } sieveAddRequest.setStzhz13Value(null); //13-三体 导入的excel表格中没有该字段 @@ -3168,10 +3185,11 @@ public class SieveFacade { sieveAddRequest.setSjgjxValue(map); ; } + System.out.println("importResult.getNTD风险结果(): "+importResult.getNTD风险结果()); if (StringUtils.isNotEmpty(importResult.getNTD风险结果())) { - if ("低风险".equals(importResult.getNTD风险结果())) { + if ("低风险".equals(importResult.getNTD风险结果()) || importResult.getNTD风险结果().contains("低") ) { sieveAddRequest.setSjgjx("0"); - } else if ("高风险".equals(importResult.getNTD风险结果())) { + } else if ("高风险".equals(importResult.getNTD风险结果())|| importResult.getNTD风险结果().contains("高")) { sieveAddRequest.setSjgjx("2"); } } @@ -3188,10 +3206,10 @@ public class SieveFacade { if (StringUtils.isNotEmpty(importResult.getAFP校正MOM值())) {//AFP校正MOM值 sieveAddRequest.setHafpMom(importResult.getAFP校正MOM值()); } - if(StringUtils.isNotEmpty(importResult.getuE3UPDCN浓度())){ //uE3 + if (StringUtils.isNotEmpty(importResult.getuE3UPDCN浓度())) { //uE3 sieveAddRequest.setuE3(importResult.getuE3UPDCN浓度()); } - if(StringUtils.isNotEmpty(importResult.getuE3UPDCN校正MOM值())){ //uE3MOM + if (StringUtils.isNotEmpty(importResult.getuE3UPDCN校正MOM值())) { //uE3MOM sieveAddRequest.setuE3(importResult.getuE3UPDCN校正MOM值()); } //sieveAddRequest.setCheckerId(); @@ -3203,22 +3221,22 @@ public class SieveFacade { sieveResultQuery.setLymsSieveId(sieveApplyOrderModel1.getLymsSieveId()); sieveResultQuery.setParentId(sieveApplyOrderModel1.getParentId()); sieveResultQuery.setYn(YnEnums.YES.getId()); - System.out.println("sieveApplyOrderModel1.getLymsSieveId():"+sieveApplyOrderModel1.getLymsSieveId()); - System.out.println("sieveApplyOrderModel1.getParentId():"+sieveApplyOrderModel1.getParentId()); + System.out.println("sieveApplyOrderModel1.getLymsSieveId():" + sieveApplyOrderModel1.getLymsSieveId()); + System.out.println("sieveApplyOrderModel1.getParentId():" + sieveApplyOrderModel1.getParentId()); List sieveResultModellist = sieveService.queryListSieveResult(sieveResultQuery); - System.out.println("//避免一个产筛申请出现多次结果: "+sieveResultModellist.size()); + System.out.println("//避免一个产筛申请出现多次结果: " + sieveResultModellist.size()); - if(CollectionUtils.isNotEmpty(sieveResultModellist)){ + if (CollectionUtils.isNotEmpty(sieveResultModellist)) { SieveResultModel sieveResultModel = sieveResultModellist.get(0); sieveAddRequest.setId(sieveResultModel.getId()); addOneSieve(sieveAddRequest, id); } sieveAddRequest.setExamineId(String.valueOf(id)); //审核者 sieveAddRequest.setCheckerId(String.valueOf(id)); //检验者 - System.out.println("sieveAddRequest: "+sieveAddRequest.toString() +" ---- id: "+id); + System.out.println("sieveAddRequest: " + sieveAddRequest.toString() + " ---- id: " + id); addOneSieve(sieveAddRequest, id); //记录一下添加成功内容 - operateLogFacade.addModifyOptLog(id, Integer.parseInt(hospitalId),sieveAddRequest, sieveAddRequest, OptActionEnums.UPDATE.getId(), "导入添加产筛信息"); + operateLogFacade.addModifyOptLog(id, Integer.parseInt(hospitalId), sieveAddRequest, sieveAddRequest, OptActionEnums.UPDATE.getId(), "导入添加产筛信息"); } -- 1.8.3.1