jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3b020008896daefa1059cb88d97b955e79450856

Authored by shiyang
1 parent 6618a47265
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 61 additions and 60 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java View file @ 3b02000
... ... @@ -215,7 +215,7 @@
215 215 @ResponseBody
216 216 @RequestMapping(method = RequestMethod.POST ,value = "/riskResult")
217 217 @TokenRequired
218   - public BaseResponse riskResult(@RequestBody CervicalCancerRequest param) {
  218 + public BaseResponse riskResult(@RequestBody CervicalCancerRequest param) throws Exception {
219 219 return cervicalCancerService.riskResult(param);
220 220 }
221 221 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ 3b02000
... ... @@ -821,56 +821,52 @@
821 821 public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url");
822 822  
823 823 //宫颈随访业务 type:1：新增、2：修改
824   - public void cervixVisitAdd(CervicalCancerRequest cervicalCancerRequest,int type) {
825   - try {
826   - if(null!=cervicalCancerRequest && MapUtils.isNotEmpty(cervicalCancerRequest.getFormData()) &&
827   - (null!=cervicalCancerRequest.getFormData().get("hpv")||
828   - null!=cervicalCancerRequest.getFormData().get("xbx")||
829   - null!=cervicalCancerRequest.getFormData().get("cin")||
830   - null!=cervicalCancerRequest.getFormData().get("cin23")||
831   - null!=cervicalCancerRequest.getFormData().get("xshpv")||
832   - null!=cervicalCancerRequest.getFormData().get("hpvjc")||
833   - null!=cervicalCancerRequest.getFormData().get("xsxbx")||
834   - null!=cervicalCancerRequest.getFormData().get("ydhjzd")
835   - )){
836   - //风险逻辑处理
837   - CervixVisitModel cervixVisitModel=cervixRiskResult(cervicalCancerRequest);
838   - //判断集合中有没有常规推荐,没有不需要增加随访，修改的时候需要删除这条随访的下次预约时间
839   - if(null==cervixVisitModel.getRuleRecommend()){
840   - if(type==1){
841   - return;
842   - }else {
843   - mongoTemplate.updateFirst(Query.query(Criteria.where("parentId").is(cervicalCancerRequest.getId())),
844   - new Update().unset("nextAfterVisitTime").set("type",2), CervixVisitModel.class);
845   - }
846   - }
847   - //新增和修改随访主表
848   - if(type==1) {
849   - cervixVisitModel.setParentId(cervicalCancerRequest.getId());
850   - cervixVisitModel.setHospitalId(cervicalCancerRequest.getHospitalId());
851   - cervixVisitModel.setUsername(cervicalCancerRequest.getName());
852   - cervixVisitModel.setAge(cervicalCancerRequest.getAge());
853   - cervixVisitModel.setCertificateNum(cervicalCancerRequest.getIdCardNo());
854   - cervixVisitModel.setPhone(cervicalCancerRequest.getPhone());
855   - cervixVisitModel.setProvinceId(cervicalCancerRequest.getProvinceId());
856   - cervixVisitModel.setCityId(cervicalCancerRequest.getCityId());
857   - cervixVisitModel.setAreaId(cervicalCancerRequest.getAreaId());
858   - cervixVisitModel.setStreetId(cervicalCancerRequest.getStreetId());
859   - cervixVisitModel.setAddress(cervicalCancerRequest.getAddress());
860   - cervixVisitModel.setCode(cervicalCancerRequest.getCode());
861   - cervixVisitModel.setCheckDate(cervicalCancerRequest.getCreated());
862   - cervixVisitModel.setType(0);
863   - cervixVisitModel.setYn(1);
864   - cervixVisitService.addOneCervixVisit(cervixVisitModel);
  824 + public void cervixVisitAdd(CervicalCancerRequest cervicalCancerRequest,int type) throws Exception {
  825 + if(null!=cervicalCancerRequest && MapUtils.isNotEmpty(cervicalCancerRequest.getFormData()) &&
  826 + (null!=cervicalCancerRequest.getFormData().get("hpv")||
  827 + null!=cervicalCancerRequest.getFormData().get("xbx")||
  828 + null!=cervicalCancerRequest.getFormData().get("cin")||
  829 + null!=cervicalCancerRequest.getFormData().get("cin23")||
  830 + null!=cervicalCancerRequest.getFormData().get("xshpv")||
  831 + null!=cervicalCancerRequest.getFormData().get("hpvjc")||
  832 + null!=cervicalCancerRequest.getFormData().get("xsxbx")||
  833 + null!=cervicalCancerRequest.getFormData().get("ydhjzd")
  834 + )){
  835 + //风险逻辑处理
  836 + CervixVisitModel cervixVisitModel=cervixRiskResult(cervicalCancerRequest);
  837 + //判断集合中有没有常规推荐,没有不需要增加随访，修改的时候需要删除这条随访的下次预约时间
  838 + if(null==cervixVisitModel.getRuleRecommend()){
  839 + if(type==1){
  840 + return;
865 841 }else {
866   - cervixVisitModel.setParentId(cervicalCancerRequest.getId());
867   - cervixVisitModel.setCode(cervicalCancerRequest.getCode());
868   - cervixVisitModel.setCheckDate(cervicalCancerRequest.getCreated());
869   - cervixVisitService.updateOneCervixVisit(cervixVisitModel,2);
  842 + mongoTemplate.updateFirst(Query.query(Criteria.where("parentId").is(cervicalCancerRequest.getId())),
  843 + new Update().unset("nextAfterVisitTime").set("type",2), CervixVisitModel.class);
870 844 }
871 845 }
872   - } catch (Exception e) {
873   - e.printStackTrace();
  846 + //新增和修改随访主表
  847 + if(type==1) {
  848 + cervixVisitModel.setParentId(cervicalCancerRequest.getId());
  849 + cervixVisitModel.setHospitalId(cervicalCancerRequest.getHospitalId());
  850 + cervixVisitModel.setUsername(cervicalCancerRequest.getName());
  851 + cervixVisitModel.setAge(cervicalCancerRequest.getAge());
  852 + cervixVisitModel.setCertificateNum(cervicalCancerRequest.getIdCardNo());
  853 + cervixVisitModel.setPhone(cervicalCancerRequest.getPhone());
  854 + cervixVisitModel.setProvinceId(cervicalCancerRequest.getProvinceId());
  855 + cervixVisitModel.setCityId(cervicalCancerRequest.getCityId());
  856 + cervixVisitModel.setAreaId(cervicalCancerRequest.getAreaId());
  857 + cervixVisitModel.setStreetId(cervicalCancerRequest.getStreetId());
  858 + cervixVisitModel.setAddress(cervicalCancerRequest.getAddress());
  859 + cervixVisitModel.setCode(cervicalCancerRequest.getCode());
  860 + cervixVisitModel.setCheckDate(cervicalCancerRequest.getCreated());
  861 + cervixVisitModel.setType(0);
  862 + cervixVisitModel.setYn(1);
  863 + cervixVisitService.addOneCervixVisit(cervixVisitModel);
  864 + }else {
  865 + cervixVisitModel.setParentId(cervicalCancerRequest.getId());
  866 + cervixVisitModel.setCode(cervicalCancerRequest.getCode());
  867 + cervixVisitModel.setCheckDate(cervicalCancerRequest.getCreated());
  868 + cervixVisitService.updateOneCervixVisit(cervixVisitModel,2);
  869 + }
874 870 }
875 871 }
876 872  
877 873  
... ... @@ -1051,15 +1047,20 @@
1051 1047 public BaseResponse riskResult(CervicalCancerRequest param) {
1052 1048 BaseResponse response=new BaseResponse();
1053 1049 Map map=new HashMap();
1054   - //风险逻辑处理
1055   - CervixVisitModel cervixVisitModel=cervixRiskResult(param);
1056   - map.put("ruleRecommend",cervixVisitModel.getRuleRecommend());
1057   - map.put("nowRisk",cervixVisitModel.getNowRisk());
1058   - map.put("addUpRisk",cervixVisitModel.getAddUpRisk());
  1050 + try {
  1051 + //风险逻辑处理
  1052 + CervixVisitModel cervixVisitModel=cervixRiskResult(param);
  1053 + map.put("ruleRecommend",cervixVisitModel.getRuleRecommend());
  1054 + map.put("nowRisk",cervixVisitModel.getNowRisk());
  1055 + map.put("addUpRisk",cervixVisitModel.getAddUpRisk());
1059 1056  
1060   - response.setObject(map);
1061   - response.setErrorcode(ErrorCodeConstants.SUCCESS);
1062   - response.setErrormsg("成功");
  1057 + response.setObject(map);
  1058 + response.setErrorcode(ErrorCodeConstants.SUCCESS);
  1059 + response.setErrormsg("成功");
  1060 + } catch (Exception e) {
  1061 + e.printStackTrace();
  1062 + return new BaseResponse(e.getMessage(), ErrorCodeConstants.SYSTEM_ERROR);
  1063 + }
1063 1064 return response;
1064 1065 }
1065 1066  
... ... @@ -1068,7 +1069,7 @@
1068 1069 * @param cervicalCancerRequest
1069 1070 * @return CervixVisitModel
1070 1071 */
1071   - public CervixVisitModel cervixRiskResult(CervicalCancerRequest cervicalCancerRequest){
  1072 + public CervixVisitModel cervixRiskResult(CervicalCancerRequest cervicalCancerRequest) throws Exception {
1072 1073  
1073 1074 CervixVisitModel cervixVisitModel=new CervixVisitModel();
1074 1075 //宫颈检查随访项
... ... @@ -1971,7 +1972,7 @@
1971 1972 cervixVisitModel.setAddUpRisk("54");
1972 1973 }
1973 1974 }
1974   - return cervixVisitModel;
  1975 + return cervixVisitModel;
1975 1976 }
1976 1977 }