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 7f002a4..7cd2701 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 @@ -1415,7 +1415,9 @@ public class ApplyOrderFacade { sieveHuada.setInformedConsentVersion("02"); sieveHuada.setGestationalWeeks(getWeeks(sieveHuada.getGestationalWeeks()));//孕周 sieveHuada.setChargeType("3"); -// sieveHuada.setExtBaseInfoId(); + sieveHuada.setSampleType("S051"); + sieveHuada.setIsNeedOtherChromReport("0"); + sieveHuada.setIsNeedReportOtherResult("0"); //调用华大基因接口 ArrayList paramsList = new ArrayList(); @@ -1460,7 +1462,6 @@ public class ApplyOrderFacade { if (!b) { map.put("code", "500"); map.put("msg", "syscode错误"); - map.put("data", ""); return map; } String data = null; @@ -1472,23 +1473,27 @@ public class ApplyOrderFacade { String syscode1 = signParams.get("syscode").toString(); String sign1 = signParams.get("sign").toString(); HashMap map1 = new HashMap<>(); - params = "{\"sampleInfoId\":\"2E147741C27E6FBDE050A8C0A2E0AED9\",\"createTime\":\"2016-03-16 15:12:16\",\"signaturePath\":\"\",\"sourceType\":\"LOGISTICS\",\"downloadTimes\":0,\"productSortName\":\"产前\",\"modifiedTime\":\"2019-07-10 17:24:14\",\"bloodDate\":\"\",\"sampleName\":\"张三\",\"oldSampleNum\":\"\",\"cardId\":\"161245942D\",\"mobile\":\"123-1233333\",\"province\":\"\",\"city\":\"茂名市\",\"customerCode\":\"JKCN001115\",\"customerName\":\"\",\"sampleNum\":\"16B1245942D\",\"sampleNumShort\":\"161245942D\",\"recheckTime\":\"\",\"reportPath\":\"http://192.168.225.169/uploadFiles/report/16B1245942D/1562330425321//16B1245942D_sign.pdf\",\"saveTime\":\"\",\"productCode\":\"DX1331\",\"productName\":\"\",\"sampleReportId\":\"8CEECB66A9145744E053D8E0A8C0B73B\",\"citys\":[],\"customerCodes\":[],\"dataSources\":[],\"productLines\":[],\"productCodes\":[],\"bispProductLine\":\"3\"}\n"; + //params = "{\"sampleInfoId\":\"2E147741C27E6FBDE050A8C0A2E0AED9\",\"createTime\":\"2016-03-16 15:12:16\",\"signaturePath\":\"\",\"sourceType\":\"LOGISTICS\",\"downloadTimes\":0,\"productSortName\":\"产前\",\"modifiedTime\":\"2019-07-10 17:24:14\",\"bloodDate\":\"\",\"sampleName\":\"张三\",\"oldSampleNum\":\"\",\"cardId\":\"161245942D\",\"mobile\":\"123-1233333\",\"province\":\"\",\"city\":\"茂名市\",\"customerCode\":\"JKCN001115\",\"customerName\":\"\",\"sampleNum\":\"16B1245942D\",\"sampleNumShort\":\"161245942D\",\"recheckTime\":\"\",\"reportPath\":\"http://192.168.225.169/uploadFiles/report/16B1245942D/1562330425321//16B1245942D_sign.pdf\",\"saveTime\":\"\",\"productCode\":\"DX1331\",\"productName\":\"\",\"sampleReportId\":\"8CEECB66A9145744E053D8E0A8C0B73B\",\"citys\":[],\"customerCodes\":[],\"dataSources\":[],\"productLines\":[],\"productCodes\":[],\"bispProductLine\":\"3\"}\n"; Map mapParams = new HashMap<>(); mapParams.put("sampleReportId", JSON.parseObject(params).get("sampleReportId")); mapParams.put("bispProductLine", JSON.parseObject(params).get("bispProductLine")); JSONObject jsonMapParams = new JSONObject(mapParams); map1.put("params", jsonMapParams.toString()); data = HttpClientUtil.sendPost(HUADA_URL + "/intf?method=findReportDetail&" + "timestamp=" + timestamp1 + "&syscode=" + syscode1 + "&sign=" + sign1, map1); + JSONObject jsonObject = JSONObject.parseObject(data); + Object rows = jsonObject.get("rows"); + HuadaCallbackModel huadaCallbackModel = JSONObject.parseObject(rows.toString(), HuadaCallbackModel.class); + System.out.println(huadaCallbackModel.toString()); + + } catch (Exception e) { e.printStackTrace(); map.put("code", "500"); map.put("msg", "查询报告详情异常"); - map.put("data", data); return map; } map.put("code", "200"); map.put("msg", "success"); - map.put("data", data); return map; } 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 new file mode 100644 index 0000000..3b02ba9 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaCallbackModel.java @@ -0,0 +1,435 @@ +package com.lyms.platform.operate.web.request; + +/** + * 产华大基因,检查结果回调参数实体 + * + */ +public class HuadaCallbackModel { + + private String z13ZScore;//13检测结果 示例："3.54026", + private String z18ZScore;//18检测结果 示例："-0.26363", + private String z21ZScore;//21检测结果 示例："-0.35463", + private String t13;//13号染色体风险判定 示例："未检出T13", + private String t18;//28号染色体风险判定 示例："未检出T18", + private String t21;//21号染色体风险判定 示例："未检出T21", + private String t13Risk;// 13号染色体风险值 示例："1/1447077767", + private String t18Risk;// 18号染色体风险值 示例："1/5699077113", + private String t21Risk;// 21号染色体风险值 示例："1/357240872", + private String t13Result;//13号染色体结果 0阴性 1阳性 示例："1", + private String t18Result;//18号染色体结果 0阴性 1阳性 示例："2", + private String t21Result;//21号染色体结果 0阴性 1阳性 示例："1", + private String sexResult;//性染色体结果 示例："1", + private String gestationalWeeks;//妊娠周期 示例："12W+1", + private String sampleInfoId;//主键，客户方无作用 示例："", + private String signaturePath;//签名地址 示例："", + private String sourceType;// 示例："", + private String downloadTimes;//下载次数 示例：0, + private String productSortName;//报告产品类型 示例："", + private String bloodDate;// 示例："2016-11-10 00:00:00.0", + private String sampleName;//数据来源 示例："微醺01", + private String oldSampleNum;// 示例："", + private String cardId;//身份证号 示例："440882198401021126", + private String mobile;//手机号 示例："15910111265", + private String province;//省 示例："", + private String city;//城市 示例："深圳市", + private String customerCode;//客户编码 示例："JKCN001192", + private String customerName;//客户名称 示例："深圳市妇幼保健院", + private String sampleNum;//样本编号 示例："SPS3013057", + private String sampleNumShort;//样本编号 示例："", + private String recheckTime;//复查时间 示例："2017-05-17 09:32:25.0", + private String reportPath;//无作用 示例："\\\\192.168.225.169\\uploadFiles\\report\\SPS3013057\\1494984768513\\\\SPS3013057.pdf", + private String saveTime;//报告下载时间 示例："", + private String productCode;//产品编号 示例："DX0558", + private String productName;//产品名称 示例："胎儿染色体非整倍体（T21、T18、T13）检测（联合探针锚定聚合测序法）", + private String sampleReportId;//报告ID 示例："4F9F9DED0C9B1559E053D8E0A8C0AA9F", + private String sampleBaseIdsampleBaseId;// 示例："4FA2007765A71CF2E053D8E0A8C0249D", + private String citys;//权限-城市 1-城市 2-客户编码 3-数据来源 4-产品线 5 产品编码 示例：[], + private String customerCodes;//权限-城市 1-城市 2-客户编码 3-数据来源 4-产品线 5 产品编码 示例：[], + private String dataSources;//权限-城市 1-城市 2-客户编码 3-数据来源 4-产品线 5 产品编码 示例：[], + private String productLines;//权限-城市 1-城市 2-客户编码 3-数据来源 4-产品线 5 产品编码 示例：[], + private String productCodes;//权限-城市 1-城市 2-客户编码 3-数据来源 4-产品线 5 产品编码 示例：[] + + public String getZ13ZScore() { + return z13ZScore; + } + + public void setZ13ZScore(String z13ZScore) { + this.z13ZScore = z13ZScore; + } + + public String getZ18ZScore() { + return z18ZScore; + } + + public void setZ18ZScore(String z18ZScore) { + this.z18ZScore = z18ZScore; + } + + public String getZ21ZScore() { + return z21ZScore; + } + + public void setZ21ZScore(String z21ZScore) { + this.z21ZScore = z21ZScore; + } + + public String getT13() { + return t13; + } + + public void setT13(String t13) { + this.t13 = t13; + } + + public String getT18() { + return t18; + } + + public void setT18(String t18) { + this.t18 = t18; + } + + public String getT21() { + return t21; + } + + public void setT21(String t21) { + this.t21 = t21; + } + + public String getT13Risk() { + return t13Risk; + } + + public void setT13Risk(String t13Risk) { + this.t13Risk = t13Risk; + } + + public String getT18Risk() { + return t18Risk; + } + + public void setT18Risk(String t18Risk) { + this.t18Risk = t18Risk; + } + + public String getT21Risk() { + return t21Risk; + } + + public void setT21Risk(String t21Risk) { + this.t21Risk = t21Risk; + } + + public String getT13Result() { + return t13Result; + } + + public void setT13Result(String t13Result) { + this.t13Result = t13Result; + } + + public String getT18Result() { + return t18Result; + } + + public void setT18Result(String t18Result) { + this.t18Result = t18Result; + } + + public String getT21Result() { + return t21Result; + } + + public void setT21Result(String t21Result) { + this.t21Result = t21Result; + } + + public String getSexResult() { + return sexResult; + } + + public void setSexResult(String sexResult) { + this.sexResult = sexResult; + } + + public String getGestationalWeeks() { + return gestationalWeeks; + } + + public void setGestationalWeeks(String gestationalWeeks) { + this.gestationalWeeks = gestationalWeeks; + } + + public String getSampleInfoId() { + return sampleInfoId; + } + + public void setSampleInfoId(String sampleInfoId) { + this.sampleInfoId = sampleInfoId; + } + + public String getSignaturePath() { + return signaturePath; + } + + public void setSignaturePath(String signaturePath) { + this.signaturePath = signaturePath; + } + + public String getSourceType() { + return sourceType; + } + + public void setSourceType(String sourceType) { + this.sourceType = sourceType; + } + + public String getDownloadTimes() { + return downloadTimes; + } + + public void setDownloadTimes(String downloadTimes) { + this.downloadTimes = downloadTimes; + } + + public String getProductSortName() { + return productSortName; + } + + public void setProductSortName(String productSortName) { + this.productSortName = productSortName; + } + + public String getBloodDate() { + return bloodDate; + } + + public void setBloodDate(String bloodDate) { + this.bloodDate = bloodDate; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getOldSampleNum() { + return oldSampleNum; + } + + public void setOldSampleNum(String oldSampleNum) { + this.oldSampleNum = oldSampleNum; + } + + public String getCardId() { + return cardId; + } + + public void setCardId(String cardId) { + this.cardId = cardId; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getCustomerCode() { + return customerCode; + } + + public void setCustomerCode(String customerCode) { + this.customerCode = customerCode; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getSampleNum() { + return sampleNum; + } + + public void setSampleNum(String sampleNum) { + this.sampleNum = sampleNum; + } + + public String getSampleNumShort() { + return sampleNumShort; + } + + public void setSampleNumShort(String sampleNumShort) { + this.sampleNumShort = sampleNumShort; + } + + public String getRecheckTime() { + return recheckTime; + } + + public void setRecheckTime(String recheckTime) { + this.recheckTime = recheckTime; + } + + public String getReportPath() { + return reportPath; + } + + public void setReportPath(String reportPath) { + this.reportPath = reportPath; + } + + public String getSaveTime() { + return saveTime; + } + + public void setSaveTime(String saveTime) { + this.saveTime = saveTime; + } + + public String getProductCode() { + return productCode; + } + + public void setProductCode(String productCode) { + this.productCode = productCode; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getSampleReportId() { + return sampleReportId; + } + + public void setSampleReportId(String sampleReportId) { + this.sampleReportId = sampleReportId; + } + + public String getSampleBaseIdsampleBaseId() { + return sampleBaseIdsampleBaseId; + } + + public void setSampleBaseIdsampleBaseId(String sampleBaseIdsampleBaseId) { + this.sampleBaseIdsampleBaseId = sampleBaseIdsampleBaseId; + } + + public String getCitys() { + return citys; + } + + public void setCitys(String citys) { + this.citys = citys; + } + + public String getCustomerCodes() { + return customerCodes; + } + + public void setCustomerCodes(String customerCodes) { + this.customerCodes = customerCodes; + } + + public String getDataSources() { + return dataSources; + } + + public void setDataSources(String dataSources) { + this.dataSources = dataSources; + } + + public String getProductLines() { + return productLines; + } + + public void setProductLines(String productLines) { + this.productLines = productLines; + } + + public String getProductCodes() { + return productCodes; + } + + public void setProductCodes(String productCodes) { + this.productCodes = productCodes; + } + + @Override + public String toString() { + return "HuadaCallbackModel{" + + "z13ZScore='" + z13ZScore + '\'' + + ", z18ZScore='" + z18ZScore + '\'' + + ", z21ZScore='" + z21ZScore + '\'' + + ", t13='" + t13 + '\'' + + ", t18='" + t18 + '\'' + + ", t21='" + t21 + '\'' + + ", t13Risk='" + t13Risk + '\'' + + ", t18Risk='" + t18Risk + '\'' + + ", t21Risk='" + t21Risk + '\'' + + ", t13Result='" + t13Result + '\'' + + ", t18Result='" + t18Result + '\'' + + ", t21Result='" + t21Result + '\'' + + ", sexResult='" + sexResult + '\'' + + ", gestationalWeeks='" + gestationalWeeks + '\'' + + ", sampleInfoId='" + sampleInfoId + '\'' + + ", signaturePath='" + signaturePath + '\'' + + ", sourceType='" + sourceType + '\'' + + ", downloadTimes='" + downloadTimes + '\'' + + ", productSortName='" + productSortName + '\'' + + ", bloodDate='" + bloodDate + '\'' + + ", sampleName='" + sampleName + '\'' + + ", oldSampleNum='" + oldSampleNum + '\'' + + ", cardId='" + cardId + '\'' + + ", mobile='" + mobile + '\'' + + ", province='" + province + '\'' + + ", city='" + city + '\'' + + ", customerCode='" + customerCode + '\'' + + ", customerName='" + customerName + '\'' + + ", sampleNum='" + sampleNum + '\'' + + ", sampleNumShort='" + sampleNumShort + '\'' + + ", recheckTime='" + recheckTime + '\'' + + ", reportPath='" + reportPath + '\'' + + ", saveTime='" + saveTime + '\'' + + ", productCode='" + productCode + '\'' + + ", productName='" + productName + '\'' + + ", sampleReportId='" + sampleReportId + '\'' + + ", sampleBaseIdsampleBaseId='" + sampleBaseIdsampleBaseId + '\'' + + ", citys='" + citys + '\'' + + ", customerCodes='" + customerCodes + '\'' + + ", dataSources='" + dataSources + '\'' + + ", productLines='" + productLines + '\'' + + ", productCodes='" + productCodes + '\'' + + '}'; + } +}