From 94745e5e8ef2e3833d187340c8d9aa8b43917da0 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Thu, 17 Feb 2022 18:01:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=BF=E5=BE=B7=E5=B8=82=E5=A6=87=E5=B9=BC?= =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E4=B8=A4=E7=99=8C=E9=9C=80=E6=B1=82-?= =?UTF-8?q?=E6=89=BF=E5=BE=B7=E5=A6=87=E3=80=81=E5=B9=BC=E9=9A=86=E5=8C=96?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/CancerScreeningFacade.java | 162 +++++++++------------ .../web/request/PreEugenicsBaseListRequest.java | 11 ++ .../service/impl/CervicalCancerServiceImpl.java | 7 +- .../web/service/impl/PreEugebicsServiceImpl.java | 23 +++ 4 files changed, 111 insertions(+), 92 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index 5e8035e..16fb4a4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -383,7 +383,7 @@ public class CancerScreeningFacade { query.addCriteria(criteria); query.with(new Sort(Sort.Direction.DESC, "created")); List models = mongoTemplate.find(query, CancerScreeningModel.class); - if(models.size()>1){ + if(models.size()>0){ if (models.get(0).getId().equals(cancerScr.getId())) { //修改乳腺癌追访 BreastAfterVisitQuery breastAfterVisitQuery=new BreastAfterVisitQuery(); @@ -594,98 +594,80 @@ public class CancerScreeningFacade { //乳腺追访业务 type:1：新增、2：修改 public void breastAfterVisitAdd(CancerScreeningModel cancerScreeningModel,int type) { try { - if(null!=cancerScreeningModel&& - (MapUtils.isNotEmpty(cancerScreeningModel.getRxlRtz())|| - MapUtils.isNotEmpty(cancerScreeningModel.getRxlRty())|| - MapUtils.isNotEmpty(cancerScreeningModel.getRxlYyz())|| - MapUtils.isNotEmpty(cancerScreeningModel.getRxlYyy())|| - MapUtils.isNotEmpty(cancerScreeningModel.getRxlZkz())|| - MapUtils.isNotEmpty(cancerScreeningModel.getRxlZky())|| - StringUtils.isNotEmpty(cancerScreeningModel.getRxXJc()))){ - BreastAfterVisitModel breastAfterVisitModel=new BreastAfterVisitModel(); - //乳头左 - if(MapUtils.isNotEmpty(cancerScreeningModel.getRxlRtz())&&null!=cancerScreeningModel.getRxlRtz().get("select")){ - if("3".equals(cancerScreeningModel.getRxlRtz().get("select").toString())){ - breastAfterVisitModel.setRxlRtz(cancerScreeningModel.getRxlRtz()); - breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6)); - } - } - //乳头右 - if(MapUtils.isNotEmpty(cancerScreeningModel.getRxlRty())&&null!=cancerScreeningModel.getRxlRty().get("select")){ - if("3".equals(cancerScreeningModel.getRxlRty().get("select").toString())){ - breastAfterVisitModel.setRxlRty(cancerScreeningModel.getRxlRty()); - breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6)); - } - } - //溢液左 - if(MapUtils.isNotEmpty(cancerScreeningModel.getRxlYyz())&&null!=cancerScreeningModel.getRxlYyz().get("select")){ - if(!"1".equals(cancerScreeningModel.getRxlYyz().get("select").toString())){ - breastAfterVisitModel.setRxlYyz(cancerScreeningModel.getRxlYyz()); - breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6)); - } - } - //溢液右 - if(MapUtils.isNotEmpty(cancerScreeningModel.getRxlYyy())&&null!=cancerScreeningModel.getRxlYyy().get("select")){ - if(!"1".equals(cancerScreeningModel.getRxlYyy().get("select").toString())){ - breastAfterVisitModel.setRxlYyy(cancerScreeningModel.getRxlYyy()); - breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6)); - } - } - //肿块左 - if(MapUtils.isNotEmpty(cancerScreeningModel.getRxlZkz())&&null!=cancerScreeningModel.getRxlZkz().get("select")){ - if(!"1".equals(cancerScreeningModel.getRxlZkz().get("select").toString())){ - breastAfterVisitModel.setRxlZkz(cancerScreeningModel.getRxlZkz()); - breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6)); - } - } - //肿块右 - if(MapUtils.isNotEmpty(cancerScreeningModel.getRxlZky())&&null!=cancerScreeningModel.getRxlZky().get("select")){ - if(!"1".equals(cancerScreeningModel.getRxlZky().get("select").toString())){ - breastAfterVisitModel.setRxlZky(cancerScreeningModel.getRxlZky()); - breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6)); - } - } - //乳腺X钼靶 - if(StringUtils.isNotEmpty(cancerScreeningModel.getRxXJc())){ - if("3".equals(cancerScreeningModel.getRxXJc())){ - breastAfterVisitModel.setRxXJc(cancerScreeningModel.getRxXJc()); - breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6)); - } - if("4".equals(cancerScreeningModel.getRxXJc())){ - breastAfterVisitModel.setRxXJc(cancerScreeningModel.getRxXJc()); - breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),3)); - } + BreastAfterVisitModel breastAfterVisitModel=new BreastAfterVisitModel(); + //乳头左 + if("3".equals(cancerScreeningModel.getRxlRtz().get("select").toString())){ + breastAfterVisitModel.setRxlRtz(cancerScreeningModel.getRxlRtz()); + breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6)); + } + //乳头右 + if("3".equals(cancerScreeningModel.getRxlRty().get("select").toString())){ + breastAfterVisitModel.setRxlRty(cancerScreeningModel.getRxlRty()); + breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6)); + } + //溢液左 + if(StringUtils.isNotEmpty(cancerScreeningModel.getRxlYyz().get("select").toString())&&!"1".equals(cancerScreeningModel.getRxlYyz().get("select").toString())){ + breastAfterVisitModel.setRxlYyz(cancerScreeningModel.getRxlYyz()); + breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6)); + } + //溢液右 + if(StringUtils.isNotEmpty(cancerScreeningModel.getRxlYyy().get("select").toString())&&!"1".equals(cancerScreeningModel.getRxlYyy().get("select").toString())){ + breastAfterVisitModel.setRxlYyy(cancerScreeningModel.getRxlYyy()); + breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6)); + } + //肿块左 + if(StringUtils.isNotEmpty(cancerScreeningModel.getRxlZkz().get("select").toString())&&!"1".equals(cancerScreeningModel.getRxlZkz().get("select").toString())){ + breastAfterVisitModel.setRxlZkz(cancerScreeningModel.getRxlZkz()); + breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6)); + } + //肿块右 + if(StringUtils.isNotEmpty(cancerScreeningModel.getRxlZky().get("select").toString())&&!"1".equals(cancerScreeningModel.getRxlZky().get("select").toString())){ + breastAfterVisitModel.setRxlZky(cancerScreeningModel.getRxlZky()); + breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6)); + } + //乳腺X钼靶 + if(StringUtils.isNotEmpty(cancerScreeningModel.getRxXJc())){ + if("3".equals(cancerScreeningModel.getRxXJc())){ + breastAfterVisitModel.setRxXJc(cancerScreeningModel.getRxXJc()); + breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),6)); } - //新增和修改追访主表 - if(type==1) { - breastAfterVisitModel.setNewRxCssj(cancerScreeningModel.getNewRxCssj()); - breastAfterVisitModel.setParentId(cancerScreeningModel.getId()); - breastAfterVisitModel.setHospitalId(cancerScreeningModel.getHospitalId()); - breastAfterVisitModel.setUsername(cancerScreeningModel.getUsername()); - breastAfterVisitModel.setBirthday(cancerScreeningModel.getBirthday()); - breastAfterVisitModel.setNationId(cancerScreeningModel.getNationId()); - breastAfterVisitModel.setCertificateNum(cancerScreeningModel.getCertificateNum()); - breastAfterVisitModel.setPhone(cancerScreeningModel.getPhone()); - breastAfterVisitModel.setProvinceId(cancerScreeningModel.getProvinceId()); - breastAfterVisitModel.setCityId(cancerScreeningModel.getCityId()); - breastAfterVisitModel.setAreaId(cancerScreeningModel.getAreaId()); - breastAfterVisitModel.setStreetId(cancerScreeningModel.getStreetId()); - breastAfterVisitModel.setAddress(cancerScreeningModel.getAddress()); - breastAfterVisitModel.setCode(cancerScreeningModel.getCode()); - breastAfterVisitModel.setCheckDate(cancerScreeningModel.getCreated()); - breastAfterVisitModel.setType(0); - breastAfterVisitModel.setYn(1); - breastAfterVisitService.addOneBreastAfterVisit(breastAfterVisitModel); - }else { - breastAfterVisitModel.setNewRxCssj(cancerScreeningModel.getNewRxCssj()); - breastAfterVisitModel.setParentId(cancerScreeningModel.getId()); - breastAfterVisitModel.setCode(cancerScreeningModel.getCode()); - breastAfterVisitModel.setCheckDate(cancerScreeningModel.getCreated()); - breastAfterVisitService.updateOneBreastAfterVisit(breastAfterVisitModel,2); + if("4".equals(cancerScreeningModel.getRxXJc())){ + breastAfterVisitModel.setRxXJc(cancerScreeningModel.getRxXJc()); + breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),3)); } - - } + //判断集合中下次预约追访时间有没有,没有不需要增加 + if(null==breastAfterVisitModel.getNextAfterVisitTime()){ + return; + } + //新增和修改追访主表 + if(type==1) { + breastAfterVisitModel.setNewRxCssj(cancerScreeningModel.getNewRxCssj()); + breastAfterVisitModel.setParentId(cancerScreeningModel.getId()); + breastAfterVisitModel.setHospitalId(cancerScreeningModel.getHospitalId()); + breastAfterVisitModel.setUsername(cancerScreeningModel.getUsername()); + breastAfterVisitModel.setBirthday(cancerScreeningModel.getBirthday()); + breastAfterVisitModel.setNationId(cancerScreeningModel.getNationId()); + breastAfterVisitModel.setCertificateNum(cancerScreeningModel.getCertificateNum()); + breastAfterVisitModel.setPhone(cancerScreeningModel.getPhone()); + breastAfterVisitModel.setProvinceId(cancerScreeningModel.getProvinceId()); + breastAfterVisitModel.setCityId(cancerScreeningModel.getCityId()); + breastAfterVisitModel.setAreaId(cancerScreeningModel.getAreaId()); + breastAfterVisitModel.setStreetId(cancerScreeningModel.getStreetId()); + breastAfterVisitModel.setAddress(cancerScreeningModel.getAddress()); + breastAfterVisitModel.setCode(cancerScreeningModel.getCode()); + breastAfterVisitModel.setCheckDate(cancerScreeningModel.getCreated()); + breastAfterVisitModel.setType(0); + breastAfterVisitModel.setYn(1); + breastAfterVisitService.addOneBreastAfterVisit(breastAfterVisitModel); + }else { + breastAfterVisitModel.setNewRxCssj(cancerScreeningModel.getNewRxCssj()); + breastAfterVisitModel.setParentId(cancerScreeningModel.getId()); + breastAfterVisitModel.setCode(cancerScreeningModel.getCode()); + breastAfterVisitModel.setCheckDate(cancerScreeningModel.getCreated()); + breastAfterVisitService.updateOneBreastAfterVisit(breastAfterVisitModel,2); + } + } catch (Exception e) { e.printStackTrace(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java index 4290e26..05d05cf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java @@ -70,6 +70,17 @@ public class PreEugenicsBaseListRequest extends BaseQuery { //隆化- 是否全部模块上传省平台成功。0：失败。1：成功（有一个模块上传失败也是0） private Integer isUploadingProvince; + //隆化-男女临床检查项目填写是否完整 0:不完整 1：完整 + private Integer clinicalCheckYn; + + public Integer getClinicalCheckYn() { + return clinicalCheckYn; + } + + public void setClinicalCheckYn(Integer clinicalCheckYn) { + this.clinicalCheckYn = clinicalCheckYn; + } + public Integer getIsUploadingProvince() { return isUploadingProvince; } 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 9adc865..b988e08 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 @@ -114,7 +114,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { query2.addCriteria(criteria); query2.with(new Sort(Sort.Direction.DESC, "created")); List models = mongoTemplate.find(query2, CervicalCancerModel.class); - if(models.size()>1){ + if(models.size()>0){ if (models.get(0).getId().equals(param.getId())) { //添加宫颈癌追访 CervixVisitQuery cervixVisitQuery=new CervixVisitQuery(); @@ -1218,7 +1218,10 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { cervixVisitModel.setRuleRecommend(6); } } - + //判断集合中有没有常规推荐,没有不需要增加随访 + if(null==cervixVisitModel.getRuleRecommend()){ + return; + } //新增和修改随访主表 if(type==1) { cervixVisitModel.setParentId(cervicalCancerRequest.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java index 4848e50..fc5c696 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -359,6 +359,29 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen if (hasBc != null) { query.addCriteria(Criteria.where("wifeBCheck").exists(hasBc)); } + //隆化定制-妻子和丈夫临床检查完整状态 0:不完整 1：完整 +// if("2100001605".equals(hospitalId)){ +// Integer clinicalCheckYn=param.getClinicalCheckYn(); +// if(clinicalCheckYn!=null){ +// if(0==clinicalCheckYn){ +// MongoCondition c = MongoCondition.newInstance(); +// MongoCondition con1 = MongoCondition.newInstance("wifeClinicalCheck", false, MongoOper.EXISTS); +// MongoCondition con2 = MongoCondition.newInstance("husbandClinicalCheck",false, MongoOper.EXISTS); +// MongoCondition con3 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.0","", MongoOper.IS); +// MongoCondition con4 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.1","", MongoOper.IS); +// MongoCondition con5 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.2","", MongoOper.IS); +// MongoCondition con6 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.3","", MongoOper.IS); +// MongoCondition con7 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.4","", MongoOper.IS); +// MongoCondition con8 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.5","", MongoOper.IS); +// MongoCondition con9 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.6","", MongoOper.IS); +// MongoCondition con10 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.7","", MongoOper.IS); +// MongoCondition con11 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.8","", MongoOper.IS); +// query.addCriteria(c.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5, con6, con7, con8 +// , con9, con10, con11}).getCriteria()); +// } +// +// } +// } Integer hyj = param.getHyj(); if (hyj != null) { -- 1.8.3.1