jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 59027ec44d41859c1a1e2c0ce36599affd6e2981

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

听力诊断模块

Showing 3 changed files with 46 additions and 7 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java View file @ 59027ec
... ... @@ -169,7 +169,13 @@
169 169  
170 170 BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery();
171 171  
172   - query.setHospitalId(hospitalId);
  172 + // query.setHospitalId(hospitalId);
  173 + //当前登录人医院Id
  174 + List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
  175 + List<String> hospitalIds = new ArrayList<String>();
  176 + //加入院组
  177 + hospitalIds.addAll(hospiIds);
  178 + query.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
173 179 if (hdReq.getDiagnDoctorId() != null) {//诊断医生
174 180 query.setDiagnDoctorId(hdReq.getDiagnDoctorId());
175 181 }
... ... @@ -321,7 +327,13 @@
321 327  
322 328 BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery();
323 329  
324   - query.setHospitalId(hospitalId);
  330 + // query.setHospitalId(hospitalId);
  331 + //当前登录人医院Id
  332 + List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
  333 + List<String> hospitalIds = new ArrayList<String>();
  334 + //加入院组
  335 + hospitalIds.addAll(hospiIds);
  336 + query.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
325 337  
326 338 if (hdReq.getDiagnDoctorId() != null) {//诊断医生
327 339 query.setDiagnDoctorId(hdReq.getDiagnDoctorId());
... ... @@ -485,7 +497,6 @@
485 497  
486 498 List<String> babyIds = new ArrayList<>();
487 499  
488   - BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery();
489 500  
490 501 BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery();
491 502 babyQuery.setQueryNo(model.getKeyWord());
... ... @@ -498,6 +509,7 @@
498 509 return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
499 510 }
500 511  
  512 + BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery();
501 513 if (CollectionUtils.isNotEmpty(models)) {
502 514 for (BabyPatientExtendEarBaby pa : models) {
503 515 babyIds.add(pa.getBabyPatientId());
... ... @@ -518,6 +530,13 @@
518 530 screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
519 531 }
520 532 screenQuery.setStatus(0);
  533 + //当前登录人医院Id
  534 + List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
  535 + List<String> hospitalIds = new ArrayList<String>();
  536 + hospitalIds.addAll(hospiIds);
  537 + //加入院组
  538 + screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
  539 +
521 540 //查询全部数据
522 541 List<BabyPatientExtendEarScreen> earScreens = screenService.dubiousScreen(screenQuery);
523 542  
... ... @@ -643,6 +662,12 @@
643 662 if (model.getDiagnDoctorId() != null) {
644 663 screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
645 664 }
  665 + screenQuery.setStatus(0);
  666 + //当前登录人医院Id
  667 + List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
  668 + List<String> hospitalIds = new ArrayList<String>();
  669 + hospitalIds.addAll(hospiIds);
  670 + screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
646 671 //查询全部数据
647 672 List<BabyPatientExtendEarScreen> earScreens = screenService.dubiousScreen(screenQuery);
648 673  
... ... @@ -768,7 +793,12 @@
768 793 if (model.getDiagnDoctorId() != null) {
769 794 screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
770 795 }
771   - screenQuery.setCheckHospitalId(hospitalId);
  796 + // screenQuery.setCheckHospitalId(hospitalId);
  797 + //当前登录人医院Id
  798 + List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
  799 + List<String> hospitalIds = new ArrayList<String>();
  800 + hospitalIds.addAll(hospiIds);
  801 + screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
772 802 List<BabyPatientExtendEarScreen> earScreens = screenService.notAuscultationBabyPatientExtendEarScreen(screenQuery);
773 803 //查询全部数据
774 804 List<HearDiagnManageListResult> hdmResult = new ArrayList<>();
... ... @@ -922,7 +952,7 @@
922 952 //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
923 953 if (StringUtils.isNotEmpty(model.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId
924 954 babyQuery.setQueryNo(model.getKeyWord());
925   - babyQuery.setHospitalId(hospitalId);
  955 + // babyQuery.setHospitalId(hospitalId);
926 956 }
927 957  
928 958 List<BabyPatientExtendEarBaby> babyModels = earBabyService.queryBabyPatientExtendEarBaby(babyQuery);
... ... @@ -937,7 +967,12 @@
937 967 if (model.getDiagnDoctorId() != null) {
938 968 screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
939 969 }
940   - screenQuery.setCheckHospitalId(hospitalId);
  970 + // screenQuery.setCheckHospitalId(hospitalId);
  971 + List<String> hospitalIds = new ArrayList<String>();
  972 + //当前登录人医院Id
  973 + List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
  974 + hospitalIds.addAll(hospiIds);
  975 + screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
941 976 screenQuery.setStatus(0);
942 977  
943 978 //根据儿童条件查询如果为空
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java View file @ 59027ec
... ... @@ -197,7 +197,8 @@
197 197  
198 198 //根据医院id和儿童档案id获取听力筛查记录，获取一次初筛记录和最后一次复筛记录，将初筛和复筛的检测结果显示到转诊申请页。
199 199 BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery();
200   - query.setCheckHospitalId(hospitalId);
  200 + query.setCheckHospitalId(hc.getOutOrgid());
  201 +
201 202 query.setBabyId(hc.getTargetId());
202 203 query.setSort("screen_date");
203 204 // d、本院：初筛未通过或复筛确诊
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ 59027ec
... ... @@ -218,8 +218,11 @@
218 218  
219 219 BabyModel babyModel = babyService.getOneBabyById(babyId);
220 220 String pid = babyModel.getPid();
  221 +
  222 + //根据pid查询
221 223 BabyModelQuery babyQuery = new BabyModelQuery();
222 224 babyQuery.setPid(pid);
  225 + //转诊待接收状态
223 226 babyQuery.setEnable("0");
224 227 babyQuery.setHospitalId(hospitalId);
225 228 List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyQuery);