From 80f0d372fc05ebe89cc4429c29cfc73d1e23c697 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Thu, 22 Aug 2024 10:34:48 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E9=AB=98=E5=8D=B1?= =?UTF-8?q?=E5=9B=A0=E7=B4=A0=E6=9F=A5=E8=AF=A2=E7=A9=BA=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/biz/service/PatientsService.java | 2 +- .../src/main/java/com/lyms/platform/query/PatientsQuery.java | 6 +++--- .../operate/web/controller/PatientServiceController.java | 1 + .../com/lyms/platform/operate/web/facade/PatientFacade.java | 10 +++++++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index dbc9e39..f3910ef 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -132,7 +132,7 @@ public class PatientsService { patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query)); query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit()); } - System.out.println(query.convertToMongoQuery()); + // System.out.println(query.convertToMongoQuery().toString()); return iPatientDao.queryPatient(query.addOrder(Sort.Direction.fromString(sort), field)); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 46984dd..9602dea 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -1329,10 +1329,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } } //高危颜色等级无标记查询 - if (null != noRlevel) { + if (CollectionUtils.isNotEmpty(noRlevel)) { MongoCondition c = MongoCondition.newInstance(); - MongoCondition con1 = MongoCondition.newInstance("riskLevelId", noRlevel, MongoOper.NIN); - MongoCondition con2 = MongoCondition.newInstance("riskLevelId", true, MongoOper.EXISTS); + MongoCondition con1 = MongoCondition.newInstance("riskLevelId", "[]", MongoOper.IS); + MongoCondition con2 = MongoCondition.newInstance("riskLevelId", false, MongoOper.EXISTS); if (c1 != null) { c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria()); } else { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java index 3325fb6..0f13e51 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java @@ -147,6 +147,7 @@ public class PatientServiceController extends BaseController { BaseResponse baseResponse = new BaseResponse(); baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + System.out.println(yxzhVO.getHospitalId()+" HospitalId,"+yxzhVO.getIdno()); try { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setCardNo(yxzhVO.getIdno()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 94054c7..f565218 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -274,6 +274,10 @@ public class PatientFacade extends BaseServiceImpl { patientsQuery.setType(type); if ("2100002419".equals(hospitalId)){ patientsQuery.setHospitalId(hospitalId); + if (type!=3){ + patientsQuery.setDtFm(true); + } + } @@ -375,7 +379,7 @@ public class PatientFacade extends BaseServiceImpl { } else { patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel()); - + patientsQuery.setIsHighRisk(isHighRisk); } patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capEnd()); @@ -423,7 +427,7 @@ public class PatientFacade extends BaseServiceImpl { patientsQuery.setLimit(riskPatientsQueryRequest.getLimit()); patientsQuery.setPage(riskPatientsQueryRequest.getPage()); - patientsQuery.setIsHighRisk(isHighRisk); + patientsQuery.setYn(YnEnums.YES.getId()); // patientsQuery.setBuildType(1); //0 未分娩建档 2 自动分娩类型 http://jira.healthbaby.com.cn/browse/WEB-639 @@ -743,7 +747,7 @@ public class PatientFacade extends BaseServiceImpl { riskPatientsQueryRequest.setSort("6");//按分娩时间排序 riskPatientsQueryRequest.setOrder("1");//降序 //以前逻辑 - // System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); + System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); } stopWatch.stop(); -- 1.8.3.1