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 037dffe..f72af4d 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 @@ -5,7 +5,6 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.pojo.BabyModel; import java.util.Date; -import java.util.List; public class BabyPatientExtendEarHearingDiagnoseQuery extends BaseQuery { @@ -24,7 +23,7 @@ public class BabyPatientExtendEarHearingDiagnoseQuery extends BaseQuery { /** * 儿童档案id */ - private List babyIds; + private String[] babyIds; /** * 创建医院ID */ @@ -842,11 +841,11 @@ public class BabyPatientExtendEarHearingDiagnoseQuery extends BaseQuery { this.oaeRight750 = oaeRight750; } - public List getBabyIds() { + public String[] getBabyIds() { return babyIds; } - public void setBabyIds(List babyIds) { + public void setBabyIds(String[] babyIds) { this.babyIds = babyIds; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java index afa5263..c6251b1 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java @@ -10,7 +10,7 @@ import java.util.List; public class BabyPatientExtendEarScreenQuery extends BaseQuery { private String id; //听诊儿童档案集合 - private List babyIds; + private String[] babyIds; private String babyId; @@ -174,11 +174,11 @@ public class BabyPatientExtendEarScreenQuery extends BaseQuery { } - public List getBabyIds() { + public String[] getBabyIds() { return babyIds; } - public void setBabyIds(List babyIds) { + public void setBabyIds(String[] babyIds) { this.babyIds = babyIds; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarHearingDiagnoseService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarHearingDiagnoseService.java index 57f3e8e..99ac459 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarHearingDiagnoseService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarHearingDiagnoseService.java @@ -21,7 +21,7 @@ public interface BabyPatientExtendEarHearingDiagnoseService { public List queryBabyPatientExtendEarHearingDiagnose(BabyPatientExtendEarHearingDiagnoseQuery query); /** - * ѯϡϡԺԺ.... + * 查询待诊断、已诊断、本院、外院等.... * @param query * @return */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java index 1cf10c5..e0fe8f2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java @@ -65,6 +65,7 @@ public class EarController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/initFollowUp") @ResponseBody + @TokenRequired public BaseResponse initFollowUp(String babyId) { if (StringUtils.isNotEmpty(babyId)) {//传入儿童档案id return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id"); @@ -123,6 +124,7 @@ public class EarController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/initHearingDiagnose") @ResponseBody + @TokenRequired public BaseResponse initHearingDiagnose(String babyId, HttpServletRequest request) { //获取当前登录用户ID LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); @@ -132,7 +134,7 @@ public class EarController extends BaseController { //当前登录人医院Id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); - if (StringUtils.isNotEmpty(babyId)) {//传入儿童档案id + if (StringUtils.isEmpty(babyId)) {//传入儿童档案id return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id"); } @@ -183,6 +185,7 @@ public class EarController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/initHighrChangeHosp") @ResponseBody + @TokenRequired public BaseResponse initHighrChangeHosp(String babyId, HttpServletRequest request) { //根据babyId和当前医院id //获取当前登录用户ID 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 158bbae..42340c5 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 @@ -135,12 +135,53 @@ public class HearingDiagnoseController extends BaseController { if (loginState == null) { return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); } + + //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id + if (hdReq.getKeyWord() != null) {//关键字：姓名、联系方式、就诊卡 + //调用mysql表查询baby档案。 表还未设计 + } + //当前登录人医院Id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); + //医院ID 集合。本院、外院、全部... + List outOrgids = new ArrayList<>(); + if (hdReq.getSource() == 2) {//2.转诊过来的医院、 + //转诊过来的医院id + HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery(); + hchQuery.setTargetType(2);//儿童 + hchQuery.setChangeType(1);//听力转诊 + hchQuery.setStatus(2);//已接受 + hchQuery.setIntoOrgid(hospitalId); + List hchList = highchangeService.queryHighriskChangeHospital(hchQuery); + if (hchList != null && hchList.size() > 0) { + for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收 + outOrgids.add(hch.getOutOrgid()); + } + } + } else if (hdReq.getSource() == 1) {//1.本院 + //当前医院 + outOrgids.add(hospitalId); + } else {//4.全部医院/默认全部医院 + //当前医院 + outOrgids.add(hospitalId); + //转诊过来的医院id + HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery(); + hchQuery.setTargetType(2);//儿童 + hchQuery.setChangeType(1);//听力转诊 + hchQuery.setStatus(2);//已接受 + hchQuery.setIntoOrgid(hospitalId); + List hchList = highchangeService.queryHighriskChangeHospital(hchQuery); + if (hchList != null && hchList.size() > 0) { + for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收 + outOrgids.add(hch.getOutOrgid()); + } + } + } + BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery(); - //设置分页信息 - query.setLimit(hdReq.getLimit()); - query.setPage(hdReq.getPage()); + //设置要显示的医院集合（已加入条件本院、外院、全部） + query.setCheckHospitalIds((String[])outOrgids.toArray(new String[outOrgids.size()])); + if (hdReq.getDiagnoseStartTime() != null) {//诊断开始时间 query.setDiagnoseStartTime(hdReq.getDiagnoseStartTime()); } @@ -179,47 +220,7 @@ public class HearingDiagnoseController extends BaseController { query.setConfirmEndTime(hdReq.getConfirmEndTime()); } - //医院ID 集合。本院、外院、全部... - List outOrgids = new ArrayList<>(); - if (hdReq.getSource() == 2) {//2.*医院、 - //转诊过来的医院id - HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery(); - hchQuery.setTargetType(2);//儿童 - hchQuery.setChangeType(1);//听力转诊 - hchQuery.setStatus(2);//已接受 - hchQuery.setIntoOrgid(hospitalId); - List hchList = highchangeService.queryHighriskChangeHospital(hchQuery); - if (hchList != null && hchList.size() > 0) { - for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收 - outOrgids.add(hch.getOutOrgid()); - } - } - } else if (hdReq.getSource() == 1) {//1.本院 - //当前医院 - outOrgids.add(hospitalId); - } else {//4.全部医院/默认全部医院 - //当前医院 - outOrgids.add(hospitalId); - //转诊过来的医院id - HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery(); - hchQuery.setTargetType(2);//儿童 - hchQuery.setChangeType(1);//听力转诊 - hchQuery.setStatus(2);//已接受 - hchQuery.setIntoOrgid(hospitalId); - List hchList = highchangeService.queryHighriskChangeHospital(hchQuery); - if (hchList != null && hchList.size() > 0) { - for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收 - outOrgids.add(hch.getOutOrgid()); - } - } - } - - if (hdReq.getKeyWord() != null) {//关键字：姓名、联系方式、就诊卡 - //调用mysql表查询baby档案。 表还未设计 - } - //设置要显示的医院集合 - // query.setCheckHospitalIds(outOrgids); //根据当前医院id，和已接受儿童档案的转入医院id 进行查询 if (hdReq.getEnalble() == 2) {//2待诊断，查询听筛记录，还未做听诊的 diff --git a/platform-operate-api/src/main/resources/rebel.xml b/platform-operate-api/src/main/resources/rebel.xml index f73dc5c..149fd02 100644 --- a/platform-operate-api/src/main/resources/rebel.xml +++ b/platform-operate-api/src/main/resources/rebel.xml @@ -1,14 +1,14 @@ - + - + - +