From 3b020008896daefa1059cb88d97b955e79450856 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Mon, 14 Mar 2022 12:44:43 +0800 Subject: [PATCH] update --- .../web/controller/CervicalCancerController.java | 2 +- .../service/impl/CervicalCancerServiceImpl.java | 119 +++++++++++---------- 2 files changed, 61 insertions(+), 60 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java index 9e62a72..7634f1c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java @@ -215,7 +215,7 @@ public class CervicalCancerController extends BaseController { @ResponseBody @RequestMapping(method = RequestMethod.POST ,value = "/riskResult") @TokenRequired - public BaseResponse riskResult(@RequestBody CervicalCancerRequest param) { + public BaseResponse riskResult(@RequestBody CervicalCancerRequest param) throws Exception { return cervicalCancerService.riskResult(param); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index 777759e..ab7a1c5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -821,56 +821,52 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url"); //宫颈随访业务 type:1：新增、2：修改 - public void cervixVisitAdd(CervicalCancerRequest cervicalCancerRequest,int type) { - try { - if(null!=cervicalCancerRequest && MapUtils.isNotEmpty(cervicalCancerRequest.getFormData()) && - (null!=cervicalCancerRequest.getFormData().get("hpv")|| - null!=cervicalCancerRequest.getFormData().get("xbx")|| - null!=cervicalCancerRequest.getFormData().get("cin")|| - null!=cervicalCancerRequest.getFormData().get("cin23")|| - null!=cervicalCancerRequest.getFormData().get("xshpv")|| - null!=cervicalCancerRequest.getFormData().get("hpvjc")|| - null!=cervicalCancerRequest.getFormData().get("xsxbx")|| - null!=cervicalCancerRequest.getFormData().get("ydhjzd") - )){ - //风险逻辑处理 - CervixVisitModel cervixVisitModel=cervixRiskResult(cervicalCancerRequest); - //判断集合中有没有常规推荐,没有不需要增加随访，修改的时候需要删除这条随访的下次预约时间 - if(null==cervixVisitModel.getRuleRecommend()){ - if(type==1){ - return; - }else { - mongoTemplate.updateFirst(Query.query(Criteria.where("parentId").is(cervicalCancerRequest.getId())), - new Update().unset("nextAfterVisitTime").set("type",2), CervixVisitModel.class); - } - } - //新增和修改随访主表 - if(type==1) { - cervixVisitModel.setParentId(cervicalCancerRequest.getId()); - cervixVisitModel.setHospitalId(cervicalCancerRequest.getHospitalId()); - cervixVisitModel.setUsername(cervicalCancerRequest.getName()); - cervixVisitModel.setAge(cervicalCancerRequest.getAge()); - cervixVisitModel.setCertificateNum(cervicalCancerRequest.getIdCardNo()); - cervixVisitModel.setPhone(cervicalCancerRequest.getPhone()); - cervixVisitModel.setProvinceId(cervicalCancerRequest.getProvinceId()); - cervixVisitModel.setCityId(cervicalCancerRequest.getCityId()); - cervixVisitModel.setAreaId(cervicalCancerRequest.getAreaId()); - cervixVisitModel.setStreetId(cervicalCancerRequest.getStreetId()); - cervixVisitModel.setAddress(cervicalCancerRequest.getAddress()); - cervixVisitModel.setCode(cervicalCancerRequest.getCode()); - cervixVisitModel.setCheckDate(cervicalCancerRequest.getCreated()); - cervixVisitModel.setType(0); - cervixVisitModel.setYn(1); - cervixVisitService.addOneCervixVisit(cervixVisitModel); + public void cervixVisitAdd(CervicalCancerRequest cervicalCancerRequest,int type) throws Exception { + if(null!=cervicalCancerRequest && MapUtils.isNotEmpty(cervicalCancerRequest.getFormData()) && + (null!=cervicalCancerRequest.getFormData().get("hpv")|| + null!=cervicalCancerRequest.getFormData().get("xbx")|| + null!=cervicalCancerRequest.getFormData().get("cin")|| + null!=cervicalCancerRequest.getFormData().get("cin23")|| + null!=cervicalCancerRequest.getFormData().get("xshpv")|| + null!=cervicalCancerRequest.getFormData().get("hpvjc")|| + null!=cervicalCancerRequest.getFormData().get("xsxbx")|| + null!=cervicalCancerRequest.getFormData().get("ydhjzd") + )){ + //风险逻辑处理 + CervixVisitModel cervixVisitModel=cervixRiskResult(cervicalCancerRequest); + //判断集合中有没有常规推荐,没有不需要增加随访，修改的时候需要删除这条随访的下次预约时间 + if(null==cervixVisitModel.getRuleRecommend()){ + if(type==1){ + return; }else { - cervixVisitModel.setParentId(cervicalCancerRequest.getId()); - cervixVisitModel.setCode(cervicalCancerRequest.getCode()); - cervixVisitModel.setCheckDate(cervicalCancerRequest.getCreated()); - cervixVisitService.updateOneCervixVisit(cervixVisitModel,2); - } + mongoTemplate.updateFirst(Query.query(Criteria.where("parentId").is(cervicalCancerRequest.getId())), + new Update().unset("nextAfterVisitTime").set("type",2), CervixVisitModel.class); + } + } + //新增和修改随访主表 + if(type==1) { + cervixVisitModel.setParentId(cervicalCancerRequest.getId()); + cervixVisitModel.setHospitalId(cervicalCancerRequest.getHospitalId()); + cervixVisitModel.setUsername(cervicalCancerRequest.getName()); + cervixVisitModel.setAge(cervicalCancerRequest.getAge()); + cervixVisitModel.setCertificateNum(cervicalCancerRequest.getIdCardNo()); + cervixVisitModel.setPhone(cervicalCancerRequest.getPhone()); + cervixVisitModel.setProvinceId(cervicalCancerRequest.getProvinceId()); + cervixVisitModel.setCityId(cervicalCancerRequest.getCityId()); + cervixVisitModel.setAreaId(cervicalCancerRequest.getAreaId()); + cervixVisitModel.setStreetId(cervicalCancerRequest.getStreetId()); + cervixVisitModel.setAddress(cervicalCancerRequest.getAddress()); + cervixVisitModel.setCode(cervicalCancerRequest.getCode()); + cervixVisitModel.setCheckDate(cervicalCancerRequest.getCreated()); + cervixVisitModel.setType(0); + cervixVisitModel.setYn(1); + cervixVisitService.addOneCervixVisit(cervixVisitModel); + }else { + cervixVisitModel.setParentId(cervicalCancerRequest.getId()); + cervixVisitModel.setCode(cervicalCancerRequest.getCode()); + cervixVisitModel.setCheckDate(cervicalCancerRequest.getCreated()); + cervixVisitService.updateOneCervixVisit(cervixVisitModel,2); } - } catch (Exception e) { - e.printStackTrace(); } } @@ -1051,15 +1047,20 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { public BaseResponse riskResult(CervicalCancerRequest param) { BaseResponse response=new BaseResponse(); Map map=new HashMap(); - //风险逻辑处理 - CervixVisitModel cervixVisitModel=cervixRiskResult(param); - map.put("ruleRecommend",cervixVisitModel.getRuleRecommend()); - map.put("nowRisk",cervixVisitModel.getNowRisk()); - map.put("addUpRisk",cervixVisitModel.getAddUpRisk()); - - response.setObject(map); - response.setErrorcode(ErrorCodeConstants.SUCCESS); - response.setErrormsg("成功"); + try { + //风险逻辑处理 + CervixVisitModel cervixVisitModel=cervixRiskResult(param); + map.put("ruleRecommend",cervixVisitModel.getRuleRecommend()); + map.put("nowRisk",cervixVisitModel.getNowRisk()); + map.put("addUpRisk",cervixVisitModel.getAddUpRisk()); + + response.setObject(map); + response.setErrorcode(ErrorCodeConstants.SUCCESS); + response.setErrormsg("成功"); + } catch (Exception e) { + e.printStackTrace(); + return new BaseResponse(e.getMessage(), ErrorCodeConstants.SYSTEM_ERROR); + } return response; } @@ -1068,7 +1069,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { * @param cervicalCancerRequest * @return CervixVisitModel */ - public CervixVisitModel cervixRiskResult(CervicalCancerRequest cervicalCancerRequest){ + public CervixVisitModel cervixRiskResult(CervicalCancerRequest cervicalCancerRequest) throws Exception { CervixVisitModel cervixVisitModel=new CervixVisitModel(); //宫颈检查随访项 @@ -1971,6 +1972,6 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { cervixVisitModel.setAddUpRisk("54"); } } - return cervixVisitModel; + return cervixVisitModel; } } -- 1.8.3.1