liquanyu / regional-platform

Download as
Browse Code »

Commit 927e441406deaea416a4c37c236b0ec46eadc6b6

Authored by yangfei
2 parents 6f40d10d1a 37eb90b70e
Exists in master and in 1 other branch dev

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 927e441
... ... @@ -22,6 +22,7 @@
22 22 import com.lyms.platform.permission.service.UsersService;
23 23 import com.lyms.platform.pojo.*;
24 24 import com.lyms.platform.query.AntExRecordQuery;
  25 +import com.lyms.platform.query.BasicConfigQuery;
25 26 import com.lyms.platform.query.DataPermissionsModelQuery;
26 27 import com.lyms.platform.query.PatientsQuery;
27 28 import org.apache.commons.collections.CollectionUtils;
... ... @@ -672,7 +673,7 @@
672 673 List currentRiskList = oneRecord.gethRisk();
673 674 List beforeRiskList = twoRecord.gethRisk();
674 675  
675   - if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && getConditionRisk(request.getRiskFactorId(),currentRiskList))
  676 + if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && getConditionRisk(request.getRiskFactorId(),currentRiskList,request.getLevel()))
676 677 {
677 678 ids.add(oneRecord.getId());
678 679 incriskMap.put(oneRecord.getId(), currentRiskList);
... ... @@ -687,7 +688,7 @@
687 688 incrHrisk.add(riskId);
688 689 }
689 690 }
690   - if (CollectionUtils.isNotEmpty(incrHrisk) && getConditionRisk(request.getRiskFactorId(),incrHrisk))
  691 + if (CollectionUtils.isNotEmpty(incrHrisk) && getConditionRisk(request.getRiskFactorId(),incrHrisk,request.getLevel()))
691 692 {
692 693 ids.add(oneRecord.getId());
693 694 incriskMap.put(oneRecord.getId(), incrHrisk);
... ... @@ -696,8 +697,12 @@
696 697 }
697 698 else
698 699 {
699   - ids.add(oneRecord.getId());
700   - incriskMap.put(oneRecord.getId(), oneRecord.gethRisk());
  700 + if (CollectionUtils.isNotEmpty(oneRecord.gethRisk()) && getConditionRisk(request.getRiskFactorId(),
  701 + oneRecord.gethRisk(),request.getLevel()))
  702 + {
  703 + ids.add(oneRecord.getId());
  704 + incriskMap.put(oneRecord.getId(), oneRecord.gethRisk());
  705 + }
701 706 }
702 707 }
703 708 }
... ... @@ -715,7 +720,7 @@
715 720  
716 721 List currentRiskList = oneRecord.gethRisk();
717 722 List beforeRiskList = twoRecord.gethRisk();
718   - if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && getConditionRisk(request.getRiskFactorId(),currentRiskList))
  723 + if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && getConditionRisk(request.getRiskFactorId(),currentRiskList,request.getLevel()))
719 724 {
720 725 ids.add(oneRecord.getId());
721 726 incriskMap.put(oneRecord.getId(), currentRiskList);
722 727  
... ... @@ -730,10 +735,11 @@
730 735 incrHrisk.add(String.valueOf(riskId));
731 736 }
732 737 }
733   - if (CollectionUtils.isNotEmpty(incrHrisk) && getConditionRisk(request.getRiskFactorId(),incrHrisk))
  738 + if (CollectionUtils.isNotEmpty(incrHrisk) && getConditionRisk(request.getRiskFactorId(),incrHrisk,request.getLevel()))
734 739 {
735   - ids.add(oneRecord.getId());
736   - incriskMap.put(oneRecord.getId(), incrHrisk);
  740 +
  741 + ids.add(oneRecord.getId());
  742 + incriskMap.put(oneRecord.getId(), incrHrisk);
737 743 }
738 744 }
739 745 }
... ... @@ -749,7 +755,7 @@
749 755 pageAntExRecordsQuery.setPage(request.getPage());
750 756 pageAntExRecordsQuery.setLimit(request.getLimit());
751 757 pageAntExRecordsQuery.setIds(ids);
752   - pageAntExRecordsQuery.setLevelId(request.getLevel());
  758 + //pageAntExRecordsQuery.setLevelId(request.getLevel());
753 759  
754 760  
755 761 List<AntExRecordModel> pageAntExRecords = recordService.queryAntExRecords(pageAntExRecordsQuery);
756 762  
757 763  
758 764  
... ... @@ -764,13 +770,31 @@
764 770 return pageAntExRecords;
765 771 }
766 772  
767   - private boolean getConditionRisk(String riskId,List<String> incrHrisk)
  773 +
  774 + private boolean isExistsLevel(String level,List<String> incrHrisk)
