Commit d432625adb5aceacb52d631e546835ba7be16813
1 parent
b1de498fd6
Exists in
dev
#fix:优化艾梅乙管理，新增查询条件
Showing 3 changed files with 31 additions and 28 deletions
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
View file @
d432625
| ... | ... | @@ -1428,40 +1428,37 @@ |
| 1428 | 1428 | } |
| 1429 | 1429 | |
| 1430 | 1430 | if(StringUtils.isNotEmpty(diseaseType)){ |
| 1431 | - condition=condition.and("dtAmy",0,MongoOper.IS); | |
| 1432 | - MongoCondition c = MongoCondition.newInstance(); | |
| 1433 | - List <MongoCondition> mongoCondits = new ArrayList <>(); | |
| 1431 | + if(diseaseType.equals("all")){ | |
| 1432 | + condition=condition.and("dtAmy",0,MongoOper.IS); | |
| 1433 | + }else { | |
| 1434 | + condition=condition.and("dtAmy",0,MongoOper.IS); | |
| 1435 | + MongoCondition c = MongoCondition.newInstance(); | |
| 1436 | + List <MongoCondition> mongoCondits = new ArrayList <>(); | |
| 1434 | 1437 | //乙肝查询 |
| 1435 | - // hBcAbJ;//乙肝表面抗原 | |
| 1436 | - // hBeAbJ;//乙肝表面抗体 | |
| 1437 | - // hBeAgj;//乙肝e抗原 | |
| 1438 | - // hBsAbJ;//乙肝e抗体 阳 | |
| 1439 | - // hBsAgJ;//乙肝核心抗体 | |
| 1438 | + // hBcAbJ;//乙肝表面抗原 | |
| 1439 | + // hBeAbJ;//乙肝表面抗体 | |
| 1440 | + // hBeAgj;//乙肝e抗原 | |
| 1441 | + // hBsAbJ;//乙肝e抗体 阳 | |
| 1442 | + // hBsAgJ;//乙肝核心抗体 | |
| 1440 | 1443 | if (diseaseType.equals(DiseaseTypeEnums.YIGAN.getName())) { |
| 1441 | 1444 | mongoCondits.add(new MongoCondition("hBcAbJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBcAbJ", "陽", MongoOper.LIKE))); |
| 1442 | 1445 | mongoCondits.add(new MongoCondition("hBeAbJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBeAbJ", "陽", MongoOper.LIKE))); |
| 1443 | 1446 | mongoCondits.add(new MongoCondition("hBeAgj", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBeAgj", "陽", MongoOper.LIKE))); |
| 1444 | 1447 | mongoCondits.add(new MongoCondition("hBsAbJ", "阴", MongoOper.LIKE)); |
| 1445 | 1448 | mongoCondits.add(new MongoCondition("hBsAgJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBsAgJ", "陽", MongoOper.LIKE))); |
| 1446 | - | |
| 1447 | 1449 | }else if (diseaseType.equals(DiseaseTypeEnums.MEIDU.getName())) { |
| 1448 | - //梅毒查询 | |
| 1449 | - mongoCondits.add(new MongoCondition("tp", "阳", MongoOper.LIKE).orCondition(new MongoCondition("tp", "陽", MongoOper.LIKE))); | |
| 1450 | - mongoCondits.add(new MongoCondition("HIVJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("HIVJ", "陽", MongoOper.LIKE))); | |
| 1451 | - }else { | |
| 1452 | - mongoCondits.add(new MongoCondition("hBcAbJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBcAbJ", "陽", MongoOper.LIKE))); | |
| 1453 | - mongoCondits.add(new MongoCondition("hBeAbJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBeAbJ", "陽", MongoOper.LIKE))); | |
| 1454 | - mongoCondits.add(new MongoCondition("hBeAgj", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBeAgj", "陽", MongoOper.LIKE))); | |
| 1455 | - mongoCondits.add(new MongoCondition("hBsAbJ", "阴", MongoOper.LIKE)); | |
| 1456 | - mongoCondits.add(new MongoCondition("hBsAgJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBsAgJ", "陽", MongoOper.LIKE))); | |
| 1457 | - mongoCondits.add(new MongoCondition("tp", "阳", MongoOper.LIKE).orCondition(new MongoCondition("tp", "陽",MongoOper.LIKE))); | |
| 1458 | - mongoCondits.add(new MongoCondition("HIVJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("HIVJ", "陽", MongoOper.LIKE))); | |
| 1450 | + //梅毒查询 | |
| 1451 | + mongoCondits.add(new MongoCondition("tp", "阳", MongoOper.LIKE)); | |
| 1452 | + mongoCondits.add(new MongoCondition("HIVJ", "阳", MongoOper.LIKE)); | |
| 1453 | + // mongoCondits.add(new MongoCondition("HIVJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("HIVJ", "陽", MongoOper.LIKE))); | |
| 1459 | 1454 | } |
| 1460 | - if (c1 != null) { | |
| 1461 | - c1 = c1.andOperator(c.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])).getCriteria()); | |
| 1462 | - } else { | |
| 1463 | - c1 = c.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])).getCriteria(); | |
| 1455 | + if (c1 != null) { | |
| 1456 | + c1 = c1.andOperator(c.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])).getCriteria()); | |
| 1457 | + } else { | |
| 1458 | + c1 = c.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])).getCriteria(); | |
| 1459 | + } | |
| 1464 | 1460 | } |
| 1461 | + | |
| 1465 | 1462 | } |
| 1466 | 1463 | if (existRiskLevel) { |
| 1467 | 1464 | MongoCondition c = MongoCondition.newInstance(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
View file @
d432625
| ... | ... | @@ -621,7 +621,7 @@ |
| 621 | 621 | return patientFacade.patientGuildSms(patientGuideSmsRequest, loginState.getId()); |
| 622 | 622 | } |
| 623 | 623 | /** |
| 624 | - * 艾梅乙孕妇管理 | |
| 624 | + * 艾梅乙孕妇消息条数 | |
| 625 | 625 | * |
| 626 | 626 | * @return 返回结果 |
| 627 | 627 | */ |
| 628 | 628 | |
| ... | ... | @@ -643,9 +643,11 @@ |
| 643 | 643 | @RequestMapping(value = "/queryAmyPatients", method = RequestMethod.GET) |
| 644 | 644 | @ResponseBody |
| 645 | 645 | @TokenRequired |
| 646 | - public BaseResponse queryAmyPatients(String diseaseType,Integer page,Integer limit, HttpServletRequest request){ | |
| 646 | + public BaseResponse queryAmyPatients(String diseaseType,Integer page, | |
| 647 | + Integer limit, | |
| 648 | + String queryNo,String doctor,HttpServletRequest request){ | |
| 647 | 649 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 648 | - return patientFacade.queryAmyPatients(loginState.getId(),diseaseType,page,limit); | |
| 650 | + return patientFacade.queryAmyPatients(loginState.getId(),diseaseType,page,limit,queryNo,doctor); | |
| 649 | 651 | } |
| 650 | 652 | /** |
| 651 | 653 | * 区域高危孕妇管理 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
d432625
| ... | ... | @@ -724,16 +724,20 @@ |
| 724 | 724 | * @param userId |
| 725 | 725 | * @return |
| 726 | 726 | */ |
| 727 | - public BaseResponse queryAmyPatients(Integer userId,String diseaseType,Integer page,Integer limit){ | |
| 727 | + public BaseResponse queryAmyPatients(Integer userId,String diseaseType, | |
| 728 | + Integer page,Integer limit,String queryNo,String checkDoctor){ | |
| 728 | 729 | String hospital = autoMatchFacade.getHospitalId(userId); |
| 729 | 730 | PatientsQuery patientsQuery =new PatientsQuery(); |
| 730 | 731 | patientsQuery.setDtFm(true); |
| 732 | + patientsQuery.setNeed("true"); | |
| 731 | 733 | patientsQuery.setPage(page); |
| 732 | 734 | patientsQuery.setLimit(limit); |
| 733 | 735 | patientsQuery.setHospitalId(hospital); |
| 734 | 736 | patientsQuery.setYn(1); |
| 735 | 737 | patientsQuery.setType(1); |
| 736 | 738 | patientsQuery.setDiseaseType(diseaseType); |
| 739 | + patientsQuery.setQueryNo(queryNo); | |
| 740 | + patientsQuery.setLastCheckEmployeeId(checkDoctor); | |
| 737 | 741 | List <Patients> patientses = patientsService.queryPatient(patientsQuery); |
| 738 | 742 | List data = convertToQuanPatient(patientses, userId, hospital); |
| 739 | 743 | return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(patientsQuery.getPageInfo()); |