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 b57f461..34d899d 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 @@ -13,6 +13,7 @@ import com.lyms.platform.common.enums.SexEnum; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.operate.web.facade.AreaCountFacade; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.BabyEarFacade; import com.lyms.platform.operate.web.request.HearDiaManageRequest; @@ -22,6 +23,7 @@ import com.lyms.platform.operate.web.utils.ResponseUtil; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.query.BabyModelQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -66,6 +68,8 @@ public class HearDiagnManageController extends BaseController { private BabyPatientExtendEarBabyService earBabyService; @Autowired private BabyEarFacade earFacade; + @Autowired + private AreaCountFacade areaCountFacade; /** * 获取儿童听筛记录 @@ -430,7 +434,7 @@ public class HearDiagnManageController extends BaseController { query.setSort("diagnose_time desc"); query.setNeed("1"); query.setLimit(hdReq.getLimit()); - query.setOffset((hdReq.getPage()-1)*hdReq.getLimit()); + query.setOffset((hdReq.getPage() - 1) * hdReq.getLimit()); query.setPage(hdReq.getPage()); List hearingDiagnoseList = hearingDiagnoseService.getHdAndScreen(query); @@ -648,7 +652,7 @@ public class HearDiagnManageController extends BaseController { BaseListResponse result = new BaseListResponse(); PageInfo pageInfo = new PageInfo(); if (model.getStatus() == null) { - for (int i = (model.getPage() - 1) * model.getLimit(); i < hearDiagnManageListResults.size() && i < model.getPage()*model.getLimit(); i++) { + for (int i = (model.getPage() - 1) * model.getLimit(); i < hearDiagnManageListResults.size() && i < model.getPage() * model.getLimit(); i++) { hdmResult.add(hearDiagnManageListResults.get(i)); } pageInfo.setCount(hearDiagnManageListResults.size()); @@ -656,19 +660,19 @@ public class HearDiagnManageController extends BaseController { } else { // 1-已诊断、2-待诊断 if (model.getStatus() == 1) { - for (int i = (model.getPage() - 1) * model.getLimit(); i < alrScreens.size() && i < model.getPage()*model.getLimit(); i++) { + for (int i = (model.getPage() - 1) * model.getLimit(); i < alrScreens.size() && i < model.getPage() * model.getLimit(); i++) { hdmResult.add(alrScreens.get(i)); } pageInfo.setCount(alrScreens.size()); result.setData(hdmResult); } else if (model.getStatus() == 2) { - for (int i = (model.getPage() - 1) * model.getLimit(); i < notScreens.size() && i < model.getPage()*model.getLimit(); i++) { + for (int i = (model.getPage() - 1) * model.getLimit(); i < notScreens.size() && i < model.getPage() * model.getLimit(); i++) { hdmResult.add(notScreens.get(i)); } pageInfo.setCount(notScreens.size()); result.setData(hdmResult); } else { - for (int i = (model.getPage() - 1) * model.getLimit(); i < hearDiagnManageListResults.size() && i < model.getPage()*model.getLimit(); i++) { + for (int i = (model.getPage() - 1) * model.getLimit(); i < hearDiagnManageListResults.size() && i < model.getPage() * model.getLimit(); i++) { hdmResult.add(hearDiagnManageListResults.get(i)); } pageInfo.setCount(hearDiagnManageListResults.size()); @@ -1148,7 +1152,7 @@ public class HearDiagnManageController extends BaseController { babyQuery.setNoEnable("0"); babyQuery.setNeed("y"); babyQuery.setSort("build_date desc"); - babyQuery.setOffset((model.getPage()-1)*model.getLimit()); + babyQuery.setOffset((model.getPage() - 1) * model.getLimit()); babyQuery.setLimit(model.getLimit()); babyQuery.setPage(model.getPage()); List babyIds = new ArrayList<>(); @@ -1262,4 +1266,609 @@ public class HearDiagnManageController extends BaseController { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有数据"); } } + + /** + * 区域 确诊儿童管理 + * + * @param hdReq + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getConfirmDiagRegionList") + @ResponseBody + @TokenRequired + public BaseResponse getConfirmDiagRegionList(HearDiaManageRequest hdReq, HttpServletRequest request) { + //获取当前登录用户ID + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + if (loginState == null) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); + } + //获取当前用户能看到的那些医院 + List hospitalIds = new ArrayList<>(); + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(hdReq.getHospitalId())) { + hospitalIds.add(hdReq.getHospitalId()); + } else { + //获取用户拥有的权限医院和条件筛选的医院交集 + hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), hdReq.getOrgProvinceId(), hdReq.getOrgCityId(), hdReq.getAreaId()); + } + //当前登录人医院Id + // String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); + + BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery(); + + query.setCheckHospitalIds(hospitalIds.toArray(new String[hospitalIds.size()])); + //当前登录人医院Id + // List hospiIds = earFacade.getOrgHospitalIds(hospitalId); + // List hospitalIds = new ArrayList(); + //加入院组 + // hospitalIds.addAll(hospiIds); + // query.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); + + if (hdReq.getDiagnDoctorId() != null) {//诊断医生 + query.setDiagnDoctorId(hdReq.getDiagnDoctorId()); + } + + if (hdReq.getConfirmStartTime() != null) {//确诊开始时间 + query.setConfirmStartTime(hdReq.getConfirmStartTime()); + } + + if (hdReq.getConfirmEndTime() != null) {//确诊结束时间 + query.setConfirmEndTime(hdReq.getConfirmEndTime()); + } + + //省市区查询儿童列表信息 + BabyModelQuery modelQuery = new BabyModelQuery(); + modelQuery.setProvinceId(hdReq.getProvinceId()); + modelQuery.setCityId(hdReq.getCityId()); + modelQuery.setAreaId(hdReq.getAreaId()); + modelQuery.setStreetId(hdReq.getStreetId()); + modelQuery.setAreaId(hdReq.getAreaId()); + List babyModels = babyService.queryBabyWithQuery(modelQuery); + List list = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyModel babyModel : babyModels) { + list.add(babyModel.getId()); + } + } + + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); + babyQuery.setQueryNo(hdReq.getKeyWord()); + babyQuery.setBirthStart(hdReq.getBirthStartTime()); + babyQuery.setBirthEnd(hdReq.getBirthEndTime()); + babyQuery.setHospitalIds(hospitalIds.toArray(new String[hospitalIds.size()])); + babyQuery.setBabyPatientIds(list.toArray(new String[list.size()])); + List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); + + List babyIds = new ArrayList<>(); + if (CollectionUtils.isEmpty(models) && (StringUtils.isNotEmpty(hdReq.getKeyWord()) || hdReq.getBirthStartTime() != null || hdReq.getBirthEndTime() != null)) { + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + if (CollectionUtils.isNotEmpty(models)) { + for (BabyPatientExtendEarBaby pa : models) { + babyIds.add(pa.getBabyPatientId()); + } + query.setBabyIds(babyIds.toArray(new String[babyIds.size()])); + } + + + //设置确诊 + query.setIsconfirm(1); + query.setIfdel(0); + if (hdReq.getConfirmResult() != null) {//模糊查询确诊结果 + List cfList = new ArrayList<>(); + if (hdReq.getConfirmResult() == 1) {//轻度 + cfList.add(",1,"); + cfList.add(",2,"); + cfList.add(",3,"); + } else if (hdReq.getConfirmResult() == 2) {//中度 + cfList.add(",4,"); + cfList.add(",5,"); + cfList.add(",6,"); + } else if (hdReq.getConfirmResult() == 3) {//重度 + cfList.add(",7,"); + cfList.add(",8,"); + cfList.add(",9,"); + cfList.add(",10,"); + cfList.add(",11,"); + cfList.add(",12,"); + } else if (hdReq.getConfirmResult() == 4) {//极重度 + cfList.add(",13,"); + cfList.add(",14,"); + cfList.add(",15,"); + } + query.setConfirmResults(cfList.toArray(new String[cfList.size()])); + } + query.setSort("diagnose_time desc"); + query.setNeed("1"); + query.setLimit(hdReq.getLimit()); + query.setOffset((hdReq.getPage() - 1) * hdReq.getLimit()); + query.setPage(hdReq.getPage()); + + List hearingDiagnoseList = hearingDiagnoseService.getHdAndScreen(query); + + List hdList = new ArrayList<>(); + + for (BabyPatientExtendEarHearingDiagnose hd : hearingDiagnoseList) { + HearingDiagnoseListResult hea = new HearingDiagnoseListResult(); + hea.setIsconfirm(hd.getIsconfirm() == null ? "未确诊" : hd.getIsconfirm() == 0 ? "未确诊" : "已确诊"); + hea.setId(hd.getId()); + hea.setDiagnoseTime(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime())); + String docotorId = hd.getDiagnDoctorId(); + Users users = usersService.getUsers(Integer.parseInt(docotorId == null ? "0" : docotorId)); + if (users != null) { + hea.setDoctorName(users.getName() == null ? "-" : users.getName()); + } + BabyModel babyModel = babyService.getOneBabyById(hd.getBabyId()); + if (babyModel != null) { + hea.setBabyName(babyModel.getName()); + hea.setBabyId(hd.getBabyId()); + hea.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMname())); + hea.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMphone())); + hea.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone())); + hea.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date())); + hea.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth()))); + hea.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex()))); + } + hea.setHdTime(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime()))); + if (hd.getHighFactor() != null) { + String hf[] = hd.getHighFactor().split(","); + StringBuffer hrSb = new StringBuffer(); + for (int b = 0; b < hf.length; b++) { + if (StringUtils.isNotEmpty(hf[b])) { + Map map = new HashMap<>(); + String title = HighRiskEnum.getTitle(Integer.parseInt(hf[b])); + map.put(Integer.parseInt(hf[b]), title); + // highRiskEnums.add(map); + hrSb.append(title + "、"); + } + } + String hfString = null; + if (hrSb.toString().endsWith("、")) { + hfString = hrSb.substring(0, hrSb.length() - 1); + } else { + hfString = hrSb.toString(); + } + hea.setHighRiskEnums(hfString); + } + //确诊结果 + if (hd.getConfirmResult() != null) { + String cr[] = hd.getConfirmResult().split(","); + StringBuffer hdSb = new StringBuffer(); + for (int b = 0; b < cr.length; b++) { + if (StringUtils.isNotEmpty(cr[b])) { + Map map = new HashMap<>(); + String title = ConfirmedEnums.getTitle(Integer.parseInt(cr[b])); + map.put(Integer.parseInt(cr[b]), title); + // hdEnums.add(map); + hdSb.append(title + "、"); + } + } + String hfString = null; + if (hdSb.toString().endsWith("、")) { + hfString = hdSb.substring(0, hdSb.length() - 1); + } else { + hfString = hdSb.toString(); + } + hea.setDiagnResult(hfString); + } + hdList.add(hea); + } + BaseListResponse result = new BaseListResponse(); + result.setData(hdList); + // PageInfo pageInfo = new PageInfo(); + // pageInfo.setLimit(hdReq.getLimit()); + // pageInfo.setPage(hdReq.getPage()); + // pageInfo.setCount(query.getCount()); + + result.setPageInfo(query.getPageInfo()); + return result; + } + + /** + * 区域儿童听力可疑 + * + * @param model + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getSuspDiagRegionList") + @ResponseBody + @TokenRequired + public BaseResponse getSuspDiagRegionList(HearDiaManageRequest model, HttpServletRequest request) { + //获取当前登录用户ID + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + if (loginState == null) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); + } + + //获取当前用户能看到的那些医院 + List hospitalIds = new ArrayList<>(); + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getHospitalId())) { + hospitalIds.add(model.getHospitalId()); + } else { + //获取用户拥有的权限医院和条件筛选的医院交集 + hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), model.getOrgProvinceId(), model.getOrgCityId(), model.getAreaId()); + } + //当前登录人医院Id + //String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); + + List babyIds = new ArrayList<>(); + //省市区查询儿童列表信息 + BabyModelQuery modelQuery = new BabyModelQuery(); + modelQuery.setProvinceId(model.getProvinceId()); + modelQuery.setCityId(model.getCityId()); + modelQuery.setAreaId(model.getAreaId()); + modelQuery.setStreetId(model.getStreetId()); + modelQuery.setAreaId(model.getAreaId()); + List babyModels = babyService.queryBabyWithQuery(modelQuery); + List list = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyModel babyModel : babyModels) { + list.add(babyModel.getId()); + } + } + + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); + babyQuery.setQueryNo(model.getKeyWord()); + babyQuery.setBirthStart(model.getBirthStartTime()); + babyQuery.setBirthEnd(model.getBirthEndTime()); + babyQuery.setHospitalIds(hospitalIds.toArray(new String[hospitalIds.size()])); + babyQuery.setBabyPatientIds(list.toArray(new String[list.size()])); + List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); + + + if (CollectionUtils.isEmpty(models) && (StringUtils.isNotEmpty(model.getKeyWord()) || model.getBirthStartTime() != null || model.getBirthEndTime() != null)) { + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery(); + if (CollectionUtils.isNotEmpty(models)) { + for (BabyPatientExtendEarBaby pa : models) { + babyIds.add(pa.getBabyPatientId()); + } + screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()])); + } + + //听筛开始时间 + if (model.getSecrStartTime() != null) { + screenQuery.setScreenStartDate(model.getSecrStartTime()); + } + //开始结束时间 + if (model.getSecrEndTime() != null) { + screenQuery.setScreenEndDate(model.getSecrEndTime()); + } + //检测医生ID + if (model.getDiagnDoctorId() != null) { + screenQuery.setCheckDoctorId(model.getDiagnDoctorId()); + } + screenQuery.setStatus(0); + screenQuery.setCheckHospitalIds(hospitalIds.toArray(new String[hospitalIds.size()])); + //当前登录人医院Id + // List hospiIds = earFacade.getOrgHospitalIds(hospitalId); + // List hospitalIds = new ArrayList(); + // hospitalIds.addAll(hospiIds); + //加入院组 + // screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); + + //查询全部数据 + List earScreens = screenService.dubiousScreen(screenQuery); + + //已诊断数据 + List alrScreens = new ArrayList<>(); + //未诊断数据 + List notScreens = new ArrayList<>(); + //全部数据 + List hearDiagnManageListResults = new ArrayList<>(); + //要返回的数据 + List hdmResult = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(earScreens)) { + for (BabyPatientExtendEarScreen es : earScreens) { + HearDiagnManageListResult hdm = new HearDiagnManageListResult(); + hdm.setId(es.getId()); + String docotorId = es.getCheckDoctorId(); + if (StringUtils.isNotEmpty(docotorId)) { + Users users = usersService.getUsers(Integer.parseInt(docotorId == null ? "0" : docotorId)); + if (users != null) { + hdm.setDoctorName(users.getName() == null ? "-" : users.getName()); + } + } + hdm.setSecrTime(DateUtil.getyyyy_MM_dd(es.getScreenDate())); + BabyModel babyModel = babyService.getOneBabyById(es.getBabyId()); + if (babyModel != null) { + hdm.setBabyName(babyModel.getName()); + hdm.setBabyId(es.getBabyId()); + hdm.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMname())); + hdm.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMphone())); + hdm.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone())); + hdm.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date())); + hdm.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth()))); + hdm.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex()))); + } + + if (StringUtils.isNotEmpty(es.getHighRiskCause())) { + StringBuffer hfBuff = new StringBuffer(); + String[] highFactors = es.getHighRiskCause().split(","); + for (String hf : highFactors) { + if (StringUtils.isNotEmpty(hf)) { + String name = HighRiskEnum.getTitle(Integer.parseInt(hf)); + hfBuff.append(name + "、"); + } + } + String hfString = null; + if (hfBuff.toString().endsWith("、")) { + hfString = hfBuff.substring(0, hfBuff.length() - 1); + } else { + hfString = hfBuff.toString(); + } + hdm.setHighRiskEnums(hfString); + } + + String babyId = es.getBabyId(); + BabyPatientExtendEarHearingDiagnoseQuery hdQuery = new BabyPatientExtendEarHearingDiagnoseQuery(); + hdQuery.setBabyId(babyId); + //根据babyId查询听力诊断，如果有数据则已诊断 + int count = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnoseCount(hdQuery); + hdm.setSecrType(es.getScreenType() == 1 ? "初筛" : "复筛"); + hdm.setSecrResult(es.getScrIspass() == 1 ? "通过" : "未通过"); + if (count > 0) {//儿童在医院里做过听力诊断记录，标记为已诊断 + hdm.setStatus("已诊断"); + alrScreens.add(hdm); + } else { + hdm.setStatus("未诊断"); + notScreens.add(hdm); + } + hearDiagnManageListResults.add(hdm); + } + } else { + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有数据"); + } + BaseListResponse result = new BaseListResponse(); + PageInfo pageInfo = new PageInfo(); + if (model.getStatus() == null) { + for (int i = (model.getPage() - 1) * model.getLimit(); i < hearDiagnManageListResults.size() && i < model.getPage() * model.getLimit(); i++) { + hdmResult.add(hearDiagnManageListResults.get(i)); + } + pageInfo.setCount(hearDiagnManageListResults.size()); + result.setData(hdmResult); + } else { + // 1-已诊断、2-待诊断 + if (model.getStatus() == 1) { + for (int i = (model.getPage() - 1) * model.getLimit(); i < alrScreens.size() && i < model.getPage() * model.getLimit(); i++) { + hdmResult.add(alrScreens.get(i)); + } + pageInfo.setCount(alrScreens.size()); + result.setData(hdmResult); + } else if (model.getStatus() == 2) { + for (int i = (model.getPage() - 1) * model.getLimit(); i < notScreens.size() && i < model.getPage() * model.getLimit(); i++) { + hdmResult.add(notScreens.get(i)); + } + pageInfo.setCount(notScreens.size()); + result.setData(hdmResult); + } else { + for (int i = (model.getPage() - 1) * model.getLimit(); i < hearDiagnManageListResults.size() && i < model.getPage() * model.getLimit(); i++) { + hdmResult.add(hearDiagnManageListResults.get(i)); + } + pageInfo.setCount(hearDiagnManageListResults.size()); + result.setData(hdmResult); + } + } + + pageInfo.setLimit(model.getLimit()); + pageInfo.setPage(model.getPage()); + result.setPageInfo(pageInfo); + result.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + return result; + } + + @RequestMapping(method = RequestMethod.GET, value = "/getAllDiagRegionList") + @ResponseBody + @TokenRequired + public BaseResponse getAllDiagRegionList(HearDiaManageRequest model, 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()); + + List hospitalIds = new ArrayList<>(); + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getHospitalId())) { + hospitalIds.add(model.getHospitalId()); + } else { + //获取用户拥有的权限医院和条件筛选的医院交集 + hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), model.getOrgProvinceId(), model.getOrgCityId(), model.getAreaId()); + } + + + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); + + Date currentDate = DateUtil.formatDate(new Date()); + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getBirth()) && model.getMonthAgeStart() != null && model.getMonthAgeEnd() != null) { + + Date start = DateUtil.addMonth(currentDate, -model.getMonthAgeStart()); + String birthStr = model.getBirth(); + String[] dates = birthStr.split(" - "); + + if (DateUtil.parseYMD(dates[1]).getTime() < start.getTime()) { + babyQuery.setBirthEnd(DateUtil.parseYMD(dates[1])); + } else { + babyQuery.setBirthEnd(start); + } + + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -model.getMonthAgeEnd() - 1), 1); + + if (DateUtil.parseYMD(dates[0]).getTime() < end.getTime()) { + babyQuery.setBirthStart(end); + } else { + babyQuery.setBirthStart(DateUtil.parseYMD(dates[0])); + } + } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getBirth()) && model.getMonthAgeStart() != null) { + + Date start = DateUtil.addMonth(currentDate, -model.getMonthAgeStart()); + String birthStr = model.getBirth(); + String[] dates = birthStr.split(" - "); + + if (DateUtil.parseYMD(dates[1]).getTime() < start.getTime()) { + babyQuery.setBirthEnd(DateUtil.parseYMD(dates[1])); + } else { + babyQuery.setBirthEnd(start); + } + + babyQuery.setBirthStart(DateUtil.parseYMD(dates[0])); + + } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getBirth())) { + String birthStr = model.getBirth(); + String[] dates = birthStr.split(" - "); + babyQuery.setBirthStart(DateUtil.parseYMD(dates[0])); + babyQuery.setBirthEnd(new Date(DateUtil.parseYMD(dates[1]).getTime() + 24 * 60 * 60 * 1000 - 1)); + } else if (model.getMonthAgeStart() != null && model.getMonthAgeEnd() != null) { + Date start = DateUtil.addMonth(currentDate, -model.getMonthAgeStart()); + babyQuery.setBirthEnd(start); + + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -model.getMonthAgeEnd() - 1), 1); + babyQuery.setBirthStart(end); + } else if (model.getMonthAgeStart() != null) { + Date start = DateUtil.addMonth(currentDate, -model.getMonthAgeStart()); + babyQuery.setBirthEnd(start); + } else if (model.getMonthAgeEnd() != null) { + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -model.getMonthAgeEnd() - 1), 1); + babyQuery.setBirthStart(end); + } + + //省市区查询儿童列表信息 + BabyModelQuery modelQuery = new BabyModelQuery(); + modelQuery.setProvinceId(model.getProvinceId()); + modelQuery.setCityId(model.getCityId()); + modelQuery.setAreaId(model.getAreaId()); + modelQuery.setStreetId(model.getStreetId()); + modelQuery.setAreaId(model.getAreaId()); + List baby = babyService.queryBabyWithQuery(modelQuery); + List list = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(baby)) { + for (BabyModel babyModel : baby) { + list.add(babyModel.getId()); + } + } + babyQuery.setHospitalIds(hospitalIds.toArray(new String[hospitalIds.size()])); + babyQuery.setNoEnable("0"); + babyQuery.setNeed("y"); + babyQuery.setSort("build_date desc"); + babyQuery.setOffset((model.getPage() - 1) * model.getLimit()); + babyQuery.setLimit(model.getLimit()); + babyQuery.setPage(model.getPage()); + babyQuery.setBabyPatientIds(list.toArray(new String[list.size()])); + List babyIds = new ArrayList<>(); + + //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id + if (StringUtils.isNotEmpty(model.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId + babyQuery.setQueryNo(model.getKeyWord()); + // babyQuery.setHospitalId(hospitalId); + } + + List babyModels = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); + + for (BabyPatientExtendEarBaby babyModel : babyModels) { + babyIds.add(babyModel.getBabyPatientId()); + } + + //查询儿童听筛记录 + BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery(); + //检测医生ID + if (model.getDiagnDoctorId() != null) { + screenQuery.setCheckDoctorId(model.getDiagnDoctorId()); + } + screenQuery.setCheckHospitalIds(hospitalIds.toArray(new String[hospitalIds.size()])); + // List hospitalIds = new ArrayList(); + //当前登录人医院Id + // List hospiIds = earFacade.getOrgHospitalIds(hospitalId); + // hospitalIds.addAll(hospiIds); + // screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); + screenQuery.setStatus(0); + + //根据儿童条件查询如果为空 + if (CollectionUtils.isEmpty(babyIds) && (model.getMonthAgeStart() != null || model.getMonthAgeEnd() != null || StringUtils.isNotEmpty(model.getKeyWord()) || model.getBirthStartTime() != null || model.getBirthEndTime() != null)) { + BaseListResponse result = new BaseListResponse(); + result.setData(new ArrayList()); + result.setErrorcode(0); + return result; + } + + //查询全部数据 + List earScreens = screenService.queryBabyPatientExtendEarScreen(screenQuery); + Map screenMap = new HashMap<>(); + if (CollectionUtils.isNotEmpty(earScreens)) { + for (BabyPatientExtendEarScreen es : earScreens) { + screenMap.put(es.getBabyId(), es); + } + } + + //听筛医生不为空 + if (CollectionUtils.isEmpty(earScreens) && model.getDiagnDoctorId() != null) { + BaseListResponse result = new BaseListResponse(); + result.setData(new ArrayList()); + result.setErrorcode(0); + return result; + } + + + //要返回的数据 + List hdmResult = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyPatientExtendEarBaby ear : babyModels) { + HearDiagnManageListResult hdm = new HearDiagnManageListResult(); + hdm.setBabyName(ear.getName()); + hdm.setBabyId(ear.getBabyPatientId()); + hdm.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(ear.getMname())); + hdm.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(ear.getMphone())); + hdm.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(ear.getMphone())); + hdm.setMonthAge(DateUtil.getBabyMonthAge(ear.getBirth(), new Date())); + hdm.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(ear.getBirth()))); + hdm.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(ear.getSex()))); + + BabyPatientExtendEarScreen es = screenMap.get(ear.getBabyPatientId()); + + if (es == null) { + if (model.getDiagnDoctorId() != null) {//筛查医生查询条件不为空，没找到则跳过 + continue; + } + } + if (es != null) { + hdm.setId(es.getId()); + String docotorId = es.getCheckDoctorId(); + Users users = usersService.getUsers(Integer.parseInt(docotorId == null ? "0" : docotorId)); + if (users != null) { + hdm.setDoctorName(users.getName() == null ? "-" : users.getName()); + } + hdm.setSecrTime(DateUtil.getyyyy_MM_dd(es.getScreenDate())); + if (StringUtils.isNotEmpty(es.getHighRiskCause())) { + StringBuffer hfBuff = new StringBuffer(); + String[] highFactors = es.getHighRiskCause().split(","); + for (String hf : highFactors) { + if (StringUtils.isNotEmpty(hf)) { + String name = HighRiskEnum.getTitle(Integer.parseInt(hf)); + hfBuff.append(name + "、"); + } + } + String hfString = null; + if (hfBuff.toString().endsWith("、")) { + hfString = hfBuff.substring(0, hfBuff.length() - 1); + } else { + hfString = hfBuff.toString(); + } + hdm.setHighRiskEnums(hfString); + } + } + hdmResult.add(hdm); + } + BaseListResponse result = new BaseListResponse(); + result.setPageInfo(babyQuery.getPageInfo()); + result.setData(hdmResult); + return result; + } else { + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有数据"); + } + } + } 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 bf44a9a..59dc821 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 @@ -869,393 +869,4 @@ public class HearingDiagnoseController extends BaseController { return result; } - @RequestMapping(method = RequestMethod.GET, value = "/queryHearingDiagnoseRegionList") - @ResponseBody - @TokenRequired - public BaseResponse queryHearingDiagnoseRegionList(HearingDiagnoseRequest hdReq, HttpServletRequest request) { - //获取当前登录用户ID - LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - if (loginState == null) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); - } - //获取当前用户能看到的那些医院 - List hospitalIds = new ArrayList<>(); - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(hdReq.getHospitalId())) { - hospitalIds.add(hdReq.getHospitalId()); - } else { - //获取用户拥有的权限医院和条件筛选的医院交集 - hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), hdReq.getOrgProvinceId(), hdReq.getOrgCityId(), hdReq.getAreaId()); - } - //当前登录人医院Id - // String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); - String[] hospitalIdArry = new String[hospitalIds.size()]; - - - BabyModelQuery modelQuery = new BabyModelQuery(); - modelQuery.setProvinceId(hdReq.getProvinceId()); - modelQuery.setCityId(hdReq.getCityId()); - modelQuery.setAreaId(hdReq.getAreaId()); - modelQuery.setStreetId(hdReq.getStreetId()); - modelQuery.setAreaId(hdReq.getAreaId()); - List babyModels = babyService.queryBabyWithQuery(modelQuery); - List list = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(babyModels)) { - for (BabyModel babyModel : babyModels) { - list.add(babyModel.getId()); - } - } - - List pids = new ArrayList<>(); - if (hdReq.getSource() != null) { - if (hdReq.getSource() == 2) {//2.外院 - //转诊过来的医院id - HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery(); - hchQuery.setTargetType(2);//儿童 - hchQuery.setChangeType(1);//听力转诊 - hchQuery.setStatus(2);//已接受 - hchQuery.setHospitalIds(hospitalIds.toArray(hospitalIdArry)); - List hchList = highchangeService.queryHighriskChangeHospital(hchQuery); - if (hchList != null && hchList.size() > 0) { - for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收 - pids.add(hch.getPid()); - } - } - BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); - babyQuery.setHospitalIds(hospitalIds.toArray(hospitalIdArry)); - 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.setHospitalIds(hospitalIds.toArray(hospitalIdArry)); - babyQuery.setIsEnable("1"); - babyQuery.setBabyPatientIds(list.toArray(new String[list.size()])); - - - List earBabies = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); - for (BabyPatientExtendEarBaby eb : earBabies) { - pids.add(eb.getPersonId()); - } - } - } - - - BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery(); - - - BabyPatientExtendEarScreenQuery scrQuery = new BabyPatientExtendEarScreenQuery(); - //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id - if (StringUtils.isNotEmpty(hdReq.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId - BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); - babyQuery.setQueryNo(hdReq.getKeyWord()); - babyQuery.setHospitalIds(hospitalIds.toArray(hospitalIdArry)); - List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); - if (CollectionUtils.isNotEmpty(models)) { - List babyIds = new ArrayList<>(); - for (BabyPatientExtendEarBaby babyModel : models) { - babyIds.add(babyModel.getBabyPatientId()); - } - scrQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()])); - query.setBabyIds(babyIds.toArray(new String[babyIds.size()])); - } else { - return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); - } - } - - - //是否需要查询听筛数据 - boolean isHdScr = true; - - if (CollectionUtils.isNotEmpty(pids)) { - query.setPids((String[]) pids.toArray(new String[pids.size()])); - } - if (CollectionUtils.isEmpty(pids) && hdReq.getSource() != null) { - return new FrontEndResult().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); - } - - if (hdReq.getDiagnoseStartTime() != null) {//诊断开始时间 - query.setDiagnoseStartTime(hdReq.getDiagnoseStartTime()); - isHdScr = false; - } - - if (hdReq.getDiagnoseEndTime() != null) {//诊断结束时间 - query.setDiagnoseEndTime(hdReq.getDiagnoseEndTime()); - isHdScr = false; - } - - if (hdReq.getDiagnDoctorId() != null) {//诊断医生 - query.setDiagnDoctorId(hdReq.getDiagnDoctorId()); - isHdScr = false; - } - - - if (hdReq.getDiagnNextStartTime() != null) {//预约下次开始诊断时间 - query.setDiagnNextStartTime(hdReq.getDiagnNextStartTime()); - isHdScr = false; - } - - if (hdReq.getDiagnNextEndTime() != null) {//预约下次结束诊断时间 - query.setDiagnNextEndTime(hdReq.getDiagnNextEndTime()); - isHdScr = false; - } - - if (hdReq.getIsconfirm() != null) {//是否确诊 0-未确诊 1-确诊 - query.setIsconfirm(hdReq.getIsconfirm()); - isHdScr = false; - } - if (hdReq.getConfirmDegree() != null) {//查询确诊程度 - isHdScr = false; - List cfList = new ArrayList<>(); - if (hdReq.getConfirmDegree() == 1) {//轻度 - cfList.add(",1,"); - cfList.add(",2,"); - cfList.add(",3,"); - } else if (hdReq.getConfirmDegree() == 2) {//中度 - cfList.add(",4,"); - cfList.add(",5,"); - cfList.add(",6,"); - } else if (hdReq.getConfirmDegree() == 3) {//中重度和重度 - cfList.add(",7,"); - cfList.add(",8,"); - cfList.add(",9,"); - cfList.add(",10,"); - cfList.add(",11,"); - cfList.add(",12,"); - } else if (hdReq.getConfirmDegree() == 4) {//极重度 - cfList.add(",13,"); - cfList.add(",14,"); - cfList.add(",15,"); - } - query.setConfirmResults(cfList.toArray(new String[cfList.size()])); - } - - if (hdReq.getConfirmResult() != null) {//确诊程度 - isHdScr = false; - List cfList = new ArrayList<>(); - if (hdReq.getConfirmResult() == 1) {//轻度 - cfList.add(",1,"); - cfList.add(",2,"); - cfList.add(",3,"); - } else if (hdReq.getConfirmResult() == 2) {//中度 - cfList.add(",4,"); - cfList.add(",5,"); - cfList.add(",6,"); - } else if (hdReq.getConfirmResult() == 3) {//中重度和重度 - cfList.add(",7,"); - cfList.add(",8,"); - cfList.add(",9,"); - cfList.add(",10,"); - cfList.add(",11,"); - cfList.add(",12,"); - } else if (hdReq.getConfirmResult() == 4) {//极重度 - cfList.add(",13,"); - cfList.add(",14,"); - cfList.add(",15,"); - } - query.setConfirmResults(cfList.toArray(new String[cfList.size()])); - } - - - if (hdReq.getConfirmStartTime() != null) {//确诊开始时间 - isHdScr = false; - query.setConfirmStartTime(hdReq.getConfirmStartTime()); - } - - if (hdReq.getConfirmEndTime() != null) {//确诊结束时间 - isHdScr = false; - query.setConfirmEndTime(hdReq.getConfirmEndTime()); - } - - query.setCheckHospitalIds(hospitalIds.toArray(hospitalIdArry)); - query.setSort("diagnose_time desc"); - - //已经诊断的数据 - List hearingDiagnoseList = hearingDiagnoseService.getHdAndScreen(query); - - //待诊断 - List waitConfiList = new ArrayList<>(); - //已诊断 - List confiList = new ArrayList<>(); - //全部 - List hdrList = new ArrayList<>(); - List babyIds = new ArrayList<>(); - //需要查询听筛数据 - if (isHdScr) { - // scrQuery.setCreateHospitalId(hospitalId); - scrQuery.setCheckHospitalIds(hospitalIds.toArray(hospitalIdArry)); - //本院听筛数据 复筛未通过-待诊断 - babyIds = screenService.queryScrBabyIds(scrQuery); - } - - //添加已经诊断的数据 - for (BabyPatientExtendEarHearingDiagnose hd : hearingDiagnoseList) { - //删除总数据 - babyIds.remove(hd.getBabyId()); - HearingDiagnoseListResult hea = new HearingDiagnoseListResult(); - BabyModel babyModel = babyService.getOneBabyById(hd.getBabyId()); - if (babyModel != null) { - hea.setBabyName(babyModel.getName()); - hea.setBabyId(hd.getBabyId()); - hea.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMname())); - hea.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMphone())); - hea.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone())); - hea.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), hd.getDiagnoseTime())); - hea.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth()))); - hea.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex()))); - } - hea.setIsconfirm(hd.getIsconfirm() == null ? "未确诊" : hd.getIsconfirm() == 0 ? "未确诊" : "已确诊"); - hea.setId(hd.getId()); - hea.setDiagnoseTime(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime())); - String docotorId = hd.getDiagnDoctorId(); - Users users = usersService.getUsers(Integer.parseInt(docotorId == null ? "0" : docotorId)); - if (users != null) { - hea.setDoctorName(users.getName() == null ? "-" : users.getName()); - } - hea.setHdTime(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime()))); - //听力高危因数 - if (hd.getHighFactor() != null) { - String hf[] = hd.getHighFactor().split(","); - StringBuffer hrSb = new StringBuffer(); - for (int b = 0; b < hf.length; b++) { - if (StringUtils.isNotEmpty(hf[b])) { - Map map = new HashMap<>(); - String title = HighRiskEnum.getTitle(Integer.parseInt(hf[b])); - map.put(Integer.parseInt(hf[b]), title); - hrSb.append(title + "、"); - } - } - String hfString = null; - if (hrSb.toString().endsWith("、")) { - hfString = hrSb.substring(0, hrSb.length() - 1); - } else { - hfString = hrSb.toString(); - } - hea.setHighRiskEnums(hfString); - } - //确诊结果 - if (hd.getConfirmResult() != null) { - String cr[] = hd.getConfirmResult().split(","); - StringBuffer hdSb = new StringBuffer(); - for (int b = 0; b < cr.length; b++) { - if (StringUtils.isNotEmpty(cr[b])) { - Map map = new HashMap<>(); - String title = ConfirmedEnums.getTitle(Integer.parseInt(cr[b])); - map.put(Integer.parseInt(cr[b]), title); - hdSb.append(title + "、"); - } - } - String hfString = null; - if (hdSb.toString().endsWith("、")) { - hfString = hdSb.substring(0, hdSb.length() - 1); - } else { - hfString = hdSb.toString(); - } - hea.setConfirmResult(hfString); - } - - //诊断结果 - if (hd.getDiagnResult() != null) { - String cr[] = hd.getDiagnResult().split(","); - StringBuffer hdSb = new StringBuffer(); - for (int b = 0; b < cr.length; b++) { - if (StringUtils.isNotEmpty(cr[b])) { - Map map = new HashMap<>(); - String title = HearingDiagnosisEnums.getTitle(Integer.parseInt(cr[b])); - map.put(Integer.parseInt(cr[b]), title); - hdSb.append(title + "、"); - } - } - String hfString = null; - if (hdSb.toString().endsWith("、")) { - hfString = hdSb.substring(0, hdSb.length() - 1); - } else { - hfString = hdSb.toString(); - } - hea.setDiagnResult(hfString); - } - //已诊断 - confiList.add(hea); - //全部 - hdrList.add(hea); - } - - - Collections.sort(hearingDiagnoseList); - for (int i = 0; i < babyIds.size(); i++) { - HearingDiagnoseListResult hea = new HearingDiagnoseListResult(); - BabyModel babyModel = babyService.getOneBabyById(babyIds.get(i)); - if (babyModel != null) { - hea.setBabyName(babyModel.getName()); - hea.setBabyId(babyIds.get(i)); - hea.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMname())); - hea.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMphone())); - hea.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone())); - hea.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date())); - hea.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth()))); - hea.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex()))); - } - hea.setDiagnResult("待诊断"); - //全部 - hdrList.add(hea); - //待诊断 - waitConfiList.add(hea); - } - - BaseListResponse result = new BaseListResponse(); - PageInfo pageInfo = new PageInfo(); - List resList = new ArrayList<>(); - if (hdReq.getEnalble() != null) { - if (hdReq.getEnalble() == 1) { - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { - resList.add(confiList.get(i)); - } - result.setData(resList); - pageInfo.setCount(confiList.size()); - } else if (hdReq.getEnalble() == 2) { - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { - resList.add(waitConfiList.get(i)); - } - pageInfo.setCount(waitConfiList.size()); - result.setData(resList); - } else if (hdReq.getEnalble() == 3) { - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { - resList.add(hdrList.get(i)); - } - pageInfo.setCount(hdrList.size()); - result.setData(resList); - } - } else if (hdReq.getIsconfirm() != null) { - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { - resList.add(confiList.get(i)); - } - result.setData(resList); - pageInfo.setCount(confiList.size()); - } else if (hdReq.getConfirmDegree() != null) { - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { - resList.add(confiList.get(i)); - } - result.setData(resList); - pageInfo.setCount(confiList.size()); - } else if (StringUtils.isNotEmpty(hdReq.getDiagnDoctorId())) { - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { - resList.add(confiList.get(i)); - } - result.setData(resList); - pageInfo.setCount(confiList.size()); - } else { - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { - resList.add(hdrList.get(i)); - } - pageInfo.setCount(hdrList.size()); - result.setData(resList); - } - - pageInfo.setLimit(hdReq.getLimit()); - pageInfo.setPage(hdReq.getPage()); - result.setPageInfo(pageInfo); - result.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); - return result; - } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HearDiaManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HearDiaManageRequest.java index deff425..133777c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HearDiaManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HearDiaManageRequest.java @@ -7,7 +7,7 @@ import java.util.Date; * @createTime 2017年07月26日 16时26分 * @discription */ -public class HearDiaManageRequest extends BasePageQueryRequest{ +public class HearDiaManageRequest extends BasePageQueryRequest { /** * 确诊开始时间 */ @@ -71,6 +71,99 @@ public class HearDiaManageRequest extends BasePageQueryRequest{ //结束月龄 private Integer monthAgeEnd; + //省 + private String provinceId; + //城市id + private String cityId; + //县id + private String areaId; + //镇id + private String streetId; + //详细地址 + private String address; + + //省市区查询机构 + private String orgProvinceId; + //城市id + private String orgCityId; + //县id + private String orgAreaId; + //医院id + private String hospitalId; + + + public String getProvinceId() { + return provinceId; + } + + public void setProvinceId(String provinceId) { + this.provinceId = provinceId; + } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getStreetId() { + return streetId; + } + + public void setStreetId(String streetId) { + this.streetId = streetId; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getOrgProvinceId() { + return orgProvinceId; + } + + public void setOrgProvinceId(String orgProvinceId) { + this.orgProvinceId = orgProvinceId; + } + + public String getOrgCityId() { + return orgCityId; + } + + public void setOrgCityId(String orgCityId) { + this.orgCityId = orgCityId; + } + + public String getOrgAreaId() { + return orgAreaId; + } + + public void setOrgAreaId(String orgAreaId) { + this.orgAreaId = orgAreaId; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + public String getBirth() { return birth; }