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 3448a10..093f976 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
@@ -856,204 +856,77 @@ public class CervicalCancerServiceImpl implements CervicalCancerService {
                     cervixVisitModel.setYdhjzd(ydhjzd);
                 }
                 /**
-                 * 1A缺乏过往HPV结果者，宫颈筛查异常的即时和5年累积CIN3风险
-                 *11.未知HPV史，通过HPV分型和细胞学预测CIN3+风险
-                 *12.未知HPV史，通过HPV分型和细胞学预测CIN3+风险
+                 * 5年内随访
                  */
-                if(hpv==1){//既往史HPV
-                    if(xshpv==1){//现实HPV
-                        switch (xsxbx){
-                            case 2:
-                                cervixVisitModel.setRuleRecommend(3);
-                                cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                                break;
-                            case 3:
-                                cervixVisitModel.setRuleRecommend(2);
-                                cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                                break;
-                            case 4:
-                                cervixVisitModel.setRuleRecommend(1);
-                                cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                                break;
-                            case 5:
-                                cervixVisitModel.setRuleRecommend(4);
-                                break;
-                            case 6:
-                                cervixVisitModel.setRuleRecommend(4);
-                                break;
-                            case 7:
-                                cervixVisitModel.setRuleRecommend(5);
-                                break;
-                        }
-                    }
-                    if(xshpv==2){//现实HPV
-                        if(xsxbx==2){
-                            cervixVisitModel.setRuleRecommend(1);
+                //1A缺乏过往HPV结果者，宫颈筛查异常的即时和5年累积CIN3风险
+                //1B过往HPV(-)者，宫颈筛查异常的即时和5年累积CIN3风险
+                if(hpv==1||hpv==2) {//既往史HPV
+                    if(xshpv==1) {//现实HPV
+                        if(xsxbx==2) {//现实细胞学
+                            cervixVisitModel.setRuleRecommend(3);
                             cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                         }
-                        if(Arrays.asList(3,4).contains(xsxbx)){
-                            cervixVisitModel.setRuleRecommend(4);
-                        }
-                        if(Arrays.asList(5,6,7).contains(xsxbx)){
-                            cervixVisitModel.setRuleRecommend(5);
-                        }
-                    }
-                    switch (hpvjc){//现实HPV检测手段
-                        case 1:
-                            if(Arrays.asList(2,3,4).contains(xsxbx)){
-                                cervixVisitModel.setRuleRecommend(4);
-                            }
-                            if(Arrays.asList(5,6).contains(xsxbx)){
-                                cervixVisitModel.setRuleRecommend(5);
-                            }
-                            if(xsxbx==7){
-                                cervixVisitModel.setRuleRecommend(6);
-                            }
-                            break;
-                        case 2:
-                            if(Arrays.asList(2,3,4).contains(xsxbx)){
-                                cervixVisitModel.setRuleRecommend(4);
-                            }
-                            if(Arrays.asList(6,7).contains(xsxbx)){
-                                cervixVisitModel.setRuleRecommend(5);
-                            }
-                            if(xsxbx==5){
-                                cervixVisitModel.setRuleRecommend(4);
-                            }
-                            break;
-                        case 3:
-                            if(Arrays.asList(2,3,4).contains(xsxbx)){
-                                cervixVisitModel.setRuleRecommend(1);
-                                cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                            }
-                            if(Arrays.asList(5,6).contains(xsxbx)){
-                                cervixVisitModel.setRuleRecommend(4);
-                            }
-                            if(xsxbx==7){
-                                cervixVisitModel.setRuleRecommend(5);
-                            }
-                            break;
                     }
                 }
-                /**
-                 * 1B过往HPV(-)者，宫颈筛查异常的即时和5年累积CIN3风险
-                 */
-                if(hpv==2) {//既往史HPV
-                    if(xshpv==1){//现实HPV
-                        switch (xsxbx){
-                            case 2:
-                                cervixVisitModel.setRuleRecommend(3);
-                                cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                                break;
-                            case 3:
-                                cervixVisitModel.setRuleRecommend(2);
-                                cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                                break;
-                            case 4:
-                                cervixVisitModel.setRuleRecommend(1);
-                                cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                                break;
-                        }
-                        if(Arrays.asList(5,6,7).contains(xsxbx)){
-                            cervixVisitModel.setRuleRecommend(4);
+                //2AHPV(-)ASCUS随访者即时和5年累积CIN3风险
+                if(hpv==2&&xbx==2){//既往史HPV和细胞学
+                    if(xshpv==1) {//现实HPV
+                        if(xsxbx==2) {//现实细胞学
+                            cervixVisitModel.setRuleRecommend(3);
+                            cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                         }
                     }
-                    if(xshpv==2){//现实HPV
-                        if(Arrays.asList(2,3,4).contains(xsxbx)){
-                            cervixVisitModel.setRuleRecommend(1);
+                }
+                //2BHPV(-)LSIL随访者即时和5年累积CIN3风险
+                if(hpv==2&&xbx==3) {//既往史HPV和细胞学
+                    if(xshpv==1) {//现实HPV
+                        if(xsxbx==2) {//现实细胞学
+                            cervixVisitModel.setRuleRecommend(3);
                             cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                         }
-                        if(Arrays.asList(5,6).contains(xsxbx)){
-                            cervixVisitModel.setRuleRecommend(4);
-                        }
-                        if(xsxbx==7){
-                            cervixVisitModel.setRuleRecommend(5);
-                        }
                     }
                 }
                 /**
-                 * 2AHPV(-)ASCUS随访者即时和5年累积CIN3风险
+                 * 3年内随访
                  */
-                if(hpv==2&&xbx==2){//既往史HPV和细胞学
+                //1A缺乏过往HPV结果者，宫颈筛查异常的即时和5年累积CIN3风险
+                //1B过往HPV(-)者，宫颈筛查异常的即时和5年累积CIN3风险
+                if(hpv==1||hpv==2){//既往史HPV
                     if(xshpv==1) {//现实HPV
-                        switch (xsxbx){
-                            case 2:
-                                cervixVisitModel.setRuleRecommend(3);
-                                cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                                break;
-                            case 3:
-                                cervixVisitModel.setRuleRecommend(2);
-                                cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                                break;
-                            case 4:
-                                cervixVisitModel.setRuleRecommend(1);
-                                cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                                break;
-                        }
-                        if(Arrays.asList(5,6,7).contains(xsxbx)){
-                            cervixVisitModel.setRuleRecommend(4);
+                        if(xsxbx==3) {//现实细胞学
+                            cervixVisitModel.setRuleRecommend(2);
+                            cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                         }
                     }
-                    if(xshpv==2) {//现实HPV
-                        if(Arrays.asList(2,3,4).contains(xsxbx)){
-                            cervixVisitModel.setRuleRecommend(1);
+                }
+                //2AHPV(-)ASCUS随访者即时和5年累积CIN3风险
+                if(hpv==2&&xbx==2){//既往史HPV和细胞学
+                    if(xshpv==1) {//现实HPV
+                        if(xsxbx==3) {//现实细胞学
+                            cervixVisitModel.setRuleRecommend(2);
                             cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                         }
-                        if(Arrays.asList(5,6).contains(xsxbx)){
-                            cervixVisitModel.setRuleRecommend(4);
-                        }
-                        if(xsxbx==7){
-                            cervixVisitModel.setRuleRecommend(5);
-                        }
-                    }
-                    if(ydhjzd==1||ydhjzd==2){//现实阴道活检诊断
-                        cervixVisitModel.setRuleRecommend(1);
-                        cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                     }
                 }
-                /**
-                 * 2BHPV(-)LSIL随访者即时和5年累积CIN3风险
-                 */
+                //2BHPV(-)LSIL随访者即时和5年累积CIN3风险
                 if(hpv==2&&xbx==3) {//既往史HPV和细胞学
                     if(xshpv==1) {//现实HPV
-                        switch (xsxbx){
-                            case 2:
-                                cervixVisitModel.setRuleRecommend(3);
-                                cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                                break;
-                            case 3:
-                                cervixVisitModel.setRuleRecommend(2);
-                                cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                                break;
-                            case 4:
-                                cervixVisitModel.setRuleRecommend(1);
-                                cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                                break;
-                        }
-                        if(Arrays.asList(5,6,7).contains(xsxbx)){
-                            cervixVisitModel.setRuleRecommend(4);
+                        if(xsxbx==3) {//现实细胞学
+                            cervixVisitModel.setRuleRecommend(2);
+                            cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                         }
                     }
-                    if(xshpv==2) {//现实HPV
-                        if(xsxbx==2){
-                            cervixVisitModel.setRuleRecommend(1);
+                }
+                //4A.LSIL阴道镜＜CIN 2 者随访的即时和5年累积CIN3风险
+                if(cin==3&&xbx==3){//CIN,细胞学
+                    if(xshpv==1) {//现实HPV
+                        if (Arrays.asList(2, 8).contains(xsxbx)) {//现实细胞学
+                            cervixVisitModel.setRuleRecommend(2);
                             cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                         }
-                        if(Arrays.asList(3,4,5,6).contains(xsxbx)){
-                            cervixVisitModel.setRuleRecommend(4);
-                        }
-                        if(xsxbx==7){
-                            cervixVisitModel.setRuleRecommend(5);
-                        }
-                    }
-                    if(ydhjzd==1||ydhjzd==2){//现实阴道活检诊断
-                        cervixVisitModel.setRuleRecommend(1);
-                        cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                     }
                 }
-                /**
-                 * 5B.CIN 2/3治疗后2-3次随访阴性的长期随访
-                 */
+                //5B.CIN 2/3治疗后2-3次随访阴性的长期随访
                 if(cin23==2){
                     //查询历史宫颈检查记录
                     Query query=new Query();
@@ -1080,7 +953,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService {
                             cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                         }
                         /**
-                         * 这里需要把随访时间短的做为最后判断。及时通知医生随访
+                         * 这里需要把随访时间短的做为最后判断。及时通知医生随访(1年内随访)
                          */
                         if(hpv==2&&xbx==1&&xshpv==1&&xsxbx==1){//既往史和现实，双检测（-）代表HPV和细胞学都是阴性
                             cervixVisitModel.setRuleRecommend(1);
@@ -1093,53 +966,73 @@ public class CervicalCancerServiceImpl implements CervicalCancerService {
                     }
                 }
                 /**
-                 * 5A.CIN 2/3治疗后的即时和5年累积CIN3风险（相同逻辑情况下随访时间短的放到最后判断）
+                 * 1年内随访
                  */
-                if(cin23==2){//cin23值
-                    if(xshpv==1){//现实HPV
-                        if(Arrays.asList(2,3,4,8).contains(xsxbx)){
+                //1A缺乏过往HPV结果者，宫颈筛查异常的即时和5年累积CIN3风险
+                //11.未知HPV史，通过HPV分型和细胞学预测CIN3+风险
+                //1B过往HPV(-)者，宫颈筛查异常的即时和5年累积CIN3风险
+                //12.未知HPV史，通过HPV分型和细胞学预测CIN3+风险
+                if(hpv==1||hpv==2) {//既往史HPV
+                    if (xshpv == 1) {//现实HPV
+                        if (xsxbx == 4) {//现实细胞学
                             cervixVisitModel.setRuleRecommend(1);
                             cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                         }
-                        if(xsxbx==7){
-                            cervixVisitModel.setRuleRecommend(4);
-                        }
                     }
-                    if(xshpv==2){//现实HPV
-                        if(Arrays.asList(2,3,4).contains(xsxbx)){
-                            cervixVisitModel.setRuleRecommend(4);
+                    if (xshpv == 2) {//现实HPV
+                        if (Arrays.asList(2, 3, 4).contains(xsxbx)) {//现实细胞学
+                            cervixVisitModel.setRuleRecommend(1);
+                            cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                         }
-                        if(xsxbx==7){
-                            cervixVisitModel.setRuleRecommend(5);
+                    }
+                    if(hpvjc==3){//现实HPV检测手段
+                        if(Arrays.asList(2,3,4).contains(xsxbx)){//现实细胞学
+                            cervixVisitModel.setRuleRecommend(1);
+                            cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                         }
                     }
                 }
-                /**
-                 * 2CHPV(+)NILM随访者即时和5年累积CIN3风险
-                 */
-                if(hpv==3&&xbx==4) {//既往史HPV和细胞学
-                    if(xshpv==1) {//现实HPV
-                        if(Arrays.asList(2,3,4).contains(xsxbx)){
+                //2AHPV(-)ASCUS随访者即时和5年累积CIN3风险
+                if(hpv==2&&xbx==2) {//既往史HPV和细胞学
+                    if (xshpv == 1||xshpv==2) {//现实HPV
+                        if (Arrays.asList(2, 3, 4).contains(xsxbx)) {//现实细胞学
                             cervixVisitModel.setRuleRecommend(1);
                             cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                         }
-                        if(Arrays.asList(5,6).contains(xsxbx)){
-                            cervixVisitModel.setRuleRecommend(4);
-                        }
-                        if(xsxbx==7){
-                            cervixVisitModel.setRuleRecommend(5);
-                        }
                     }
-                    if(xshpv==2) {//现实HPV
-                        if(xsxbx==2){
+                    if(ydhjzd==1||ydhjzd==2){//现实阴道活检诊断
+                        cervixVisitModel.setRuleRecommend(1);
+                        cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
+                    }
+                }
+                //2BHPV(-)LSIL随访者即时和5年累积CIN3风险
+                if(hpv==2&&xbx==3) {//既往史HPV和细胞学
+                    if (xshpv == 1 || xshpv == 2) {//现实HPV
+                        if (Arrays.asList(2, 4).contains(xsxbx)) {//现实细胞学
                             cervixVisitModel.setRuleRecommend(1);
                             cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                         }
-                        if(Arrays.asList(3,4,5,6).contains(xsxbx)){
-                            cervixVisitModel.setRuleRecommend(4);
+                    }
+                    if(ydhjzd==1||ydhjzd==2){//现实阴道活检诊断
+                        cervixVisitModel.setRuleRecommend(1);
+                        cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
+                    }
+                }
+                //5A.CIN 2/3治疗后的即时和5年累积CIN3风险
+                if(cin23==2) {//cin23值
+                    if (xshpv == 1) {//现实HPV
+                        if (Arrays.asList(2, 3, 4, 8).contains(xsxbx)) {//现实细胞学
+                            cervixVisitModel.setRuleRecommend(1);
+                            cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                         }
-                        if(xsxbx==7){
-                            cervixVisitModel.setRuleRecommend(5);
+                    }
+                }
+                //2CHPV(+)NILM随访者即时和5年累积CIN3风险
+                if(hpv==3&&xbx==4) {//既往史HPV和细胞学
+                    if (xshpv == 1||xshpv==2) {//现实HPV
+                        if (Arrays.asList(2, 3, 4).contains(xsxbx)) {
+                            cervixVisitModel.setRuleRecommend(1);
+                            cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                         }
                     }
                     if(ydhjzd==1||ydhjzd==2){//现实阴道活检诊断
@@ -1147,66 +1040,184 @@ public class CervicalCancerServiceImpl implements CervicalCancerService {
                         cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                     }
                 }
-                /**
-                 * 3阴道镜检查后的即时和5年累积CIN3风险
-                 */
+                //3阴道镜检查后的即时和5年累积CIN3风险
                 if(Arrays.asList(1,2,3).contains(hpv)&&Arrays.asList(5,6,7).contains(xbx)){//既往史HPV和细胞学
                     if(ydhjzd==1||ydhjzd==2){//现实阴道活检诊断
                         cervixVisitModel.setRuleRecommend(1);
                         cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                     }
                 }
+                //4A.LSIL阴道镜＜CIN 2 者随访的即时和5年累积CIN3风险
+                //4B.HSIL阴道镜＜CIN 2 者随访的即时和5年累积CIN3风险
+                if(cin==3) {//CIN
+                    if (xbx == 3 || xbx == 7) {//细胞学
+                        if (xshpv == 1 || xshpv == 2) {//现实HPV
+                            if (Arrays.asList(2, 3, 4, 8).contains(xsxbx)) {
+                                cervixVisitModel.setRuleRecommend(1);
+                                cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
+                            }
+                        }
+                    }
+                }
                 /**
-                 * 4A.LSIL阴道镜＜CIN 2 者随访的即时和5年累积CIN3风险
-                 * 4B.HSIL阴道镜＜CIN 2 者随访的即时和5年累积CIN3风险
+                 * 阴道镜检查
                  */
-                if(cin==3){//CIN(因为2个表的CIN条件相同，只需细胞学分别判断)
-                    switch (xbx){//细胞学
+                //1A缺乏过往HPV结果者，宫颈筛查异常的即时和5年累积CIN3风险
+                //11.未知HPV史，通过HPV分型和细胞学预测CIN3+风险
+                //1B过往HPV(-)者，宫颈筛查异常的即时和5年累积CIN3风险
+                if(hpv==1||hpv==2) {//既往史HPV
+                    if (xshpv == 1||xshpv==2) {//现实HPV
+                        if(Arrays.asList(3,4,5,6,7).contains(xsxbx)){
+                            cervixVisitModel.setRuleRecommend(4);
+                        }
+                    }
+                }
+                //2AHPV(-)ASCUS随访者即时和5年累积CIN3风险
+                if(hpv==2&&xbx==2) {//既往史HPV和细胞学
+                    if (xshpv == 1||xshpv==2) {//现实HPV
+                        if (Arrays.asList(5, 6, 7).contains(xsxbx)) {
+                            cervixVisitModel.setRuleRecommend(4);
+                        }
+                    }
+                }
+                //2BHPV(-)LSIL随访者即时和5年累积CIN3风险
+                if(hpv==2&&xbx==3) {//既往史HPV和细胞学
+                    if (xshpv == 1||xshpv==2) {//现实HPV
+                        if (Arrays.asList(3,4,5, 6, 7).contains(xsxbx)) {
+                            cervixVisitModel.setRuleRecommend(4);
+                        }
+                    }
+                }
+                //5A.CIN 2/3治疗后的即时和5年累积CIN3风险
+                if(cin23==2) {//cin23值
+                    if (xshpv == 1 || xshpv == 2) {//现实HPV
+                        if(Arrays.asList(2,3,4,7).contains(xsxbx)){
+                            cervixVisitModel.setRuleRecommend(4);
+                        }
+                    }
+                }
+                //2CHPV(+)NILM随访者即时和5年累积CIN3风险
+                if(hpv==3&&xbx==4) {//既往史HPV和细胞学
+                    if (xshpv == 1 || xshpv == 2) {//现实HPV
+                        if (Arrays.asList(3, 4, 5, 6).contains(xsxbx)) {
+                            cervixVisitModel.setRuleRecommend(4);
+                        }
+                    }
+                }
+                //4A.LSIL阴道镜＜CIN 2 者随访的即时和5年累积CIN3风险
+                //4B.HSIL阴道镜＜CIN 2 者随访的即时和5年累积CIN3风险
+                if(cin==3&&xbx == 3) {//CIN,细胞学
+                    if (xshpv == 1 || xshpv == 2) {
+                        if(xsxbx==7){
+                            cervixVisitModel.setRuleRecommend(4);
+                        }
+                    }
+                }
+                if(cin==3&&xbx == 7) {//CIN,细胞学
+                    if (xshpv == 2) {
+                        if(Arrays.asList(2,3,4).contains(xsxbx)){
+                            cervixVisitModel.setRuleRecommend(4);
+                        }
+                    }
+                }
+                //12.未知HPV史，通过HPV分型和细胞学预测CIN3+风险
+                if(hpv==1) {//既往史HPV
+                    switch (hpvjc) {//现实HPV检测手段
+                        case 1:
+                            if(Arrays.asList(2,3,4).contains(xsxbx)){
+                                cervixVisitModel.setRuleRecommend(4);
+                            }
+                            break;
+                        case 2:
+                            if(Arrays.asList(2,3,4,5).contains(xsxbx)){
+                                cervixVisitModel.setRuleRecommend(4);
+                            }
+                            break;
                         case 3:
-                            if(xshpv==1){//现实HPV
-                                if(Arrays.asList(2,8).contains(xsxbx)){
-                                    cervixVisitModel.setRuleRecommend(2);
-                                    cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                                }
-                                if(Arrays.asList(3,4).contains(xsxbx)){
-                                    cervixVisitModel.setRuleRecommend(1);
-                                    cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                                }
-                                if(xsxbx==7){
-                                    cervixVisitModel.setRuleRecommend(4);
-                                }
+                            if(Arrays.asList(5,6).contains(xsxbx)){
+                                cervixVisitModel.setRuleRecommend(4);
                             }
-                            if(xshpv==2){//现实HPV
-                                if(Arrays.asList(2,3,4).contains(xsxbx)){
-                                    cervixVisitModel.setRuleRecommend(1);
-                                    cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                                }
-                                if(xsxbx==7){
-                                    cervixVisitModel.setRuleRecommend(4);
-                                }
+                            break;
+                    }
+                }
+                /**
+                 * 阴道镜检查、治疗
+                 */
+                //1A缺乏过往HPV结果者，宫颈筛查异常的即时和5年累积CIN3风险
+                //11.未知HPV史，通过HPV分型和细胞学预测CIN3+风险
+                //1B过往HPV(-)者，宫颈筛查异常的即时和5年累积CIN3风险
+                if(hpv==1||hpv==2) {//既往史HPV
+                    if (xshpv == 1 || xshpv == 2) {//现实HPV
+                        if (Arrays.asList(5, 6, 7).contains(xsxbx)) {
+                            cervixVisitModel.setRuleRecommend(5);
+                        }
+                    }
+                }
+                //2AHPV(-)ASCUS随访者即时和5年累积CIN3风险
+                if(hpv==2&&xbx==2) {//既往史HPV和细胞学
+                    if (xshpv == 2 && xsxbx == 7) {//现实HPV,现实细胞学
+                        cervixVisitModel.setRuleRecommend(5);
+                    }
+                }
+                //2BHPV(-)LSIL随访者即时和5年累积CIN3风险
+                if(hpv==2&&xbx==3) {//既往史HPV和细胞学
+                    if (xshpv == 2 && xsxbx == 7) {//现实HPV
+                        cervixVisitModel.setRuleRecommend(5);
+                    }
+                }
+                //5A.CIN 2/3治疗后的即时和5年累积CIN3风险
+                if(cin23==2) {//cin23值
+                    if (xshpv == 2 && xsxbx == 7) {//现实HPV
+                        cervixVisitModel.setRuleRecommend(5);
+                    }
+                }
+                //2CHPV(+)NILM随访者即时和5年累积CIN3风险
+                if(hpv==3&&xbx==4) {//既往史HPV和细胞学
+                    if (xshpv == 1 && xsxbx == 7) {//现实HPV
+                        cervixVisitModel.setRuleRecommend(5);
+                    }
+                    if (xshpv == 2 && xsxbx == 7) {//现实HPV
+                        cervixVisitModel.setRuleRecommend(5);
+                    }
+                }
+                //4A.LSIL阴道镜＜CIN 2 者随访的即时和5年累积CIN3风险
+                //4B.HSIL阴道镜＜CIN 2 者随访的即时和5年累积CIN3风险
+                if(cin==3&&xbx==7) {//CIN,细胞学
+                    if (xshpv == 1 || xshpv == 2) {//现实HPV
+                        if (xsxbx == 7) {
+                            cervixVisitModel.setRuleRecommend(5);
+                        }
+                    }
+                }
+                //12.未知HPV史，通过HPV分型和细胞学预测CIN3+风险
+                if(hpv==1) {//既往史HPV
+                    switch (hpvjc) {//现实HPV检测手段
+                        case 1:
+                            if (Arrays.asList(5, 6).contains(xsxbx)) {
+                                cervixVisitModel.setRuleRecommend(5);
                             }
                             break;
-                        case 7:
-                            if(xshpv==1){//现实HPV
-                                if(Arrays.asList(2,3,4,8).contains(xsxbx)){
-                                    cervixVisitModel.setRuleRecommend(1);
-                                    cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
-                                }
-                                if(xsxbx==7){
-                                    cervixVisitModel.setRuleRecommend(5);
-                                }
+                        case 2:
+                            if (Arrays.asList(6, 7).contains(xsxbx)) {
+                                cervixVisitModel.setRuleRecommend(5);
                             }
-                            if(xshpv==2){//现实HPV
-                                if(Arrays.asList(2,3,4).contains(xsxbx)){
-                                    cervixVisitModel.setRuleRecommend(4);
-                                }
-                                if(xsxbx==7){
-                                    cervixVisitModel.setRuleRecommend(5);
-                                }
+                            break;
+                        case 3:
+                            if (xsxbx == 7) {
+                                cervixVisitModel.setRuleRecommend(5);
                             }
                             break;
                     }
                 }
+                /**
+                 * 快速治疗
+                 */
+                //12.未知HPV史，通过HPV分型和细胞学预测CIN3+风险
+                if(hpv==1) {//既往史HPV
+                    if (hpvjc == 1 && xsxbx == 7) {
+                        cervixVisitModel.setRuleRecommend(6);
+                    }
+                }
 
                 //新增和修改随访主表
                 if(type==1) {