jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9a951b53dd6d2cda5b3256900161f9e01c8a7704

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

update

Showing 1 changed file with 136 additions and 152 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 9a951b5
... ... @@ -448,86 +448,92 @@
448 448 //先查询本院是否已申请
449 449 //List<SieveApplyOrderModel> list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
450 450 //if (CollectionUtils.isEmpty(list1)) {
451   - //增加产筛
452   - applyOrderService.addOneSieveApplyOrder(sieveApplyOrderModel);
  451 + //增加产筛
  452 + applyOrderService.addOneSieveApplyOrder(sieveApplyOrderModel);
453 453  
454   - /** 改为已使用状态 */
455   - if (StringUtils.isNotBlank(sieveApplyOrderAddRequest.getCouponCode())) {
456   - couponService.use(hospitalId, sieveApplyOrderAddRequest.getCouponCode(), userId, sieveApplyOrderModel.getId());
457   - }
  454 + /** 改为已使用状态 */
  455 + if (StringUtils.isNotBlank(sieveApplyOrderAddRequest.getCouponCode())) {
  456 + couponService.use(hospitalId, sieveApplyOrderAddRequest.getCouponCode(), userId, sieveApplyOrderModel.getId());
  457 + }
458 458  
459   - operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), sieveApplyOrderModel, OptActionEnums.ADD.getId(), "增加产筛申请单");
  459 + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), sieveApplyOrderModel, OptActionEnums.ADD.getId(), "增加产筛申请单");
