From 95bdcb479b1af4c60b1bb7c3420b6ab92ace7110 Mon Sep 17 00:00:00 2001 From: "[wangbo]" Date: Tue, 20 Aug 2019 15:41:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0=E5=A4=8D?= =?UTF-8?q?=E8=AF=8A=E9=9A=8F=E8=AE=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/PuerperaManageController.java | 94 ++++++++++++---------- .../operate/web/controller/ViewController.java | 4 +- .../operate/web/facade/TrackDownFacade.java | 1 + .../platform/operate/web/facade/ViewFacade.java | 72 +++++++++++++---- 4 files changed, 110 insertions(+), 61 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java index 760b2e4..0b9f504 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java @@ -58,6 +58,7 @@ public class PuerperaManageController extends BaseController { /** * 产妇管理查询接口 + * * @param managerRequest * @return */ @@ -99,6 +100,7 @@ public class PuerperaManageController extends BaseController { /** * 查询所有包括孕妇和产妇 + * * @param patientsQueryRequest * @param request * @return @@ -106,7 +108,7 @@ public class PuerperaManageController extends BaseController { @RequestMapping(value = "/allPats", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse queryAllPatPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) { + public BaseResponse queryAllPatPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return patientFacade.queryHighRisk1(patientsQueryRequest, null, null, loginState.getId(), "true", Boolean.FALSE); } @@ -120,13 +122,14 @@ public class PuerperaManageController extends BaseController { @RequestMapping(value = "/hPuer", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse queryHighRiskPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) { + public BaseResponse queryHighRiskPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); BaseResponse baseResponse = patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, loginState.getId(), "true", Boolean.FALSE); return baseResponse; } + /** - *全部孕妇管理 + * 全部孕妇管理 * * @param patientsQueryRequest 全部孕妇管理查询 (因为请求参数一样同用一个对象) * @return 返回结果 @@ -134,63 +137,68 @@ public class PuerperaManageController extends BaseController { @RequestMapping(value = "/aPuer", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse queryAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) { + public BaseResponse queryAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientFacade.queryHighRisk(patientsQueryRequest, null, 1, loginState.getId(), "true", Boolean.FALSE); + return patientFacade.queryHighRisk(patientsQueryRequest, null, 1, loginState.getId(), "true", Boolean.FALSE); } /** * 导出孕产妇数据 + * * @param patientsQueryRequest * @param request * @return */ @RequestMapping(value = "/exportData", method = RequestMethod.GET) @TokenRequired - public void exportAllPuer(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request,HttpServletResponse response) { + public void exportAllPuer(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request, HttpServletResponse response) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - patientFacade.exportAllPuer(patientsQueryRequest,loginState.getId(),response); + patientFacade.exportAllPuer(patientsQueryRequest, loginState.getId(), response); } + /** * 诸城重点孕妇登记表导出 + * * @param request * @return */ @RequestMapping(value = "/zcKeyPregnantWomenExcel", method = RequestMethod.GET) @TokenRequired - public void zcKeyPregnantWomenExcel(@RequestParam(value = "ids",required = false) String ids, - HttpServletRequest request,HttpServletResponse response) { + public void zcKeyPregnantWomenExcel(@RequestParam(value = "ids", required = false) String ids, + HttpServletRequest request, HttpServletResponse response) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - patientFacade.zcKeyPregnantWomenExcel(ids,response,loginState.getId()); + patientFacade.zcKeyPregnantWomenExcel(ids, response, loginState.getId()); } + /** * 导出孕产妇健康管理登记表(唐山滦县) + * * @param patientsQueryRequest * @param request * @return */ @RequestMapping(value = "/exportTsLxData", method = RequestMethod.GET) @TokenRequired - public void exportTsLxData(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request,HttpServletResponse response) { + public void exportTsLxData(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request, HttpServletResponse response) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - patientFacade.tsLxExport(patientsQueryRequest,loginState.getId(),response); + patientFacade.tsLxExport(patientsQueryRequest, loginState.getId(), response); } - /** * 区县产妇统计 + * * @param patientsQueryRequest * @param request * @return */ @RequestMapping(value = "/exportAllPuerpera", method = RequestMethod.GET) @TokenRequired - public void exportAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request,HttpServletResponse response) { + public void exportAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request, HttpServletResponse response) { patientsQueryRequest.setFmHospital(patientsQueryRequest.gethId()); patientsQueryRequest.setNotEnable("2"); - patientFacade.exportAllPuer(patientsQueryRequest,0,response); + patientFacade.exportAllPuer(patientsQueryRequest, 0, response); } @@ -202,18 +210,19 @@ public class PuerperaManageController extends BaseController { @RequestMapping(value = "/apatients", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse queryAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){ + public BaseResponse queryAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId(),"true",Boolean.FALSE); + return patientFacade.queryHighRisk(patientsQueryRequest, null, 3, loginState.getId(), "true", Boolean.FALSE); } + @RequestMapping(value = "/apatients/enums", method = RequestMethod.GET) @ResponseBody - public BaseResponse getEnums(){ + public BaseResponse getEnums() { Map map = new HashMap<>(); map.put("gwfz", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.HIGH_RISK_ID)); List list = new ArrayList(); - for(int i=5;i<=100;i=i+5){ + for (int i = 5; i <= 100; i = i + 5) { list.add(i); } @@ -241,19 +250,16 @@ public class PuerperaManageController extends BaseController { @RequestMapping(value = "/apatients/rLevel", method = RequestMethod.GET) @ResponseBody - public BaseResponse rLevle(){ + public BaseResponse rLevle() { Map map = new HashMap<>(); List results = new ArrayList<>(); List riskLevelConfig = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.HIGH_RISK_ID); - if (CollectionUtils.isNotEmpty(riskLevelConfig)) - { - for(BasicConfigResult levelConfig : riskLevelConfig) - { + if (CollectionUtils.isNotEmpty(riskLevelConfig)) { + for (BasicConfigResult levelConfig : riskLevelConfig) { //健康 - if ("e637b361-99cf-41eb-84f2-f0dab596e928".equals(levelConfig.getId())) - { + if ("e637b361-99cf-41eb-84f2-f0dab596e928".equals(levelConfig.getId())) { continue; } results.add(levelConfig); @@ -272,7 +278,7 @@ public class PuerperaManageController extends BaseController { @RequestMapping(value = "/findp", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse getPatent(@Valid PatientQueryRequest request,HttpServletRequest request1){ + public BaseResponse getPatent(@Valid PatientQueryRequest request, HttpServletRequest request1) { LoginContext loginState = (LoginContext) request1.getAttribute("loginContext"); return patientFacade.findPatient(request, loginState.getId()); } @@ -285,7 +291,7 @@ public class PuerperaManageController extends BaseController { @RequestMapping(value = "/findp2", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse getPatent2(@Valid PatientQueryRequest request,HttpServletRequest request1){ + public BaseResponse getPatent2(@Valid PatientQueryRequest request, HttpServletRequest request1) { LoginContext loginState = (LoginContext) request1.getAttribute("loginContext"); return patientFacade.findPatient2(request, loginState.getId()); } @@ -298,7 +304,7 @@ public class PuerperaManageController extends BaseController { @RequestMapping(value = "/sendPGuildSms", method = RequestMethod.POST) @ResponseBody @TokenRequired - public BaseResponse patientGuildSms(@RequestBody @Valid PatientGuideSmsRequest patientGuideSmsRequest,HttpServletRequest request1){ + public BaseResponse patientGuildSms(@RequestBody @Valid PatientGuideSmsRequest patientGuideSmsRequest, HttpServletRequest request1) { LoginContext loginState = (LoginContext) request1.getAttribute("loginContext"); return patientFacade.patientGuildSms(patientGuideSmsRequest, loginState.getId()); } @@ -312,9 +318,9 @@ public class PuerperaManageController extends BaseController { @RequestMapping(value = "/rhPuer", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse queryRegionPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) { + public BaseResponse queryRegionPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, loginState.getId(), "true",Boolean.TRUE); + return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, loginState.getId(), "true", Boolean.TRUE); } /** @@ -325,7 +331,7 @@ public class PuerperaManageController extends BaseController { @RequestMapping(value = "/rapatients", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse queryRegionAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){ + public BaseResponse queryRegionAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); patientsQueryRequest.setFmHospital(patientsQueryRequest.gethId()); patientsQueryRequest.sethId(null); @@ -343,7 +349,7 @@ public class PuerperaManageController extends BaseController { patientsQueryRequest.setStartAge(null); patientsQueryRequest.setEndAge(null); - return patientFacade.queryHighRisk(patientsQueryRequest, null, 3, loginState.getId(), "true", Boolean.TRUE); + return patientFacade.queryHighRisk(patientsQueryRequest, null, 3, loginState.getId(), "true", Boolean.TRUE); } /** @@ -354,15 +360,15 @@ public class PuerperaManageController extends BaseController { @RequestMapping(value = "/allPuerpera", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse queryPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){ + public BaseResponse queryPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { patientsQueryRequest.setFmHospital(patientsQueryRequest.gethId()); patientsQueryRequest.setNotEnable("2"); - return patientFacade.queryHighRisk(patientsQueryRequest, null, 3, 0, "true", Boolean.FALSE); + return patientFacade.queryHighRisk(patientsQueryRequest, null, 3, 0, "true", Boolean.FALSE); } /** - *区域全部孕妇管理 + * 区域全部孕妇管理 * * @param patientsQueryRequest 全部孕妇管理查询 (因为请求参数一样同用一个对象) * @return 返回结果 @@ -370,9 +376,9 @@ public class PuerperaManageController extends BaseController { @RequestMapping(value = "/raPuer", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse queryRegionAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) { + public BaseResponse queryRegionAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientFacade.queryHighRisk(patientsQueryRequest, null, 1, loginState.getId(), "true", Boolean.TRUE); + return patientFacade.queryHighRisk(patientsQueryRequest, null, 1, loginState.getId(), "true", Boolean.TRUE); } /** @@ -434,10 +440,10 @@ public class PuerperaManageController extends BaseController { header.put("bookbuildingDoctor", "建档医生"); String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()); - if("1000000114".equals(hospitalId)){ + if ("1000000114".equals(hospitalId)) { header.put("sendCareMan", "母子保健手册"); header.put("bookbuildingDate", "发放时间"); - }else{ + } else { header.put("bookbuildingDate", "建档时间"); } httpServletResponse.setContentType("application/force-download"); @@ -449,10 +455,9 @@ public class PuerperaManageController extends BaseController { } /** - * 母子保健手册导出 + * 母子保健手册导出 * - * @param httpServletRequest - // * @param patientManagerRequest + * @param httpServletRequest // * @param patientManagerRequest * @param httpServletResponse */ @TokenRequired @@ -536,7 +541,6 @@ public class PuerperaManageController extends BaseController { response.flushBuffer(); - } catch (IOException e) { e.printStackTrace(); } @@ -638,4 +642,6 @@ public class PuerperaManageController extends BaseController { e.printStackTrace(); } } + + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index 21d5d4a..f6e2c15 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -201,13 +201,13 @@ public class ViewController extends BaseController { @RequestMapping(value = "/printExFuData", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse printExFuData(@RequestParam("id") String id, HttpServletRequest request) { + public BaseResponse printExFuData(@RequestParam("id") String id, HttpServletRequest request, Integer state, String gravida) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); if (loginState == null) { System.out.println("用户未登录!"); return new BaseListResponse().setErrormsg("失败").setErrorcode(ErrorCodeConstants.USER_NOT_EXISTS); } - List> mapList = viewFacade.prFuData(id, 5, loginState.getId()); + List> mapList = viewFacade.prFuData(id, 5, loginState.getId(), state, gravida); return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(mapList); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 23860c3..dfd374f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -290,6 +290,7 @@ public class TrackDownFacade { PatientsQuery patientsQuery = new PatientsQuery(); //孕14周-孕20周+6天、未进行产前筛查 + if (downQueryRequest.getTrackType() == 4) { Date start = DateUtil.getWeekStart(21); patientsQuery.setLastMensesStart(start); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 5031024..09a0f92 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -37,6 +37,7 @@ import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; +import sun.util.resources.cldr.id.CurrencyNames_id; import java.io.BufferedReader; import java.io.File; @@ -513,35 +514,79 @@ public class ViewFacade { * @param num 当前位置 * @return */ - public List> prFuData(String id, int num, Integer userId) { + public List> prFuData(String id, int num, Integer userId, Integer state, String gravida) { List> mList = new ArrayList>(); //Map map = new HashedMap(); - AntenatalExaminationModel[] exData = new AntenatalExaminationModel[4]; + AntenatalExaminationModel[] exData = null; + if (state == 0) {//表示没有全部权限 + exData = new AntenatalExaminationModel[4]; + } else { + exData = new AntenatalExaminationModel[15]; + } + Patients patients = null; AntenatalExaminationModel antenatalExaminationModel = antExService.findOneById(id); - Patients patients = patientsService.findOnePatientById(antenatalExaminationModel.getParentId()); + String riskName = null; + boolean flag = false; + List parentIdList = new ArrayList<>(); + if ("0".equals(gravida)) {//表示全部孕妇处打印 + patients = patientsService.findOnePatientById(id); + if (patients != null) { + Calendar instance = Calendar.getInstance(); + instance.setTime(new Date()); + instance.add(Calendar.DATE, -294);//只差未分娩的孕妇 + instance.set(Calendar.HOUR_OF_DAY, 00); + instance.set(Calendar.MINUTE, 00); + instance.set(Calendar.SECOND, 00); + instance.set(Calendar.MILLISECOND, 000); + Date start = instance.getTime(); + List patientsList = mongoTemplate.find(Query.query(Criteria.where("pid").is(patients.getPid()).and("lastMenses").gte(start)), Patients.class); + if (CollectionUtils.isNotEmpty(patientsList)) { + for (Patients patients1 : patientsList) { + parentIdList.add(patients1.getId()); + } + flag = true; + } + AntenatalExaminationModel antenatalExaminationModels = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients.getPid())), AntenatalExaminationModel.class); + riskName = getRisk(antenatalExaminationModels.getRiskFactor(), antenatalExaminationModels.getOtherRisk()); + } + } else { + patients = patientsService.findOnePatientById(antenatalExaminationModel.getParentId()); + riskName = getRisk(antenatalExaminationModel.getRiskFactor(), antenatalExaminationModel.getOtherRisk()); + } String name = patients.getUsername(); - String riskName = getRisk(antenatalExaminationModel.getRiskFactor(), antenatalExaminationModel.getOtherRisk()); + if (StringUtils.isNotEmpty(riskName)) { name += "(" + riskName + ")"; } - - //map.put("name",name); - if (num < 4) { exData[num - 1] = antenatalExaminationModel; } else {//全部 - String patientsId = antenatalExaminationModel.getParentId(); + AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setParentId(patientsId); + if (flag) { + antExQuery.setParentIds(parentIdList); + } else { + String patientsId = antenatalExaminationModel.getParentId(); + antExQuery.setParentId(patientsId); + } + //复诊 List list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.ASC, "checkDate")); + System.out.println(antExQuery.convertToQuery().convertToMongoQuery().toString()); + if (list != null && list.size() > 0) { for (int i = 0; i < list.size(); i++) { - if (i >= 4) { - break; + //返回2-5次 + if (state == 0) { + if (i >= 4) { + break; + } + exData[i] = list.get(i); + } else { + //返回全部 + exData[i] = list.get(i); } - exData[i] = list.get(i); } } else { return mList; @@ -624,13 +669,10 @@ public class ViewFacade { } if (StringUtils.isNotEmpty(data.getUrineProtein())) { map.put("urineProtein", data.getUrineProtein()); - } if (StringUtils.isNotEmpty(data.getbChao())) { map.put("bChao", data.getbChao()); - } - String hospital = autoMatchFacade.getHospitalId(userId); ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(data.getParentId()); -- 1.8.3.1