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 6b08fd2..cc1f06b 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 @@ -70,7 +70,7 @@ public class EarController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/checkBabyFollowUp") @ResponseBody @TokenRequired - public BaseResponse checkBabyFollowUp(String babyId, HttpServletRequest request){ + public BaseResponse checkBabyFollowUp(String babyId, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); if (loginState == null) { @@ -87,7 +87,7 @@ public class EarController extends BaseController { //当前登录人医院Id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); //获取机构内同一儿童babyIds - List babyIds = babyEarFacade.getBabyIdsByItemOrg(babyId,hospitalId); + List babyIds = babyEarFacade.getBabyIdsByItemOrg(babyId, hospitalId); query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()])); List followUpList = babyPatientExtendEarFollowUpService.queryBabyPatientExtendEarFollowUp(query); //是否结案 @@ -140,362 +140,368 @@ public class EarController extends BaseController { break; } } - if (!isConfirm) {// //若没有听诊记录或所有听诊记录都未确诊。提示：该儿童还未听力确诊，不能进行随访。 - return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童听诊记录还未有确诊记录不能进行随访"); - } - //根据条件查询基础配置信息表 - return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + if (!isConfirm) {// //若没有听诊记录或所有听诊记录都未确诊。提示：该儿童还未听力确诊，不能进行随访。 + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童听诊记录还未有确诊记录不能进行随访"); } + //根据条件查询基础配置信息表 + return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + } - /** - * 进入新增听筛初始化数据 - * - * @return - */ - @RequestMapping(method = RequestMethod.GET, value = "/initScreen") - @ResponseBody - @TokenRequired - public BaseResponse initScreen () { - //根据条件查询基础配置信息表 - InitScreen initScreen = new InitScreen(); - initScreen.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class)); - initScreen.setDeafEnumsResult(DeafEnums.getDeafEnums()); - return initScreen.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); - } + /** + * 进入新增听筛初始化数据 + * + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/initScreen") + @ResponseBody + @TokenRequired + public BaseResponse initScreen() { + //根据条件查询基础配置信息表 + InitScreen initScreen = new InitScreen(); + initScreen.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class)); + initScreen.setDeafEnumsResult(DeafEnums.getDeafEnums()); + return initScreen.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + } - /** - * 检测儿童是否能够听筛 - * - * @param babyId 儿童档案id - * @return - */ - @RequestMapping(method = RequestMethod.GET, value = "/checkBabySrccen") - @ResponseBody - @TokenRequired - public BaseResponse checkBabySrccen (String babyId, HttpServletRequest request){ - - LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - if (loginState == null) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); - } + /** + * 检测儿童是否能够听筛 + * + * @param babyId 儿童档案id + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/checkBabySrccen") + @ResponseBody + @TokenRequired + public BaseResponse checkBabySrccen(String babyId, HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + if (loginState == null) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); + } - if (StringUtils.isEmpty(babyId)) {//传入儿童档案id - return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id"); - } - //当前登录人医院Id - String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); - //查询儿童听力基础信息 - //根据babyId查询是否存 - BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); + if (StringUtils.isEmpty(babyId)) {//传入儿童档案id + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id"); + } + //当前登录人医院Id + String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); - List babyIds = babyEarFacade.getBabyIdsByItemOrg(babyId,hospitalId); - earQuery.setBabyPatientIds((String[]) babyIds.toArray(new String[babyIds.size()])); + //查询儿童听力基础信息 + //根据babyId查询是否存 + BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); - //获取院内医院集合 - List hospiIds = babyEarFacade.getOrgHospitalIds(hospitalId); - earQuery.setCreateHospitalIds((String[]) hospiIds.toArray(new String[hospiIds.size()])); + List babyIds = babyEarFacade.getBabyIdsByItemOrg(babyId, hospitalId); + earQuery.setBabyPatientIds((String[]) babyIds.toArray(new String[babyIds.size()])); - List babyPatientExtendEars = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); - //是否听力建档 - if (CollectionUtils.isEmpty(babyPatientExtendEars)) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童还未完善听力建档"); - } + //获取院内医院集合 + List hospiIds = babyEarFacade.getOrgHospitalIds(hospitalId); + earQuery.setCreateHospitalIds((String[]) hospiIds.toArray(new String[hospiIds.size()])); - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + List babyPatientExtendEars = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); + //是否听力建档 + if (CollectionUtils.isEmpty(babyPatientExtendEars)) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童还未完善听力建档"); } - /** - * 进入新增随访记录页面前，验证及初始化数据 - * - * @return - */ - @RequestMapping(method = RequestMethod.GET, value = "/initFollowUp") - @ResponseBody - @TokenRequired - public BaseResponse initFollowUp () { - //根据条件查询基础配置信息表 - InitFollowUp initHearingDiagnose = new InitFollowUp(); - initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class)); - return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + } + + /** + * 进入新增随访记录页面前，验证及初始化数据 + * + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/initFollowUp") + @ResponseBody + @TokenRequired + public BaseResponse initFollowUp() { + //根据条件查询基础配置信息表 + InitFollowUp initHearingDiagnose = new InitFollowUp(); + initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class)); + return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + } + + /** + * 听力诊断列表管理初始化数据 + * + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/initHearingDiagnoseListData") + @ResponseBody + @TokenRequired + public BaseResponse initHearingDiagnoseListData() { + InitHearingDiagnoseListData baseResponse = new InitHearingDiagnoseListData(); + //状态 + baseResponse.setStatus(EnumUtil.toJson(HdEnums.StatusEnums.class)); + baseResponse.setSource(EnumUtil.toJson(HdEnums.SourceEnums.class)); + baseResponse.setIsConfirm(EnumUtil.toJson(HdEnums.IsConfirmEnums.class)); + baseResponse.setConfirmResult(EnumUtil.toJson(HdEnums.ConfirmResultEnums.class)); + baseResponse.setConfirmLevel(EnumUtil.toJson(HdEnums.ConfirmLevelEnums.class)); + return baseResponse; + } + + /** + * 进入新增听力诊断页面前，验证及初始化数据 + * + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/initHearingDiagnose") + @ResponseBody + public BaseResponse initHearingDiagnose(String babyId) { + //根据条件查询基础配置信息表 + InitHearingDiagnose initHearingDiagnose = new InitHearingDiagnose(); + initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class)); + initHearingDiagnose.setHearingDiagnosis(EnumUtil.toJson(HearingDiagnosisEnums.class)); + initHearingDiagnose.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class)); + initHearingDiagnose.setHandlingSuggestion(HdEnums.getHandlingSuggestionEnums()); + + //查询最后一次听诊时间 + //查询听诊记录 + BabyPatientExtendEarHearingDiagnoseQuery hdQuery = new BabyPatientExtendEarHearingDiagnoseQuery(); + hdQuery.setBabyId(babyId); + hdQuery.setSort("diagnose_time"); + List hdList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(hdQuery); + if (CollectionUtils.isNotEmpty(hdList)) { + BabyPatientExtendEarHearingDiagnose ehd = hdList.get(hdList.size() - 1); + initHearingDiagnose.setDiagnoseTime(DateUtil.getyyyy_MM_dd(ehd.getDiagnoseTime())); } + return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + } - /** - * 听力诊断列表管理初始化数据 - * - * @return - */ - @RequestMapping(method = RequestMethod.GET, value = "/initHearingDiagnoseListData") - @ResponseBody - @TokenRequired - public BaseResponse initHearingDiagnoseListData () { - InitHearingDiagnoseListData baseResponse = new InitHearingDiagnoseListData(); - //状态 - baseResponse.setStatus(EnumUtil.toJson(HdEnums.StatusEnums.class)); - baseResponse.setSource(EnumUtil.toJson(HdEnums.SourceEnums.class)); - baseResponse.setIsConfirm(EnumUtil.toJson(HdEnums.IsConfirmEnums.class)); - baseResponse.setConfirmResult(EnumUtil.toJson(HdEnums.ConfirmResultEnums.class)); - baseResponse.setConfirmLevel(EnumUtil.toJson(HdEnums.ConfirmLevelEnums.class)); - return baseResponse; + /** + * 进入新增听力诊断页面前，验证及初始化数据 + * + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/checkHearingDiagnose") + @ResponseBody + @TokenRequired + public BaseResponse checkHearingDiagnose(String babyId, HttpServletRequest request) { + + //获取当前登录用户ID + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + if (loginState == null) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); } + //当前登录人医院Id + String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); - /** - * 进入新增听力诊断页面前，验证及初始化数据 - * - * @return - */ - @RequestMapping(method = RequestMethod.GET, value = "/initHearingDiagnose") - @ResponseBody - public BaseResponse initHearingDiagnose (String babyId){ - //根据条件查询基础配置信息表 - InitHearingDiagnose initHearingDiagnose = new InitHearingDiagnose(); - initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class)); - initHearingDiagnose.setHearingDiagnosis(EnumUtil.toJson(HearingDiagnosisEnums.class)); - initHearingDiagnose.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class)); - initHearingDiagnose.setHandlingSuggestion(HdEnums.getHandlingSuggestionEnums()); - - //查询最后一次听诊时间 - //查询听诊记录 - BabyPatientExtendEarHearingDiagnoseQuery hdQuery = new BabyPatientExtendEarHearingDiagnoseQuery(); - hdQuery.setBabyId(babyId); - hdQuery.setSort("diagnose_time"); - List hdList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(hdQuery); - if (CollectionUtils.isNotEmpty(hdList)) { - BabyPatientExtendEarHearingDiagnose ehd = hdList.get(hdList.size() - 1); - initHearingDiagnose.setDiagnoseTime(DateUtil.getyyyy_MM_dd(ehd.getDiagnoseTime())); - } - return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + if (StringUtils.isEmpty(babyId)) {//传入儿童档案id + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id"); } - /** - * 进入新增听力诊断页面前，验证及初始化数据 - * - * @return - */ - @RequestMapping(method = RequestMethod.GET, value = "/checkHearingDiagnose") - @ResponseBody - @TokenRequired - public BaseResponse checkHearingDiagnose (String babyId, HttpServletRequest request){ - - //获取当前登录用户ID - LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - if (loginState == null) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); - } - //当前登录人医院Id - String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); + BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery(); + List babyIds = babyEarFacade.getBabyIdsByItemOrg(babyId, hospitalId); - if (StringUtils.isEmpty(babyId)) {//传入儿童档案id - return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id"); + query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()])); + // d、本院：初筛未通过或复筛确诊 + List screenList = screenService.queryBabyPatientExtendEarScreen(query); + if (screenList == null || screenList.size() == 0) {//没有听筛记录，查询转诊记录 + //查询听力转诊申请 // e、外院：有申请记录则允许进行新增听力筛查 + HighriskChangeHospitalQuery hcQuery = new HighriskChangeHospitalQuery(); + hcQuery.setIntoOrgid(hospitalId); + hcQuery.setTargetId(babyId); + List hchList = highchangeService.queryHighriskChangeHospital(hcQuery); + if (hchList == null || hchList.size() == 0) {//没有找到听力转诊申请 + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童还未完成听力筛查，不能进行听诊"); } - - BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery(); - List babyIds = babyEarFacade.getBabyIdsByItemOrg(babyId,hospitalId); - - query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()])); - // d、本院：初筛未通过或复筛确诊 - List screenList = screenService.queryBabyPatientExtendEarScreen(query); - if (screenList == null || screenList.size() == 0) {//没有听筛记录，查询转诊记录 - //查询听力转诊申请 // e、外院：有申请记录则允许进行新增听力筛查 - HighriskChangeHospitalQuery hcQuery = new HighriskChangeHospitalQuery(); - hcQuery.setIntoOrgid(hospitalId); - hcQuery.setTargetId(babyId); - List hchList = highchangeService.queryHighriskChangeHospital(hcQuery); - if (hchList == null || hchList.size() == 0) {//没有找到听力转诊申请 - return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童还未完成听力筛查，不能进行听诊"); - } - } else { - boolean isResu = false; - for (BabyPatientExtendEarScreen scr : screenList) { - if(scr.getScrIspass()==2&&scr.getScreenType()==2){//是复筛并且未通过 - isResu = true; - break; - } - } - if (!isResu) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童听筛已通过，不能进行听力诊断"); + } else { + boolean isResu = false; + for (BabyPatientExtendEarScreen scr : screenList) { + if (scr.getScrIspass() == 2 && scr.getScreenType() == 2) {//是复筛并且未通过 + isResu = true; + break; } } + if (!isResu) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童听筛已通过，不能进行听力诊断"); + } + } - //根据条件查询基础配置信息表 - InitHearingDiagnose initHearingDiagnose = new InitHearingDiagnose(); - // initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class)); - // - // initHearingDiagnose.setHearingDiagnosis(EnumUtil.toJson(HearingDiagnosisEnums.class)); - // - // initHearingDiagnose.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class)); + //根据条件查询基础配置信息表 + InitHearingDiagnose initHearingDiagnose = new InitHearingDiagnose(); + // initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class)); + // + // initHearingDiagnose.setHearingDiagnosis(EnumUtil.toJson(HearingDiagnosisEnums.class)); + // + // initHearingDiagnose.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class)); - return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); - } + return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + } - /** - * 随访模块列表管理初始化数据 - * - * @return - */ - @RequestMapping(method = RequestMethod.GET, value = "/initHighrFollowUpData") - @ResponseBody - @TokenRequired - public BaseResponse initHighrFollowUpData () { - InitFollowUpListData initFollowUpListData = new InitFollowUpListData(); - //确诊结果 - initFollowUpListData.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class)); - //是否结案 - initFollowUpListData.setIsClose(EnumUtil.toJson(IsCloseEnums.class)); - //来源 - initFollowUpListData.setSource(EnumUtil.toJson(SourceEnums.class)); - //干预治疗 - initFollowUpListData.setTreatment(EnumUtil.toJson(TreatmentEnums.class)); - return initFollowUpListData.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + /** + * 随访模块列表管理初始化数据 + * + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/initHighrFollowUpData") + @ResponseBody + @TokenRequired + public BaseResponse initHighrFollowUpData() { + InitFollowUpListData initFollowUpListData = new InitFollowUpListData(); + //确诊结果 + initFollowUpListData.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class)); + //是否结案 + initFollowUpListData.setIsClose(EnumUtil.toJson(IsCloseEnums.class)); + //来源 + initFollowUpListData.setSource(EnumUtil.toJson(SourceEnums.class)); + //干预治疗 + initFollowUpListData.setTreatment(EnumUtil.toJson(TreatmentEnums.class)); + return initFollowUpListData.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + } + + /** + * 进入新增听力转诊页面前，验证及初始化数据 + * + * @param babyId 儿童档案ID + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/initHighrChangeHosp") + @ResponseBody + @TokenRequired + public BaseResponse initHighrChangeHosp(String babyId, HttpServletRequest request) { + //根据babyId和当前医院id + //获取当前登录用户ID + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + if (loginState == null) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); } + //医院id + String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); - /** - * 进入新增听力转诊页面前，验证及初始化数据 - * - * @param babyId 儿童档案ID - * @return - */ - @RequestMapping(method = RequestMethod.GET, value = "/initHighrChangeHosp") - @ResponseBody - @TokenRequired - public BaseResponse initHighrChangeHosp (String babyId, HttpServletRequest request){ - //根据babyId和当前医院id - //获取当前登录用户ID - LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - if (loginState == null) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); + //根据医院id和儿童档案id获取听力筛查记录，获取一次初筛记录和最后一次复筛记录，将初筛和复筛的检测结果显示到转诊申请页。 + BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery(); + query.setCheckHospitalId(hospitalId); + query.setBabyId(babyId); + query.setStatus(0); + query.setSort("create_date"); + // d、本院：初筛未通过或复筛确诊 + List screenList = screenService.queryBabyPatientExtendEarScreen(query); + if (screenList == null && screenList.size() == 0) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("该儿童还未听筛记录不能进行听力转诊"); + } + //根据医院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; + } } - //医院id - String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); - - //根据医院id和儿童档案id获取听力筛查记录，获取一次初筛记录和最后一次复筛记录，将初筛和复筛的检测结果显示到转诊申请页。 - BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery(); - query.setCheckHospitalId(hospitalId); - query.setBabyId(babyId); - query.setStatus(0); - query.setSort("create_date"); - // d、本院：初筛未通过或复筛确诊 - List screenList = screenService.queryBabyPatientExtendEarScreen(query); - if (screenList == null && screenList.size() == 0) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("该儿童还未听筛记录不能进行听力转诊"); + if (es.getScreenType() == 2) { + endScreen = es; } - //根据医院ID和babyid查询听筛初筛第一条记录和复筛最后一条记录进行并集。前端显示 - Map map = new HashMap<>(); - //取第一条初筛记录结果 - BabyPatientExtendEarScreen firstScreen = screenList.get(0); + } + - if (firstScreen.getOaeLeft() == null) { - firstScreen.setOaeLeft(1); + //初筛 + if (firstScreen != null) { + //未通过 + if (firstScreen.getScrIspass() == 2) { + map.put("firstResu", "未通过"); + } else { + map.put("firstResu", "通过"); } - if (firstScreen.getOaeRight() == null) { - firstScreen.setOaeRight(1); + StringBuffer firstMethod = new StringBuffer(""); + if (firstScreen.getOaeLeft() != null || firstScreen.getOaeRight() != null) { + firstMethod.append("OAE/"); } - if (firstScreen.getAabrLeft() == null) { - firstScreen.setAabrLeft(1); + if (firstScreen.getAabrLeft() != null || firstScreen.getAabrRight() != null) { + firstMethod.append("AABR/"); } - if (firstScreen.getAabrRight() == null) { - firstScreen.setAabrRight(1); + + if (firstScreen.getGjb2Del35() != null || firstScreen.getGjb2Del176() != null || firstScreen.getGjb2Del235() != null || firstScreen.getGjb2Del299() != null) { + firstMethod.append("GJB2/"); } - //初筛未通过 - StringBuffer firstResu = new StringBuffer(); - if (firstScreen.getOaeLeft() == -1 || firstScreen.getOaeRight() == -1 || firstScreen.getAabrLeft() == -1 || firstScreen.getAabrRight() == -1) {//oae未通过 - firstResu.append("未通过("); + if (firstScreen.getGjb3Slc26a4538() != null) { + firstMethod.append("GJB3/"); } - if ((firstScreen.getOaeLeft() == -1 || firstScreen.getAabrLeft() == -1) && (firstScreen.getOaeRight() == -1 || firstScreen.getAabrRight() == -1)) {//oae未通过 - firstResu.append("双耳"); - } else if (firstScreen.getOaeLeft() == -1 || firstScreen.getAabrLeft() == -1) {//oae未通过 - firstResu.append("左耳"); - } else if (firstScreen.getOaeRight() == -1 || firstScreen.getAabrRight() == -1) {//aabr未通过 - firstResu.append("右耳"); + if (firstScreen.getGjb3Slc26a42168() != null || firstScreen.getGjb3Slc26a4Ivs7() != null) { + firstMethod.append("SLC26A4/"); } - if (StringUtils.isNotEmpty(firstResu.toString())) { - firstResu.append(")"); + if (firstScreen.getRrna1494() != null || firstScreen.getRrna1555() != null) { + firstMethod.append("线粒体125rRNA/"); } - - map.put("firstResu", firstResu.toString()); - if ((firstScreen.getOaeLeft() == -1 || firstScreen.getOaeRight() == -1) && (firstScreen.getAabrLeft() == -1 || firstScreen.getAabrRight() == -1)) { - map.put("firstMethod", "OAE/AABR"); - } else if (firstScreen.getOaeLeft() == -1 || firstScreen.getOaeRight() == -1) { - map.put("firstMethod", "OAE"); - } else if (firstScreen.getAabrLeft() == -1 || firstScreen.getAabrRight() == -1) { - map.put("firstMethod", "AABR"); + String hfString = null; + if (firstMethod.toString().endsWith("/")) { + hfString = firstMethod.substring(0, firstMethod.length() - 1); + } else { + hfString = firstMethod.toString(); } //初筛时间 map.put("firstTime", DateUtil.getyyyy_MM_dd(firstScreen.getScreenDate())); + map.put("firstMethod", hfString); + } - if (screenList.size() > 1) { - //取复筛记录最后一条结果 - BabyPatientExtendEarScreen endScreen = screenList.get(screenList.size() - 1); - //初筛未通过 - StringBuffer endResu = new StringBuffer(); - if ((endScreen.getOaeLeft() != null && endScreen.getOaeLeft() == -1) || (endScreen.getOaeRight() != null && endScreen.getOaeRight() == -1) || (endScreen.getAabrLeft() != null && endScreen.getAabrLeft() == -1) || (endScreen.getAabrRight() != null && endScreen.getAabrRight() == -1)) {//oae未通过 - endResu.append("未通过("); - } - if (((endScreen.getOaeLeft() != null && endScreen.getOaeLeft() == -1) || (endScreen.getAabrLeft() != null && endScreen.getAabrLeft() == -1)) && ((endScreen.getOaeRight() != null && endScreen.getOaeRight() == -1) || (endScreen.getAabrRight() != null && endScreen.getAabrRight() == -1))) {//oae未通过 - endResu.append("双耳"); - - } else if ((endScreen.getOaeLeft() != null && endScreen.getOaeLeft() == -1) || (endScreen.getAabrLeft() != null && endScreen.getAabrLeft() == -1)) {//oae未通过 - endResu.append("左耳"); - } else if ((endScreen.getOaeRight() != null && endScreen.getOaeRight() == -1) || (endScreen.getAabrRight() != null && endScreen.getAabrRight() == -1)) {//aabr未通过 - endResu.append("右耳"); - } - if (StringUtils.isNotEmpty(endResu.toString())) { - endResu.append(")"); - } - - map.put("endResu", endResu.toString()); - - if (endScreen.getOaeLeft() == null) { - endScreen.setOaeLeft(1); - } - if (endScreen.getOaeRight() == null) { - endScreen.setOaeRight(1); - } - if (endScreen.getAabrLeft() == null) { - endScreen.setAabrLeft(1); - } - if (endScreen.getAabrRight() == null) { - endScreen.setAabrRight(1); - } - - if ((endScreen.getOaeLeft() == -1 || endScreen.getOaeRight() == -1) && (endScreen.getAabrLeft() == -1 || endScreen.getAabrRight() == -1)) { - map.put("endMethod", "OAE/AABR"); - } else if (endScreen.getOaeLeft() == -1 || endScreen.getOaeRight() == -1) { - map.put("endMethod", "OAE"); - } else if (endScreen.getAabrLeft() == -1 || endScreen.getAabrRight() == -1) { - map.put("endMethod", "AABR"); - } - //初筛时间 - map.put("endTime", DateUtil.getyyyy_MM_dd(endScreen.getScreenDate())); + //复筛 + if (endScreen != null) { + //未通过 + if (endScreen.getScrIspass() == 2) { + map.put("endResu", "未通过"); + } else { + map.put("endResu", "通过"); + } + StringBuffer endMethod = new StringBuffer(""); + if (endScreen.getOaeLeft() != null || endScreen.getOaeRight() != null) { + endMethod.append("OAE/"); + } + if (endScreen.getAabrLeft() != null || endScreen.getAabrRight() != null) { + endMethod.append("AABR/"); } - BaseResponse baseResp = new BaseResponse(); - baseResp.setObject(map); - return baseResp.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); - } - /** - * 添加儿童建档 - * - * @return - */ - @RequestMapping(method = RequestMethod.POST) - @ResponseBody - @TokenRequired - public BaseObjectResponse add (BabyPatientExtendEar ear, BabyPatientExtendEarBirth earBirth, - BabyPatientExtendEarMother earMother, BabyPatientExtendEarFamily earFamily, HttpServletRequest request){ - return babyPatientExtendEarService.insert(ear, earBirth, earMother, earFamily, getUserId(request)); + 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 { + hfString = endMethod.toString(); + } + //初筛时间 + map.put("endTime", DateUtil.getyyyy_MM_dd(endScreen.getScreenDate())); + map.put("endMethod", hfString); } + BaseResponse baseResp = new BaseResponse(); + baseResp.setObject(map); + return baseResp.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + } - /** - * 获取 添加儿童建档界面的 下拉列表数据 - * - * @return - */ - @RequestMapping(value = "/configs", method = RequestMethod.GET) - @ResponseBody - public BaseObjectResponse configs () { - return babyPatientExtendEarService.getConfigs(); - } + /** + * 添加儿童建档 + * + * @return + */ + @RequestMapping(method = RequestMethod.POST) + @ResponseBody + @TokenRequired + public BaseObjectResponse add(BabyPatientExtendEar ear, BabyPatientExtendEarBirth earBirth, + BabyPatientExtendEarMother earMother, BabyPatientExtendEarFamily earFamily, HttpServletRequest request) { + return babyPatientExtendEarService.insert(ear, earBirth, earMother, earFamily, getUserId(request)); + } + /** + * 获取 添加儿童建档界面的 下拉列表数据 + * + * @return + */ + @RequestMapping(value = "/configs", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse configs() { + return babyPatientExtendEarService.getConfigs(); } + +}