jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 94745e5e8ef2e3833d187340c8d9aa8b43917da0

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

承德市妇幼上线两癌需求-承德妇、幼隆化问题修改

Showing 4 changed files with 111 additions and 92 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java View file @ 94745e5
... ... @@ -383,7 +383,7 @@
383 383 query.addCriteria(criteria);
384 384 query.with(new Sort(Sort.Direction.DESC, "created"));
385 385 List<CancerScreeningModel> models = mongoTemplate.find(query, CancerScreeningModel.class);
386   - if(models.size()>1){
  386 + if(models.size()>0){
387 387 if (models.get(0).getId().equals(cancerScr.getId())) {
388 388 //修改乳腺癌追访
389 389 BreastAfterVisitQuery breastAfterVisitQuery=new BreastAfterVisitQuery();
390 390  
391 391  
392 392  
... ... @@ -594,98 +594,80 @@
594 594 //乳腺追访业务 type:1：新增、2：修改
595 595 public void breastAfterVisitAdd(CancerScreeningModel cancerScreeningModel,int type) {
596 596 try {
597   - if(null!=cancerScreeningModel&&
598   - (MapUtils.isNotEmpty(cancerScreeningModel.getRxlRtz())||
599   - MapUtils.isNotEmpty(cancerScreeningModel.getRxlRty())||
600   - MapUtils.isNotEmpty(cancerScreeningModel.getRxlYyz())||
601   - MapUtils.isNotEmpty(cancerScreeningModel.getRxlYyy())||
602   - MapUtils.isNotEmpty(cancerScreeningModel.getRxlZkz())||
603   - MapUtils.isNotEmpty(cancerScreeningModel.getRxlZky())||
604   - StringUtils.isNotEmpty(cancerScreeningModel.getRxXJc()))){
605   - BreastAfterVisitModel breastAfterVisitModel=new BreastAfterVisitModel();
606   - //乳头左
607   - if(MapUtils.isNotEmpty(cancerScreeningModel.getRxlRtz())&&null!=cancerScreeningModel.getRxlRtz().get("select")){
608   - if("3".equals(cancerScreeningModel.getRxlRtz().get("select").toString())){
609   - breastAfterVisitModel.setRxlRtz(cancerScreeningModel.getRxlRtz());
610   - breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6));
611   - }
  597 + BreastAfterVisitModel breastAfterVisitModel=new BreastAfterVisitModel();
  598 + //乳头左
  599 + if("3".equals(cancerScreeningModel.getRxlRtz().get("select").toString())){
  600 + breastAfterVisitModel.setRxlRtz(cancerScreeningModel.getRxlRtz());
  601 + breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6));
  602 + }
  603 + //乳头右
  604 + if("3".equals(cancerScreeningModel.getRxlRty().get("select").toString())){
  605 + breastAfterVisitModel.setRxlRty(cancerScreeningModel.getRxlRty());
  606 + breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6));
  607 + }
  608 + //溢液左
  609 + if(StringUtils.isNotEmpty(cancerScreeningModel.getRxlYyz().get("select").toString())&&!"1".equals(cancerScreeningModel.getRxlYyz().get("select").toString())){
  610 + breastAfterVisitModel.setRxlYyz(cancerScreeningModel.getRxlYyz());
  611 + breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6));
  612 + }
  613 + //溢液右
  614 + if(StringUtils.isNotEmpty(cancerScreeningModel.getRxlYyy().get("select").toString())&&!"1".equals(cancerScreeningModel.getRxlYyy().get("select").toString())){
  615 + breastAfterVisitModel.setRxlYyy(cancerScreeningModel.getRxlYyy());
  616 + breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6));
  617 + }
  618 + //肿块左
  619 + if(StringUtils.isNotEmpty(cancerScreeningModel.getRxlZkz().get("select").toString())&&!"1".equals(cancerScreeningModel.getRxlZkz().get("select").toString())){
  620 + breastAfterVisitModel.setRxlZkz(cancerScreeningModel.getRxlZkz());
  621 + breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6));
  622 + }
  623 + //肿块右
  624 + if(StringUtils.isNotEmpty(cancerScreeningModel.getRxlZky().get("select").toString())&&!"1".equals(cancerScreeningModel.getRxlZky().get("select").toString())){
  625 + breastAfterVisitModel.setRxlZky(cancerScreeningModel.getRxlZky());
  626 + breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6));
  627 + }
  628 + //乳腺X钼靶
  629 + if(StringUtils.isNotEmpty(cancerScreeningModel.getRxXJc())){
  630 + if("3".equals(cancerScreeningModel.getRxXJc())){
  631 + breastAfterVisitModel.setRxXJc(cancerScreeningModel.getRxXJc());
  632 + breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6));
