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 c9d3cbe..7f8e5e5 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 @@ -1170,12 +1170,6 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { * 5B.CIN 2/3治疗后2-3次随访阴性的长期随访 */ if(cin23==2){ - if(hpv==2&&xbx==1&&xshpv==1&&xsxbx==1){//既往史和现实,双检测(-)代表HPV和细胞学都是阴性 - cervixVisitModel.setRuleRecommend(1); - } - if(hpv==2&&xshpv==1){//既往史和现实,HPV 都是阴性 - cervixVisitModel.setRuleRecommend(1); - } //查询历史宫颈检查记录 Query query=new Query(); Criteria criteria = Criteria.where("parentId").is(cervicalCancerRequest.getParentId()); @@ -1193,10 +1187,21 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { //双检测(-)*2,既往史,当前HPV和细胞学都是阴性,且上次宫颈检查HPV和细胞学都是阴性,且现实,当前HPV和细胞学都是阴性 if(hpv==2&&xbx==1&&lastHpv==2&&lastXbx==1&&xshpv==1&&xsxbx==1){ cervixVisitModel.setRuleRecommend(2); + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated()); } //HPV(-)*2,既往史,当前HPV是阴性,且上次宫颈检查HPV是阴性,且现实,当前HPV是阴性 if(hpv==2&&lastHpv==2&&xshpv==1){ cervixVisitModel.setRuleRecommend(2); + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated()); + } + //这里需要把随访时间短的做为最后判断。及时通知医生随访 + if(hpv==2&&xbx==1&&xshpv==1&&xsxbx==1){//既往史和现实,双检测(-)代表HPV和细胞学都是阴性 + cervixVisitModel.setRuleRecommend(1); + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated()); + } + if(hpv==2&&xshpv==1){//既往史和现实,HPV 都是阴性 + cervixVisitModel.setRuleRecommend(1); + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated()); } } }