diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 8890dcb..6e0ad1a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -38,11 +38,12 @@ public class AntenatalExaminationController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/antexmanage") @ResponseBody @TokenRequired - public BaseResponse queryAntenatalExamination(@Valid AntenatalExaminationQueryRequest antenatalExaminationQueryRequest) { + public BaseResponse queryAntenatalExamination(@Valid AntenatalExaminationQueryRequest antenatalExaminationQueryRequest,HttpServletRequest request) { if (StringUtils.isEmpty(antenatalExaminationQueryRequest.getCardNo()) && StringUtils.isEmpty(antenatalExaminationQueryRequest.getVcCardNo())) { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请输入查询条件"); } - return antenatalExaminationFacade.queryAntenatalExamination(antenatalExaminationQueryRequest); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return antenatalExaminationFacade.queryAntenatalExamination(antenatalExaminationQueryRequest,loginState.getId()); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java index 70a0406..6b4ea8a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java @@ -1,8 +1,11 @@ package com.lyms.platform.operate.web.controller; +import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; +import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; import com.lyms.platform.operate.web.request.AntenatalExaminationQueryRequest; @@ -119,10 +122,12 @@ public class BookbuildingController extends BaseController{ */ @RequestMapping(value = "/queryThisBabyPatient/{id}", method = RequestMethod.GET) @ResponseBody - public BaseResponse queryThisBabyPatient(@PathVariable("id")String id){ + @TokenRequired + public BaseResponse queryThisBabyPatient(@PathVariable("id")String id,HttpServletRequest request){ AntenatalExaminationQueryRequest antenatalExaminationQueryRequest = new AntenatalExaminationQueryRequest(); antenatalExaminationQueryRequest.setPatientId(id); - return antenatalExaminationFacade.queryAntenatalExamination(antenatalExaminationQueryRequest); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return antenatalExaminationFacade.queryAntenatalExamination(antenatalExaminationQueryRequest,loginState.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index 4cf6d44..aee3498 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -37,8 +37,9 @@ public class MatDeliverController extends BaseController{ @RequestMapping(value = "/matmanger",method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse queryMatDeliver(@Valid MatDeliverQueryRequest deliverQueryRequest) { - return matDeliverFacade.queryMatDeliver(deliverQueryRequest); + public BaseResponse queryMatDeliver(@Valid MatDeliverQueryRequest deliverQueryRequest,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return matDeliverFacade.queryMatDeliver(deliverQueryRequest,loginState.getId()); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index ca91f73..184d8e9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -10,7 +10,10 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.*; -import com.lyms.platform.operate.web.result.*; +import com.lyms.platform.operate.web.result.AntData; +import com.lyms.platform.operate.web.result.AntenatalExaminationResult; +import com.lyms.platform.operate.web.result.AntexChuResult; +import com.lyms.platform.operate.web.result.AntexListResult; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.*; @@ -71,12 +74,12 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(list1)) { model.setHospitalId(list1.get(0) + ""); } - AntExQuery antExQuery=new AntExQuery(); + AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setParentId(antExAddRequest.getParentId()); antExQuery.setStart(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date()))); List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); - if(CollectionUtils.isNotEmpty(list)){ + if (CollectionUtils.isNotEmpty(list)) { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("同一天只能建一次复诊"); } antenatalExaminationService.addOneBabyAnt(model); @@ -116,20 +119,20 @@ public class AntenatalExaminationFacade { List list1 = autoMatchFacade.matchOrgId(userId); if (CollectionUtils.isNotEmpty(list1)) { antExChuModel.setHospitalId(list1.get(0) + ""); - AntExChuQuery antExChuQuery=new AntExChuQuery(); + AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); antExChuQuery.setHospitalId(list1.get(0) + ""); Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); - PatientsQuery patientsQuery=new PatientsQuery(); + PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setPid(patients.getPid()); patientsQuery.setYn(YnEnums.YES.getId()); - List list = patientsService.queryPatient(patientsQuery); + List list = patientsService.queryPatient(patientsQuery); antExChuQuery.setStart(list.get(0).getCreated()); antExChuQuery.setParentId(excAddRequest.getParentId()); - List data = antenatalExaminationService.queryAntExChu(antExChuQuery); - if(CollectionUtils.isNotEmpty(data)){ + List data = antenatalExaminationService.queryAntExChu(antExChuQuery); + if (CollectionUtils.isNotEmpty(data)) { return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("您本次妊娠中已在本医院建档"); } } @@ -141,7 +144,7 @@ public class AntenatalExaminationFacade { /** * 获取最后一次高危产检的高危信息 - * + *

* 先取复诊最后一条，在取初诊 * * @return @@ -153,7 +156,7 @@ public class AntenatalExaminationFacade { model = list.get(0); } try { - if(null!=model&&StringUtils.isNotEmpty(model.getRiskFactor())){ + if (null != model && StringUtils.isNotEmpty(model.getRiskFactor())) { List list1 = JsonUtil.toList(model.getRiskFactor(), List.class); return queryRisk(list1); } @@ -168,7 +171,7 @@ public class AntenatalExaminationFacade { antExChuModel = list1.get(0); } try { - if(null!=antExChuModel &&StringUtils.isNotEmpty(antExChuModel.getHighrisk())){ + if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); return queryRisk(list2); } @@ -196,15 +199,15 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(list)) { antexListResult.convertToResult(null, list.get(0), null); for (Patients patients : list) { - List stopPregs =null; + List stopPregs = null; List data = new ArrayList<>(); MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setYn(YnEnums.YES.getId()); matDeliverQuery.setParentId(patients.getId()); - Organization organization=null; + Organization organization = null; //建档记录 - if(null!=patients.getHospitalId()){ - organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); + if (null != patients.getHospitalId()) { + organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); } data.add(new AntData(patients, null != organization ? organization.getName() : "")); //分娩记录 @@ -213,17 +216,18 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(modelList)) { MaternalDeliverModel model = modelList.get(0); dueDate = model.getDueDate(); - }else { + } else { //终止妊娠 - StopPregQuery query = new StopPregQuery(); + StopPregQuery query = new StopPregQuery(); query.setYn(YnEnums.YES.getId()); query.setPid(patients.getPid()); - stopPregs = stopPregnancyService.queryStopPreg(query); - if(CollectionUtils.isNotEmpty(stopPregs)){ - dueDate=DateUtil.getyyyy_MM_dd(stopPregs.get(0).getStopDate()); + stopPregs = stopPregnancyService.queryStopPreg(query); + if (CollectionUtils.isNotEmpty(stopPregs)) { + dueDate = DateUtil.getyyyy_MM_dd(stopPregs.get(0).getStopDate()); } } - PostReviewQuery postReviewQuery = new PostReviewQuery();; + PostReviewQuery postReviewQuery = new PostReviewQuery(); + ; if (StringUtils.isNotEmpty(dueDate)) { Date date = DateUtil.parseYMD(dueDate); //初诊记录 @@ -235,7 +239,7 @@ public class AntenatalExaminationFacade { List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(antExChuModels)) { for (AntExChuModel an : antExChuModels) { - if(null!=an.getHospitalId()) { + if (null != an.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); } data.add(new AntData(an, null != organization ? organization.getName() : "")); @@ -250,7 +254,7 @@ public class AntenatalExaminationFacade { List list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); if (CollectionUtils.isNotEmpty(list1)) { for (AntenatalExaminationModel an : list1) { - if(null!=an.getHospitalId()) { + if (null != an.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); } data.add(new AntData(an, null != organization ? organization.getName() : "")); @@ -272,7 +276,7 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(modelList)) { organization = organizationService.getOrganization(Integer.valueOf(modelList.get(0).getHospitalId())); data.add(new AntData(modelList.get(0), patients.getLastMenses(), null != organization ? organization.getName() : "")); - }else if(CollectionUtils.isNotEmpty(stopPregs)){ + } else if (CollectionUtils.isNotEmpty(stopPregs)) { //终止妊娠记录 organization = organizationService.getOrganization(Integer.valueOf(modelList.get(0).getHospitalId())); data.add(new AntData(stopPregs.get(0), patients.getLastMenses(), null != organization ? organization.getName() : "")); @@ -281,7 +285,7 @@ public class AntenatalExaminationFacade { List reviewModels = postReviewService.findWithList(postReviewQuery); if (CollectionUtils.isNotEmpty(reviewModels)) { for (PostReviewModel postReviewModel : reviewModels) { - if(null!=postReviewModel.getHospitalId()) { + if (null != postReviewModel.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); } data.add(new AntData(postReviewModel, null != organization ? organization.getName() : "")); @@ -325,7 +329,7 @@ public class AntenatalExaminationFacade { * @param vcCardNo * @return */ - public Patients findOnePatient(String cardNo, String vcCardNo, String id) { + public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId) { PatientsQuery patientsQuery = new PatientsQuery(); if (StringUtils.isNotEmpty(cardNo)) { patientsQuery.setCardNo(cardNo); @@ -334,41 +338,47 @@ public class AntenatalExaminationFacade { } else if (StringUtils.isNotEmpty(id)) { patientsQuery.setId(id); } - + patientsQuery.setHospitalId(hospitalId); patientsQuery.setYn(YnEnums.YES.getId()); Patients patients = null; List list = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(list)) { - patients = list.get(0); + return list.get(0); + } + patientsQuery.setHospitalId(null); + list = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(list)) { + return list.get(0); } return patients; } /** * 查看是否满足产筛申请条件 - * + *

* 1.孕周 15周-到20 周 并且没有做过产筛 + * * @param date * @param parentId * @return */ - public String cap(Date date,String parentId){ - if(null==date){ + public String cap(Date date, String parentId) { + if (null == date) { return "0"; } - int day= DateUtil.getDays(date,new Date()); - int start = 15*7; - int end = 20*7+6; - if(day>=start&&day<=end){ - SieveApplyOrderQuery sieveApplyOrderQuery=new SieveApplyOrderQuery(); + int day = DateUtil.getDays(date, new Date()); + int start = 15 * 7; + int end = 20 * 7 + 6; + if (day >= start && day <= end) { + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); sieveApplyOrderQuery.setParentId(parentId); List list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); - if(CollectionUtils.isEmpty(list)){ + if (CollectionUtils.isEmpty(list)) { return "1"; } } - return "0"; + return "0"; } /** @@ -377,7 +387,7 @@ public class AntenatalExaminationFacade { * @param queryRequest * @return */ - public BaseResponse queryAntenatalExamination(AntenatalExaminationQueryRequest queryRequest) { + public BaseResponse queryAntenatalExamination(AntenatalExaminationQueryRequest queryRequest,Integer userId) { Patients patients = null; if (!StringUtils.isEmpty(queryRequest.getPatientId())) { @@ -390,8 +400,13 @@ public class AntenatalExaminationFacade { patients = list.get(0); } } else { + List list1 =autoMatchFacade.matchOrgId(userId); + String hospital =null; + if(CollectionUtils.isNotEmpty(list1)){ + hospital= list1.get(0) + ""; + } //查询产妇数据 - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null); + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(),null, hospital); } if (null == patients) { @@ -417,7 +432,7 @@ public class AntenatalExaminationFacade { } antexListResult.convertToResult(list, patients, antExChulist); - antexListResult.setIsSieve(cap(patients.getLastMenses(),patients.getId())); + antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId())); antexListResult.setRiskFactor(data); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); } @@ -449,14 +464,14 @@ public class AntenatalExaminationFacade { AntenatalExaminationResult antenatalExaminationResult = new AntenatalExaminationResult(); antenatalExaminationResult.convertToResult(examinationModel); try { - if(StringUtils.isNotEmpty(examinationModel.getRiskFactor())){ + if (StringUtils.isNotEmpty(examinationModel.getRiskFactor())) { List list1 = JsonUtil.toList(examinationModel.getRiskFactor(), List.class); antenatalExaminationResult.setRiskFactor(queryRisk(list1)); } } catch (Exception e) { } try { - if(StringUtils.isNotEmpty(examinationModel.getDiagnosis())) { + if (StringUtils.isNotEmpty(examinationModel.getDiagnosis())) { List list = JsonUtil.toList(examinationModel.getDiagnosis(), List.class); antenatalExaminationResult.setDiagnosis(queryRisk(list)); } @@ -469,9 +484,9 @@ public class AntenatalExaminationFacade { applyOrderQuery.setParentId(examinationModel.getParentId()); applyOrderQuery.setYn(YnEnums.YES.getId()); Patients patients = patientsService.findOnePatientById(examinationModel.getParentId()); - Date data = null; - if(null!=data){ - data=patients.getLastMenses(); + Date data = null; + if (null != data) { + data = patients.getLastMenses(); } antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId())); antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1); @@ -487,17 +502,17 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(antExChuModels)) { antExChuModel = antExChuModels.get(0); } - if(null!=antExChuModel){ + if (null != antExChuModel) { antexChuResult.convertToResult(antExChuModel); try { - if(StringUtils.isNotEmpty(antExChuModel.getDiagnosis())){ + if (StringUtils.isNotEmpty(antExChuModel.getDiagnosis())) { List list = JsonUtil.toList(antExChuModel.getDiagnosis(), List.class); antexChuResult.setDiagnosis(queryRisk(list)); } } catch (Exception e) { } try { - if(StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { + if (StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); antexChuResult.setHighrisk(queryRisk(list1)); } @@ -510,7 +525,7 @@ public class AntenatalExaminationFacade { applyOrderQuery.setParentId(antExChuModel.getParentId()); applyOrderQuery.setYn(YnEnums.YES.getId()); antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1); - antexChuResult.setIsSieve(cap(antExChuModel.getLastMenses(),antExChuModel.getParentId())); + antexChuResult.setIsSieve(cap(antExChuModel.getLastMenses(), antExChuModel.getParentId())); object = antexChuResult; } } @@ -554,9 +569,10 @@ public class AntenatalExaminationFacade { map.put("fxys", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.FXYS)); map.put("gwfz", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.GWFZ)); map.put("organizations", convert()); - map.put("cTime",DateUtil.getyyyy_MM_dd(new Date())); + map.put("cTime", DateUtil.getyyyy_MM_dd(new Date())); return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + //胎数 public List getTaiShu() { List list = new ArrayList<>(); @@ -568,6 +584,7 @@ public class AntenatalExaminationFacade { } return list; } + public List convert() { List organization = organizationService.queryHospital(); List data = new ArrayList(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 6c999e1..a27d70d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -229,9 +229,14 @@ public class MatDeliverFacade { * @param deliverQueryRequest * @return */ - public BaseResponse queryMatDeliver(MatDeliverQueryRequest deliverQueryRequest) { + public BaseResponse queryMatDeliver(MatDeliverQueryRequest deliverQueryRequest,Integer userId) { + List list1 =autoMatchFacade.matchOrgId(userId); + String hospital =null; + if(CollectionUtils.isNotEmpty(list1)){ + hospital= list1.get(0) + ""; + } //获取 - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null); + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null,hospital); if (null == patients) { return new BaseResponse().setErrormsg("没有相关的产妇记录").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR); }