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 c48b464..f57e84f 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 @@ -86,7 +86,7 @@ public class SieveController extends BaseController { @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()); + return sieveFacade.querySievePatientInfo(cardNo, vcCardNo, loginState.getId()); } @@ -107,6 +107,19 @@ public class SieveController extends BaseController { } + /** + * 接收产筛申请 + * @param parentId + * @param request + * @return + */ + @ResponseBody + @RequestMapping(value = "/reviceSieve",method = RequestMethod.GET) + @TokenRequired + public BaseResponse reviceSieve(@RequestParam("parentId")String parentId,HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return sieveFacade.reviceSieve(parentId, loginState.getId()); + } /** 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 f2d04d5..87ed5de 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 @@ -394,12 +394,9 @@ public class SieveFacade { sieveQuery.setNeed(needPage); String hospitalId = autoMatchFacade.getHospitalId(userId); sieveQuery.setHospitalId(hospitalId); - // System.out.println("产筛列表："+sieveQuery.convertToQuery().convertToMongoQuery()); //查询产筛list List list = sieveService.queryList1(sieveQuery, "order"); List data = new ArrayList<>(); - - int batchSize = 4; int end = 0; List listFuture = new ArrayList<>(); @@ -408,7 +405,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))); + listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService,applyOrderService,organizationService))); } for (Future f : listFuture) { try { @@ -417,49 +414,6 @@ public class SieveFacade { ExceptionUtils.catchException(e, "cqSieve list get result Future error."); } } - - - -/* - if (CollectionUtils.isNotEmpty(list)) { - for (SieveModel sieveModel : list) { - SieveListResult sieveListResult = new SieveListResult(); - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setHospitalId(hospitalId); - antExQuery.setParentId(sieveModel.getParentId()); - List list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); - if (CollectionUtils.isNotEmpty(list1)) { - if (StringUtils.isNotEmpty(list1.get(0).getTireNumber())) { - sieveModel.setTireNumber(NumberUtils.toInt(list1.get(0).getTireNumber())); - } - } else { - AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setYn(YnEnums.YES.getId()); - antExChuQuery.setParentId(sieveModel.getParentId()); - antExChuQuery.setHospitalId(hospitalId); - List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); - if (CollectionUtils.isNotEmpty(antExChuModels)) { - if (StringUtils.isNotEmpty(antExChuModels.get(0).getTireNumber())) { - sieveModel.setTireNumber(NumberUtils.toInt(antExChuModels.get(0).getTireNumber())); - } - } - } - - sieveListResult.convertToResult(sieveModel); - Patients patients = patientsService.findOnePatientById(sieveModel.getParentId()); - if (null != patients) { - sieveListResult.setIsGravida((patients.getType() == 3 && patients.getFmDate() != null) ? "0" : "1"); - if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) - sieveListResult.setcDueWeek("终止妊娠"); - else if (patients.getType() == 3) { - sieveListResult.setcDueWeek("已分娩"); - } - sieveListResult.setAge(DateUtil.getAge(patients.getBirth()) + "岁"); - } - data.add(sieveListResult); - } - }*/ return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(sieveQuery.getPageInfo()); } @@ -684,7 +638,7 @@ public class SieveFacade { patientBaseResult.setRiskFactor(highScoreResult.getHighRisk()); patientBaseResult.setRiskScore(highScoreResult.getScoreStr()); - map.put("patientInfo",patientBaseResult); + map.put("patientInfo", patientBaseResult); SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); sieveApplyOrderQuery1.setParentId(parentId); @@ -702,7 +656,7 @@ public class SieveFacade { result.put("id",sieveApply.getId()); result.put("parentId",sieveApply.getParentId()); - result.put("checkItem",sieveApply.getCheckItem()); + result.put("check",sieveApply.getCheckItem()); result.put("guide",sieveApply.getGuide()); result.put("checkDate",sieveApply.getCheckDate()); result.put("applyDoctor",sieveApply.getApplyDoctor()); @@ -727,4 +681,14 @@ public class SieveFacade { } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map); } + + public BaseResponse reviceSieve(String parentId, Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + SieveModel sieve = new SieveModel(); + sieve.setParentId(parentId); + sieve.setHospitalId(hospitalId); + sieve.setReviceStatus(2); + sieveService.updateOneChanQianDiaSieve(sieve); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } } \ No newline at end of file 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 9b3468b..9b5d6b3 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 @@ -60,6 +60,28 @@ public class SieveListResult implements IBasicResultConvert> { private PatientsService patientsService; - public SieveWorker(String hospitalId, List list, AntenatalExaminationService antService, PatientsService patientsService,ApplyOrderService applyOrderService) { + private OrganizationService organizationService; + + public SieveWorker(String hospitalId, List list, AntenatalExaminationService antService, + PatientsService patientsService,ApplyOrderService applyOrderService, + OrganizationService organizationService) { this.hospitalId = hospitalId; this.list = list; this.antService = antService; this.patientsService = patientsService; this.applyOrderService = applyOrderService; + this.organizationService = organizationService; } @Override @@ -48,6 +56,7 @@ public class SieveWorker implements Callable> { List results = new ArrayList<>(); for (SieveModel sieveModel : list) { SieveListResult sieveListResult = new SieveListResult(); + sieveListResult.setReviceStatus(sieveModel.getReviceStatus()); AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setHospitalId(hospitalId); @@ -105,11 +114,16 @@ public class SieveWorker implements Callable> { { referralStatus = 2; } + + Organization organization = organizationService.getOrganization(Integer.parseInt(model.getHospitalId())); + sieveListResult.setApplyHospital(organization.getName()); } sieveListResult.setReferralStatus(referralStatus); + + results.add(sieveListResult); } return results;