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 99ed609..d10d568 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 @@ -1300,24 +1300,30 @@ public class PatientFacade extends BaseServiceImpl { Query yn = null; - //双绒双羊、单绒单羊、单绒双羊 - if ("1".equals(riskPatientsQueryRequest.getTwinsType())) { - Criteria criteria2 = Criteria.where("name").is("双胎妊娠(双绒双羊)"); - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria2)); - - } else if ("2".equals(riskPatientsQueryRequest.getTwinsType())) { - Criteria criteria2 = Criteria.where("name").is("双胎妊娠(单绒双羊)"); - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria2)); - - } else if ("3".equals(riskPatientsQueryRequest.getTwinsType())) { - Criteria criteria3 = Criteria.where("name").is("双胎妊娠(单绒单羊)"); - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria3)); - } else { - Criteria criteria1 = Criteria.where("name").is("双胎妊娠(双绒双羊)"); - Criteria criteria2 = Criteria.where("name").is("双胎妊娠(单绒双羊)"); - Criteria criteria3 = Criteria.where("name").is("双胎妊娠(单绒单羊)"); - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3)); + if (hospital.equals("2100002419")){ + Criteria criteria4 = Criteria.where("name").is("双胎妊娠"); + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4)); + }else { + //双绒双羊、单绒单羊、单绒双羊 + if ("1".equals(riskPatientsQueryRequest.getTwinsType())) { + Criteria criteria2 = Criteria.where("name").is("双胎妊娠(双绒双羊)"); + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria2)); + + } else if ("2".equals(riskPatientsQueryRequest.getTwinsType())) { + Criteria criteria2 = Criteria.where("name").is("双胎妊娠(单绒双羊)"); + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria2)); + + } else if ("3".equals(riskPatientsQueryRequest.getTwinsType())) { + Criteria criteria3 = Criteria.where("name").is("双胎妊娠(单绒单羊)"); + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria3)); + } else { + Criteria criteria1 = Criteria.where("name").is("双胎妊娠(双绒双羊)"); + Criteria criteria2 = Criteria.where("name").is("双胎妊娠(单绒双羊)"); + Criteria criteria3 = Criteria.where("name").is("双胎妊娠(单绒单羊)"); + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3)); + } } + List models = mongoTemplate.find(yn, BasicConfig.class); List rFactorList = new ArrayList <>(); if (models != null && models.size() > 0) { @@ -1741,6 +1747,7 @@ public class PatientFacade extends BaseServiceImpl { //组合请求 PatientsQuery patientsQuery = new PatientsQuery();//complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion); patientsQuery.setHospitalId(hospital); + patientsQuery.setNeed(needPage); //查询符合条件的孕妇 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital); stopWatch.start(); @@ -1763,7 +1770,6 @@ public class PatientFacade extends BaseServiceImpl { Criteria criteria2 = Criteria.where("name").is("甲减(需药物治疗)"); Criteria criteria3 = Criteria.where("name").is("甲状腺功能减退引起相应系统功能障碍,基础代谢率小于-50%"); Criteria criteria4 = Criteria.where("name").is("甲状腺功能减低(无需药物治疗)"); - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4)); } List models = mongoTemplate.find(yn, BasicConfig.class); @@ -1773,7 +1779,7 @@ public class PatientFacade extends BaseServiceImpl { rFactorList.add(models.get(i).getId()); } } - //TODO 换查询方式,把in改成包含 + patientsQuery.setjFactorList(rFactorList); List patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); stopWatch.stop(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/TwinsPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/TwinsPatientWorker.java index ca394a1..a0cf2cc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/TwinsPatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/TwinsPatientWorker.java @@ -267,7 +267,8 @@ public class TwinsPatientWorker implements Callable> { if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) { if(basicConfig.getName().contains("双绒双羊") || basicConfig.getName().contains("单绒双羊") || - basicConfig.getName().contains("单绒单羊")){ + basicConfig.getName().contains("单绒单羊") || + basicConfig.getName().equals("双胎妊娠")){ sb.append(basicConfig.getName()).append(','); } } @@ -331,7 +332,8 @@ public class TwinsPatientWorker implements Callable> { } } else if (twinsPatientsResult.getrFactor().contains("双绒双羊") || twinsPatientsResult.getrFactor().contains("单绒双羊") || - twinsPatientsResult.getrFactor().contains("单绒单羊")) { + twinsPatientsResult.getrFactor().contains("单绒单羊") || + twinsPatientsResult.getrFactor().equals("双胎妊娠")) { data.add(twinsPatientsResult); } }