768 775 {
  776 + if (StringUtils.isNotEmpty(level))
  777 + {
  778 + BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
  779 + basicConfigQuery.setIds(incrHrisk);
  780 + basicConfigQuery.setParentId(level);
  781 + List<BasicConfig> configs = basicConfigService.queryBasicConfig(basicConfigQuery);
  782 + if (CollectionUtils.isNotEmpty(configs))
  783 + {
  784 + return true;
  785 + }
  786 + return false;
  787 + }
  788 + return true;
  789 + }
  790 +
  791 + private boolean getConditionRisk(String riskId,List<String> incrHrisk,String level)
  792 + {
769 793 if (StringUtils.isEmpty(riskId))
770 794 {
771   - return true;
  795 + return true && isExistsLevel(level,incrHrisk);
772 796 }
773   - return incrHrisk.contains(riskId);
  797 + return incrHrisk.contains(riskId) && isExistsLevel(level,incrHrisk);
774 798 }
775 799  
776 800  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 927e441
... ... @@ -366,6 +366,19 @@
366 366 {
367 367 sieveApplyOrderModel.setId(sieveApplyOrderAddRequest.getId());
368 368 applyOrderService.updateSieve(sieveApplyOrderModel);
  369 +
  370 + SieveQuery sieveQuery = new SieveQuery();
  371 + sieveQuery.setYn(YnEnums.YES.getId());
  372 + sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId());
  373 + List<SieveModel> sieveModels = sieveService.queryList(sieveQuery);
  374 + if (CollectionUtils.isNotEmpty(sieveModels)) {
  375 + SieveModel sieveModel = sieveModels.get(0);
  376 + if (sieveModel.getSieveHospitalId() != null && !sieveModel.getSieveHospitalId().equals(sieveApplyOrderAddRequest.getSieveHospitalId()))
  377 + {
  378 + sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId());
  379 + sieveService.updateOneChanQianDiaSieve(sieveModel);
  380 + }
  381 + }
369 382 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功");
370 383 }
371 384  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java View file @ 927e441
... ... @@ -361,9 +361,10 @@
361 361  
362 362 /**
363 363 * 历史检验检查的查看页面
364   - *
365   - * @param vcCardNo
366   - * @param phone
  364 + * @param vcCardNo 就诊卡
  365 + * @param phone 手机号码
  366 + * @param cardNo 身份证
  367 + * @param perType
367 368 * @param model
368 369 * @return
369 370 */
... ... @@ -371,7 +372,7 @@
371 372  
372 373 List<LisReportModel> reportModelList = new ArrayList<>();
373 374 //通过就诊卡号和医院id查询到医院下面的lis记录
374   - if (StringUtils.isNotEmpty(vcCardNo)) {
  375 + if (StringUtils.isNotEmpty(vcCardNo) || StringUtils.isNotEmpty(cardNo)) {
375 376 //德州市妇幼
376 377 if ("1000000114".equals(model.getHospitalId())) {
377 378 model.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo));
... ... @@ -402,6 +403,10 @@
402 403 else if("2100001097".equals(model.getHospitalId())){
403 404 model.setVcCardNo(gryyHisService.getIdByVcCardNo(vcCardNo));
404 405 }
  406 + //隆化县妇幼保健院 lis数据的就诊卡字段保存的病人的身份证号值
  407 + else if("2100001605".equals(model.getHospitalId())){
  408 + model.setVcCardNo(cardNo);
  409 + }
405 410 else {
406 411 model.setVcCardNo(vcCardNo);
407 412 }
... ... @@ -542,6 +547,12 @@
542 547 }
543 548 //仪陇县人民医院 就诊卡号字段存的身份证号码
544 549 else if ("2100001718".equals(pat.getHospitalId())) {
  550 + vcCardNos.add(pat.getCardNo());
  551 +
  552 + }
  553 + //隆化县妇幼保健院 lis数据的就诊卡字段保存的病人的身份证号值
  554 + else if("2100001605".equals(pat.getHospitalId()))
  555 + {
545 556 vcCardNos.add(pat.getCardNo());
546 557 }else {
547 558 vcCardNos.add(pat.getVcCardNo());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 927e441
... ... @@ -118,13 +118,13 @@
118 118 SieveQuery sieveQuery = new SieveQuery();
119 119 sieveQuery.setParentId(sieveAddRequest.getParentId());
120 120 sieveQuery.setYn(YnEnums.YES.getId());
121   - String hospitalId = autoMatchFacade.getHospitalId(userId);
  121 +// String hospitalId = autoMatchFacade.getHospitalId(userId);
122 122 // sieveQuery.setHospitalId(hospitalId);
123 123 List<SieveModel> list = sieveService.queryList(sieveQuery);
124 124 SieveModel sieveModel = new SieveModel();
125 125 sieveModel.setStatus(3);
126 126 sieveModel.setId(list.get(0).getId());
127   - sieveModel.setHospitalId(hospitalId);
  127 + //sieveModel.setHospitalId(hospitalId);
128 128 sieveModel.setZtfx(sieveAddRequest.getMax());
129 129 sieveModel.setResultTime(sieveResultModel.getResultTime());
130 130  
... ... @@ -263,8 +263,8 @@
263 263 SieveApplyOrderQuery sieveQuery = new SieveApplyOrderQuery();
264 264 sieveQuery.setYn(YnEnums.YES.getId());
265 265 sieveQuery.setParentId(id);
266   - String hospital = autoMatchFacade.getHospitalId(userId);
267   - sieveQuery.setHospitalId(hospital);
  266 + //String hospital = autoMatchFacade.getHospitalId(userId);
  267 + //sieveQuery.setHospitalId(hospital);
268 268 List<SieveApplyOrderModel> applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveQuery);
269 269 List list = new ArrayList();
270 270 if (CollectionUtils.isNotEmpty(applyOrderModels)) {