612 633 }
613   - //乳头右
614   - if(MapUtils.isNotEmpty(cancerScreeningModel.getRxlRty())&&null!=cancerScreeningModel.getRxlRty().get("select")){
615   - if("3".equals(cancerScreeningModel.getRxlRty().get("select").toString())){
616   - breastAfterVisitModel.setRxlRty(cancerScreeningModel.getRxlRty());
617   - breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6));
618   - }
  634 + if("4".equals(cancerScreeningModel.getRxXJc())){
  635 + breastAfterVisitModel.setRxXJc(cancerScreeningModel.getRxXJc());
  636 + breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),3));
619 637 }
620   - //溢液左
621   - if(MapUtils.isNotEmpty(cancerScreeningModel.getRxlYyz())&&null!=cancerScreeningModel.getRxlYyz().get("select")){
622   - if(!"1".equals(cancerScreeningModel.getRxlYyz().get("select").toString())){
623   - breastAfterVisitModel.setRxlYyz(cancerScreeningModel.getRxlYyz());
624   - breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6));
625   - }
626   - }
627   - //溢液右
628   - if(MapUtils.isNotEmpty(cancerScreeningModel.getRxlYyy())&&null!=cancerScreeningModel.getRxlYyy().get("select")){
629   - if(!"1".equals(cancerScreeningModel.getRxlYyy().get("select").toString())){
630   - breastAfterVisitModel.setRxlYyy(cancerScreeningModel.getRxlYyy());
631   - breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6));
632   - }
633   - }
634   - //肿块左
635   - if(MapUtils.isNotEmpty(cancerScreeningModel.getRxlZkz())&&null!=cancerScreeningModel.getRxlZkz().get("select")){
636   - if(!"1".equals(cancerScreeningModel.getRxlZkz().get("select").toString())){
637   - breastAfterVisitModel.setRxlZkz(cancerScreeningModel.getRxlZkz());
638   - breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6));
639   - }
640   - }
641   - //肿块右
642   - if(MapUtils.isNotEmpty(cancerScreeningModel.getRxlZky())&&null!=cancerScreeningModel.getRxlZky().get("select")){
643   - if(!"1".equals(cancerScreeningModel.getRxlZky().get("select").toString())){
644   - breastAfterVisitModel.setRxlZky(cancerScreeningModel.getRxlZky());
645   - breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6));
646   - }
647   - }
648   - //乳腺X钼靶
649   - if(StringUtils.isNotEmpty(cancerScreeningModel.getRxXJc())){
650   - if("3".equals(cancerScreeningModel.getRxXJc())){
651   - breastAfterVisitModel.setRxXJc(cancerScreeningModel.getRxXJc());
652   - breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6));
653   - }
654   - if("4".equals(cancerScreeningModel.getRxXJc())){
655   - breastAfterVisitModel.setRxXJc(cancerScreeningModel.getRxXJc());
656   - breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),3));
657   - }
658   - }
659   - //新增和修改追访主表
660   - if(type==1) {
661   - breastAfterVisitModel.setNewRxCssj(cancerScreeningModel.getNewRxCssj());
662   - breastAfterVisitModel.setParentId(cancerScreeningModel.getId());
663   - breastAfterVisitModel.setHospitalId(cancerScreeningModel.getHospitalId());
664   - breastAfterVisitModel.setUsername(cancerScreeningModel.getUsername());
665   - breastAfterVisitModel.setBirthday(cancerScreeningModel.getBirthday());
666   - breastAfterVisitModel.setNationId(cancerScreeningModel.getNationId());
667   - breastAfterVisitModel.setCertificateNum(cancerScreeningModel.getCertificateNum());
668   - breastAfterVisitModel.setPhone(cancerScreeningModel.getPhone());
669   - breastAfterVisitModel.setProvinceId(cancerScreeningModel.getProvinceId());
670   - breastAfterVisitModel.setCityId(cancerScreeningModel.getCityId());
671   - breastAfterVisitModel.setAreaId(cancerScreeningModel.getAreaId());
672   - breastAfterVisitModel.setStreetId(cancerScreeningModel.getStreetId());
673   - breastAfterVisitModel.setAddress(cancerScreeningModel.getAddress());
674   - breastAfterVisitModel.setCode(cancerScreeningModel.getCode());
675   - breastAfterVisitModel.setCheckDate(cancerScreeningModel.getCreated());
676   - breastAfterVisitModel.setType(0);
677   - breastAfterVisitModel.setYn(1);
678   - breastAfterVisitService.addOneBreastAfterVisit(breastAfterVisitModel);
679   - }else {
680   - breastAfterVisitModel.setNewRxCssj(cancerScreeningModel.getNewRxCssj());
681   - breastAfterVisitModel.setParentId(cancerScreeningModel.getId());
682   - breastAfterVisitModel.setCode(cancerScreeningModel.getCode());
683   - breastAfterVisitModel.setCheckDate(cancerScreeningModel.getCreated());
684   - breastAfterVisitService.updateOneBreastAfterVisit(breastAfterVisitModel,2);
685   - }
686   -
687   -
688 638 }
  639 + //判断集合中下次预约追访时间有没有,没有不需要增加
  640 + if(null==breastAfterVisitModel.getNextAfterVisitTime()){
  641 + return;
  642 + }
  643 + //新增和修改追访主表
  644 + if(type==1) {
  645 + breastAfterVisitModel.setNewRxCssj(cancerScreeningModel.getNewRxCssj());
  646 + breastAfterVisitModel.setParentId(cancerScreeningModel.getId());
  647 + breastAfterVisitModel.setHospitalId(cancerScreeningModel.getHospitalId());
  648 + breastAfterVisitModel.setUsername(cancerScreeningModel.getUsername());
  649 + breastAfterVisitModel.setBirthday(cancerScreeningModel.getBirthday());
  650 + breastAfterVisitModel.setNationId(cancerScreeningModel.getNationId());
  651 + breastAfterVisitModel.setCertificateNum(cancerScreeningModel.getCertificateNum());
  652 + breastAfterVisitModel.setPhone(cancerScreeningModel.getPhone());
  653 + breastAfterVisitModel.setProvinceId(cancerScreeningModel.getProvinceId());
  654 + breastAfterVisitModel.setCityId(cancerScreeningModel.getCityId());
  655 + breastAfterVisitModel.setAreaId(cancerScreeningModel.getAreaId());
  656 + breastAfterVisitModel.setStreetId(cancerScreeningModel.getStreetId());
  657 + breastAfterVisitModel.setAddress(cancerScreeningModel.getAddress());
  658 + breastAfterVisitModel.setCode(cancerScreeningModel.getCode());
  659 + breastAfterVisitModel.setCheckDate(cancerScreeningModel.getCreated());
  660 + breastAfterVisitModel.setType(0);
  661 + breastAfterVisitModel.setYn(1);
  662 + breastAfterVisitService.addOneBreastAfterVisit(breastAfterVisitModel);
  663 + }else {
  664 + breastAfterVisitModel.setNewRxCssj(cancerScreeningModel.getNewRxCssj());
  665 + breastAfterVisitModel.setParentId(cancerScreeningModel.getId());
  666 + breastAfterVisitModel.setCode(cancerScreeningModel.getCode());
  667 + breastAfterVisitModel.setCheckDate(cancerScreeningModel.getCreated());
  668 + breastAfterVisitService.updateOneBreastAfterVisit(breastAfterVisitModel,2);
  669 + }
  670 +
