diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnoseQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnoseQuery.java index ff27c02..037dffe 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnoseQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnoseQuery.java @@ -32,7 +32,7 @@ public class BabyPatientExtendEarHearingDiagnoseQuery extends BaseQuery { /** * 要显示的医院集合 */ - private List checkHospitalIds; + private String[] checkHospitalIds; /** * 诊断时间 */ @@ -450,11 +450,11 @@ public class BabyPatientExtendEarHearingDiagnoseQuery extends BaseQuery { */ private Date confirmEndTime; - public List getCheckHospitalIds() { + public String[] getCheckHospitalIds() { return checkHospitalIds; } - public void setCheckHospitalIds(List checkHospitalIds) { + public void setCheckHospitalIds(String[] checkHospitalIds) { this.checkHospitalIds = checkHospitalIds; } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml index 4cab8d3..9c3bfb5 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml @@ -810,10 +810,11 @@ select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_ on hd.baby_id = sc.baby_id - and sc.check_hospital_id in - - #{item} + and sc.check_hospital_id in ( + + #{hsId} + ) /*诊断日期*/ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index 66e2a75..158bbae 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -94,7 +94,7 @@ public class HearingDiagnoseController extends BaseController { HighriskChangeHospitalQuery hcQuery = new HighriskChangeHospitalQuery(); hcQuery.setIntoOrgid(hospitalId); hcQuery.setTargetId(babyId); - List hospitalIds = new ArrayList<>(); + List hospitalIds = new ArrayList(); hospitalIds.add(hospitalId); List hchList = highchangeService.queryHighriskChangeHospital(hcQuery); if(hchList.size()>0){ @@ -102,7 +102,7 @@ public class HearingDiagnoseController extends BaseController { hospitalIds.add(h.getOutOrgid()); } } - query.setCheckHospitalIds(hospitalIds); + query.setCheckHospitalIds((String[])hospitalIds.toArray(new String[hospitalIds.size()])); List behdList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(query); List> list = new ArrayList<>(); @@ -219,7 +219,7 @@ public class HearingDiagnoseController extends BaseController { } //设置要显示的医院集合 - query.setCheckHospitalIds(outOrgids); + // query.setCheckHospitalIds(outOrgids); //根据当前医院id,和已接受儿童档案的转入医院id 进行查询 if (hdReq.getEnalble() == 2) {//2待诊断,查询听筛记录,还未做听诊的 diff --git a/platform-operate-api/src/main/webapp/WEB-INF/web.xml b/platform-operate-api/src/main/webapp/WEB-INF/web.xml index 95bdcb9..c56d423 100644 --- a/platform-operate-api/src/main/webapp/WEB-INF/web.xml +++ b/platform-operate-api/src/main/webapp/WEB-INF/web.xml @@ -87,6 +87,41 @@ dispatcher / + + + CorsFilter + org.apache.catalina.filters.CorsFilter + + cors.allowed.origins + * + + + cors.allowed.methods + GET,POST,HEAD,OPTIONS,PUT,DELETE + + + cors.allowed.headers + Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers,authorization + + + cors.exposed.headers + Access-Control-Allow-Origin,Access-Control-Allow-Credentials + + + cors.support.credentials + true + + + cors.preflight.maxage + 10 + + + + CorsFilter + /* + + + perfFilter com.lyms.platform.common.perf.SimpleHttpPerfFilter