jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6b03da1d6939176bf84ce1e78b847f9cf8e4a9da

Authored by wtt
1 parent 4f6c9dca13
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

华大，5.3.查询报告详情返回结果实体类增加，和固定值设置

Showing 2 changed files with 445 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 6b03da1
... ... @@ -1415,7 +1415,9 @@
1415 1415 sieveHuada.setInformedConsentVersion("02");
1416 1416 sieveHuada.setGestationalWeeks(getWeeks(sieveHuada.getGestationalWeeks()));//孕周
1417 1417 sieveHuada.setChargeType("3");
1418   -// sieveHuada.setExtBaseInfoId();
  1418 + sieveHuada.setSampleType("S051");
  1419 + sieveHuada.setIsNeedOtherChromReport("0");
  1420 + sieveHuada.setIsNeedReportOtherResult("0");
1419 1421  
1420 1422 //调用华大基因接口
1421 1423 ArrayList<AllParamsRequest> paramsList = new ArrayList();
... ... @@ -1460,7 +1462,6 @@
1460 1462 if (!b) {
1461 1463 map.put("code", "500");
1462 1464 map.put("msg", "syscode错误");
1463   - map.put("data", "");
1464 1465 return map;
1465 1466 }
1466 1467 String data = null;
1467 1468  
1468 1469  
1469 1470  
... ... @@ -1472,23 +1473,27 @@
1472 1473 String syscode1 = signParams.get("syscode").toString();
1473 1474 String sign1 = signParams.get("sign").toString();
1474 1475 HashMap<String, String> map1 = new HashMap<>();
1475   - 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";
  1476 + //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";
1476 1477 Map<String, Object> mapParams = new HashMap<>();
1477 1478 mapParams.put("sampleReportId", JSON.parseObject(params).get("sampleReportId"));
1478 1479 mapParams.put("bispProductLine", JSON.parseObject(params).get("bispProductLine"));
1479 1480 JSONObject jsonMapParams = new JSONObject(mapParams);
1480 1481 map1.put("params", jsonMapParams.toString());
1481 1482 data = HttpClientUtil.sendPost(HUADA_URL + "/intf?method=findReportDetail&" + "timestamp=" + timestamp1 + "&syscode=" + syscode1 + "&sign=" + sign1, map1);
  1483 + JSONObject jsonObject = JSONObject.parseObject(data);
  1484 + Object rows = jsonObject.get("rows");
  1485 + HuadaCallbackModel huadaCallbackModel = JSONObject.parseObject(rows.toString(), HuadaCallbackModel.class);
  1486 + System.out.println(huadaCallbackModel.toString());
  1487 +
  1488 +
