Commit ac82dbf6807e39c4a2cd8363ad1d63868d5a4f36

Authored by shiyang
1 parent b9f20ea05d

承德市妇幼上线两癌需求-乳腺和宫颈添加追访随访逻辑。把随访时间短的做为最后判断。及时通知医生随访

Showing 1 changed file with 11 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ ac82dbf
... ... @@ -1170,12 +1170,6 @@
1170 1170 * 5B.CIN 2/3治疗后2-3次随访阴性的长期随访
1171 1171 */
1172 1172 if(cin23==2){
1173   - if(hpv==2&&xbx==1&&xshpv==1&&xsxbx==1){//既往史和现实,双检测(-)代表HPV和细胞学都是阴性
1174   - cervixVisitModel.setRuleRecommend(1);
1175   - }
1176   - if(hpv==2&&xshpv==1){//既往史和现实,HPV 都是阴性
1177   - cervixVisitModel.setRuleRecommend(1);
1178   - }
1179 1173 //查询历史宫颈检查记录
1180 1174 Query query=new Query();
1181 1175 Criteria criteria = Criteria.where("parentId").is(cervicalCancerRequest.getParentId());
1182 1176  
... ... @@ -1193,10 +1187,21 @@
1193 1187 //双检测(-)*2,既往史,当前HPV和细胞学都是阴性,且上次宫颈检查HPV和细胞学都是阴性,且现实,当前HPV和细胞学都是阴性
1194 1188 if(hpv==2&&xbx==1&&lastHpv==2&&lastXbx==1&&xshpv==1&&xsxbx==1){
1195 1189 cervixVisitModel.setRuleRecommend(2);
  1190 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
1196 1191 }
1197 1192 //HPV(-)*2,既往史,当前HPV是阴性,且上次宫颈检查HPV是阴性,且现实,当前HPV是阴性
1198 1193 if(hpv==2&&lastHpv==2&&xshpv==1){
1199 1194 cervixVisitModel.setRuleRecommend(2);
  1195 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  1196 + }
  1197 + //这里需要把随访时间短的做为最后判断。及时通知医生随访
  1198 + if(hpv==2&&xbx==1&&xshpv==1&&xsxbx==1){//既往史和现实,双检测(-)代表HPV和细胞学都是阴性
  1199 + cervixVisitModel.setRuleRecommend(1);
  1200 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  1201 + }
  1202 + if(hpv==2&&xshpv==1){//既往史和现实,HPV 都是阴性
  1203 + cervixVisitModel.setRuleRecommend(1);
  1204 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
1200 1205 }
1201 1206 }
1202 1207 }