689 671  
690 672 } catch (Exception e) {
691 673 e.printStackTrace();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java View file @ 94745e5
... ... @@ -70,6 +70,17 @@
70 70 //隆化- 是否全部模块上传省平台成功。0：失败。1：成功（有一个模块上传失败也是0）
71 71 private Integer isUploadingProvince;
72 72  
  73 + //隆化-男女临床检查项目填写是否完整 0:不完整 1：完整
  74 + private Integer clinicalCheckYn;
  75 +
  76 + public Integer getClinicalCheckYn() {
  77 + return clinicalCheckYn;
  78 + }
  79 +
  80 + public void setClinicalCheckYn(Integer clinicalCheckYn) {
  81 + this.clinicalCheckYn = clinicalCheckYn;
  82 + }
  83 +
73 84 public Integer getIsUploadingProvince() {
74 85 return isUploadingProvince;
75 86 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ 94745e5
... ... @@ -114,7 +114,7 @@
114 114 query2.addCriteria(criteria);
115 115 query2.with(new Sort(Sort.Direction.DESC, "created"));
116 116 List<CervicalCancerModel> models = mongoTemplate.find(query2, CervicalCancerModel.class);
117   - if(models.size()>1){
  117 + if(models.size()>0){
118 118 if (models.get(0).getId().equals(param.getId())) {
119 119 //添加宫颈癌追访
120 120 CervixVisitQuery cervixVisitQuery=new CervixVisitQuery();
... ... @@ -1218,7 +1218,10 @@
1218 1218 cervixVisitModel.setRuleRecommend(6);
1219 1219 }
1220 1220 }
1221   -
  1221 + //判断集合中有没有常规推荐,没有不需要增加随访
  1222 + if(null==cervixVisitModel.getRuleRecommend()){
  1223 + return;
  1224 + }
1222 1225 //新增和修改随访主表
1223 1226 if(type==1) {
1224 1227 cervixVisitModel.setParentId(cervicalCancerRequest.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java View file @ 94745e5
... ... @@ -359,6 +359,29 @@
359 359 if (hasBc != null) {
360 360 query.addCriteria(Criteria.where("wifeBCheck").exists(hasBc));
361 361 }
  362 + //隆化定制-妻子和丈夫临床检查完整状态 0:不完整 1：完整
  363 +// if("2100001605".equals(hospitalId)){
  364 +// Integer clinicalCheckYn=param.getClinicalCheckYn();
  365 +// if(clinicalCheckYn!=null){
  366 +// if(0==clinicalCheckYn){
  367 +// MongoCondition c = MongoCondition.newInstance();
  368 +// MongoCondition con1 = MongoCondition.newInstance("wifeClinicalCheck", false, MongoOper.EXISTS);
  369 +// MongoCondition con2 = MongoCondition.newInstance("husbandClinicalCheck",false, MongoOper.EXISTS);
  370 +// MongoCondition con3 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.0","", MongoOper.IS);
  371 +// MongoCondition con4 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.1","", MongoOper.IS);
  372 +// MongoCondition con5 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.2","", MongoOper.IS);
  373 +// MongoCondition con6 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.3","", MongoOper.IS);
  374 +// MongoCondition con7 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.4","", MongoOper.IS);
  375 +// MongoCondition con8 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.5","", MongoOper.IS);
  376 +// MongoCondition con9 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.6","", MongoOper.IS);
  377 +// MongoCondition con10 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.7","", MongoOper.IS);
  378 +// MongoCondition con11 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.8","", MongoOper.IS);
  379 +// query.addCriteria(c.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5, con6, con7, con8
  380 +// , con9, con10, con11}).getCriteria());
  381 +// }
  382 +//
  383 +// }
  384 +// }
362 385  
363 386 Integer hyj = param.getHyj();
364 387 if (hyj != null) {