Commit a729dda72d31165e4e3f96a8e77d530751950c42
1 parent
95816885ea
Exists in
master
and in
6 other branches
增加体温服务
Showing 2 changed files with 28 additions and 4 deletions
platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
View file @
a729dda
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
View file @
a729dda
| ... | ... | @@ -41,8 +41,8 @@ |
| 41 | 41 | static |
| 42 | 42 | { |
| 43 | 43 | HighLevelMap.put("绿色预警", "低风险"); |
| 44 | - HighLevelMap.put("橙色预警", "一般风险"); | |
| 45 | - HighLevelMap.put("黄色预警", "较高风险"); | |
| 44 | + HighLevelMap.put("黄色预警", "一般风险"); | |
| 45 | + HighLevelMap.put("橙色预警", "较高风险"); | |
| 46 | 46 | HighLevelMap.put("红色预警", "高风险"); |
| 47 | 47 | HighLevelMap.put("紫色预警", "传染病"); |
| 48 | 48 | } |
| ... | ... | @@ -280,7 +280,7 @@ |
| 280 | 280 | List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(userId); |
| 281 | 281 | |
| 282 | 282 | String permission = permissionsModelList.get(0).getAreaPermission(); |
| 283 | - System.out.println("permission======"+permission); | |
| 283 | + System.out.println("permission======" + permission); | |
| 284 | 284 | |
| 285 | 285 | String parentId = ""; |
| 286 | 286 | if (StringUtils.isNotEmpty(countRequest.getProvinceId())) |
| ... | ... | @@ -306,6 +306,7 @@ |
| 306 | 306 | countRequest.setExportType(3); |
| 307 | 307 | } |
| 308 | 308 | |
| 309 | + | |
| 309 | 310 | int addrType = countRequest.getExportType(); |
| 310 | 311 | List<String> title = getTableDataTitle(addrType,times); |
| 311 | 312 | |
| ... | ... | @@ -313,6 +314,28 @@ |
| 313 | 314 | |
| 314 | 315 | //用于存在没有机构的区域Id |
| 315 | 316 | List<String> addrId = new ArrayList<>(); |
| 317 | + | |
| 318 | +// | |
| 319 | +// List<String> childsId = new ArrayList<>(); | |
| 320 | +// | |
| 321 | +// if (addrType == 1) | |
| 322 | +// { | |
| 323 | +// if (StringUtils.isNotEmpty(permission)) | |
| 324 | +// { | |
| 325 | +// List<Map> permissions = JsonUtil.toList(permission,Map.class); | |
| 326 | +// } | |
| 327 | +// } | |
| 328 | +// else if(addrType == 2) | |
| 329 | +// { | |
| 330 | +// } | |
| 331 | +// else | |
| 332 | +// { | |
| 333 | +// } | |
| 334 | +// | |
| 335 | +// if (addrType < 3) | |
| 336 | +// { | |
| 337 | +// } | |
| 338 | + | |
| 316 | 339 | |
| 317 | 340 | |
| 318 | 341 | //序列号 |