460 460  
461   - SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
462   - sieveApplyOrderQuery.setStatus(0);
463   - sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
464   - sieveApplyOrderQuery.setParentId(sieveApplyOrderAddRequest.getParentId());
465   - //查询转诊申请单
466   - List<SieveApplyOrderModel> list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
467   - if (CollectionUtils.isNotEmpty(list)) {
468   - List<String> idList = new ArrayList<>();
469   - for (SieveApplyOrderModel orderModel : list) {
470   - if (null != orderModel.getParentId()) {
471   - Patients patients = patientsService.findOnePatientById(orderModel.getParentId());
472   - if (null != patients) {
473   - SieveQuery sieveQuery = new SieveQuery();
474   - sieveQuery.setYn(YnEnums.YES.getId());
  461 + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
  462 + sieveApplyOrderQuery.setStatus(0); //标识是否同步过数据 0 表示未同步 1表示已同步
  463 + sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
  464 + sieveApplyOrderQuery.setParentId(sieveApplyOrderAddRequest.getParentId());
  465 + //查询转诊申请单
  466 + List<SieveApplyOrderModel> list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
  467 + if (CollectionUtils.isNotEmpty(list)) {
  468 + List<Map> idList = new ArrayList<>();
  469 + for (SieveApplyOrderModel orderModel : list) {
  470 + Map map = new HashMap();
  471 + if (null != orderModel.getParentId()) {
  472 + Patients patients = patientsService.findOnePatientById(orderModel.getParentId());
  473 + SieveModel sieveModel = null;
  474 + if (null != patients) {
  475 + SieveQuery sieveQuery = new SieveQuery();
  476 + sieveQuery.setYn(YnEnums.YES.getId());
  477 + sieveQuery.setStatus(1);//20200608 wtt 修改后可以实现 产筛申请添加第二时候产前筛查也会添加
475 478 // sieveQuery.setHospitalId(hospitalId);
476   - sieveQuery.setParentId(patients.getId());
477   - List<SieveModel> modelList = sieveService.queryList(sieveQuery);
478   - if (CollectionUtils.isEmpty(modelList)) {
479   - SieveModel sieveModel = patientsService.convertToModel(patients);
480   - sieveModel.setReviceStatus(1);
481   - sieveModel.setFrom("2");
482   - sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId());
483   - sieveModel.setApplyHospitalId(hospitalId);
484   - sieveModel.setHospitalId(orderModel.getHospitalId());
485   - SieveService.handOrder(sieveModel);
486   - sieveModel.setSieveType(sieveApplyOrderModel.getSieveType());
487   - sieveModel.setCostType(sieveApplyOrderModel.getCostType());
488   - sieveService.addChanQianSieve(sieveModel);
  479 + sieveQuery.setParentId(patients.getId());
  480 + List<SieveModel> modelList = sieveService.queryList(sieveQuery);
  481 + if (CollectionUtils.isEmpty(modelList)) {
  482 + sieveModel = patientsService.convertToModel(patients);
  483 + sieveModel.setReviceStatus(1);//接收状态 1未接收 2接收
  484 + sieveModel.setFrom("2");//数据来源 0 自动跑进来的 1 建档进来 2 产筛申请进来
  485 + sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId());
  486 + sieveModel.setApplyHospitalId(hospitalId);
  487 + sieveModel.setHospitalId(orderModel.getHospitalId());
  488 + SieveService.handOrder(sieveModel);
  489 + sieveModel.setSieveType(sieveApplyOrderModel.getSieveType());
  490 + sieveModel.setCostType(sieveApplyOrderModel.getCostType());
  491 + sieveService.addChanQianSieve(sieveModel);
489 492  
490   - operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), sieveModel, OptActionEnums.ADD.getId(), "增加产筛申请单");
491   - }
  493 + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), sieveModel, OptActionEnums.ADD.getId(), "增加产筛申请单");
492 494 }
493   - idList.add(orderModel.getId());
494 495 }
  496 + map.put("orderModelid", orderModel.getId());
  497 + map.put("sieveModelid", sieveModel.getId());
  498 + idList.add(map);
495 499 }
496   - SieveApplyOrderModel sieveApplyOrderModel1 = new SieveApplyOrderModel();
  500 + }
  501 + SieveApplyOrderModel sieveApplyOrderModel1 = new SieveApplyOrderModel();
  502 + sieveApplyOrderModel1.setStatus(1); //标识是否同步过数据 0 表示未同步 1表示已同步
  503 + for (Map str : idList) {
  504 + sieveApplyOrderModel1.setId(str.get("orderModelid").toString());
  505 + sieveApplyOrderModel1.setModified(new Date());
497 506 sieveApplyOrderModel1.setStatus(1);
498   - for (String str : idList) {
499   - sieveApplyOrderModel1.setId(str);
500   - sieveApplyOrderModel1.setModified(new Date());
501   - sieveApplyOrderModel1.setStatus(1);
502   - SieveApplyOrderQuery sieveApplyOrderQuery2 = new SieveApplyOrderQuery();
503   - sieveApplyOrderQuery2.setId(str);
504   - List<SieveApplyOrderModel> list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2);
505   - applyOrderService.updateSieve(sieveApplyOrderModel1);
506   - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list2.get(0), sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请");
507   - }
  507 + sieveApplyOrderModel1.setRedundancy(str.get("sieveModelid").toString());
  508 + SieveApplyOrderQuery sieveApplyOrderQuery2 = new SieveApplyOrderQuery();
  509 + sieveApplyOrderQuery2.setId(str.get("orderModelid").toString());
  510 + List<SieveApplyOrderModel> list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2);
  511 + applyOrderService.updateSieve(sieveApplyOrderModel1);
  512 + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list2.get(0), sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请");
508 513 }
509   - SieveQuery sieveQuery = new SieveQuery();
510   - sieveQuery.setYn(YnEnums.YES.getId());
511   - sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId());
512   - List<SieveModel> sieveModels = sieveService.queryList(sieveQuery);
513   - if (CollectionUtils.isNotEmpty(sieveModels)) {
514   - SieveModel sieveModel = sieveModels.get(0);
515   - sieveModel.setReviceStatus(1);
516   - sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId());
517   - sieveModel.setApplyHospitalId(hospitalId);
518   - sieveModel.setApplyTime(sieveApplyOrderModel.getApplyTime());
519   - sieveModel.setStatus(2);
520   - if (StringUtils.isNotEmpty(sieveApplyOrderModel.getCheckDate())) {
521   - sieveModel.setApplyDate(DateUtil.parseYMD(sieveApplyOrderModel.getCheckDate()));
522   - }
523   - int days = DateUtil.daysBetween(sieveModel.getLastMenses(), sieveModel.getApplyDate());
524   - sieveModel.setDueWeek(days);
525   - SieveService.handOrder(sieveModel);
526   - sieveModel.setSieveType(sieveApplyOrderModel.getSieveType());
527   - sieveModel.setCostType(sieveApplyOrderModel.getCostType());
528   - sieveService.updateOneChanQianDiaSieve(sieveModel);
529   - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), sieveModels.get(0), sieveModel, OptActionEnums.UPDATE.getId(), "增加产前筛查");
  514 + }
  515 + SieveQuery sieveQuery = new SieveQuery();
  516 + sieveQuery.setYn(YnEnums.YES.getId());
  517 + sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId());
  518 + List<SieveModel> sieveModels = sieveService.queryList(sieveQuery);
  519 + if (CollectionUtils.isNotEmpty(sieveModels)) {
  520 + SieveModel sieveModel = sieveModels.get(0);
  521 + sieveModel.setReviceStatus(1);//接收状态 1未接收 2接收
  522 + sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId());
  523 + sieveModel.setApplyHospitalId(hospitalId);
  524 + sieveModel.setApplyTime(sieveApplyOrderModel.getApplyTime());
  525 + sieveModel.setStatus(2); //1 待产筛 2 产筛中 3 完成产筛 4 完成产诊
  526 + if (StringUtils.isNotEmpty(sieveApplyOrderModel.getCheckDate())) {
  527 + sieveModel.setApplyDate(DateUtil.parseYMD(sieveApplyOrderModel.getCheckDate()));
530 528 }
  529 + int days = DateUtil.daysBetween(sieveModel.getLastMenses(), sieveModel.getApplyDate());
  530 + sieveModel.setDueWeek(days);
  531 + SieveService.handOrder(sieveModel);
  532 + sieveModel.setSieveType(sieveApplyOrderModel.getSieveType());
  533 + sieveModel.setCostType(sieveApplyOrderModel.getCostType());
  534 + sieveService.updateOneChanQianDiaSieve(sieveModel);
  535 + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), sieveModels.get(0), sieveModel, OptActionEnums.UPDATE.getId(), "增加产前筛查");
  536 + }
