diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index c5f9988..6c700fb 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -730,7 +730,12 @@ public class PatientsService { SieveModel sieveModel = new SieveModel(); sieveModel.setParentId(patients.getId()); sieveModel.setLastMenses(patients.getLastMenses()); - + //省市区 + sieveModel.setProvinceId(patients.getProvinceId()); + sieveModel.setCityId(patients.getCityId()); + sieveModel.setAreaId(patients.getAreaId()); + sieveModel.setStreetId(patients.getStreetId()); + AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setNeed("1"); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java index 68fe541..5fa485f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java @@ -81,10 +81,19 @@ public class SieveModel extends BaseModel { //申请医院 private String applyHospitalId; + + //冗余 + //省市区地址 + private String provinceId; + private String cityId; + private String areaId; + private String streetId; + // 2019/8/24 12:00 dongqing 冗余产筛类型、收费类型、报告类型 /** * null/1 血清学筛查 2/无创基因筛查 3/二者都用 - */ private String sieveType; + */ + private String sieveType; /** * 1/免费 2/自费 @@ -97,6 +106,39 @@ public class SieveModel extends BaseModel { private String reportType; + + 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 void setOrder(Integer order) { this.order = order; } @@ -358,7 +400,6 @@ public class SieveModel extends BaseModel { } - public Integer getTireNumber() { return tireNumber; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java index c53cfd5..8f9172b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java @@ -112,6 +112,45 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { */ private String reportType; + //省市区地址 + private String provinceId; + private String cityId; + private String areaId; + private String streetId; + + + 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 getSieveType() { return sieveType; } @@ -349,7 +388,18 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { if (null != hospitalId) { condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } - + if (StringUtils.isNotEmpty(provinceId)) { + condition = condition.and("provinceId", provinceId, MongoOper.IS); + } + if (StringUtils.isNotEmpty(cityId)) { + condition = condition.and("cityId", cityId, MongoOper.IS); + } + if (StringUtils.isNotEmpty(areaId)) { + condition = condition.and("areaId", areaId, MongoOper.IS); + } + if (StringUtils.isNotEmpty(streetId)) { + condition = condition.and("streetId", streetId, MongoOper.IS); + } if (null != hospitalIds && hospitalIds.size() > 0) { condition = condition.and("hospitalId", hospitalIds, MongoOper.IN); } @@ -532,7 +582,7 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { } } // sieveType = 2/无创基因筛查 3/二者都用 - else { + else { condition = condition.and("sieveType", sieveType, MongoOper.IS); } } @@ -550,7 +600,7 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { } } // costType = 2/自费 - else { + else { condition = condition.and("costType", costType, MongoOper.IS); } } @@ -568,7 +618,7 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { } } // reportType = 2/重取 3/失败 - else { + else { condition = condition.and("reportType", reportType, MongoOper.IS); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index 3e7544e..6c39133 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java @@ -48,11 +48,11 @@ public class SieveController extends BaseController { * @return */ @ResponseBody - @RequestMapping(value = "/sieve",method = RequestMethod.POST) + @RequestMapping(value = "/sieve", method = RequestMethod.POST) @TokenRequired - public BaseResponse addOneSieve(@RequestBody @Valid SieveAddRequest sieveAddRequest,HttpServletRequest request) { + public BaseResponse addOneSieve(@RequestBody @Valid SieveAddRequest sieveAddRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return sieveFacade.addOneSieve(sieveAddRequest,loginState.getId()); + return sieveFacade.addOneSieve(sieveAddRequest, loginState.getId()); } @@ -63,11 +63,12 @@ public class SieveController extends BaseController { * @return */ @ResponseBody - @RequestMapping(value = "/sieves",method = RequestMethod.GET) + @RequestMapping(value = "/sieves", method = RequestMethod.GET) @TokenRequired - public BaseResponse getOneSieve(@RequestParam("parentId")String parentId) { + public BaseResponse getOneSieve(@RequestParam("parentId") String parentId) { return sieveFacade.getOneSieve(parentId); } + /** * 产前诊断 * @@ -76,8 +77,8 @@ public class SieveController extends BaseController { */ @ResponseBody @TokenRequired - @RequestMapping(value = "/cqsieve",method = RequestMethod.POST) - public BaseResponse addOneChanQianDiaSieve(@RequestBody @Valid ChanQianDiaAddRequest chanQianDiaAddRequest,HttpServletRequest request) { + @RequestMapping(value = "/cqsieve", method = RequestMethod.POST) + public BaseResponse addOneChanQianDiaSieve(@RequestBody @Valid ChanQianDiaAddRequest chanQianDiaAddRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return sieveFacade.addOneChanQianDiaSieve(chanQianDiaAddRequest, loginState.getId()); } @@ -91,24 +92,25 @@ public class SieveController extends BaseController { */ @ResponseBody @TokenRequired - @RequestMapping(value = "/querySievePatientInfo",method = RequestMethod.GET) - public BaseResponse querySievePatientInfo(@RequestParam(required = false)String cardNo,@RequestParam(required = false)String vcCardNo,HttpServletRequest request) { + @RequestMapping(value = "/querySievePatientInfo", method = RequestMethod.GET) + public BaseResponse querySievePatientInfo(@RequestParam(required = false) String cardNo, @RequestParam(required = false) String vcCardNo, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return sieveFacade.querySievePatientInfo(cardNo, vcCardNo, loginState.getId()); } /** * 查看申请单 - * + *

* type 1 查看 2 产筛申请修改 3 结果看 4，产筛结果修改查询 + * * @param parentId * @param request * @return */ @ResponseBody @TokenRequired - @RequestMapping(value = "/getSieveApplyInfo",method = RequestMethod.GET) - public BaseResponse getSieveApplyInfo(@RequestParam("parentId")String parentId,@RequestParam(required = true)Integer type,HttpServletRequest request) { + @RequestMapping(value = "/getSieveApplyInfo", method = RequestMethod.GET) + public BaseResponse getSieveApplyInfo(@RequestParam("parentId") String parentId, @RequestParam(required = true) Integer type, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return sieveFacade.getSieveApplyInfo(parentId, loginState.getId(), type); } @@ -116,14 +118,15 @@ public class SieveController extends BaseController { /** * 接收产筛申请 + * * @param parentIds * @param request * @return */ @ResponseBody - @RequestMapping(value = "/reviceSieve",method = RequestMethod.POST) + @RequestMapping(value = "/reviceSieve", method = RequestMethod.POST) @TokenRequired - public BaseResponse reviceSieve(@RequestBody List parentIds,HttpServletRequest request){ + public BaseResponse reviceSieve(@RequestBody List parentIds, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return sieveFacade.reviceSieve(parentIds, loginState.getId()); } @@ -135,36 +138,38 @@ public class SieveController extends BaseController { * @return */ @ResponseBody - @RequestMapping(value = "/cqsieve",method = RequestMethod.GET) + @RequestMapping(value = "/cqsieve", method = RequestMethod.GET) @TokenRequired - public BaseResponse getOneChanQianDiaSieve(@RequestParam("id")String id,HttpServletRequest request) { + public BaseResponse getOneChanQianDiaSieve(@RequestParam("id") String id, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return sieveFacade.getOneChanQianDiaSieve(id/*,loginState.getId()*/); } + /** * 产前诊断 * * @return */ @ResponseBody - @RequestMapping(value = "/checkItem",method = RequestMethod.GET) + @RequestMapping(value = "/checkItem", method = RequestMethod.GET) @TokenRequired - public BaseResponse getCheckItem(@RequestParam("parentId")String id,HttpServletRequest request) { + public BaseResponse getCheckItem(@RequestParam("parentId") String id, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return sieveFacade.getCheckItem(id, loginState.getId()); } @ResponseBody - @RequestMapping(value = "/cqsieve/enums",method = RequestMethod.GET) - public BaseResponse getEnums(){ + @RequestMapping(value = "/cqsieve/enums", method = RequestMethod.GET) + public BaseResponse getEnums() { Map map = new HashMap<>(); - map.put("getChanQResultEnums",getChanQResultEnums()); - map.put("getCqResult",getCqResult()); - map.put("getSieveEnums",getSieveEnums()); - map.put("getRenShenJieJuEnums",getRenShenJieJuEnums()); - map.put("getNotify",getNotify()); - map.put("csRemarkTypeEnums",CsRemarkTypeEnums.getCSTypeEnums()); - return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + map.put("getChanQResultEnums", getChanQResultEnums()); + map.put("getCqResult", getCqResult()); + map.put("getSieveEnums", getSieveEnums()); + map.put("getRenShenJieJuEnums", getRenShenJieJuEnums()); + map.put("getNotify", getNotify()); + map.put("csRemarkTypeEnums", CsRemarkTypeEnums.getCSTypeEnums()); + return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } //产前诊断结果 public List getChanQResultEnums() { @@ -178,7 +183,7 @@ public class SieveController extends BaseController { return list; } - public List getNotify(){ + public List getNotify() { List list = new ArrayList<>(); for (SieveStatusEnums enums : SieveStatusEnums.values()) { Map resultMap = new HashMap<>(); @@ -188,6 +193,7 @@ public class SieveController extends BaseController { } return list; } + //产前诊断结果 public List getCqResult() { List list = new ArrayList<>(); @@ -230,82 +236,86 @@ public class SieveController extends BaseController { * @return */ @ResponseBody - @RequestMapping(value = "/cqsieves",method = RequestMethod.GET) + @RequestMapping(value = "/cqsieves", method = RequestMethod.GET) @TokenRequired - public BaseResponse queryChanQianSieve(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request){ + public BaseResponse queryChanQianSieve(@Valid CqSieveQueryRequest cqSieveQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return sieveFacade.queryList(cqSieveQueryRequest,loginState.getId(),"true",false); + return sieveFacade.queryList(cqSieveQueryRequest, loginState.getId(), "true", false); } /** * 实验室产筛管理 + * * @param cqSieveQueryRequest * @param request * @return */ @ResponseBody - @RequestMapping(value = "/sieveLabManage",method = RequestMethod.GET) + @RequestMapping(value = "/sieveLabManage", method = RequestMethod.GET) @TokenRequired - public BaseResponse sieveLabManage(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request){ + public BaseResponse sieveLabManage(@Valid CqSieveQueryRequest cqSieveQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return sieveFacade.queryList(cqSieveQueryRequest,loginState.getId(),"true",true); + return sieveFacade.queryList(cqSieveQueryRequest, loginState.getId(), "true", true); } - /** * 导出产筛列表 + * * @param cqSieveQueryRequest * @param request * @return */ - @RequestMapping(value = "/exportCqsieves",method = RequestMethod.GET) + @RequestMapping(value = "/exportCqsieves", method = RequestMethod.GET) @TokenRequired - public void exportCqsieves(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request,HttpServletResponse response){ + public void exportCqsieves(@Valid CqSieveQueryRequest cqSieveQueryRequest, HttpServletRequest request, HttpServletResponse response) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - sieveFacade.exportCqsieves(cqSieveQueryRequest, loginState.getId(),response); + sieveFacade.exportCqsieves(cqSieveQueryRequest, loginState.getId(), response); } /** * 产筛备注保存 - * @param cqId 产筛id + * + * @param cqId 产筛id * @param csRemarkTypeId 备注类型Id - * @param detail 详情 + * @param detail 详情 * @return */ @ResponseBody - @RequestMapping(value = "/saveCqRemark",method = RequestMethod.PUT) + @RequestMapping(value = "/saveCqRemark", method = RequestMethod.PUT) @TokenRequired - public BaseResponse saveCqRemark(@RequestParam(required = true)String cqId,@RequestParam(required = false)String csRemarkTypeId,@RequestParam(required = false)String detail) { - return sieveFacade.saveCqRemark(cqId,csRemarkTypeId,detail); + public BaseResponse saveCqRemark(@RequestParam(required = true) String cqId, @RequestParam(required = false) String csRemarkTypeId, @RequestParam(required = false) String detail) { + return sieveFacade.saveCqRemark(cqId, csRemarkTypeId, detail); } /** * 区域产前诊断及新生儿疾病筛查统计报表 + * * @param cqSieveQueryRequest * @param request * @param response */ @ResponseBody - @RequestMapping(value = "/queryCqsievesReport",method = RequestMethod.GET) + @RequestMapping(value = "/queryCqsievesReport", method = RequestMethod.GET) @TokenRequired - public BaseResponse queryCqsievesReport(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request,HttpServletResponse response){ + public BaseResponse queryCqsievesReport(@Valid CqSieveQueryRequest cqSieveQueryRequest, HttpServletRequest request, HttpServletResponse response) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return sieveFacade.queryCqsievesReport(cqSieveQueryRequest, loginState.getId()); } /** * 导出威海市孕妇产前筛查和诊断情况月报表 + * * @param cqSieveQueryRequest * @param request * @param response */ @TokenRequired @RequestMapping(value = "exportSieveReportExcl", method = RequestMethod.POST) - public void exportSieveReportExcl(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request,HttpServletResponse response) { + public void exportSieveReportExcl(@Valid CqSieveQueryRequest cqSieveQueryRequest, HttpServletRequest request, HttpServletResponse response) { sieveFacade.exportSieveReportExcl(cqSieveQueryRequest, getUserId(request), response); @@ -313,18 +323,24 @@ public class SieveController extends BaseController { /** * 导出产前诊断及新生儿疾病筛查工作情况表 + * * @param cqSieveQueryRequest * @param request * @param response */ @TokenRequired @RequestMapping(value = "exportDiagnosisReportExcl", method = RequestMethod.POST) - public void exportDiagnosisReportExcl(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request,HttpServletResponse response) { + public void exportDiagnosisReportExcl(@Valid CqSieveQueryRequest cqSieveQueryRequest, HttpServletRequest request, HttpServletResponse response) { sieveFacade.exportDiagnosisReportExcl(cqSieveQueryRequest, getUserId(request), response); } // TODO 2019/8/26 18:11 dongqing + @RequestMapping(value = "/sieveHistory", method = RequestMethod.GET) + public void SieveHistory(Date startTime, Date endTime, String hospital) { + sieveFacade.SieveHistory(startTime, endTime, hospital); + } + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 5875a83..7f23a78 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -19,6 +19,8 @@ import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.ITrackDownService; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.worker.DueOrgCountWorker; +import com.lyms.platform.operate.web.worker.GravidaVisitHistory; +import com.lyms.platform.operate.web.worker.SieveHistory; import com.lyms.platform.operate.web.worker.SieveWorker; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; @@ -140,7 +142,7 @@ public class SieveFacade { // 正常/重取/失败 报告 ==> 状态 String okType = "1", refetchType = "2", failureType = "3"; Integer status = null; - if (StringUtils.isEmpty(reportType)){ + if (StringUtils.isEmpty(reportType)) { status = 3; } else if (okType.equals(reportType)) { status = SieveStatusEnums.O2.getId(); @@ -423,6 +425,12 @@ public class SieveFacade { sieveQuery.setRenShenResult(cqSieveQueryRequest.getRenShenResult()); sieveQuery.setName(cqSieveQueryRequest.getName()); sieveQuery.setCardNo(cqSieveQueryRequest.getCardNo()); + //省市区查询 + sieveQuery.setProvinceId(cqSieveQueryRequest.getProvinceId()); + sieveQuery.setCityId(cqSieveQueryRequest.getCityId()); + sieveQuery.setAreaId(cqSieveQueryRequest.getAreaId()); + sieveQuery.setStreetId(cqSieveQueryRequest.getStreetId()); + if (null != cqSieveQueryRequest.getDueWeekStart()) { sieveQuery.setDueWeekStart(7 * Integer.valueOf(cqSieveQueryRequest.getDueWeekStart())); } @@ -462,12 +470,12 @@ public class SieveFacade { sieveQuery.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); } } - - sieveQuery.setZtfx(cqSieveQueryRequest.getZtfx()); sieveQuery.setStatus(cqSieveQueryRequest.getIsNotify()); sieveQuery.setPage(cqSieveQueryRequest.getPage()); sieveQuery.setLimit(cqSieveQueryRequest.getLimit()); + + sieveQuery.setNeed(needPage); String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -528,7 +536,7 @@ public class SieveFacade { if (end > list.size()) { end = list.size(); } - listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService, applyOrderService, organizationService, diagnosisService))); + listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService, applyOrderService, organizationService, diagnosisService, basicConfigService))); } for (Future f : listFuture) { try { @@ -812,8 +820,7 @@ public class SieveFacade { sieveResultEditInfo.put("reportType", model.getReportType()); } map.put("sieveResultEditInfo", sieveResultEditInfo); - } - else { + } else { List sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { Map result = new HashMap<>(); @@ -2147,4 +2154,40 @@ public class SieveFacade { list.add(dataMap); } + + public void SieveHistory(Date startTime, Date endTime, String hospitalId) { + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setHospitalId(hospitalId); + sieveQuery.setCreatedStart(startTime); + sieveQuery.setCreatedEnd(endTime); + List sieveQuery1 = sieveService.queryList(sieveQuery); + System.out.println("条数" + sieveQuery1.size()); + if (CollectionUtils.isNotEmpty(sieveQuery1)) { + int batchSize = 100; + int ends = 0; + List futures = new ArrayList<>(); + for (int i = 0; i < sieveQuery1.size(); i += batchSize) { + ends = (ends + batchSize); + if (ends > sieveQuery1.size()) { + ends = sieveQuery1.size(); + } + List mlist = sieveQuery1.subList(i, ends); + Callable c = new SieveHistory(mlist, patientsService, sieveService); + Future f = commonThreadPool.submit(c); + if (f != null) { + futures.add(f); + } + } + /*if (CollectionUtils.isNotEmpty(futures)) { + for (Future f : futures) { + try { + dataRequest.add((Map) f.get()); + } catch (Exception e) { + ExceptionUtils.catchException(e, "fm list error."); + } + } + }*/ + } + } + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java index 9d66a81..a96ff84 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java @@ -2,13 +2,14 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.common.core.annotation.form.Form; + /** * 产前筛查查询请求 - * + *

* Created by Administrator on 2016/7/6 0006. */ @Form -public class CqSieveQueryRequest extends BasePageQueryRequest{ +public class CqSieveQueryRequest extends BasePageQueryRequest { //孕妇姓名 @FormParam private String name; @@ -69,6 +70,7 @@ public class CqSieveQueryRequest extends BasePageQueryRequest{ private String areaId; private String streetId; + private String time; /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java index 15b1e99..155ec0e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java @@ -14,7 +14,7 @@ import java.util.Map; * Created by Administrator on 2016/7/5 0005. */ public class SieveListResult implements IBasicResultConvert { - public static final String SPIT="-"; + public static final String SPIT = "-"; private String id; //患者id @@ -37,7 +37,7 @@ public class SieveListResult implements IBasicResultConvert> dia; + private List> dia; public List> getDia() { return dia; @@ -112,7 +112,7 @@ public class SieveListResult implements IBasicResultConvert 0 ? "+" + day + "天" : ""); + this.cDueWeek2 = "孕" + str + (day > 0 ? "+" + day + "天" : ""); } - if(null!=destModel.getTireNumber()){ + if (null != destModel.getTireNumber()) { setTireNumber(TaiShuEnums.getTitle(destModel.getTireNumber() + "")); } - if(null!=destModel.getDueWeek()){ + if (null != destModel.getDueWeek()) { setDueWeek(StringUtils.dueWeek(destModel.getDueWeek())); } - if(null!=destModel.getZtfx()) { - setZtfx(destModel.getZtfx()+""); + if (null != destModel.getZtfx()) { + setZtfx(destModel.getZtfx() + ""); setZtfxText(SieveEnums.getTitle(destModel.getZtfx())); } setPhone(StringUtils.encryPhone(destModel.getPhone())); setRealPhone(destModel.getPhone()); - if(null!=destModel.getCqStatus()) { + if (null != destModel.getCqStatus()) { setCqStatus(ChanQResultEnums.getTitle(destModel.getCqStatus())); } - if(null!=destModel.getCqResult()) { + if (null != destModel.getCqResult()) { setCqResult(ChanQResultEnums.CqResult.getTitle(destModel.getCqResult())); } - if(null!=destModel.getRenShenResult()) { - setRenShenResult(RenShenJieJu1Enums.getTitle(destModel.getRenShenResult()+"")); + if (null != destModel.getRenShenResult()) { + setRenShenResult(RenShenJieJu1Enums.getTitle(destModel.getRenShenResult() + "")); } setStatus(destModel.getStatus()); setStatusText(SieveStatusEnums.getStrById(destModel.getStatus())); setCsRemarkTypeId(destModel.getCsRemarkTypeId()); - if (StringUtils.isNotEmpty(destModel.getCsRemarkTypeId())) - { + if (StringUtils.isNotEmpty(destModel.getCsRemarkTypeId())) { setCsRemarkTypeText(CsRemarkTypeEnums.getTitleById(Integer.parseInt(destModel.getCsRemarkTypeId()))); } setDetail(destModel.getDetail()); @@ -416,6 +428,7 @@ public class SieveListResult implements IBasicResultConvert sieveModels; + + private PatientsService patientsService; + + private SieveService sieveService; + + public SieveHistory(List sieveModels, PatientsService patientsService, SieveService sieveService) { + this.sieveModels = sieveModels; + this.patientsService = patientsService; + this.sieveService = sieveService; + } + + @Override + public Object call() throws Exception { + int i = 0; + for (SieveModel sieveModel : sieveModels) { + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setId(sieveModel.getParentId()); + patientsQuery.setHospitalId(sieveModel.getHospitalId()); + List patientsList = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(patientsList)) { + Patients patients = patientsList.get(0); + sieveModel.setProvinceId(patients.getProvinceId()); + sieveModel.setCityId(patients.getCityId()); + sieveModel.setAreaId(patients.getAreaId()); + sieveModel.setStreetId(patients.getStreetId()); + sieveService.updateOneChanQianDiaSieve(sieveModel); + i++; + } + } + System.out.println("数据处理" + i + "条"); + return i; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java index 852e952..dc38b3f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java @@ -1,12 +1,10 @@ package com.lyms.platform.operate.web.worker; -import com.lyms.platform.biz.service.AntenatalExaminationService; -import com.lyms.platform.biz.service.ApplyOrderService; -import com.lyms.platform.biz.service.DiagnosisService; -import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.biz.service.*; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.result.SieveListResult; +import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.*; @@ -45,10 +43,11 @@ public class SieveWorker implements Callable> { private OrganizationService organizationService; private DiagnosisService diagnosisService; + private BasicConfigService basicConfigService; public SieveWorker(String hospitalId, List list, AntenatalExaminationService antService, - PatientsService patientsService,ApplyOrderService applyOrderService, - OrganizationService organizationService,DiagnosisService diagnosisService) { + PatientsService patientsService, ApplyOrderService applyOrderService, + OrganizationService organizationService, DiagnosisService diagnosisService, BasicConfigService basicConfigService) { this.hospitalId = hospitalId; this.list = list; this.antService = antService; @@ -56,6 +55,7 @@ public class SieveWorker implements Callable> { this.applyOrderService = applyOrderService; this.organizationService = organizationService; this.diagnosisService = diagnosisService; + this.basicConfigService = basicConfigService; } @Override @@ -99,59 +99,56 @@ public class SieveWorker implements Callable> { } //转诊状态 0转诊 1待接收 2已转出 - Integer referralStatus = 0; + Integer referralStatus = 0; ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setType(2); referralApplyOrderQuery.setParentId(sieveModel.getParentId()); referralApplyOrderQuery.setOutHospitalId(hospitalId); List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); - if (CollectionUtils.isNotEmpty(orderModels)) - { + if (CollectionUtils.isNotEmpty(orderModels)) { ReferralApplyOrderModel model = orderModels.get(0); // CREATED("待接收","1"), //O("已接收","2"), - /// O1("建议转诊","3"); + /// O1("建议转诊","3"); Integer status = model.getStatus(); - if (status == 1) - { + if (status == 1) { referralStatus = 1; - } - else if (status == 2) - { + } else if (status == 2) { referralStatus = 2; } } sieveListResult.setReferralStatus(referralStatus); - if (StringUtils.isNotEmpty(sieveModel.getApplyHospitalId())) - { + if (StringUtils.isNotEmpty(sieveModel.getApplyHospitalId())) { Organization organization = organizationService.getOrganization(Integer.parseInt(sieveModel.getApplyHospitalId())); sieveListResult.setApplyHospital(organization.getName()); } - + //省市区 + sieveListResult.setCensusAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), + patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); //查询产前诊断 int a = 0; - List> mList = new ArrayList>(); - Map map = new HashMap(); - map.put("cqSieve","0");//0,未申请；1，已申请；2，已接收；3，已诊断 - map.put("diaProject",""); - map.put("diaResult","");//(0，阴性；1，阳性) + List> mList = new ArrayList>(); + Map map = new HashMap(); + map.put("cqSieve", "0");//0,未申请；1，已申请；2，已接收；3，已诊断 + map.put("diaProject", ""); + map.put("diaResult", "");//(0，阴性；1，阳性) DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); diagnosisQuery.setParentId(sieveModel.getParentId()); diagnosisQuery.setHospitalId(hospitalId); List diaList = diagnosisService.queryDiagnosis(diagnosisQuery); - if(CollectionUtils.isNotEmpty(diaList)){ - for(DiagnosisModel diagnosisModel : diaList){ - Map m = new HashMap(); - m.put("cqSieve",diagnosisModel.getDiaStatus());//0,未申请；1，已申请；2，已接收；3，已诊断 - m.put("diaProject",diagnosisModel.getDiaProject()); - m.put("diaResult",diagnosisModel.getDiaResult());//(0，阴性；1，阳性) - a=1; + if (CollectionUtils.isNotEmpty(diaList)) { + for (DiagnosisModel diagnosisModel : diaList) { + Map m = new HashMap(); + m.put("cqSieve", diagnosisModel.getDiaStatus());//0,未申请；1，已申请；2，已接收；3，已诊断 + m.put("diaProject", diagnosisModel.getDiaProject()); + m.put("diaResult", diagnosisModel.getDiaResult());//(0，阴性；1，阳性) + a = 1; mList.add(m); } } - if(a == 0){ + if (a == 0) { mList.add(map); } sieveListResult.setDia(mList);