jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6b90efab00103fc94c2baa9dc77d1b00a87148bb

Authored by jiangjiazhi
1 parent 5bd38c225e
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

分娩作废产检劵

Showing 1 changed file with 7 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 6b90efa
... ... @@ -272,7 +272,6 @@
272 272 patientsQuery.setLastCheckEmployeeId(riskPatientsQueryRequest.getLastCheckDoctorId());
273 273  
274 274  
275   -
276 275 patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel());
277 276 patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capEnd());
278 277 patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capStart());
... ... @@ -342,7 +341,7 @@
342 341 //王平说的 必须要给区域医院权限，不然他就是蠢逼 201611124 16:41
343 342 hospitalList = new ArrayList<>();
344 343 String hospital = autoMatchFacade.getHospitalId(userId);
345   - if(null!=hospital){
  344 + if (null != hospital) {
346 345 hospitalList.add(hospital);
347 346 }
348 347 DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
... ... @@ -466,7 +465,7 @@
466 465 patientsQuery.setPhone(patientQueryRequest.getPhone());
467 466 patientsQuery.setCardNo(patientQueryRequest.getCardNo());
468 467  
469   - Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), null, patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId,false), -1, false, patientQueryRequest.getPid(),false);
  468 + Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), null, patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), -1, false, patientQueryRequest.getPid(), false);
470 469 PatientBaseResult patientBaseResult = new PatientBaseResult();
471 470 if (null != patients) {
472 471 patientBaseResult.convert(patients);
... ... @@ -498,7 +497,7 @@
498 497 if (end > patientses.size()) {
499 498 end = patientses.size();
500 499 }
501   - listFuture.add(threadPoolExecutor.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService, patientsService,organizationService,basicConfigService)));
  500 + listFuture.add(threadPoolExecutor.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService, patientsService, organizationService, basicConfigService)));
502 501 }
503 502 for (Future f : listFuture) {
504 503 try {
... ... @@ -521,7 +520,7 @@
521 520 if (end > patientses.size()) {
522 521 end = patientses.size();
523 522 }
524   - listFuture.add(threadPoolExecutor.submit(new QuanPatientWorker(patientses.subList(i, end), usersService, hospital, antExService, basicConfigService, patientsService,organizationService)));
  523 + listFuture.add(threadPoolExecutor.submit(new QuanPatientWorker(patientses.subList(i, end), usersService, hospital, antExService, basicConfigService, patientsService, organizationService)));
525 524 }
526 525 for (Future f : listFuture) {
527 526 try {
... ... @@ -549,7 +548,7 @@
549 548 if (end > patientses.size()) {
550 549 end = patientses.size();
551 550 }
552   - listFuture.add(threadPoolExecutor.submit(new WorkHR(patientses.subList(i, end), usersService, hospital, basicConfigService, antExService, patientsService,organizationService)));
  551 + listFuture.add(threadPoolExecutor.submit(new WorkHR(patientses.subList(i, end), usersService, hospital, basicConfigService, antExService, patientsService, organizationService)));
553 552 }
554 553 for (Future f : listFuture) {
555 554 try {
... ... @@ -767,10 +766,8 @@
767 766 patientsQuery.setLimit(patientManagerRequest.getLimit());
768 767 patientsQuery.setPage(patientManagerRequest.getPage());
769 768 }
770   - //在区域组的时候不用查询隐藏档案
771   - if(null!=groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()))){
772   - patientsQuery.setExtEnable(false);
773   - }
  769 + //排查本院隐藏建档
  770 + patientsQuery.setExtEnable(false);
774 771 patientsQuery.setBuildTypeNot(1);
775 772 patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()));
776 773 patientsQuery.setProvinceId(StringUtils.isEmpty(patientManagerRequest.getProvinceRegisterId()) ? null : patientManagerRequest.getProvinceRegisterId());