From ae5bd3fff3569945a0a6c6f937a8a551afe5081f Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Tue, 15 Feb 2022 16:02:36 +0800
Subject: [PATCH] update

---
 .../service/impl/CervicalCancerServiceImpl.java    | 49 ++++++++++++----------
 1 file changed, 26 insertions(+), 23 deletions(-)

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 7f8e5e5..af709ab 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
@@ -1144,28 +1144,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService {
                             break;
                     }
                 }
-                /**
-                 * 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(4);
-                        }
-                    }
-                    if(xshpv==2){//现实HPV
-                        if(Arrays.asList(2,3,4).contains(xsxbx)){
-                            cervixVisitModel.setRuleRecommend(4);
-                        }
-                        if(xsxbx==7){
-                            cervixVisitModel.setRuleRecommend(5);
-                        }
-                    }
-                }
+
                 /**
                  * 5B.CIN 2/3治疗后2-3次随访阴性的长期随访
                  */
@@ -1194,7 +1173,9 @@ public class CervicalCancerServiceImpl implements CervicalCancerService {
                             cervixVisitModel.setRuleRecommend(2);
                             cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
                         }
-                        //这里需要把随访时间短的做为最后判断。及时通知医生随访
+                        /**
+                         * 这里需要把随访时间短的做为最后判断。及时通知医生随访
+                         */
                         if(hpv==2&&xbx==1&&xshpv==1&&xsxbx==1){//既往史和现实，双检测（-）代表HPV和细胞学都是阴性
                             cervixVisitModel.setRuleRecommend(1);
                             cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
@@ -1205,6 +1186,28 @@ public class CervicalCancerServiceImpl implements CervicalCancerService {
                         }
                     }
                 }
+                /**
+                 * 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(4);
+                        }
+                    }
+                    if(xshpv==2){//现实HPV
+                        if(Arrays.asList(2,3,4).contains(xsxbx)){
+                            cervixVisitModel.setRuleRecommend(4);
+                        }
+                        if(xsxbx==7){
+                            cervixVisitModel.setRuleRecommend(5);
+                        }
+                    }
+                }
                 //新增和修改随访主表
                 if(type==1) {
                     cervixVisitModel.setParentId(cervicalCancerRequest.getId());
-- 
1.8.3.1