1482 1489 } catch (Exception e) {
1483 1490 e.printStackTrace();
1484 1491 map.put("code", "500");
1485 1492 map.put("msg", "查询报告详情异常");
1486   - map.put("data", data);
1487 1493 return map;
1488 1494 }
1489 1495 map.put("code", "200");
1490 1496 map.put("msg", "success");
1491   - map.put("data", data);
1492 1497 return map;
1493 1498 }
1494 1499  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaCallbackModel.java View file @ 6b03da1
  1 +package com.lyms.platform.operate.web.request;
  2 +
  3 +/**
  4 + * 产华大基因,检查结果回调参数实体
  5 + *
  6 + */
  7 +public class HuadaCallbackModel {
  8 +
  9 + private String z13ZScore;//13检测结果 示例："3.54026",
  10 + private String z18ZScore;//18检测结果 示例："-0.26363",
  11 + private String z21ZScore;//21检测结果 示例："-0.35463",
  12 + private String t13;//13号染色体风险判定 示例："未检出T13",
  13 + private String t18;//28号染色体风险判定 示例："未检出T18",
  14 + private String t21;//21号染色体风险判定 示例："未检出T21",
  15 + private String t13Risk;// 13号染色体风险值 示例："1/1447077767",
  16 + private String t18Risk;// 18号染色体风险值 示例："1/5699077113",
  17 + private String t21Risk;// 21号染色体风险值 示例："1/357240872",
  18 + private String t13Result;//13号染色体结果 0阴性 1阳性 示例："1",
  19 + private String t18Result;//18号染色体结果 0阴性 1阳性 示例："2",
  20 + private String t21Result;//21号染色体结果 0阴性 1阳性 示例："1",
  21 + private String sexResult;//性染色体结果 示例："1",
  22 + private String gestationalWeeks;//妊娠周期 示例："12W+1",
  23 + private String sampleInfoId;//主键，客户方无作用 示例："",
  24 + private String signaturePath;//签名地址 示例："",
  25 + private String sourceType;// 示例："",
  26 + private String downloadTimes;//下载次数 示例：0,
  27 + private String productSortName;//报告产品类型 示例："",
  28 + private String bloodDate;// 示例："2016-11-10 00:00:00.0",
  29 + private String sampleName;//数据来源 示例："微醺01",
  30 + private String oldSampleNum;// 示例："",
  31 + private String cardId;//身份证号 示例："440882198401021126",
  32 + private String mobile;//手机号 示例："15910111265",
  33 + private String province;//省 示例："",
  34 + private String city;//城市 示例："深圳市",
  35 + private String customerCode;//客户编码 示例："JKCN001192",
  36 + private String customerName;//客户名称 示例："深圳市妇幼保健院",
  37 + private String sampleNum;//样本编号 示例："SPS3013057",
  38 + private String sampleNumShort;//样本编号 示例："",
  39 + private String recheckTime;//复查时间 示例："2017-05-17 09:32:25.0",
  40 + private String reportPath;//无作用 示例："\\\\192.168.225.169\\uploadFiles\\report\\SPS3013057\\1494984768513\\\\SPS3013057.pdf",
  41 + private String saveTime;//报告下载时间 示例："",
  42 + private String productCode;//产品编号 示例："DX0558",
  43 + private String productName;//产品名称 示例："胎儿染色体非整倍体（T21、T18、T13）检测（联合探针锚定聚合测序法）",
  44 + private String sampleReportId;//报告ID 示例："4F9F9DED0C9B1559E053D8E0A8C0AA9F",
  45 + private String sampleBaseIdsampleBaseId;// 示例："4FA2007765A71CF2E053D8E0A8C0249D",
  46 + private String citys;//权限-城市 1-城市 2-客户编码 3-数据来源 4-产品线 5 产品编码 示例：[],
  47 + private String customerCodes;//权限-城市 1-城市 2-客户编码 3-数据来源 4-产品线 5 产品编码 示例：[],
  48 + private String dataSources;//权限-城市 1-城市 2-客户编码 3-数据来源 4-产品线 5 产品编码 示例：[],
  49 + private String productLines;//权限-城市 1-城市 2-客户编码 3-数据来源 4-产品线 5 产品编码 示例：[],
  50 + private String productCodes;//权限-城市 1-城市 2-客户编码 3-数据来源 4-产品线 5 产品编码 示例：[]
  51 +
  52 + public String getZ13ZScore() {
  53 + return z13ZScore;
  54 + }
  55 +
  56 + public void setZ13ZScore(String z13ZScore) {
  57 + this.z13ZScore = z13ZScore;
  58 + }
  59 +
  60 + public String getZ18ZScore() {
  61 + return z18ZScore;
  62 + }
  63 +
  64 + public void setZ18ZScore(String z18ZScore) {
  65 + this.z18ZScore = z18ZScore;
  66 + }
  67 +
  68 + public String getZ21ZScore() {
  69 + return z21ZScore;
  70 + }
  71 +
  72 + public void setZ21ZScore(String z21ZScore) {
  73 + this.z21ZScore = z21ZScore;
  74 + }
  75 +
  76 + public String getT13() {
  77 + return t13;
  78 + }
  79 +
  80 + public void setT13(String t13) {
  81 + this.t13 = t13;
  82 + }
  83 +
  84 + public String getT18() {
  85 + return t18;
  86 + }
  87 +
  88 + public void setT18(String t18) {
  89 + this.t18 = t18;
  90 + }
  91 +
  92 + public String getT21() {
  93 + return t21;
  94 + }
  95 +
  96 + public void setT21(String t21) {
  97 + this.t21 = t21;
  98 + }
  99 +
  100 + public String getT13Risk() {
  101 + return t13Risk;
  102 + }
  103 +
  104 + public void setT13Risk(String t13Risk) {
  105 + this.t13Risk = t13Risk;
  106 + }
  107 +
  108 + public String getT18Risk() {
  109 + return t18Risk;
  110 + }
  111 +
  112 + public void setT18Risk(String t18Risk) {
  113 + this.t18Risk = t18Risk;
  114 + }
  115 +
  116 + public String getT21Risk() {
  117 + return t21Risk;
  118 + }
  119 +
  120 + public void setT21Risk(String t21Risk) {
  121 + this.t21Risk = t21Risk;
  122 + }
  123 +
  124 + public String getT13Result() {
  125 + return t13Result;
  126 + }
  127 +
  128 + public void setT13Result(String t13Result) {
  129 + this.t13Result = t13Result;
  130 + }
  131 +
  132 + public String getT18Result() {
  133 + return t18Result;
  134 + }
  135 +
  136 + public void setT18Result(String t18Result) {
  137 + this.t18Result = t18Result;
  138 + }
  139 +
  140 + public String getT21Result() {
  141 + return t21Result;
  142 + }
  143 +
  144 + public void setT21Result(String t21Result) {
  145 + this.t21Result = t21Result;
  146 + }
  147 +
  148 + public String getSexResult() {
  149 + return sexResult;
  150 + }
  151 +
  152 + public void setSexResult(String sexResult) {
  153 + this.sexResult = sexResult;
  154 + }
  155 +
  156 + public String getGestationalWeeks() {
  157 + return gestationalWeeks;
  158 + }
  159 +
  160 + public void setGestationalWeeks(String gestationalWeeks) {
  161 + this.gestationalWeeks = gestationalWeeks;
  162 + }
  163 +
  164 + public String getSampleInfoId() {
  165 + return sampleInfoId;
  166 + }
  167 +
  168 + public void setSampleInfoId(String sampleInfoId) {
  169 + this.sampleInfoId = sampleInfoId;
  170 + }
  171 +
  172 + public String getSignaturePath() {
  173 + return signaturePath;
  174 + }
  175 +
  176 + public void setSignaturePath(String signaturePath) {
  177 + this.signaturePath = signaturePath;
  178 + }
  179 +
  180 + public String getSourceType() {
  181 + return sourceType;
  182 + }
  183 +
  184 + public void setSourceType(String sourceType) {
  185 + this.sourceType = sourceType;
  186 + }
  187 +
  188 + public String getDownloadTimes() {
  189 + return downloadTimes;
  190 + }
  191 +
  192 + public void setDownloadTimes(String downloadTimes) {
  193 + this.downloadTimes = downloadTimes;
  194 + }
  195 +
  196 + public String getProductSortName() {
  197 + return productSortName;
  198 + }
  199 +
  200 + public void setProductSortName(String productSortName) {
  201 + this.productSortName = productSortName;
  202 + }
  203 +
  204 + public String getBloodDate() {
  205 + return bloodDate;
  206 + }
  207 +
  208 + public void setBloodDate(String bloodDate) {
  209 + this.bloodDate = bloodDate;
  210 + }
  211 +
  212 + public String getSampleName() {
  213 + return sampleName;
  214 + }
  215 +
  216 + public void setSampleName(String sampleName) {
  217 + this.sampleName = sampleName;
  218 + }
  219 +
  220 + public String getOldSampleNum() {
  221 + return oldSampleNum;
  222 + }
  223 +
  224 + public void setOldSampleNum(String oldSampleNum) {
  225 + this.oldSampleNum = oldSampleNum;
  226 + }
  227 +
  228 + public String getCardId() {
  229 + return cardId;
  230 + }
  231 +
  232 + public void setCardId(String cardId) {
  233 + this.cardId = cardId;
  234 + }
  235 +
  236 + public String getMobile() {
  237 + return mobile;
  238 + }
  239 +
  240 + public void setMobile(String mobile) {
  241 + this.mobile = mobile;
  242 + }
  243 +
  244 + public String getProvince() {
  245 + return province;
  246 + }
  247 +
  248 + public void setProvince(String province) {
  249 + this.province = province;
  250 + }
  251 +
  252 + public String getCity() {
  253 + return city;
  254 + }
  255 +
  256 + public void setCity(String city) {
  257 + this.city = city;
  258 + }
  259 +
  260 + public String getCustomerCode() {
  261 + return customerCode;
  262 + }
  263 +
  264 + public void setCustomerCode(String customerCode) {
  265 + this.customerCode = customerCode;
  266 + }
  267 +
  268 + public String getCustomerName() {
  269 + return customerName;
  270 + }
  271 +
  272 + public void setCustomerName(String customerName) {
  273 + this.customerName = customerName;
  274 + }
  275 +
  276 + public String getSampleNum() {
  277 + return sampleNum;
  278 + }
  279 +
  280 + public void setSampleNum(String sampleNum) {
  281 + this.sampleNum = sampleNum;
  282 + }
  283 +
  284 + public String getSampleNumShort() {
  285 + return sampleNumShort;
  286 + }
  287 +
  288 + public void setSampleNumShort(String sampleNumShort) {
  289 + this.sampleNumShort = sampleNumShort;
  290 + }
  291 +
  292 + public String getRecheckTime() {
  293 + return recheckTime;
  294 + }
  295 +
  296 + public void setRecheckTime(String recheckTime) {
  297 + this.recheckTime = recheckTime;
  298 + }
  299 +
  300 + public String getReportPath() {
  301 + return reportPath;
  302 + }
  303 +
  304 + public void setReportPath(String reportPath) {
  305 + this.reportPath = reportPath;
  306 + }
  307 +
  308 + public String getSaveTime() {
  309 + return saveTime;
  310 + }
  311 +
  312 + public void setSaveTime(String saveTime) {
  313 + this.saveTime = saveTime;
  314 + }
  315 +
  316 + public String getProductCode() {
  317 + return productCode;
  318 + }
  319 +
  320 + public void setProductCode(String productCode) {
  321 + this.productCode = productCode;
  322 + }
  323 +
  324 + public String getProductName() {
  325 + return productName;
  326 + }
  327 +
  328 + public void setProductName(String productName) {
  329 + this.productName = productName;
  330 + }
  331 +
  332 + public String getSampleReportId() {
  333 + return sampleReportId;
  334 + }
  335 +
  336 + public void setSampleReportId(String sampleReportId) {
  337 + this.sampleReportId = sampleReportId;
  338 + }
  339 +
  340 + public String getSampleBaseIdsampleBaseId() {
  341 + return sampleBaseIdsampleBaseId;
  342 + }
  343 +
  344 + public void setSampleBaseIdsampleBaseId(String sampleBaseIdsampleBaseId) {
  345 + this.sampleBaseIdsampleBaseId = sampleBaseIdsampleBaseId;
  346 + }
  347 +
  348 + public String getCitys() {
  349 + return citys;
  350 + }
  351 +
  352 + public void setCitys(String citys) {
  353 + this.citys = citys;
  354 + }
  355 +
  356 + public String getCustomerCodes() {
  357 + return customerCodes;
  358 + }
  359 +
  360 + public void setCustomerCodes(String customerCodes) {
  361 + this.customerCodes = customerCodes;
  362 + }
  363 +
  364 + public String getDataSources() {
  365 + return dataSources;
  366 + }
  367 +
  368 + public void setDataSources(String dataSources) {
  369 + this.dataSources = dataSources;
  370 + }
  371 +
  372 + public String getProductLines() {
  373 + return productLines;
  374 + }
  375 +
  376 + public void setProductLines(String productLines) {
  377 + this.productLines = productLines;
  378 + }
  379 +
  380 + public String getProductCodes() {
  381 + return productCodes;
  382 + }
  383 +
  384 + public void setProductCodes(String productCodes) {
  385 + this.productCodes = productCodes;
  386 + }
  387 +
  388 + @Override
  389 + public String toString() {
  390 + return "HuadaCallbackModel{" +
  391 + "z13ZScore='" + z13ZScore + '\'' +
  392 + ", z18ZScore='" + z18ZScore + '\'' +
  393 + ", z21ZScore='" + z21ZScore + '\'' +
  394 + ", t13='" + t13 + '\'' +
  395 + ", t18='" + t18 + '\'' +
  396 + ", t21='" + t21 + '\'' +
  397 + ", t13Risk='" + t13Risk + '\'' +
  398 + ", t18Risk='" + t18Risk + '\'' +
  399 + ", t21Risk='" + t21Risk + '\'' +
  400 + ", t13Result='" + t13Result + '\'' +
  401 + ", t18Result='" + t18Result + '\'' +
  402 + ", t21Result='" + t21Result + '\'' +
  403 + ", sexResult='" + sexResult + '\'' +
  404 + ", gestationalWeeks='" + gestationalWeeks + '\'' +
  405 + ", sampleInfoId='" + sampleInfoId + '\'' +
  406 + ", signaturePath='" + signaturePath + '\'' +
  407 + ", sourceType='" + sourceType + '\'' +
  408 + ", downloadTimes='" + downloadTimes + '\'' +
  409 + ", productSortName='" + productSortName + '\'' +
  410 + ", bloodDate='" + bloodDate + '\'' +
  411 + ", sampleName='" + sampleName + '\'' +
  412 + ", oldSampleNum='" + oldSampleNum + '\'' +
  413 + ", cardId='" + cardId + '\'' +
  414 + ", mobile='" + mobile + '\'' +
  415 + ", province='" + province + '\'' +
  416 + ", city='" + city + '\'' +
  417 + ", customerCode='" + customerCode + '\'' +
  418 + ", customerName='" + customerName + '\'' +
  419 + ", sampleNum='" + sampleNum + '\'' +
  420 + ", sampleNumShort='" + sampleNumShort + '\'' +
  421 + ", recheckTime='" + recheckTime + '\'' +
  422 + ", reportPath='" + reportPath + '\'' +
  423 + ", saveTime='" + saveTime + '\'' +
  424 + ", productCode='" + productCode + '\'' +
  425 + ", productName='" + productName + '\'' +
  426 + ", sampleReportId='" + sampleReportId + '\'' +
  427 + ", sampleBaseIdsampleBaseId='" + sampleBaseIdsampleBaseId + '\'' +
  428 + ", citys='" + citys + '\'' +
  429 + ", customerCodes='" + customerCodes + '\'' +
  430 + ", dataSources='" + dataSources + '\'' +
  431 + ", productLines='" + productLines + '\'' +
  432 + ", productCodes='" + productCodes + '\'' +
  433 + '}';
  434 + }
  435 +}