Commit f410847771ac62aec83ff1d77c42ef9998268a0d
1 parent
41c5f09775
Exists in
master
and in
6 other branches
威海统计1
Showing 2 changed files with 223 additions and 68 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
View file @
f410847
| ... | ... | @@ -269,6 +269,19 @@ |
| 269 | 269 | return antExRecordFacade.findList(antExManagerQueryRequest, loginState.getId(), false, "true",antExManagerQueryRequest.isCurrent()); |
| 270 | 270 | } |
| 271 | 271 | |
| 272 | + /** | |
| 273 | + * 功能描述 | |
| 274 | + * @author 武涛涛 | |
| 275 | + * @date 2020/6/4 | |
| 276 | + */ | |
| 277 | + @RequestMapping(method = RequestMethod.GET, value = "/antex/findStatisticalRisk") | |
| 278 | + @ResponseBody | |
| 279 | + @TokenRequired | |
| 280 | + public BaseResponse findStatisticalRisk(@Valid AntExManagerQueryRequest antExManagerQueryRequest, HttpServletRequest request) { | |
| 281 | + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
| 282 | + return antExRecordFacade.findStatisticalRisk(antExManagerQueryRequest, loginState.getId(), false, "true"); | |
| 283 | + } | |
| 284 | + | |
| 272 | 285 | |
| 273 | 286 | /** |
| 274 | 287 | * 导出产检管理接口 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
f410847
| ... | ... | @@ -41,6 +41,7 @@ |
| 41 | 41 | import javax.servlet.http.HttpServletResponse; |
| 42 | 42 | import java.io.IOException; |
| 43 | 43 | import java.io.OutputStream; |
| 44 | +import java.text.SimpleDateFormat; | |
| 44 | 45 | import java.util.*; |
| 45 | 46 | import java.util.concurrent.Callable; |
| 46 | 47 | import java.util.concurrent.Future; |
| ... | ... | @@ -53,6 +54,7 @@ |
| 53 | 54 | */ |
| 54 | 55 | @Component |
| 55 | 56 | public class AntExRecordFacade { |
| 57 | + public static final List<String> INCR_HRISK = new ArrayList(); | |
| 56 | 58 | @Autowired |
| 57 | 59 | private AntExRecordService recordService; |
| 58 | 60 | @Autowired |
| ... | ... | @@ -279,7 +281,7 @@ |
| 279 | 281 | * |
| 280 | 282 | * @return |
| 281 | 283 | */ |
| 282 | - public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId, boolean isRegion, String isPage,boolean isCurrent) { | |
| 284 | + public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId, boolean isRegion, String isPage, boolean isCurrent) { | |
| 283 | 285 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 284 | 286 | List<Patients> patientses = null; |
| 285 | 287 | if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) { |
| 286 | 288 | |
| 287 | 289 | |
| 288 | 290 | |
| 289 | 291 | |
| 290 | 292 | |
| 291 | 293 | |
| ... | ... | @@ -314,39 +316,25 @@ |
| 314 | 316 | List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created"); |
| 315 | 317 | List<AntExManagerResult> data = getAntExRecords(antExRecordModelList, hospital, isRegion, antExManagerQueryRequest.getShowDetail()); |
| 316 | 318 | |
| 317 | - if (isCurrent && CollectionUtils.isNotEmpty(data)) | |
| 318 | - { | |
| 319 | - for (AntExManagerResult result : data) | |
| 320 | - { | |
| 321 | - if (CollectionUtils.isNotEmpty(result.getrLevel())) | |
| 322 | - { | |
| 319 | + if (isCurrent && CollectionUtils.isNotEmpty(data)) { | |
| 320 | + for (AntExManagerResult result : data) { | |
| 321 | + if (CollectionUtils.isNotEmpty(result.getrLevel())) { | |
| 323 | 322 | List<Map> list = result.getrLevel(); |
| 324 | 323 | List<String> ids = new ArrayList<>(); |
| 325 | - for (Map map : list) | |
| 326 | - { | |
| 327 | - if(map.get("id") != null) | |
| 328 | - { | |
| 324 | + for (Map map : list) { | |
| 325 | + if (map.get("id") != null) { | |
| 329 | 326 | ids.add(map.get("id").toString()); |
| 330 | 327 | } |
| 331 | 328 | } |
| 332 | - if (ids.contains("224b2329-cb82-4da3-a071-8527f8283aab")) | |
| 333 | - { | |
| 329 | + if (ids.contains("224b2329-cb82-4da3-a071-8527f8283aab")) { | |
| 334 | 330 | result.setLevelNum(1); |
| 335 | - } | |
| 336 | - else if (ids.contains("eb146c03-b19f-4e28-b85f-fda574b2283b")) | |
| 337 | - { | |
| 331 | + } else if (ids.contains("eb146c03-b19f-4e28-b85f-fda574b2283b")) { | |
| 338 | 332 | result.setLevelNum(2); |
| 339 | - } | |
| 340 | - else if (ids.contains("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2")) | |
| 341 | - { | |
| 333 | + } else if (ids.contains("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2")) { | |
| 342 | 334 | result.setLevelNum(3); |
| 343 | - } | |
| 344 | - else if (ids.contains("315107bd-91fe-42a1-9237-752f3c046a40")) | |
| 345 | - { | |
| 335 | + } else if (ids.contains("315107bd-91fe-42a1-9237-752f3c046a40")) { | |
| 346 | 336 | result.setLevelNum(4); |
| 347 | - } | |
| 348 | - else if (ids.contains("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2")) | |
| 349 | - { | |
| 337 | + } else if (ids.contains("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2")) { | |
| 350 | 338 | result.setLevelNum(5); |
| 351 | 339 | } |
| 352 | 340 | } |
| ... | ... | @@ -355,8 +343,7 @@ |
| 355 | 343 | Collections.sort(data, new Comparator<AntExManagerResult>() { |
| 356 | 344 | @Override |
| 357 | 345 | public int compare(AntExManagerResult o1, AntExManagerResult o2) { |
| 358 | - if (o1 == null || o2 == null) | |
| 359 | - { | |
| 346 | + if (o1 == null || o2 == null) { | |
| 360 | 347 | return 0; |
| 361 | 348 | } |
| 362 | 349 | return o1.getLevelNum() - o2.getLevelNum(); |
| 363 | 350 | |
| ... | ... | @@ -368,7 +355,146 @@ |
| 368 | 355 | return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(antExRecordQuery.getPageInfo()); |
| 369 | 356 | } |
| 370 | 357 | |
| 358 | + /** | |
| 359 | + * 功能描述 威海妇幼统计各个高危总数,及初诊复诊各个高危总数 | |
| 360 | + * 这几个场景都没问题 110101199003074960 110101199003071102 测试了1 初诊 复诊 复诊, 2 初诊 复诊 3 复诊 复诊 复诊 场景 | |
| 361 | + * | |
| 362 | + * 缺少 初诊复诊分别统计,级别统计,和补充高危统计。 | |
| 363 | + * | |
| 364 | + * @return | |
| 365 | + * @author 武涛涛 | |
| 366 | + * @date 2020/6/4 | |
| 367 | + * // * @param 参数说明antExManagerQueryRequest.cTime产检时间, userId 当前用户id , isRegion false,isPage "false", | |
| 368 | + */ | |
| 369 | + public BaseResponse findStatisticalRisk(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId, boolean isRegion, String isPage) { | |
| 370 | + List<String> incrHrisk = null;//存储高危id | |
| 371 | + AntExRecordQuery antExRecordQuery = null; | |
| 372 | + try { | |
| 373 | + incrHrisk = new ArrayList(); | |
| 374 | + antExRecordQuery = complayRequest(userId, antExManagerQueryRequest, isRegion, isPage); | |
| 375 | + String hospital = autoMatchFacade.getHospitalId(userId); | |
| 376 | + antExRecordQuery.setHospitalId(hospital); | |
| 377 | + List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created"); | |
| 378 | + System.out.println("1------获取产检条数------" + antExRecordModelList.size()); | |
| 379 | + Map<String, List<AntExRecordModel>> map = handleAntexRecord2(antExRecordModelList); | |
| 380 | + System.out.println("2-----获取产检孕妇人数-------" + map.size()); | |
| 381 | + if (map != null && map.size() > 0) { | |
| 382 | + Iterator<Map.Entry<String, List<AntExRecordModel>>> iterator = map.entrySet().iterator(); | |
| 383 | + while (iterator.hasNext()) { | |
| 384 | + Map.Entry<String, List<AntExRecordModel>> next = iterator.next(); | |
| 385 | + List<AntExRecordModel> valueList = next.getValue(); | |
| 386 | + if (CollectionUtils.isNotEmpty(valueList)) { | |
| 387 | + ListSort(valueList);//升序 | |
| 388 | + System.out.println("3---获取单个孕妇产检数--1111---" + valueList.size()); | |
| 389 | + //获取个人第一个产检,判断是否为复诊 | |
| 390 | + AntExRecordModel antExRecordModel = valueList.get(0); | |
| 391 | + if (antExRecordModel != null && antExRecordModel.getType() != null && antExRecordModel.getType() == 1) { //1 复诊 2 初诊 | |
| 392 | + //复诊就查询上一次产检信息 | |
| 393 | + AntExRecordQuery beforeRecordQuery = new AntExRecordQuery(); | |
| 394 | + beforeRecordQuery.setParentId(antExRecordModel.getParentId()); | |
| 395 | + beforeRecordQuery.setCheckTimeEnd(antExRecordModel.getCheckTime()); | |
| 396 | + //beforeRecordQuery.setNeqId(antExRecordModel.getId()); //模拟多条数据时候观察一下 | |
| 397 | + List<AntExRecordModel> beforeAntRecords = recordService.queryAntExRecords(beforeRecordQuery); | |
| 398 | + if (CollectionUtils.isNotEmpty(beforeAntRecords)) { | |
| 399 | + AntExRecordModel antExRecordModel1 = beforeAntRecords.get(0); | |
| 400 | + //将产检信息添加到这个人产检记录中 | |
| 401 | + valueList.add(antExRecordModel1);// | |
| 402 | + } | |
| 403 | + } | |
| 371 | 404 | |
| 405 | + System.out.println("4----获取单个孕妇产检数--2222----" + valueList.size()); | |
| 406 | + ListSort(valueList); | |
| 407 | + //个人产检信息,统计高危 valueList | |
| 408 | + //遍历个人产检list | |
| 409 | + | |
| 410 | + for (int i = 0; i < valueList.size(); i++) { | |
| 411 | + //获取第一条 | |
| 412 | + AntExRecordModel antExRecordModel1 = valueList.get(i); | |
| 413 | + if (antExRecordModel1.gethRisk() == null && !antExRecordModel1.gethRisk().contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) { | |
| 414 | + continue; | |
| 415 | + } | |
| 416 | + List beforeRiskList = antExRecordModel1.gethRisk(); | |
| 417 | + | |
| 418 | + //这段时间一个孕妇一条初诊产检直接保存跳出 | |
| 419 | + if(antExRecordModel1.getType()==2){ | |
| 420 | + incrHrisk.addAll(beforeRiskList); | |
| 421 | + if(valueList.size() == 1){ | |
| 422 | + break; | |
| 423 | + } | |
| 424 | + } | |
| 425 | + //初诊和复诊,复诊和复诊比对避免超出坐标 | |
| 426 | + if((i + 1) >= valueList.size()){ | |
| 427 | + break; | |
| 428 | + } | |
| 429 | + //获取第二条进行比对 | |
| 430 | + List currentRiskList = valueList.get(i + 1).gethRisk(); | |
| 431 | + for (Object riskId : currentRiskList) { | |
| 432 | + if (!beforeRiskList.contains(riskId)) { | |
| 433 | + incrHrisk.add(String.valueOf(riskId)); | |
| 434 | + } | |
| 435 | + } | |
| 436 | + //不在比对孕妇最后一条 | |
| 437 | + if((i + 2) == valueList.size()){ | |
| 438 | + break; | |
| 439 | + } | |
| 440 | + | |
| 441 | + | |
| 442 | + } | |
| 443 | + } | |
| 444 | + } | |
| 445 | + System.out.println("5-----高危因素id集合-----"+incrHrisk.size()); | |
| 446 | + | |
| 447 | + /*BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); | |
| 448 | + basicConfigQuery.setId(id); | |
| 449 | + List<BasicConfig> riskConfig = basicConfigService.queryBasicConfig(basicConfigQuery); | |
| 450 | + map.put("Name", riskConfig.get(0).getName()); | |
| 451 | + map.put("cardNo", recordModel.getCardNo());*/ | |
| 452 | + | |
| 453 | + } | |
| 454 | + } catch (Exception e) { | |
| 455 | + e.printStackTrace(); | |
| 456 | + } | |
| 457 | + | |
| 458 | + return new BaseListResponse().setData(incrHrisk).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(antExRecordQuery.getPageInfo()); | |
| 459 | + } | |
| 460 | + | |
| 461 | + /** | |
| 462 | + * 功能描述 根据产检时间升序排列 | |
| 463 | + * | |
| 464 | + * @param | |
| 465 | + * @return | |
| 466 | + * @author 武涛涛 | |
| 467 | + * @date 2020/6/4 | |
| 468 | + */ | |
| 469 | + private static void ListSort(List<AntExRecordModel> list) { | |
| 470 | + Collections.sort(list, new Comparator<AntExRecordModel>() { | |
| 471 | + @Override | |
| 472 | + public int compare(AntExRecordModel o1, AntExRecordModel o2) { | |
| 473 | +// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); | |
| 474 | + try { | |
| 475 | +// Date dt1 = format.parse(o1.getCheckTime());//排序字段 | |
| 476 | +// Date dt2 = format.parse(o2.getCheckTime()); | |
| 477 | +// Date dt1 = o1.getCheckTime();//排序字段 | |
| 478 | +// Date dt2 = o2.getCheckTime(); | |
| 479 | + | |
| 480 | + Date dt1 = o1.getCreated();//排序字段 | |
| 481 | + Date dt2 = o2.getCreated(); | |
| 482 | + if (dt1.getTime() > dt2.getTime()) { | |
| 483 | + return 1; | |
| 484 | + } else if (dt1.getTime() < dt2.getTime()) { | |
| 485 | + return -1; | |
| 486 | + } else { | |
| 487 | + return 0; | |
| 488 | + } | |
| 489 | + } catch (Exception e) { | |
| 490 | + e.printStackTrace(); | |
| 491 | + } | |
| 492 | + return 0; | |
| 493 | + } | |
| 494 | + }); | |
| 495 | + } | |
| 496 | + | |
| 497 | + | |
| 372 | 498 | private List<AntExManagerResult> getAntExRecords(List<AntExRecordModel> antExRecordModelList, String hospital, boolean isRegion, Integer isShowDetail) { |
| 373 | 499 | List<AntExManagerResult> data = new ArrayList<>(); |
| 374 | 500 | if (CollectionUtils.isNotEmpty(antExRecordModelList)) { |
| ... | ... | @@ -576,7 +702,7 @@ |
| 576 | 702 | |
| 577 | 703 | public void exportFindAntEx(AntExManagerQueryRequest antExManagerQueryRequest, Integer id, boolean b, HttpServletResponse httpServletResponse) { |
| 578 | 704 | |
| 579 | - BaseListResponse listRep = (BaseListResponse) findList(antExManagerQueryRequest, id, b, null,false); | |
| 705 | + BaseListResponse listRep = (BaseListResponse) findList(antExManagerQueryRequest, id, b, null, false); | |
| 580 | 706 | List<Map<String, Object>> datas = new ArrayList<>(); |
| 581 | 707 | try { |
| 582 | 708 | if (listRep != null) { |
| ... | ... | @@ -645,7 +771,7 @@ |
| 645 | 771 | } |
| 646 | 772 | |
| 647 | 773 | public void exportfindRegionAntEx(AntExManagerQueryRequest antExManagerQueryRequest, Integer id, boolean b, HttpServletResponse httpServletResponse) { |
| 648 | - BaseListResponse listRep = (BaseListResponse) findList(antExManagerQueryRequest, id, b, null,false); | |
| 774 | + BaseListResponse listRep = (BaseListResponse) findList(antExManagerQueryRequest, id, b, null, false); | |
| 649 | 775 | List<Map<String, Object>> datas = new ArrayList<>(); |
| 650 | 776 | try { |
| 651 | 777 | |
| ... | ... | @@ -787,8 +913,8 @@ |
| 787 | 913 | map.put(recordModel.getParentId(), list); |
| 788 | 914 | //初诊直接保存在 初诊list |
| 789 | 915 | if (recordModel.getType() == 2 && CollectionUtils.isNotEmpty(recordModel.gethRisk())) { |
| 790 | - System.out.println("初诊entry.size():" +recordModel.getId()); | |
| 791 | - getGwName(listgw, recordModel,false,null); | |
| 916 | + System.out.println("初诊entry.size():" + recordModel.getId()); | |
| 917 | + getGwName(listgw, recordModel, false, null); | |
| 792 | 918 | //删除map内容 |
| 793 | 919 | map.remove(recordModel.getParentId()); |
| 794 | 920 | } |
| ... | ... | @@ -805,7 +931,7 @@ |
| 805 | 931 | continue; |
| 806 | 932 | } |
| 807 | 933 | //复诊一次 |
| 808 | - System.out.println("复诊一次entry.size():" +entry.size()); | |
| 934 | + System.out.println("复诊一次entry.size():" + entry.size()); | |
| 809 | 935 | if (entry.size() == 1) { |
| 810 | 936 | beforeRecordQuery.setParentId(entry.get(0).getParentId()); |
| 811 | 937 | beforeRecordQuery.setCheckTimeLt(entry.get(0).getCheckTime()); |
| 812 | 938 | |
| ... | ... | @@ -816,11 +942,11 @@ |
| 816 | 942 | List beforeRiskList = twoRecord.gethRisk();//上一次高危 |
| 817 | 943 | for (Object riskId : currentRiskList) { |
| 818 | 944 | if (!beforeRiskList.contains(riskId)) { |
| 819 | - if(riskId==null){ | |
| 945 | + if (riskId == null) { | |
| 820 | 946 | continue; |
| 821 | 947 | } |
| 822 | - if (!entry.isEmpty()){ | |
| 823 | - getGwName(listgw, entry.get(0),true,riskId.toString()); | |
| 948 | + if (!entry.isEmpty()) { | |
| 949 | + getGwName(listgw, entry.get(0), true, riskId.toString()); | |
| 824 | 950 | } |
| 825 | 951 | |
| 826 | 952 | } |
| ... | ... | @@ -829,7 +955,7 @@ |
| 829 | 955 | } |
| 830 | 956 | //复诊多次 |
| 831 | 957 | else { |
| 832 | - System.out.println("复诊多次entry.size():" +entry.size()); | |
| 958 | + System.out.println("复诊多次entry.size():" + entry.size()); | |
| 833 | 959 | List<AntExRecordModel> entry1 = entry; |
| 834 | 960 | for (int i = 0; i < entry1.size(); i++) { |
| 835 | 961 | if (entry1.get(i).getCheckTime() != null) { |
| 836 | 962 | |
| ... | ... | @@ -861,11 +987,11 @@ |
| 861 | 987 | List beforeRiskList = twoRecord.gethRisk();//上一次高危 |
| 862 | 988 | for (Object riskId : currentRiskList) { |
| 863 | 989 | if (!beforeRiskList.contains(riskId)) { |
| 864 | - if(riskId==null){ | |
| 990 | + if (riskId == null) { | |
| 865 | 991 | continue; |
| 866 | 992 | } |
| 867 | - if (!entry.isEmpty()){ | |
| 868 | - getGwName(listgw, entry.get(0),true,riskId.toString()); | |
| 993 | + if (!entry.isEmpty()) { | |
| 994 | + getGwName(listgw, entry.get(0), true, riskId.toString()); | |
| 869 | 995 | } |
| 870 | 996 | } |
| 871 | 997 | } |
| 872 | 998 | |
| ... | ... | @@ -880,11 +1006,11 @@ |
| 880 | 1006 | List beforeRiskList = twoRecord.gethRisk();//上一次高危 |
| 881 | 1007 | for (Object riskId : currentRiskList) { |
| 882 | 1008 | if (!beforeRiskList.contains(riskId)) { |
| 883 | - if(riskId==null){ | |
| 1009 | + if (riskId == null) { | |
| 884 | 1010 | continue; |
| 885 | 1011 | } |
| 886 | - if (!entry.isEmpty()){ | |
| 887 | - getGwName(listgw, entry.get(0),true,riskId.toString()); | |
| 1012 | + if (!entry.isEmpty()) { | |
| 1013 | + getGwName(listgw, entry.get(0), true, riskId.toString()); | |
| 888 | 1014 | } |
| 889 | 1015 | } |
| 890 | 1016 | } |
| ... | ... | @@ -1123,6 +1249,30 @@ |
| 1123 | 1249 | |
| 1124 | 1250 | |
| 1125 | 1251 | /** |
| 1252 | + * 功能描述 把同一个人的产检记录放入集合 | |
| 1253 | + * | |
| 1254 | + * @param | |
| 1255 | + * @return | |
| 1256 | + * @author 武涛涛 | |
| 1257 | + * @date 2020/6/4 | |
| 1258 | + */ | |
| 1259 | + private Map<String, List<AntExRecordModel>> handleAntexRecord2(List<AntExRecordModel> antExRecordModelList) { | |
| 1260 | + Map<String, List<AntExRecordModel>> map = new HashMap<>(); | |
| 1261 | + if (CollectionUtils.isNotEmpty(antExRecordModelList)) { | |
| 1262 | + for (AntExRecordModel recordModel : antExRecordModelList) { | |
| 1263 | + List<AntExRecordModel> list = map.get(recordModel.getParentId()); | |
| 1264 | + if (CollectionUtils.isEmpty(list)) { | |
| 1265 | + list = new ArrayList<>(); | |
| 1266 | + } | |
| 1267 | + list.add(recordModel); | |
| 1268 | + map.put(recordModel.getParentId(), list); | |
| 1269 | + | |
| 1270 | + } | |
| 1271 | + } | |
| 1272 | + return map; | |
| 1273 | + } | |
| 1274 | + | |
| 1275 | + /** | |
| 1126 | 1276 | * 把同一个人的产检记录放入集合 |
| 1127 | 1277 | * |
| 1128 | 1278 | * @param antExRecordModelList |
| ... | ... | @@ -1145,8 +1295,7 @@ |
| 1145 | 1295 | return map; |
| 1146 | 1296 | } |
| 1147 | 1297 | |
| 1148 | - public boolean isOpenAutoSaveAntenatal(String hospitalId) | |
| 1149 | - { | |
| 1298 | + public boolean isOpenAutoSaveAntenatal(String hospitalId) { | |
| 1150 | 1299 | String value = ""; |
| 1151 | 1300 | //查询当前医院是否有配置此权限 |
| 1152 | 1301 | ModularFunctionConfigModel functionConfigModel = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").is(hospitalId)), ModularFunctionConfigModel.class); |
| 1153 | 1302 | |
| 1154 | 1303 | |
| ... | ... | @@ -1165,16 +1314,14 @@ |
| 1165 | 1314 | |
| 1166 | 1315 | |
| 1167 | 1316 | /** |
| 1168 | - * | |
| 1169 | 1317 | * 如果是体重测量在后,就通过测量体重时候去修改产检中的体重 |
| 1318 | + * | |
| 1170 | 1319 | * @param hospitalId |
| 1171 | 1320 | * @param pid |
| 1172 | 1321 | * @param nutritionInfoRequest |
| 1173 | 1322 | */ |
| 1174 | - public void updateAntenatal(String hospitalId,String pid,NutritionInfoRequest nutritionInfoRequest) | |
| 1175 | - { | |
| 1176 | - if (!isOpenAutoSaveAntenatal(hospitalId)) | |
| 1177 | - { | |
| 1323 | + public void updateAntenatal(String hospitalId, String pid, NutritionInfoRequest nutritionInfoRequest) { | |
| 1324 | + if (!isOpenAutoSaveAntenatal(hospitalId)) { | |
| 1178 | 1325 | return; |
| 1179 | 1326 | } |
| 1180 | 1327 | |
| ... | ... | @@ -1333,10 +1480,8 @@ |
| 1333 | 1480 | } |
| 1334 | 1481 | //获取体重记录 |
| 1335 | 1482 | List<PatientWeight> patientWeights = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid).and("yn").is("1")), PatientWeight.class); |
| 1336 | - if (CollectionUtils.isNotEmpty(patientWeights)) | |
| 1337 | - { | |
| 1338 | - for (PatientWeight patientWeight : patientWeights) | |
| 1339 | - { | |
| 1483 | + if (CollectionUtils.isNotEmpty(patientWeights)) { | |
| 1484 | + for (PatientWeight patientWeight : patientWeights) { | |
| 1340 | 1485 | if (patientWeight != null) { |
| 1341 | 1486 | Map<String, String> dayWeights = patientWeight.getDayWeights(); |
| 1342 | 1487 | if (null != dayWeights && dayWeights.size() > 0) { |
| 1343 | 1488 | |
| 1344 | 1489 | |
| 1345 | 1490 | |
| 1346 | 1491 | |
| 1347 | 1492 | |
| ... | ... | @@ -1537,29 +1682,26 @@ |
| 1537 | 1682 | |
| 1538 | 1683 | public BaseResponse getPlanReport(String orderTime, Integer userId) { |
| 1539 | 1684 | |
| 1540 | - Map<String,Object> data = new HashMap<>(); | |
| 1685 | + Map<String, Object> data = new HashMap<>(); | |
| 1541 | 1686 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 1542 | - if (orderTime != null) | |
| 1543 | - { | |
| 1687 | + if (orderTime != null) { | |
| 1544 | 1688 | String[] arrs = orderTime.split(" - "); |
| 1545 | 1689 | Date start = DateUtil.parseYMD(arrs[0]); |
| 1546 | 1690 | Date end = DateUtil.parseYMD(arrs[1]); |
| 1547 | - long count = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end))), CheckItemOrder.class); | |
| 1548 | - data.put("allCount",String.valueOf(count)); | |
| 1691 | + long count = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end))), CheckItemOrder.class); | |
| 1692 | + data.put("allCount", String.valueOf(count)); | |
| 1549 | 1693 | |
| 1550 | 1694 | List<CheckItemConfig> itemConfigs = mongoTemplate.find(Query.query(Criteria.where("hospitalId").is(hospitalId)), CheckItemConfig.class); |
| 1551 | - if (CollectionUtils.isNotEmpty(itemConfigs)) | |
| 1552 | - { | |
| 1695 | + if (CollectionUtils.isNotEmpty(itemConfigs)) { | |
| 1553 | 1696 | List<Map> list = new ArrayList<>(); |
| 1554 | - for (CheckItemConfig item : itemConfigs) | |
| 1555 | - { | |
| 1556 | - long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(item.getId())), CheckItemOrder.class); | |
| 1557 | - Map<String,String> map = new HashMap<>(); | |
| 1558 | - map.put("itemName",item.getName()); | |
| 1559 | - map.put("itemCount",String.valueOf(itemCount)); | |
| 1697 | + for (CheckItemConfig item : itemConfigs) { | |
| 1698 | + long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(item.getId())), CheckItemOrder.class); | |
| 1699 | + Map<String, String> map = new HashMap<>(); | |
| 1700 | + map.put("itemName", item.getName()); | |
| 1701 | + map.put("itemCount", String.valueOf(itemCount)); | |
| 1560 | 1702 | list.add(map); |
| 1561 | 1703 | } |
| 1562 | - data.put("itemList",list); | |
| 1704 | + data.put("itemList", list); | |
| 1563 | 1705 | } |
| 1564 | 1706 | } |
| 1565 | 1707 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setErrormsg("成功"); |
| ... | ... | @@ -1567,7 +1709,7 @@ |
| 1567 | 1709 | |
| 1568 | 1710 | public BaseResponse getActualReport(String checkTime, Integer userId) { |
| 1569 | 1711 | |
| 1570 | - Map<String,Object> data = new HashMap<>(); | |
| 1712 | + Map<String, Object> data = new HashMap<>(); | |
| 1571 | 1713 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 1572 | 1714 | if (checkTime != null) { |
| 1573 | 1715 | String[] arrs = checkTime.split(" - "); |