diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java index d956933..bd17f85 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java @@ -18,7 +18,8 @@ public class PatientSerEnums { tz(2, "体重管理"), xt(3, "血糖管理"), xy(4, "血压管理"), - zjzx(5, "专家咨询"); + zjzx(5, "专家咨询"), + tw(6, "体温管理"); private Integer id; private String title; 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 c9e535c..bfff26e 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 @@ -41,8 +41,8 @@ public class RiskReportFacade { static { HighLevelMap.put("绿色预警", "低风险"); - HighLevelMap.put("橙色预警", "一般风险"); - HighLevelMap.put("黄色预警", "较高风险"); + HighLevelMap.put("黄色预警", "一般风险"); + HighLevelMap.put("橙色预警", "较高风险"); HighLevelMap.put("红色预警", "高风险"); HighLevelMap.put("紫色预警", "传染病"); } @@ -280,7 +280,7 @@ public class RiskReportFacade { List permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(userId); String permission = permissionsModelList.get(0).getAreaPermission(); - System.out.println("permission======"+permission); + System.out.println("permission======" + permission); String parentId = ""; if (StringUtils.isNotEmpty(countRequest.getProvinceId())) @@ -306,6 +306,7 @@ public class RiskReportFacade { countRequest.setExportType(3); } + int addrType = countRequest.getExportType(); List title = getTableDataTitle(addrType,times); @@ -314,6 +315,28 @@ public class RiskReportFacade { //用于存在没有机构的区域Id List addrId = new ArrayList<>(); +// +// List childsId = new ArrayList<>(); +// +// if (addrType == 1) +// { +// if (StringUtils.isNotEmpty(permission)) +// { +// List permissions = JsonUtil.toList(permission,Map.class); +// } +// } +// else if(addrType == 2) +// { +// } +// else +// { +// } +// +// if (addrType < 3) +// { +// } + + //序列号 int seq = 0;