Commit 3ea7b2a0d925e0ed13f8a88732a870a63cef0d6a
1 parent
0aa855fe4a
Exists in
dev
#fix:优化五色专案管理新增健康、其它查询
Showing 2 changed files with 49 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
View file @
3ea7b2a
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
View file @
3ea7b2a
| ... | ... | @@ -718,9 +718,9 @@ |
| 718 | 718 | if (CollectionUtils.isNotEmpty(riskLevelConfig)) { |
| 719 | 719 | riskLevelConfig=addRisk(riskLevelConfig); |
| 720 | 720 | for (BasicConfig levelConfig : riskLevelConfig) { |
| 721 | - if ("e637b361-99cf-41eb-84f2-f0dab596e928".equals(levelConfig.getId())) { | |
| 721 | + /* if ("e637b361-99cf-41eb-84f2-f0dab596e928".equals(levelConfig.getId())) { | |
| 722 | 722 | continue; |
| 723 | - } | |
| 723 | + }*/ | |
| 724 | 724 | int allPatientCount=0; |
| 725 | 725 | patientsQuery.setrLevel(levelConfig.getId()); |
| 726 | 726 | //高危等级 |
| ... | ... | @@ -750,6 +750,48 @@ |
| 750 | 750 | results.add(risk); |
| 751 | 751 | } |
| 752 | 752 | } |
| 753 | + | |
| 754 | + PatientsQuery query = new PatientsQuery(); | |
| 755 | + query.setYn(YnEnums.YES.getId()); | |
| 756 | + query.setBuildTypeList(patientsQuery.getBuildTypeList()); | |
| 757 | + query.setHospitalId(patientsQuery.getHospitalId()); | |
| 758 | + query.setDueStatus(patientsQuery.getDueStatus()); | |
| 759 | + //高危等级 | |
| 760 | + query.setrLevel(patientsQuery.getrLevel()); | |
| 761 | + //产检医生 | |
| 762 | + query.setLastCheckEmployeeId(patientsQuery.getLastCheckEmployeeId()); | |
| 763 | + query.setDueDateStart(patientsQuery.getDueDateStart()); | |
| 764 | + query.setDueDateEnd(patientsQuery.getDueDateEnd()); | |
| 765 | + //最后一次检查时间 | |
| 766 | + if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getLastCTime())) { | |
| 767 | + String nextDateStr = riskPatientsQueryRequest.getLastCTime(); | |
| 768 | + String[] dates = nextDateStr.split(" - "); | |
| 769 | + query.setLastCTimeStart(DateUtil.parseYMD(dates[0])); | |
| 770 | + if (dates.length == 2) { | |
| 771 | + query.setLastCTimeEnd(DateUtil.parseYMD(dates[1])); | |
| 772 | + } | |
| 773 | + } | |
| 774 | + query.setBookbuildingDateStart(patientsQuery.getBookbuildingDateStart()); | |
| 775 | + query.setBookbuildingDateEnd(patientsQuery.getBookbuildingDateEnd()); | |
| 776 | + query.setNotoRiskFactor(""); | |
| 777 | + query.setoRiskFactor("true"); | |
| 778 | + query.setType(patientsQuery.getType()); | |
| 779 | + query.setNullrFactor(false); | |
| 780 | + | |
| 781 | + //包含国家高危的自定义高危人数 | |
| 782 | + int otherPatientCount = patientsService.queryPatientCount(query); | |
| 783 | + if (otherPatientCount>0){ | |
| 784 | + RiskReportResult risk = new RiskReportResult(); | |
| 785 | + risk.setHighRiskId("otherRiskId"); | |
| 786 | + risk.setHighRisk("自定义高危"); | |
| 787 | + risk.setLevel(1); | |
| 788 | + risk.setRiskCount(otherPatientCount); | |
| 789 | + Map map = new HashMap(); | |
| 790 | + map.put("name", "自定义高危"); | |
| 791 | + map.put("color", "risk_white"); | |
| 792 | + risk.setHighLevel(Arrays.asList(new Map[]{map})); | |
| 793 | + results.add(risk); | |
| 794 | + } | |
| 753 | 795 | } |
| 754 | 796 | return new BaseListResponse() |
| 755 | 797 | .setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(results); |
| ... | ... | @@ -809,6 +851,10 @@ |
| 809 | 851 | }else if ("eb146c03-b19f-4e28-b85f-fda574b2283b".equals(rLevel)){ |
| 810 | 852 | Criteria c4 =Criteria.where("riskLevelId").regex(rLevel); |
| 811 | 853 | c1=c1.andOperator(c4); |
| 854 | + }else { | |
| 855 | + List<String> riskLevelIds=new ArrayList<>(); | |
| 856 | + riskLevelIds.add(rLevel); | |
| 857 | + c1 = c1.and("riskLevelId").is(JsonUtil.array2JsonString(riskLevelIds)); | |
| 812 | 858 | } |
| 813 | 859 | }else { |
| 814 | 860 | List<String> riskLevelIds=new ArrayList<>(); |