diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index 8293975..6009237 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -460,7 +460,7 @@ public class OrganizationController extends BaseController { // continue; // } String hname = organization.getName(); - if (!(hname.contains("医院"))) { + if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")) { continue; } } else if (StringUtils.isNotEmpty(isMaternityManagement) && isMaternityManagement.equalsIgnoreCase("2")) { @@ -468,7 +468,7 @@ public class OrganizationController extends BaseController { // if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) { // continue; // } - if (!(hname.contains("医院"))) { + if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")) { continue; } } else if (StringUtils.isNotEmpty(isMaternityManagement) && isMaternityManagement.equalsIgnoreCase("3")) { @@ -476,12 +476,12 @@ public class OrganizationController extends BaseController { // if ((hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) { // continue; // } - if (!(hname.contains("医院"))) { + if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")) { continue; } }else if (users.getOrgId()==216){ String hname = organization.getName(); - if (!(hname.contains("医院"))) { + if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")) { continue; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java index 7414416..152e09e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java @@ -245,10 +245,10 @@ public class QuanChanPatientWorker implements Callable > { } else { chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName()); } - String hname = chanResult.getFirstBH(); - if ((hname.contains("医院"))) { - /*if ((hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/ - chanResult.setFirstBH(""); + String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName(); + if ((hname.contains("医院"))) {/* if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/ + chanResult.setFirstBH(hname); + } else { chanResult.setCouponCommunity(hname); } } catch (Exception e) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java index 53f9570..1c513c9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java @@ -300,7 +300,7 @@ public class QuanPatientWorker implements Callable> { quanPatientsResult.setAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); try { String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName(); - if (!(hname.contains("医院"))) {/* if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/ + if ((hname.contains("医院"))) {/* if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/ quanPatientsResult.setFirstBH(hname); } else { quanPatientsResult.setCouponCommunity(hname); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java index b00d649..73378a7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java @@ -193,7 +193,7 @@ public class WorkHR implements Callable> { riskPatientsResult.setAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); try { String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName(); - if (!(hname.contains("医院"))) { + if ((hname.contains("医院"))) { // if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) { riskPatientsResult.setFirstBH(hname); } else {