diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java index 97a349e..166d351 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java @@ -22,6 +22,7 @@ public class BabyPatientExtendEarBabyQuery extends BaseQuery { private String hospitalId; private Integer buildType; private String enable; + private String[] enables; private String isEnable; private String noEnable; private Integer yn; @@ -40,6 +41,14 @@ public class BabyPatientExtendEarBabyQuery extends BaseQuery { */ private Date birthEnd; + public String[] getEnables() { + return enables; + } + + public void setEnables(String[] enables) { + this.enables = enables; + } + public String getIsEnable() { return isEnable; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java index d40baf8..23f3c5c 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java @@ -120,6 +120,7 @@ public class BabyPatientExtendEarFollowUpQuery extends BaseQuery { */ private String createId; private String pid; + private String[] pids; /** * 状态 */ @@ -140,6 +141,14 @@ public class BabyPatientExtendEarFollowUpQuery extends BaseQuery { //获取sql语句 private String sqlStr; + public String[] getPids() { + return pids; + } + + public void setPids(String[] pids) { + this.pids = pids; + } + public String getPid() { return pid; } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml index 40635de..7647895 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml @@ -185,6 +185,12 @@ select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,b and enable = #{enable,jdbcType=VARCHAR} + + and enable in + + #{item} + + and enable is null diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml index b9bc8bb..cf130f2 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml @@ -203,6 +203,13 @@ select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,foll and pid = #{pid,jdbcType=VARCHAR} + + + and pid in + + #{item} + + AND ( diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SourceEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SourceEnums.java index a0fac7c..c586ca2 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/SourceEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SourceEnums.java @@ -7,7 +7,7 @@ package com.lyms.platform.common.enums; */ public enum SourceEnums { ISJA(1, "本院"), - ALL(4, "全部"), + // ALL(4, "全部"), ISWJA(2, "外院"); private int id; private String name; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java index 3b0e08f..e8b5563 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java @@ -279,9 +279,9 @@ public class FollowUpController extends BaseController { } //医院ID 集合。本院、外院、全部... - List outOrgids = new ArrayList<>(); + List pids = new ArrayList<>(); if (fur.getSource() != null) { - if (fur.getSource() == 2) {//2.转诊过来的医院、 + if (fur.getSource() == 2) {//2.外院 //转诊过来的医院id HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery(); hchQuery.setTargetType(2);//儿童 @@ -291,38 +291,28 @@ public class FollowUpController extends BaseController { List hchList = highchangeService.queryHighriskChangeHospital(hchQuery); if (hchList != null && hchList.size() > 0) { for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收 - outOrgids.add(hch.getOutOrgid()); + pids.add(hch.getPid()); } } + + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); + babyQuery.setHospitalId(hospitalId); + babyQuery.setEnables(new String[]{"0","1","2"}); + List earBabies = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); + for (BabyPatientExtendEarBaby eb:earBabies){ + pids.add(eb.getPersonId()); + } }else if (fur.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()); - } + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); + babyQuery.setHospitalId(hospitalId); + babyQuery.setIsEnable("1"); + List earBabies = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); + for (BabyPatientExtendEarBaby eb:earBabies){ + pids.add(eb.getPersonId()); } } - } else { - //当前医院 - outOrgids.add(hospitalId); - } - - if(CollectionUtils.isEmpty(outOrgids)){ - return FrontEndResult.ini().setData(new ArrayList()).setPageInfo(query.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); } - query.setCheckHospitalIds((String[]) outOrgids.toArray(new String[outOrgids.size()])); query.setKeyword(fur.getKeyWord()); @@ -359,12 +349,18 @@ public class FollowUpController extends BaseController { query.setNextStartTime(fur.getNextStartTime()); query.setNextEndTime(fur.getNextEndTime()); query.setSource(fur.getSource()); + query.setHospitalId(hospitalId); //分页信息 query.setNeed("1"); query.setSort("create_time"); query.setLimit(fur.getLimit()); query.setPage(fur.getPage()); - + if(CollectionUtils.isNotEmpty(pids)){ + query.setPids((String[]) pids.toArray(new String[pids.size()])); + } + if(CollectionUtils.isEmpty(pids)&&fur.getSource()!=null){ + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); + } List BabyPatientExtendEarFollowUpList = babyPatientExtendEarFollowUpService.queryBabyPatientExtendEarFollowUp(query); List fuResult = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java index 75c25c2..122eb36 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java @@ -462,7 +462,6 @@ public class HearDiagnManageController extends BaseController { //当前登录人医院Id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); - List babyIds = new ArrayList<>(); BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery(); 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 c81a4c6..85baeea 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 @@ -351,6 +351,13 @@ public class HearingDiagnoseController extends BaseController { pids.add(hch.getPid()); } } + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); + babyQuery.setHospitalId(hospitalId); + babyQuery.setEnables(new String[]{"0","1","2"}); + List earBabies = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); + for (BabyPatientExtendEarBaby eb:earBabies){ + pids.add(eb.getPersonId()); + } } else if (hdReq.getSource() == 1) {//1.本院 BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); babyQuery.setHospitalId(hospitalId); @@ -388,11 +395,9 @@ public class HearingDiagnoseController extends BaseController { query.setPids((String[]) pids.toArray(new String[pids.size()])); } if(CollectionUtils.isEmpty(pids)&&hdReq.getSource()!=null){ - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到要删除的数据"); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); } - //设置要查询的babyId - query.setHospitalId(hospitalId); if (hdReq.getDiagnoseStartTime() != null) {//诊断开始时间 query.setDiagnoseStartTime(hdReq.getDiagnoseStartTime()); } @@ -476,6 +481,7 @@ public class HearingDiagnoseController extends BaseController { query.setConfirmEndTime(hdReq.getConfirmEndTime()); } + query.setHospitalId(hospitalId); query.setSort("diagnose_time"); //已经诊断的数据 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java index e348279..7b4b093 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java @@ -111,7 +111,7 @@ public class HighriskChangeHospitalController extends BaseController { List hchResList = disposeHighriskChange(hchList, type); List> results = new ArrayList<>(); - for (int i =0;i result = new LinkedHashMap<>(); result.put("id", i + 1); @@ -131,7 +131,7 @@ public class HighriskChangeHospitalController extends BaseController { result.put("status", ch.getStatus()); results.add(result); } - ResponseUtil.responseExcel(cnames,results, resp); + ResponseUtil.responseExcel(cnames, results, resp); } /** @@ -195,59 +195,114 @@ public class HighriskChangeHospitalController extends BaseController { //设置医院名称 hcOne.setHospitalName(hospitalName); } + + //根据医院id和儿童档案id获取听力筛查记录，获取一次初筛记录和最后一次复筛记录，将初筛和复筛的检测结果显示到转诊申请页。 BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery(); + query.setCheckHospitalId(hospitalId); query.setBabyId(hc.getTargetId()); - //听筛时间 - query.setSort("screen_date"); - //筛查类型 1=初筛 2=复筛 - query.setScreenType(2); - //查询复筛 - List screentList = screenService.queryBabyPatientExtendEarScreen(query); - if (screentList != null && screentList.size() > 0) { - BabyPatientExtendEarScreen scr = screentList.get(screentList.size() - 1); - hcOne.setEndScreen(disposeScreen(scr)); - } - query.setScreenType(1); - //初筛查询 - screentList = screenService.queryBabyPatientExtendEarScreen(query); - if (screentList != null && screentList.size() > 0) { - BabyPatientExtendEarScreen scr = screentList.get(0); - hcOne.setFirstScreen(disposeScreen(scr)); + query.setSort("create_date"); + // d、本院：初筛未通过或复筛确诊 + List screenList = screenService.queryBabyPatientExtendEarScreen(query); + //根据医院ID和babyid查询听筛初筛第一条记录和复筛最后一条记录进行并集。前端显示 + Map map = new HashMap<>(); + //取第一条初筛记录结果 + BabyPatientExtendEarScreen firstScreen = null; + //取复筛记录最后一条结果 + BabyPatientExtendEarScreen endScreen = null; + for (BabyPatientExtendEarScreen es : screenList) { + if (firstScreen == null) { + if (es.getScreenType() == 1) { + firstScreen = es; + } + } + if (es.getScreenType() == 2) { + endScreen = es; + } } - BaseResponse baseResponse = new BaseResponse(); - baseResponse.setObject(hcOne); - return baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); - } + //初筛 + if (firstScreen != null) { + //未通过 + if (firstScreen.getScrIspass() == 2) { + map.put("result", "未通过"); + } else { + map.put("result", "通过"); + } + StringBuffer firstMethod = new StringBuffer(""); + if (firstScreen.getOaeLeft() != null || firstScreen.getOaeRight() != null) { + firstMethod.append("OAE/"); + } + if (firstScreen.getAabrLeft() != null || firstScreen.getAabrRight() != null) { + firstMethod.append("AABR/"); + } - private Map disposeScreen(BabyPatientExtendEarScreen scr) { - //筛查结果通过 - boolean scrRes = true; - Integer oaeLeft = scr.getOaeLeft(); - Integer oaeRight = scr.getOaeRight(); - Integer abarLeft = scr.getAabrLeft(); - Integer abarRight = scr.getAabrRight(); - String screenMethod = ""; - if ((oaeLeft != null && oaeLeft == -1) || (oaeRight != null && oaeRight == -1)) { - scrRes = false; - } - if ((abarLeft != null && abarLeft == -1) || (abarRight != null && abarRight == -1)) { - scrRes = false; - } - if (oaeLeft != null || oaeRight != null) { - screenMethod = "OAE"; - } - if (abarLeft != null || abarRight != null) { - if (StringUtils.isNotEmpty(screenMethod)) { - screenMethod = "OAE、AABR"; + if (firstScreen.getGjb2Del35() != null || firstScreen.getGjb2Del176() != null || firstScreen.getGjb2Del235() != null || firstScreen.getGjb2Del299() != null) { + firstMethod.append("GJB2/"); + } + if (firstScreen.getGjb3Slc26a4538() != null) { + firstMethod.append("GJB3/"); + } + if (firstScreen.getGjb3Slc26a42168() != null || firstScreen.getGjb3Slc26a4Ivs7() != null) { + firstMethod.append("SLC26A4/"); + } + if (firstScreen.getRrna1494() != null || firstScreen.getRrna1555() != null) { + firstMethod.append("线粒体125rRNA/"); + } + String hfString = null; + if (firstMethod.toString().endsWith("/")) { + hfString = firstMethod.substring(0, firstMethod.length() - 1); + } else { + hfString = firstMethod.toString(); + } + //初筛时间 + map.put("screenTime", DateUtil.getyyyy_MM_dd(firstScreen.getScreenDate())); + map.put("screenMethod", hfString); + } + hcOne.setFirstScreen(map); + + Map endMap = new HashMap<>(); + //复筛 + if (endScreen != null) { + //未通过 + if (endScreen.getScrIspass() == 2) { + endMap.put("result", "未通过"); + } else { + endMap.put("result", "通过"); + } + StringBuffer endMethod = new StringBuffer(""); + if (endScreen.getOaeLeft() != null || endScreen.getOaeRight() != null) { + endMethod.append("OAE/"); + } + if (endScreen.getAabrLeft() != null || endScreen.getAabrRight() != null) { + endMethod.append("AABR/"); + } + + if (endScreen.getGjb2Del35() != null || endScreen.getGjb2Del176() != null || endScreen.getGjb2Del235() != null || endScreen.getGjb2Del299() != null) { + endMethod.append("GJB2/"); + } + if (endScreen.getGjb3Slc26a4538() != null) { + endMethod.append("GJB3/"); + } + if (endScreen.getGjb3Slc26a42168() != null || endScreen.getGjb3Slc26a4Ivs7() != null) { + endMethod.append("SLC26A4/"); + } + if (endScreen.getRrna1494() != null || endScreen.getRrna1555() != null) { + endMethod.append("线粒体125rRNA/"); + } + String hfString = null; + if (endMethod.toString().endsWith("/")) { + hfString = endMethod.substring(0, endMethod.length() - 1); } else { - screenMethod = "AABR"; + hfString = endMethod.toString(); } + //初筛时间 + endMap.put("screenTime", DateUtil.getyyyy_MM_dd(endScreen.getScreenDate())); + endMap.put("screenMethod", hfString); } - Map scrMap = new HashMap<>(); - scrMap.put("result", scrRes == true ? "通过" : "未通过"); - scrMap.put("screenMethod", screenMethod); - scrMap.put("screenTime", DateUtil.getyyyy_MM_dd(scr.getScreenDate())); - return scrMap; + + hcOne.setEndScreen(endMap); + BaseResponse baseResponse = new BaseResponse(); + baseResponse.setObject(hcOne); + return baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); } /** @@ -286,13 +341,13 @@ public class HighriskChangeHospitalController extends BaseController { babyQuery.setQueryNo(query.getQueryNo()); //查询建档记录 List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); - if(CollectionUtils.isNotEmpty(models)){ + if (CollectionUtils.isNotEmpty(models)) { List babyIds = new ArrayList<>(); - for(BabyModel babyModel:models){ + for (BabyModel babyModel : models) { babyIds.add(babyModel.getId()); } query.setBabyIds(babyIds.toArray(new String[babyIds.size()])); - }else{ + } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); } } @@ -517,7 +572,7 @@ public class HighriskChangeHospitalController extends BaseController { String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); //建立隐藏档案 - babyEarFacade.addhideBabyEar(obj.getTargetId(),obj.getIntoOrgid(),"0"); + babyEarFacade.addhideBabyEar(obj.getTargetId(), obj.getIntoOrgid(), "0"); if (StringUtil.isBlank(obj.getTargetId())) { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id");