From c30b271af11a4d3e1a6ec7910d3e5eb0d1d2d605 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Thu, 19 Sep 2024 14:00:17 +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=E9=A1=B5=E9=9D=A2=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BA=94=E8=89=B2=E3=80=81=E6=9C=8D=E5=8A=A1=E5=88=B0?= =?UTF-8?q?=E6=9C=9F=E7=AD=89=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/pojo/AppointmentModel.java | 23 ++++++++++++++ .../web/controller/PatientDtController.java | 36 +++++++++++++++++++--- .../operate/web/facade/RiskReportFacade.java | 12 +++++--- 3 files changed, 61 insertions(+), 10 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AppointmentModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AppointmentModel.java index 3fb4d88..13e6889 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AppointmentModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AppointmentModel.java @@ -5,6 +5,8 @@ package com.lyms.platform.pojo; import org.springframework.data.annotation.Transient; import java.util.Date; +import java.util.List; +import java.util.Map; public class AppointmentModel { private static final long serialVersionUID = 1L; @@ -24,8 +26,29 @@ public class AppointmentModel { private Integer isBuild; @Transient private Date serEndTime; + //服务是否到期 1为是 0为否 + @Transient + private Integer expire; private String pinyin; private Date created; + @Transient + private List rlevel;//高危风险颜色 + + public List getrlevel() { + return rlevel; + } + + public void setrlevel(List rlevel) { + this.rlevel = rlevel; + } + + public Integer getExpire() { + return expire; + } + + public void setExpire(Integer expire) { + this.expire = expire; + } public String getPinyin() { return pinyin; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java index 15d2dca..c525b9b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java @@ -12,6 +12,7 @@ import com.lyms.platform.operate.web.request.AntExAddRequest; import com.lyms.platform.operate.web.request.AntExQueryRequest; import com.lyms.platform.operate.web.request.AntenatalExaminationQueryRequest; import com.lyms.platform.operate.web.request.PatientQueryRequest; +import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.FunvCommonUtil; import com.lyms.platform.operate.web.vo.PatientNiptDTO; @@ -520,7 +521,7 @@ public class PatientDtController { startTime=startTime+" 00:00:00"; endTime=endTime+" 23:59:59"; List modelList= appointmentService.queryAppointment(doctor,startTime,endTime,name,doctorName); - + Date date=new Date(); if (CollectionUtils.isNotEmpty(modelList)){ PatientsQuery patientsQuery =new PatientsQuery(); patientsQuery.setYn(1); @@ -544,14 +545,39 @@ public class PatientDtController { List patientsList= patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(patientsList)){ appointmentModel.setIsBuild(1); - + Patients patients= patientsList.get(0); PatientServiceQuery patientQuery = new PatientServiceQuery(); - patientQuery.setParentid(patientsList.get(0).getId()); + patientQuery.setParentid(patients.getId()); patientQuery.setSerType(1); List patientServices = patientServiceService.queryPatientService(patientQuery); if (CollectionUtils.isNotEmpty(patientServices)){ - appointmentModel.setSerEndTime(patientServices.get(0).getSerEndTime()); + Date serEndTime= patientServices.get(0).getSerEndTime(); + appointmentModel.setSerEndTime(serEndTime); + if (serEndTime.compareTo(date)>0){ + appointmentModel.setExpire(0); + }else { + appointmentModel.setExpire(1); + } + } + + + if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getRiskLevelId()) && !"[]".equals(patients.getRiskLevelId())) { + List level = new ArrayList(); + try { + List list = JsonUtil.patientRiskLevelIdToList(patients.getRiskLevelId()); + for (String str : list) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str); + if (null != basicConfig) { + Map map = new HashMap(); + basicConfig.replenRisk(map); + level.add(map); + } + } + } catch (Exception e) { + ExceptionUtils.catchException(e, "patients.getRiskLevelId error."); + } + appointmentModel.setrlevel(HighScoreResult.filter(level)); } }else { appointmentModel.setIsBuild(0); @@ -609,7 +635,7 @@ public class PatientDtController { }else { params.put("categoryId",categoryId); params.put("type",type); - str= HttpClientUtil.doGet(MEMBER_BABY_URL+"/wx/pc/articles/precise" ,params,"utf-8",null); + str= HttpClientUtil.doGet(MEMBER_BABY_URL+"/wx/pc/articles/precise" ,params,"utf-8",null); } //System.out.println(str); return str; 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 93f9cfe..349e2ae 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 @@ -683,10 +683,10 @@ public class RiskReportFacade { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setHospitalId(hospitalId); + if ("2100002419".equals(hospitalId)){ + patientsQuery.setDtFm(true); + } if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getType())) { - if ("2100002419".equals(hospitalId)){ - patientsQuery.setDtFm(true); - } if ("2".equals(riskPatientsQueryRequest.getType())) { //1孕妇 patientsQuery.setType(1); @@ -802,10 +802,11 @@ public class RiskReportFacade { private MongoQuery getQuery(PatientsQuery patientsQuery){ Criteria c1 = Criteria.where("hospitalId").is(patientsQuery.getHospitalId()).and("yn").is(1); String rLevel=patientsQuery.getrLevel(); + if (patientsQuery.getType()!=null &&patientsQuery.getType()!=-1){ - if (patientsQuery.getType()==1){ + /* if (patientsQuery.getType()==1){ c1=c1.and("dtFm").ne(0); - } + }*/ c1=c1.and("type").is(patientsQuery.getType()); } if (StringUtils.isNotEmpty(patientsQuery.getLastCheckEmployeeId())){ @@ -817,6 +818,7 @@ public class RiskReportFacade { if (null != patientsQuery.getLastCTimeEnd()) { c1 = c1.lte(patientsQuery.getLastCTimeEnd()); } + c1=c1.and("dtFm").ne(0); List buildTypes = new ArrayList(); buildTypes.add(0); buildTypes.add(2); -- 1.8.3.1