From ac82dbf6807e39c4a2cd8363ad1d63868d5a4f36 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Tue, 15 Feb 2022 15:43:29 +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?=E4=B9=B3=E8=85=BA=E5=92=8C=E5=AE=AB=E9=A2=88=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E9=9A=8F=E8=AE=BF=E9=80=BB=E8=BE=91=E3=80=82?=
 =?UTF-8?q?=E6=8A=8A=E9=9A=8F=E8=AE=BF=E6=97=B6=E9=97=B4=E7=9F=AD=E7=9A=84?=
 =?UTF-8?q?=E5=81=9A=E4=B8=BA=E6=9C=80=E5=90=8E=E5=88=A4=E6=96=AD=E3=80=82?=
 =?UTF-8?q?=E5=8F=8A=E6=97=B6=E9=80=9A=E7=9F=A5=E5=8C=BB=E7=94=9F=E9=9A=8F?=
 =?UTF-8?q?=E8=AE=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/impl/CervicalCancerServiceImpl.java     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 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 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());
                         }
                     }
                 }
-- 
1.8.3.1