From 3ea7b2a0d925e0ed13f8a88732a870a63cef0d6a Mon Sep 17 00:00:00 2001
From: zhangchao <allen_adc@sina.com>
Date: Fri, 13 Sep 2024 10:18:59 +0800
Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E4=BA=94=E8=89=B2?=
 =?UTF-8?q?=E4=B8=93=E6=A1=88=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E5=81=A5?=
 =?UTF-8?q?=E5=BA=B7=E3=80=81=E5=85=B6=E5=AE=83=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/RemoteController.java   |  2 +-
 .../operate/web/facade/RiskReportFacade.java       | 50 +++++++++++++++++++++-
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
index e7ec751..2322977 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
@@ -240,7 +240,7 @@ public class RemoteController extends BaseController {
             query.setCreatedStart(start);
             query.setCreatedEnd(end);
         }
-        //大同做特殊处理只查询type为1的
+        //大同做特殊处理type等于1查询需要网络中心确认建档 type为1的不在预约建档中展示
         if ("2100002419".equals(hospitalId)){
             if (type!=null){
                 query.setType("false");
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 1ed2598..2a18ee3 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
@@ -718,9 +718,9 @@ public class RiskReportFacade {
         if (CollectionUtils.isNotEmpty(riskLevelConfig)) {
              riskLevelConfig=addRisk(riskLevelConfig);
             for (BasicConfig levelConfig : riskLevelConfig) {
-                if ("e637b361-99cf-41eb-84f2-f0dab596e928".equals(levelConfig.getId())) {
+              /*  if ("e637b361-99cf-41eb-84f2-f0dab596e928".equals(levelConfig.getId())) {
                     continue;
-                }
+                }*/
                 int allPatientCount=0;
                 patientsQuery.setrLevel(levelConfig.getId());
                 //高危等级
@@ -750,6 +750,48 @@ public class RiskReportFacade {
                     results.add(risk);
                 }
             }
+
+            PatientsQuery query = new PatientsQuery();
+            query.setYn(YnEnums.YES.getId());
+            query.setBuildTypeList(patientsQuery.getBuildTypeList());
+            query.setHospitalId(patientsQuery.getHospitalId());
+            query.setDueStatus(patientsQuery.getDueStatus());
+            //高危等级
+            query.setrLevel(patientsQuery.getrLevel());
+            //产检医生
+            query.setLastCheckEmployeeId(patientsQuery.getLastCheckEmployeeId());
+            query.setDueDateStart(patientsQuery.getDueDateStart());
+            query.setDueDateEnd(patientsQuery.getDueDateEnd());
+            //最后一次检查时间
+            if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getLastCTime())) {
+                String nextDateStr = riskPatientsQueryRequest.getLastCTime();
+                String[] dates = nextDateStr.split(" - ");
+                query.setLastCTimeStart(DateUtil.parseYMD(dates[0]));
+                if (dates.length == 2) {
+                    query.setLastCTimeEnd(DateUtil.parseYMD(dates[1]));
+                }
+            }
+            query.setBookbuildingDateStart(patientsQuery.getBookbuildingDateStart());
+            query.setBookbuildingDateEnd(patientsQuery.getBookbuildingDateEnd());
+            query.setNotoRiskFactor("");
+            query.setoRiskFactor("true");
+            query.setType(patientsQuery.getType());
+            query.setNullrFactor(false);
+
+            //包含国家高危的自定义高危人数
+            int otherPatientCount = patientsService.queryPatientCount(query);
+            if (otherPatientCount>0){
+                RiskReportResult risk = new RiskReportResult();
+                risk.setHighRiskId("otherRiskId");
+                risk.setHighRisk("自定义高危");
+                risk.setLevel(1);
+                risk.setRiskCount(otherPatientCount);
+                Map map = new HashMap();
+                map.put("name", "自定义高危");
+                map.put("color", "risk_white");
+                risk.setHighLevel(Arrays.asList(new Map[]{map}));
+                results.add(risk);
+            }
         }
         return new BaseListResponse()
                 .setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(results);
@@ -809,6 +851,10 @@ public class RiskReportFacade {
                 }else if ("eb146c03-b19f-4e28-b85f-fda574b2283b".equals(rLevel)){
                     Criteria c4 =Criteria.where("riskLevelId").regex(rLevel);
                     c1=c1.andOperator(c4);
+                }else {
+                    List<String> riskLevelIds=new ArrayList<>();
+                    riskLevelIds.add(rLevel);
+                    c1 = c1.and("riskLevelId").is(JsonUtil.array2JsonString(riskLevelIds));
                 }
             }else {
                 List<String> riskLevelIds=new ArrayList<>();
-- 
1.8.3.1