jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c14b4a4867edac7040d9b7f5586cbe05f7b09195

Authored by jesse.wang
2 parents a234c5a4a6 b03b8d156b
Exists in master and in 3 other branches dev, fengning2023-06-06, luanping

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ c14b4a4
... ... @@ -460,7 +460,7 @@
460 460 // continue;
461 461 // }
462 462 String hname = organization.getName();
463   - if (!(hname.contains("医院"))) {
  463 + if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")) {
464 464 continue;
465 465 }
466 466 } else if (StringUtils.isNotEmpty(isMaternityManagement) && isMaternityManagement.equalsIgnoreCase("2")) {
... ... @@ -468,7 +468,7 @@
468 468 // if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
469 469 // continue;
470 470 // }
471   - if (!(hname.contains("医院"))) {
  471 + if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")) {
472 472 continue;
473 473 }
474 474 } else if (StringUtils.isNotEmpty(isMaternityManagement) && isMaternityManagement.equalsIgnoreCase("3")) {
475 475  
... ... @@ -476,12 +476,12 @@
476 476 // if ((hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
477 477 // continue;
478 478 // }
479   - if (!(hname.contains("医院"))) {
  479 + if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")) {
480 480 continue;
481 481 }
482 482 }else if (users.getOrgId()==216){
483 483 String hname = organization.getName();
484   - if (!(hname.contains("医院"))) {
  484 + if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")) {
485 485 continue;
486 486 }
487 487 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java View file @ c14b4a4
... ... @@ -245,10 +245,10 @@
245 245 } else {
246 246 chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName());
247 247 }
248   - String hname = chanResult.getFirstBH();
249   - if ((hname.contains("医院"))) {
250   - /*if ((hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/
251   - chanResult.setFirstBH("");
  248 + String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName();
  249 + if ((hname.contains("医院"))) {/* if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/
  250 + chanResult.setFirstBH(hname);
  251 + } else {
252 252 chanResult.setCouponCommunity(hname);
253 253 }
254 254 } catch (Exception e) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java View file @ c14b4a4
... ... @@ -300,7 +300,7 @@
300 300 quanPatientsResult.setAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
301 301 try {
302 302 String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName();
303   - if (!(hname.contains("医院"))) {/* if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/
  303 + if ((hname.contains("医院"))) {/* if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/
304 304 quanPatientsResult.setFirstBH(hname);
305 305 } else {
306 306 quanPatientsResult.setCouponCommunity(hname);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java View file @ c14b4a4
... ... @@ -193,7 +193,7 @@
193 193 riskPatientsResult.setAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
194 194 try {
195 195 String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName();
196   - if (!(hname.contains("医院"))) {
  196 + if ((hname.contains("医院"))) {
197 197 // if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
198 198 riskPatientsResult.setFirstBH(hname);
199 199 } else {