jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b815bb79bffb29c3a59095fc1abc4659e8408453

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

听力诊断模块

Showing 1 changed file with 30 additions and 29 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java View file @ b815bb7
... ... @@ -169,13 +169,13 @@
169 169  
170 170 BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery();
171 171  
172   - // query.setHospitalId(hospitalId);
  172 + query.setHospitalId(hospitalId);
173 173 //当前登录人医院Id
174   - List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
175   - List<String> hospitalIds = new ArrayList<String>();
  174 + // List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
  175 + // List<String> hospitalIds = new ArrayList<String>();
176 176 //加入院组
177   - hospitalIds.addAll(hospiIds);
178   - query.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
  177 + // hospitalIds.addAll(hospiIds);
  178 + // query.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
179 179  
180 180 if (hdReq.getDiagnDoctorId() != null) {//诊断医生
181 181 query.setDiagnDoctorId(hdReq.getDiagnDoctorId());
182 182  
183 183  
... ... @@ -360,13 +360,13 @@
360 360  
361 361 BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery();
362 362  
363   - // query.setHospitalId(hospitalId);
  363 + query.setHospitalId(hospitalId);
364 364 //当前登录人医院Id
365   - List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
366   - List<String> hospitalIds = new ArrayList<String>();
  365 + // List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
  366 + // List<String> hospitalIds = new ArrayList<String>();
367 367 //加入院组
368   - hospitalIds.addAll(hospiIds);
369   - query.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
  368 + // hospitalIds.addAll(hospiIds);
  369 + // query.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
370 370  
371 371 if (hdReq.getDiagnDoctorId() != null) {//诊断医生
372 372 query.setDiagnDoctorId(hdReq.getDiagnDoctorId());
373 373  
374 374  
... ... @@ -564,12 +564,13 @@
564 564 screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
565 565 }
566 566 screenQuery.setStatus(0);
  567 + screenQuery.setCheckHospitalId(hospitalId);
567 568 //当前登录人医院Id
568   - List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
569   - List<String> hospitalIds = new ArrayList<String>();
570   - hospitalIds.addAll(hospiIds);
  569 + // List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
  570 + // List<String> hospitalIds = new ArrayList<String>();
  571 + // hospitalIds.addAll(hospiIds);
571 572 //加入院组
572   - screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
  573 + // screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
573 574  
574 575 //查询全部数据
575 576 List<BabyPatientExtendEarScreen> earScreens = screenService.dubiousScreen(screenQuery);
576 577  
577 578  
... ... @@ -734,13 +735,13 @@
734 735 screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
735 736 }
736 737 screenQuery.setStatus(0);
  738 + screenQuery.setCheckHospitalId(hospitalId);
737 739 //当前登录人医院Id
738   - List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
739   - List<String> hospitalIds = new ArrayList<String>();
740   - hospitalIds.addAll(hospiIds);
  740 + // List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
  741 + // List<String> hospitalIds = new ArrayList<String>();
  742 + // hospitalIds.addAll(hospiIds);
741 743 //加入院组
742   - screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
743   -
  744 + // screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
744 745 //查询全部数据
745 746 List<BabyPatientExtendEarScreen> earScreens = screenService.dubiousScreen(screenQuery);
746 747  
747 748  
... ... @@ -958,12 +959,12 @@
958 959 if (model.getDiagnDoctorId() != null) {
959 960 screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
960 961 }
961   - // screenQuery.setCheckHospitalId(hospitalId);
962   - List<String> hospitalIds = new ArrayList<String>();
  962 + screenQuery.setCheckHospitalId(hospitalId);
  963 + // List<String> hospitalIds = new ArrayList<String>();
963 964 //当前登录人医院Id
964   - List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
965   - hospitalIds.addAll(hospiIds);
966   - screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
  965 + // List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
  966 + // hospitalIds.addAll(hospiIds);
  967 + // screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
967 968 screenQuery.setStatus(0);
968 969  
969 970 //根据儿童条件查询如果为空
970 971  
... ... @@ -1168,12 +1169,12 @@
1168 1169 if (model.getDiagnDoctorId() != null) {
1169 1170 screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
1170 1171 }
1171   - // screenQuery.setCheckHospitalId(hospitalId);
1172   - List<String> hospitalIds = new ArrayList<String>();
  1172 + screenQuery.setCheckHospitalId(hospitalId);
  1173 + // List<String> hospitalIds = new ArrayList<String>();
1173 1174 //当前登录人医院Id
1174   - List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
1175   - hospitalIds.addAll(hospiIds);
1176   - screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
  1175 + // List hospiIds = earFacade.getOrgHospitalIds(hospitalId);
  1176 + // hospitalIds.addAll(hospiIds);
  1177 + // screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
1177 1178 screenQuery.setStatus(0);
1178 1179  
1179 1180 //根据儿童条件查询如果为空