531 537 // 调用华大接口
532 538 Boolean aBoolean = callHuaDa(sieveApplyOrderModel, hospitalId);
533 539 String number = sieveApplyOrderModel.getNumber();
... ... @@ -547,8 +553,7 @@
547 553 String number = sieveApplyOrderModel.getNumber();
548 554  
549 555 //为空的情况先不验证是否重复
550   - if (StringUtils.isEmpty(number))
551   - {
  556 + if (StringUtils.isEmpty(number)) {
552 557 return false;
553 558 }
554 559  
... ... @@ -583,7 +588,7 @@
583 588 Boolean result = null;
584 589 if ("4".equals(HIS_VERSION) || "30".equals(HIS_VERSION)) {
585 590 result = false;
586   - try{
  591 + try {
587 592 if (StringUtils.isNotEmpty(sieveType) && "2".equals(sieveType)) {
588 593 final String productCode = "DX1331";
589 594 HuadaSieveApplyOrderAddRequest request = new HuadaSieveApplyOrderAddRequest();
... ... @@ -607,7 +612,7 @@
607 612 // EDTA：EDTA
608 613 // K牌采血管：K牌采血管
609 614 // G牌采血管：G牌采血管
610   - String d = "1".equals(sieveApplyOrderModel.getFetusNum()) || "4".equals(sieveApplyOrderModel.getFetusNum()) ? "D" :"";
  615 + String d = "1".equals(sieveApplyOrderModel.getFetusNum()) || "4".equals(sieveApplyOrderModel.getFetusNum()) ? "D" : "";
611 616 request.setTubeType(sieveApplyOrderModel.getYpglx() + d);
612 617 // 孕周（格式：18w+1）注：“w”必须小写，“+”号后面的天数必须是0~6
613 618 request.setGestationalWeeks(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));
614 619  
615 620  
... ... @@ -690,16 +695,11 @@
690 695  
691 696 //本次妊娠情况
692 697 String pregnancy = null;
693   - if (StringUtils.isNotEmpty(sieveApplyOrderModel.getImprenation()) && "1".equals(sieveApplyOrderModel.getImprenation()))
694   - {
  698 + if (StringUtils.isNotEmpty(sieveApplyOrderModel.getImprenation()) && "1".equals(sieveApplyOrderModel.getImprenation())) {
695 699 pregnancy = "0";
696   - }
697   - else if (StringUtils.isNotEmpty(sieveApplyOrderModel.getOvulationInduction()) && "1".equals(sieveApplyOrderModel.getOvulationInduction()))
698   - {
  700 + } else if (StringUtils.isNotEmpty(sieveApplyOrderModel.getOvulationInduction()) && "1".equals(sieveApplyOrderModel.getOvulationInduction())) {
699 701 pregnancy = "1";
700   - }
701   - else if (StringUtils.isNotEmpty(sieveApplyOrderModel.getIui()) && "1".equals(sieveApplyOrderModel.getIui()))
702   - {
  702 + } else if (StringUtils.isNotEmpty(sieveApplyOrderModel.getIui()) && "1".equals(sieveApplyOrderModel.getIui())) {
703 703 pregnancy = "2";
704 704 }
705 705 request.setPregnancy(pregnancy);
706 706  
... ... @@ -711,13 +711,9 @@
711 711 request.setNativePlace(addressRegister);
712 712  
713 713  
714   -
715   -
716   -
717   - if (StringUtils.isNotEmpty(sieveApplyOrderModel.getUltrasonicNtWeek()))
718   - {
  714 + if (StringUtils.isNotEmpty(sieveApplyOrderModel.getUltrasonicNtWeek())) {
719 715 //nt测定孕周
720   - request.setNtGestationalWeeks(sieveApplyOrderModel.getUltrasonicNtWeek().replace("周","w").replace("天",""));
  716 + request.setNtGestationalWeeks(sieveApplyOrderModel.getUltrasonicNtWeek().replace("周", "w").replace("天", ""));
721 717 }
722 718  
723 719  
724 720  
... ... @@ -727,19 +723,15 @@
727 723 request.setNtValue(sieveApplyOrderModel.getUltrasonicNtVal());
728 724 //0/高风险 1/低风险 2/临界风险
729 725 String srisk = sieveApplyOrderModel.getSerumScreeningRisk();
730   - if (StringUtils.isNotEmpty(srisk))
731   - {
732   - int week = DateUtil.getWeek(patients.getLastMenses(),new Date());
733   - if (week < 13)
734   - {
  726 + if (StringUtils.isNotEmpty(srisk)) {
  727 + int week = DateUtil.getWeek(patients.getLastMenses(), new Date());
  728 + if (week < 13) {
735 729 //0：母血清筛查风险率‐高风险 1：母血清筛查风险率‐临界风险 2：母血清筛查风险率‐低风险
736 730 request.setMotherSerumRisk("0".equals(srisk) ? "0" : ("1".equals(srisk) ? "2" : "1"));
737 731 //早期
738 732 request.setTrisomy21(sieveApplyOrderModel.getSyndrome21());
739 733 request.setTrisomy18(sieveApplyOrderModel.getSyndrome18());
740   - }
741   - else
742   - {
  734 + } else {
743 735 //0：母血清筛查风险率‐高风险 1：母血清筛查风险率‐临界风险 2：母血清筛查风险率‐低风险
744 736 request.setMmotherSerumRisk("0".equals(srisk) ? "0" : ("1".equals(srisk) ? "2" : "1"));
745 737 //中期
746 738  
747 739  
... ... @@ -779,18 +771,15 @@
779 771 // request.put("pcountry", getBasicConfig(patients.getPcountryId()));
780 772 // map.put("pnation", getBasicConfig(patients.getPnationId()));
781 773  
782   - if ("4".equals(HIS_VERSION))
783   - {
  774 + if ("4".equals(HIS_VERSION)) {
784 775 result = huadaSaveSampleInfo(request);
785   - }
786   - else
787   - {
  776 + } else {
788 777 result = hsHuadaSaveSampleInfo(request);
789 778 }
790 779  
791 780 }
792   - }catch (Exception e){
793   - ExceptionUtils.catchException(e,"调用华大接口失败");
  781 + } catch (Exception e) {
  782 + ExceptionUtils.catchException(e, "调用华大接口失败");
794 783 }
795 784 }
796 785 return result;
797 786  
... ... @@ -1340,15 +1329,15 @@
1340 1329 map.put("create", DateUtil.getyyyy_MM_dd(reOrderModel.getCreated()));
1341 1330 String hospital1 = "";
1342 1331  
1343   - if(!isNumeric(reOrderModel.getTransferredHospital())){
1344   - map.put("zhuanRname",reOrderModel.getTransferredHospital());
1345   - }else{
  1332 + if (!isNumeric(reOrderModel.getTransferredHospital())) {
  1333 + map.put("zhuanRname", reOrderModel.getTransferredHospital());
  1334 + } else {
1346 1335 if (org.apache.commons.lang.StringUtils.isNotEmpty(reOrderModel.getTransferredHospital())) {
1347 1336 Organization organization = organizationService.getOrganization(Integer.parseInt(reOrderModel.getTransferredHospital()));
1348 1337 if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
1349 1338 hospital1 = organization.getName();
1350 1339 }
1351   - map.put("zhuanRname",hospital1);
  1340 + map.put("zhuanRname", hospital1);
1352 1341 }
1353 1342 }
1354 1343 if (NumberUtils.isNumber(reOrderModel.getRecDoctor())) {
1355 1344  
... ... @@ -1366,10 +1355,11 @@
1366 1355 return null;
1367 1356 }
1368 1357  
1369   - public static boolean isNumeric(String str){
  1358 + public static boolean isNumeric(String str) {
1370 1359 Pattern pattern = Pattern.compile("[0-9]*");
1371 1360 return pattern.matcher(str).matches();
1372 1361 }
  1362 +
1373 1363 public BaseResponse getEnums() {
1374 1364 Map<String, Object> map = new HashMap<>();
1375 1365 map.put("gwfz", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.HIGH_RISK_ID));
... ... @@ -1755,6 +1745,7 @@
1755 1745  
1756 1746 /**
1757 1747 * 调用衡水华大保存申请单
  1748 + *
1758 1749 * @param sieveHuada
1759 1750 * @return
1760 1751 */
1761 1752  
1762 1753  
1763 1754  
1764 1755  
... ... @@ -1788,25 +1779,23 @@
1788 1779 map.put("timestamp", timestamp);
1789 1780  
1790 1781 String json = JsonUtil.obj2JsonString(map);
1791   - System.out.println("saveSampleInfo param="+json);
1792   - ExceptionUtils.catchException("saveSampleInfo param="+json);
  1782 + System.out.println("saveSampleInfo param=" + json);
  1783 + ExceptionUtils.catchException("saveSampleInfo param=" + json);
1793 1784 String s = HttpClientUtil.doPostSSL(HUADA_URL + "/external/saveSampleInfos.do", json);
1794   - ExceptionUtils.catchException("saveSampleInfo param=" + json+ "=======result"+s);
  1785 + ExceptionUtils.catchException("saveSampleInfo param=" + json + "=======result" + s);
1795 1786 JSONObject jsonObject = JSONObject.parseObject(s);
1796 1787  
1797 1788 Object codeObj = jsonObject.get("code");
1798   - if (codeObj != null && "200".equals(codeObj.toString()) && s.contains("true"))
1799   - {
  1789 + if (codeObj != null && "200".equals(codeObj.toString()) && s.contains("true")) {
1800 1790 return true;
1801 1791 }
1802 1792 } catch (Exception e) {
1803   - ExceptionUtils.catchException(e,"error");
  1793 + ExceptionUtils.catchException(e, "error");
1804 1794 }
1805 1795 return false;
1806 1796 }
1807 1797  
1808 1798  
1809   -
1810 1799 public Map huadaCallback(String syscode, String sign, String timestamp, String params) {
1811 1800 Map map = new HashMap();
1812 1801 System.out.println("syscode:" + syscode + "sign:" + sign + "timestamp:" + timestamp);
1813 1802  
... ... @@ -1932,10 +1921,13 @@
1932 1921 put("valueTwo", split13[1]);
1933 1922 put("valueKey", huadaCallbackModel.getZ13ZScore());
1934 1923 }});
1935   - newModel.setTszhzValue(new HashMap<String, String>(){{
1936   - put("valueOne", split21[0]);put("valueTwo", split21[1]);put("valueKey", huadaCallbackModel.getZ21ZScore()); }});
  1924 + newModel.setTszhzValue(new HashMap<String, String>() {{
  1925 + put("valueOne", split21[0]);
  1926 + put("valueTwo", split21[1]);
  1927 + put("valueKey", huadaCallbackModel.getZ21ZScore());
  1928 + }});
1937 1929  
1938   - String reportTypeStr = StringUtils.isNotEmpty(huadaCallbackModel.getReportType()) ? huadaCallbackModel.getReportType() : huadaGetReportType(newModel.getSampleReportId());
  1930 + String reportTypeStr = StringUtils.isNotEmpty(huadaCallbackModel.getReportType()) ? huadaCallbackModel.getReportType() : huadaGetReportType(newModel.getSampleReportId());
1939 1931 String reportType = "1";
1940 1932 if ("正式报告".equals(reportTypeStr)) {
1941 1933 reportType = "1";
... ... @@ -1949,7 +1941,7 @@
1949 1941 return newModel;
1950 1942 }
1951 1943  
1952   - public void huadaFtp(String sampleReportId,HttpServletResponse response) {
  1944 + public void huadaFtp(String sampleReportId, HttpServletResponse response) {
1953 1945  
1954 1946 try {
1955 1947 Map<String, Object> signParams = getSignParams(SYSCODE, SECRET);
... ... @@ -1958,8 +1950,7 @@
1958 1950 String sign1 = signParams.get("sign").toString();
1959 1951 HashMap<String, String> map1 = new HashMap<>();
1960 1952 String data = null;
1961   - if ("30".equals(HIS_VERSION))
1962   - {
  1953 + if ("30".equals(HIS_VERSION)) {
1963 1954 Map<String, Object> mapParams = new HashMap<>();
1964 1955 mapParams.put("sampleNum", sampleReportId);
1965 1956 mapParams.put("syscode", syscode1);
1966 1957  
1967 1958  
... ... @@ -1968,15 +1959,13 @@
1968 1959 data = HttpClientUtil.doPostSSL(HUADA_URL + "/external/downloadReport.do", JsonUtil.obj2Str(mapParams));
1969 1960 JSONObject respJSON = JSON.parseObject(data);
1970 1961 if ("200".equals(respJSON.get("code").toString())) {
1971   - Object rowsJSON =respJSON.get("data");
  1962 + Object rowsJSON = respJSON.get("data");
1972 1963 if (rowsJSON != null) {
1973 1964 byte[] bytes = rowsJSON.toString().getBytes("iso8859-1");
1974   - getFile(bytes,response);
  1965 + getFile(bytes, response);
1975 1966 }
1976 1967 }
1977   - }
1978   - else
1979   - {
  1968 + } else {
1980 1969 timestamp1 = timestamp1.replaceAll(" ", "%20");
1981 1970 Map<String, Object> mapParams = new HashMap<>();
1982 1971 mapParams.put("sampleReportId", sampleReportId);
1983 1972  
... ... @@ -1985,10 +1974,10 @@
1985 1974 data = HttpClientUtil.sendPost(HUADA_URL + "/intf?method=downloadReport&" + "timestamp=" + timestamp1 + "&syscode=" + syscode1 + "&sign=" + sign1, map1);
1986 1975 JSONObject respJSON = JSON.parseObject(data);
1987 1976 if ("200".equals(respJSON.get("code").toString())) {
1988   - Object rowsJSON =respJSON.get("rows");
  1977 + Object rowsJSON = respJSON.get("rows");
1989 1978 if (rowsJSON != null) {
1990 1979 byte[] bytes = rowsJSON.toString().getBytes("iso8859-1");
1991   - getFile(bytes,response);
  1980 + getFile(bytes, response);
1992 1981 }
1993 1982 }
1994 1983 }
... ... @@ -1998,6 +1987,7 @@
1998 1987 }
1999 1988  
2000 1989 }
  1990 +
2001 1991 public String huadaGetReportType(String sampleReportId) {
2002 1992 try {
2003 1993 Map<String, Object> signParams = getSignParams(SYSCODE, SECRET);
2004 1994  
2005 1995  
... ... @@ -2011,12 +2001,12 @@
2011 2001 JSONObject jsonMapParams = new JSONObject(mapParams);
2012 2002 map1.put("params", jsonMapParams.toString());
2013 2003 String data = HttpClientUtil.sendPost(HUADA_URL + "/intf?method=getReportType&" + "timestamp=" + timestamp1 + "&syscode=" + syscode1 + "&sign=" + sign1, map1);
2014   - if(!data.isEmpty()){
  2004 + if (!data.isEmpty()) {
2015 2005 net.sf.json.JSONObject jsonObject11 = net.sf.json.JSONObject.fromObject(data);
2016   - net.sf.json.JSONArray rows = (net.sf.json.JSONArray)jsonObject11.get("rows");
2017   - net.sf.json.JSONObject reporttype = (net.sf.json.JSONObject)rows.get(0);
  2006 + net.sf.json.JSONArray rows = (net.sf.json.JSONArray) jsonObject11.get("rows");
  2007 + net.sf.json.JSONObject reporttype = (net.sf.json.JSONObject) rows.get(0);
2018 2008 String reporttype1 = reporttype.get("REPORTTYPE").toString();
2019   - return reporttype1;
  2009 + return reporttype1;
2020 2010 }
2021 2011 } catch (Exception e) {
2022 2012 e.printStackTrace();
... ... @@ -2024,6 +2014,7 @@
2024 2014 }
2025 2015 return "";
2026 2016 }
  2017 +
2027 2018 /**
2028 2019 * 根据byte数组，生成文件
2029 2020 */
... ... @@ -2109,7 +2100,7 @@
2109 2100 Query query = Query.query(Criteria.where("sampleReportId").is(sampleReportId));
2110 2101 SieveResultModel resultModel = mongoTemplate.findOne(query, SieveResultModel.class);
2111 2102 if (resultModel != null) {
2112   - Integer printSize = (resultModel.getPrintSize() == null ? 0 : resultModel.getPrintSize())+1;
  2103 + Integer printSize = (resultModel.getPrintSize() == null ? 0 : resultModel.getPrintSize()) + 1;
2113 2104  
2114 2105 Update update = new Update();
2115 2106 update.set("printSize", printSize);
2116 2107  
... ... @@ -2125,14 +2116,14 @@
2125 2116  
2126 2117 /**
2127 2118 * 回调
  2119 + *
2128 2120 * @param sampleNum
2129 2121 * @param token
2130 2122 * @return
2131 2123 */
2132 2124 public BaseResponse resultCallback(final String sampleNum, String token) {
2133 2125 BaseResponse baseResponse = new BaseResponse();
2134   - if (!"uc0d98e79de93d6e49521deab9b0d9eb7a".equals(token))
2135   - {
  2126 + if (!"uc0d98e79de93d6e49521deab9b0d9eb7a".equals(token)) {
2136 2127 return baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("Authorization错误");
2137 2128 }
2138 2129  
2139 2130  
2140 2131  
2141 2132  
2142 2133  
2143 2134  
2144 2135  
... ... @@ -2157,35 +2148,29 @@
2157 2148 map.put("syscode", syscode);
2158 2149 map.put("sign", sign);
2159 2150 map.put("timestamp", timestamp);
2160   - System.out.println("query report param "+JsonUtil.obj2Str(map));
  2151 + System.out.println("query report param " + JsonUtil.obj2Str(map));
2161 2152  
2162 2153 //重试三次
2163   - for (int i = 0; i <3 ; i++)
2164   - {
  2154 + for (int i = 0; i < 3; i++) {
2165 2155 try {
2166 2156 String data = HttpClientUtil.doPostSSL(HUADA_URL + "/external/getReport.do", JsonUtil.obj2Str(map));
2167   - if (StringUtils.isNotEmpty(data))
2168   - {
  2157 + if (StringUtils.isNotEmpty(data)) {
2169 2158 System.out.println(data);
2170 2159 JSONObject jsonObject = JSONObject.parseObject(data);
2171 2160 Object codeObj = jsonObject.get("code");
2172   - if (codeObj != null && "200".equals(codeObj.toString()) && data.contains("success"))
2173   - {
  2161 + if (codeObj != null && "200".equals(codeObj.toString()) && data.contains("success")) {
2174 2162 dohandleResult(jsonObject.get("data"));
2175 2163 break;
2176 2164 }
2177 2165 }
2178   - }catch (Exception e)
2179   - {
2180   - System.out.println(e.getMessage()+" getReport.do fail "+i);
  2166 + } catch (Exception e) {
  2167 + System.out.println(e.getMessage() + " getReport.do fail " + i);
2181 2168 try {
2182 2169 Thread.sleep(1000);
2183   - }catch (Exception e1)
2184   - {
  2170 + } catch (Exception e1) {
2185 2171  
2186 2172 }
2187   - if (i == 2)
2188   - {
  2173 + if (i == 2) {
2189 2174 return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg("获取报告失败");
2190 2175 }
2191 2176 continue;
... ... @@ -2196,8 +2181,7 @@
2196 2181 }
2197 2182  
2198 2183 private void dohandleResult(final Object dataObj) {
2199   - if (dataObj == null)
2200   - {
  2184 + if (dataObj == null) {
2201 2185 return;
2202 2186 }
2203 2187 new Thread(new Runnable() {