jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d674b5c3d832db3200546cec18d3526371227ad7

Authored by jiangjiazhi
1 parent 963b0c5ade
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

增加查询多项高危

Showing 3 changed files with 19 additions and 2 deletions

platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java View file @ d674b5c
... ... @@ -218,6 +218,19 @@
218 218 private String levelId;
219 219 private String rFactor;
220 220  
  221 + /**
  222 + * 高危因素集合
  223 + */
  224 + private List<String> rFactorList;
  225 +
  226 + public List<String> getrFactorList() {
  227 + return rFactorList;
  228 + }
  229 +
  230 + public void setrFactorList(List<String> rFactorList) {
  231 + this.rFactorList = rFactorList;
  232 + }
  233 +
221 234 public String getrFactor() {
222 235 return rFactor;
223 236 }
... ... @@ -434,6 +447,9 @@
434 447 if (StringUtils.isNotEmpty(levelId)) {
435 448 condition = condition.and("hLevel", levelId, MongoOper.IN);
436 449 }
  450 + if(null!=rFactorList &&!rFactorList.isEmpty()){
  451 + condition = condition.and("hRisk", rFactorList, MongoOper.IN);
  452 + }else
437 453 if (StringUtils.isNotEmpty(rFactor)) {
438 454 condition = condition.and("hRisk", rFactor, MongoOper.IN);
439 455 }
platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java View file @ d674b5c
... ... @@ -819,14 +819,14 @@
819 819 StopWatch stopWatch3 = new StopWatch("SyncWork-" + hospitalId + "-patient-" + patients.getId());
820 820 com.lymsh.mommybaby.maindata.model.Patients mamiPatient = ConvertHelper
821 821 .convertPatient(patients);
822   - if (StringUtils.isNotEmpty(mamiPatient.getPhone())) {
  822 + /* if (StringUtils.isNotEmpty(mamiPatient.getPhone())) {
823 823 MembersQuery membersQuery = new MembersQuery();
824 824 membersQuery.setPhone(mamiPatient.getPhone());
825 825 List<Members> memberses = membersService.queryMembers(membersQuery);
826 826 if (CollectionUtils.isNotEmpty(memberses)) {
827 827 mamiPatient.setMemberId(memberses.get(0).getId());
828 828 }
829   - }
  829 + }*/
830 830  
831 831 mamiPatient.setCrisis(setCric(patients));
832 832 logger.info("aouPatients" + patients.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ d674b5c
... ... @@ -88,6 +88,7 @@
88 88 // antExRecordQuery.setName(antExManagerQueryRequest.getName());
89 89 // antExRecordQuery.setPhone(antExManagerQueryRequest.getPhone());
90 90 antExRecordQuery.setrFactor(antExManagerQueryRequest.getRiskFactorId());
  91 + antExRecordQuery.setrFactorList(com.lyms.platform.common.utils.StringUtils.covertToList(antExManagerQueryRequest.getRiskFactorId(), String.class));
91 92 antExRecordQuery.setLevelId(antExManagerQueryRequest.getLevel());
92 93 antExRecordQuery.setBarCode(antExManagerQueryRequest.getBarCode());
93 94 // antExRecordQuery.setCardNo(antExManagerQueryRequest.getCardNo());