diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index cca3d43..fffe060 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -13,6 +13,7 @@ import com.lyms.platform.operate.web.request.RiskPatientsQueryRequest; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.AreaHighRiskCountExportTask; import com.lyms.platform.operate.web.utils.HiskCountTask; +import com.lyms.platform.operate.web.utils.MathUtil; import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; @@ -528,6 +529,7 @@ public class RiskReportFacade { idQuery.setYn(YnEnums.YES.getId()); List items = new ArrayList<>(); + for (Map addr : list) { String id = String.valueOf(addr.get("id")); @@ -555,6 +557,38 @@ public class RiskReportFacade { } map.put("data",items); series.add(map); + +// List> bfbItem = new ArrayList<>(); +// +// if (CollectionUtils.isNotEmpty(series)) +// { +// int index = 0; +// for (Map seriseMap : series) +// { +// Map percent = new HashMap<>(); +// percent.put("name",seriseMap.get("name")); +// percent.put("type","line"); +// +// +// //占比/环比百分比 +// List bfb = new ArrayList<>(); +// +// +// index++; +// List colums = (List)seriseMap.get("data"); +// Object obj = colums.get(index); +// int total = 0; +// +// for (Map sMap : series) +// { +// List colums1 = (List)sMap.get("data"); +// Object obj1 = colums1.get(index); +// +// total += Integer.valueOf(String.valueOf(obj1)); +// } +// bfb.add(MathUtil.getProportion(Integer.valueOf(String.valueOf(obj)),total); +// } +// } } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index 3ac4501..ac51904 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -199,6 +199,7 @@ public class SyncDataTaskService { } }catch(Exception ex){ ExceptionUtils.catchException(ex, url+": syncData Error."); + continue; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HttpClientUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HttpClientUtil.java index fe4b369..7eb7701 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HttpClientUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HttpClientUtil.java @@ -83,7 +83,8 @@ public class HttpClientUtil { } } }catch(Exception ex){ - ex.printStackTrace(); + ExceptionUtils.catchException(ex, url + ": doPost syncData Error."); + return null; } return result; } @@ -199,4 +200,19 @@ public class HttpClientUtil { } return json1; } +// +// public static void main(String[] args) +// { +// SqlRequest request = new SqlRequest(); +// try { +// request.setSql(org.apache.commons.codec.binary.Base64.encodeBase64String("asdafsd".getBytes("utf-8"))); +// } catch (UnsupportedEncodingException e) { +// e.printStackTrace(); +// } +// request.setSqlId("11"); +// String json = JsonUtil.obj2Str(request); +// String result = HttpClientUtil.doPostSSL("https://area-lc-api.healthbaby.com.cn:55581/syncMysqlData",json,"3d19960bf3e81e7d816c4f26051c49ba"); +// System.out.print(result); +// } + } \ No newline at end of file