diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ICervixVisitDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ICervixVisitDao.java index ec710ad..90e3d19 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ICervixVisitDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ICervixVisitDao.java @@ -7,13 +7,13 @@ import com.lyms.platform.pojo.CervixVisitModel; import java.util.List; /** - * 宫颈追访 + * 宫颈随访 * Created by Administrator on 2022/2/10 */ public interface ICervixVisitDao { /** - * 增加一条宫颈追访 + * 增加一条宫颈随访 * * @param cervixVisitModel * @return diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CervixVisitDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CervixVisitDaoImpl.java index 83ec0ec..7314254 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CervixVisitDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CervixVisitDaoImpl.java @@ -32,7 +32,7 @@ public class CervixVisitDaoImpl extends BaseMongoDAOImpl imple } /** - * 修改一条宫颈追访 + * 修改一条宫颈随访 * @param cervixVisitModel */ @Override @@ -40,7 +40,7 @@ public class CervixVisitDaoImpl extends BaseMongoDAOImpl imple update(new MongoQuery(new MongoCondition("parentId", cervixVisitModel.getParentId(), MongoOper.IS)).convertToMongoQuery(), cervixVisitModel); } /** - * 修改一条宫颈追访 + * 修改一条宫颈随访 * @param cervixVisitModel */ @Override diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CervixVisitService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CervixVisitService.java index 9cf2a2e..edf5144 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CervixVisitService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CervixVisitService.java @@ -17,7 +17,7 @@ import java.util.Date; import java.util.List; /** - * 宫颈追访服务实现 + * 宫颈随访服务实现 * */ @Service @@ -27,7 +27,7 @@ public class CervixVisitService { /** - * 增加一条宫颈追访 + * 增加一条宫颈随访 * * @param cervixVisitModel * @return CervixVisitModel @@ -39,7 +39,7 @@ public class CervixVisitService { return iCervixVisitDao.addOneCanScr(cervixVisitModel); } /** - * 修改一条宫颈追访 + * 修改一条宫颈随访 * 添加 * @param cervixVisitModel * @param type 1:id查询 2:parentId查询 diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CervixVisitModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CervixVisitModel.java index 335fd28..c51fa25 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CervixVisitModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CervixVisitModel.java @@ -3,7 +3,7 @@ package com.lyms.platform.pojo; /** * @auther sy * @createTime 2022年02月10日 - * @discription 宫颈追访列表模型 + * @discription 宫颈随访列表模型 */ import com.lyms.platform.common.result.BaseModel; @@ -46,34 +46,34 @@ public class CervixVisitModel extends BaseModel { * 既往史 */ //HPV检查 - private String hpv; + private Integer hpv; //细胞学 - private String xbx; + private Integer xbx; //CIN - private String cin; + private Integer cin; //CIN2/3 - private String cin23; + private Integer cin23; //HPV疫苗注射 - private String hpvym; + private Integer hpvym; /** * 现时情况（xshpv、hpvjc互斥字段。） */ //HPV - private String xshpv; + private Integer xshpv; //HPV检测手段 - private String hpvjc; + private Integer hpvjc; //细胞学 - private String xsxbx; + private Integer xsxbx; //阴道活检诊断 - private String ydhjzd; + private Integer ydhjzd; /** *常规推荐 + *1年内追访、3年内随访、5年内随访、阴道镜检查、阴道镜治疗。(1-5)参数 */ - //随访时间段（1年内追访、3年内随访、5年内随访） - //阴道镜检查 - //阴道镜治疗 - + private Integer ruleRecommend; + //推荐预约时间(用于判断满足以上条件，发送短信使用) + private Date RecommendVisitTime; //检査日期 private Date checkDate; @@ -93,6 +93,22 @@ public class CervixVisitModel extends BaseModel { private Date modified; + public Integer getRuleRecommend() { + return ruleRecommend; + } + + public void setRuleRecommend(Integer ruleRecommend) { + this.ruleRecommend = ruleRecommend; + } + + public Date getRecommendVisitTime() { + return RecommendVisitTime; + } + + public void setRecommendVisitTime(Date recommendVisitTime) { + RecommendVisitTime = recommendVisitTime; + } + public String getId() { return id; } @@ -262,75 +278,75 @@ public class CervixVisitModel extends BaseModel { this.modified = modified; } - public String getHpv() { + public Integer getHpv() { return hpv; } - public void setHpv(String hpv) { + public void setHpv(Integer hpv) { this.hpv = hpv; } - public String getXbx() { + public Integer getXbx() { return xbx; } - public void setXbx(String xbx) { + public void setXbx(Integer xbx) { this.xbx = xbx; } - public String getCin() { + public Integer getCin() { return cin; } - public void setCin(String cin) { + public void setCin(Integer cin) { this.cin = cin; } - public String getCin23() { + public Integer getCin23() { return cin23; } - public void setCin23(String cin23) { + public void setCin23(Integer cin23) { this.cin23 = cin23; } - public String getHpvym() { + public Integer getHpvym() { return hpvym; } - public void setHpvym(String hpvym) { + public void setHpvym(Integer hpvym) { this.hpvym = hpvym; } - public String getXshpv() { + public Integer getXshpv() { return xshpv; } - public void setXshpv(String xshpv) { + public void setXshpv(Integer xshpv) { this.xshpv = xshpv; } - public String getHpvjc() { + public Integer getHpvjc() { return hpvjc; } - public void setHpvjc(String hpvjc) { + public void setHpvjc(Integer hpvjc) { this.hpvjc = hpvjc; } - public String getXsxbx() { + public Integer getXsxbx() { return xsxbx; } - public void setXsxbx(String xsxbx) { + public void setXsxbx(Integer xsxbx) { this.xsxbx = xsxbx; } - public String getYdhjzd() { + public Integer getYdhjzd() { return ydhjzd; } - public void setYdhjzd(String ydhjzd) { + public void setYdhjzd(Integer ydhjzd) { this.ydhjzd = ydhjzd; } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CervixVisitRecordModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CervixVisitRecordModel.java index cc8ab96..3cbab99 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CervixVisitRecordModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CervixVisitRecordModel.java @@ -3,7 +3,7 @@ package com.lyms.platform.pojo; /** * @auther sy * @createTime 2022年02月10日 - * @discription 宫颈追访记录模型 + * @discription 宫颈随访记录模型 */ import com.lyms.platform.common.result.BaseModel; @@ -32,6 +32,8 @@ public class CervixVisitRecordModel extends BaseModel { private String afterVisitResult; //追访流程 private String afterVisitFlowPath; + //随访状态(0:待随访，1：已随访) + private Integer type; /** * 是否有效 @@ -40,6 +42,14 @@ public class CervixVisitRecordModel extends BaseModel { private Date created; + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + public String getId() { return id; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CervixVisitQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CervixVisitQuery.java index f283053..206647d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/CervixVisitQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/CervixVisitQuery.java @@ -3,7 +3,7 @@ package com.lyms.platform.query; /** * @auther sy * @createTime 2022年02月10日 - * @discription 宫颈追访列表 + * @discription 宫颈随访列表 */ import com.lyms.platform.common.base.IConvertToNativeQuery; @@ -57,10 +57,11 @@ public class CervixVisitQuery extends BaseQuery implements IConvertToNativeQuery //随访状态(0:待随访，1：已随访) private Integer type; - //常规推荐 - //随访时间段（1年内追访、3年内随访、5年内随访） - //阴道镜检查 - //阴道镜治疗 + /** + *常规推荐 + *1年内追访、3年内随访、5年内随访、阴道镜检查、阴道镜治疗。(1-5)参数 + */ + private Integer ruleRecommend; /** * 是否有效 @@ -68,6 +69,14 @@ public class CervixVisitQuery extends BaseQuery implements IConvertToNativeQuery private Integer yn; + public Integer getRuleRecommend() { + return ruleRecommend; + } + + public void setRuleRecommend(Integer ruleRecommend) { + this.ruleRecommend = ruleRecommend; + } + public String getId() { return id; } @@ -269,6 +278,9 @@ public class CervixVisitQuery extends BaseQuery implements IConvertToNativeQuery if(null!=type){ condition=condition.and("type", type, MongoOper.IS); } + if(null!=ruleRecommend){ + condition=condition.and("type", ruleRecommend, MongoOper.IS); + } Criteria c = null; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java index b3da1a6..b5c0594 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java @@ -170,7 +170,7 @@ public class CervicalCancerController extends BaseController { return cervicalCancerService.doSyncCervicalCancer(); } /** - * 宫颈癌追访筛查列表 + * 宫颈癌随访筛查列表 * @param cervixVisitRequest * @param request * @return @@ -183,7 +183,7 @@ public class CervicalCancerController extends BaseController { return cervicalCancerService.cervixVisitList(cervixVisitRequest, loginState.getId()); } /** - * 添加宫颈癌追访记录 + * 添加宫颈癌随访记录 * @param cervixVisitRecordModel * @param request * @return @@ -197,7 +197,7 @@ public class CervicalCancerController extends BaseController { } /** - * 宫颈癌追访记录列表 + * 宫颈癌随访记录列表 * @param id * @param request * @return diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervixVisitRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervixVisitRequest.java index 456799d..0d6779b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervixVisitRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervixVisitRequest.java @@ -3,7 +3,7 @@ package com.lyms.platform.operate.web.request; /** * @auther sy * @createTime 2022年02月10日 - * @discription 宫颈追访列表查询条件 + * @discription 宫颈随访列表查询条件 */ public class CervixVisitRequest extends BasePageQueryRequest { @@ -33,12 +33,20 @@ public class CervixVisitRequest extends BasePageQueryRequest { //随访状态(0:待随访，1：已随访) private Integer type; - //常规推荐 - //随访时间段（1年内追访、3年内随访、5年内随访） - //阴道镜检查 - //阴道镜治疗 + /** + *常规推荐 + *1年内追访、3年内随访、5年内随访、阴道镜检查、阴道镜治疗。(1-5)参数 + */ + private Integer ruleRecommend; + public Integer getRuleRecommend() { + return ruleRecommend; + } + + public void setRuleRecommend(Integer ruleRecommend) { + this.ruleRecommend = ruleRecommend; + } public String getCheckDate() { return checkDate; 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 552c0fd..065f17b 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 @@ -798,7 +798,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url"); - //宫颈追访业务 type:1：新增、2：修改 + //宫颈随访业务 type:1：新增、2：修改 public void cervixVisitAdd(CervicalCancerRequest cervicalCancerRequest,int type) { try { if(null!=cervicalCancerRequest && MapUtils.isNotEmpty(cervicalCancerRequest.getFormData()) && @@ -806,43 +806,331 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { null!=cervicalCancerRequest.getFormData().get("xbx")|| null!=cervicalCancerRequest.getFormData().get("cin")|| null!=cervicalCancerRequest.getFormData().get("cin23")|| - null!=cervicalCancerRequest.getFormData().get("hpvym")|| null!=cervicalCancerRequest.getFormData().get("xshpv")|| null!=cervicalCancerRequest.getFormData().get("hpvjc")|| null!=cervicalCancerRequest.getFormData().get("xsxbx")|| null!=cervicalCancerRequest.getFormData().get("ydhjzd") )){ CervixVisitModel cervixVisitModel=new CervixVisitModel(); - //下次预约时间逻辑 - cervixVisitModel.setNextAfterVisitTime(cervicalCancerRequest.getCreated()); - //宫颈检查追访项 + //宫颈检查随访项 + Integer hpv=0,xbx=0,cin=0,cin23=0,xshpv=0,hpvjc=0,xsxbx=0,ydhjzd=0; if(null!=cervicalCancerRequest.getFormData().get("hpv")){ - cervixVisitModel.setHpv(cervicalCancerRequest.getFormData().get("hpv").toString()); + hpv= (Integer) cervicalCancerRequest.getFormData().get("hpv"); + cervixVisitModel.setHpv(hpv); } if(null!=cervicalCancerRequest.getFormData().get("xbx")){ - cervixVisitModel.setXbx(cervicalCancerRequest.getFormData().get("xbx").toString()); + xbx= (Integer) cervicalCancerRequest.getFormData().get("xbx"); + cervixVisitModel.setXbx(xbx); } if(null!=cervicalCancerRequest.getFormData().get("cin")){ - cervixVisitModel.setCin(cervicalCancerRequest.getFormData().get("cin").toString()); + cin= (Integer) cervicalCancerRequest.getFormData().get("cin"); + cervixVisitModel.setCin(cin); } if(null!=cervicalCancerRequest.getFormData().get("cin23")){ - cervixVisitModel.setCin23(cervicalCancerRequest.getFormData().get("cin23").toString()); - } - if(null!=cervicalCancerRequest.getFormData().get("hpvym")){ - cervixVisitModel.setHpvym(cervicalCancerRequest.getFormData().get("hpvym").toString()); + cin23= (Integer) cervicalCancerRequest.getFormData().get("cin23"); + cervixVisitModel.setCin23(cin23); } if(null!=cervicalCancerRequest.getFormData().get("xshpv")){ - cervixVisitModel.setXshpv(cervicalCancerRequest.getFormData().get("xshpv").toString()); + xshpv= (Integer) cervicalCancerRequest.getFormData().get("xshpv"); + cervixVisitModel.setXshpv(xshpv); } if(null!=cervicalCancerRequest.getFormData().get("hpvjc")){ - cervixVisitModel.setHpvjc(cervicalCancerRequest.getFormData().get("hpvjc").toString()); + hpvjc= (Integer) cervicalCancerRequest.getFormData().get("hpvjc"); + cervixVisitModel.setHpvjc(hpvjc); } if(null!=cervicalCancerRequest.getFormData().get("xsxbx")){ - cervixVisitModel.setXsxbx(cervicalCancerRequest.getFormData().get("xsxbx").toString()); + xsxbx= (Integer) cervicalCancerRequest.getFormData().get("xsxbx"); + cervixVisitModel.setXsxbx(xsxbx); } if(null!=cervicalCancerRequest.getFormData().get("ydhjzd")){ - cervixVisitModel.setYdhjzd(cervicalCancerRequest.getFormData().get("ydhjzd").toString()); + ydhjzd= (Integer) cervicalCancerRequest.getFormData().get("ydhjzd"); + cervixVisitModel.setYdhjzd(ydhjzd); + } + 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); + 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; + } + } + 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); + } + } + if(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(hpv==2&&xbx==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(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(ydhjzd==1||ydhjzd==2){//现实阴道活检诊断 + cervixVisitModel.setRuleRecommend(1); + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated()); + } } + 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(xshpv==2) {//现实HPV + if(xsxbx==2){ + cervixVisitModel.setRuleRecommend(1); + 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()); + } + } + if(hpv==3&&xbx==4) {//既往史HPV和细胞学 + if(xshpv==1) {//现实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){ + cervixVisitModel.setRuleRecommend(1); + 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()); + } + } + 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()); + } + } + if(cin==3){//CIN(因为2个表的CIN条件相同，只需细胞学分别判断) + switch (xbx){//细胞学 + 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(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; + 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); + } + } + if(xshpv==2){//现实HPV + if(Arrays.asList(2,3,4).contains(xsxbx)){ + cervixVisitModel.setRuleRecommend(4); + } + if(xsxbx==7){ + cervixVisitModel.setRuleRecommend(5); + } + } + break; + } + } + if(cin23==2){ + 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()); cervixVisitModel.setHospitalId(cervicalCancerRequest.getHospitalId()); @@ -873,7 +1161,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { } /** - * 宫颈癌追访列表 + * 宫颈癌随访列表 * * @param queryRequest * @param id @@ -911,7 +1199,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { query.setNextAfterVisitTimeStart(DateUtil.parseYMD(arrs[0])); query.setNextAfterVisitTimeEnd(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1)); } - //下次追访时间保存时已经加过时间逻辑，这里直接小于等于当前时间（默认规则） + //下次随访时间保存时已经加过时间逻辑，这里直接小于等于当前时间（默认规则） query.setNextAfterVisitTime(new Date()); //逾期天数 if (null != queryRequest.getOverdueStart()) { @@ -977,7 +1265,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(query.getPageInfo()); } /** - * 宫颈癌追访记录添加 + * 宫颈癌随访记录添加 * * @param RecordModel * @param id @@ -1010,7 +1298,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { } /** - * 宫颈癌追访记录列表 + * 宫颈癌随访记录列表 * * @param id * @return @@ -1023,7 +1311,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { Map map=new HashMap(); map.put("afterVisitTime", DateUtil.getyyyy_MM_dd(recordModel.getAfterVisitTime())); map.put("afterVisitName", recordModel.getAfterVisitName()); - //追访方式 + //随访方式 String afterVisitType=""; if(org.apache.commons.lang.StringUtils.isNotEmpty(recordModel.getAfterVisitType())){ if(NumberUtils.isNumber(recordModel.getAfterVisitType())){