jiangjiazhi / regional-platform

Download as
Browse Code »

Commit eb8ae7f81eb9f3cc99fe2f626d2d4b0bb0d984ad

Authored by shiyang
1 parent 32737a1a6d
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

承德市妇幼上线两癌需求-宫颈癌随访逻辑

Showing 9 changed files with 408 additions and 74 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ICervixVisitDao.java View file @ eb8ae7f
... ... @@ -7,13 +7,13 @@
7 7 import java.util.List;
8 8  
9 9 /**
10   - * 宫颈追访
  10 + * 宫颈随访
11 11 * Created by Administrator on 2022/2/10
12 12 */
13 13 public interface ICervixVisitDao {
14 14  
15 15 /**
16   - * 增加一条宫颈追访
  16 + * 增加一条宫颈随访
17 17 *
18 18 * @param cervixVisitModel
19 19 * @return
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CervixVisitDaoImpl.java View file @ eb8ae7f
... ... @@ -32,7 +32,7 @@
32 32 }
33 33  
34 34 /**
35   - * 修改一条宫颈追访
  35 + * 修改一条宫颈随访
36 36 * @param cervixVisitModel
37 37 */
38 38 @Override
... ... @@ -40,7 +40,7 @@
40 40 update(new MongoQuery(new MongoCondition("parentId", cervixVisitModel.getParentId(), MongoOper.IS)).convertToMongoQuery(), cervixVisitModel);
41 41 }
42 42 /**
43   - * 修改一条宫颈追访
  43 + * 修改一条宫颈随访
44 44 * @param cervixVisitModel
45 45 */
46 46 @Override
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CervixVisitService.java View file @ eb8ae7f
... ... @@ -17,7 +17,7 @@
17 17 import java.util.List;
18 18  
19 19 /**
20   - * 宫颈追访服务实现
  20 + * 宫颈随访服务实现
21 21 *
22 22 */
23 23 @Service
... ... @@ -27,7 +27,7 @@
27 27  
28 28  
29 29 /**
30   - * 增加一条宫颈追访
  30 + * 增加一条宫颈随访
31 31 *
32 32 * @param cervixVisitModel
33 33 * @return CervixVisitModel
... ... @@ -39,7 +39,7 @@
39 39 return iCervixVisitDao.addOneCanScr(cervixVisitModel);
40 40 }
41 41 /**
42   - * 修改一条宫颈追访
  42 + * 修改一条宫颈随访
43 43 * 添加
44 44 * @param cervixVisitModel
45 45 * @param type 1:id查询 2:parentId查询
platform-dal/src/main/java/com/lyms/platform/pojo/CervixVisitModel.java View file @ eb8ae7f
... ... @@ -3,7 +3,7 @@
3 3 /**
4 4 * @auther sy
5 5 * @createTime 2022年02月10日
6   - * @discription 宫颈追访列表模型
  6 + * @discription 宫颈随访列表模型
7 7 */
8 8  
9 9 import com.lyms.platform.common.result.BaseModel;
10 10  
11 11  
12 12  
13 13  
14 14  
15 15  
16 16  
17 17  
18 18  
19 19  
... ... @@ -46,34 +46,34 @@
46 46 * 既往史
47 47 */
48 48 //HPV检查
49   - private String hpv;
  49 + private Integer hpv;
50 50 //细胞学
51   - private String xbx;
  51 + private Integer xbx;
52 52 //CIN
53   - private String cin;
  53 + private Integer cin;
54 54 //CIN2/3
55   - private String cin23;
  55 + private Integer cin23;
56 56 //HPV疫苗注射
57   - private String hpvym;
  57 + private Integer hpvym;
58 58 /**
59 59 * 现时情况（xshpv、hpvjc互斥字段。）
60 60 */
61 61 //HPV
62   - private String xshpv;
  62 + private Integer xshpv;
63 63 //HPV检测手段
64   - private String hpvjc;
  64 + private Integer hpvjc;
65 65 //细胞学
66   - private String xsxbx;
  66 + private Integer xsxbx;
67 67 //阴道活检诊断
68   - private String ydhjzd;
  68 + private Integer ydhjzd;
69 69  
70 70 /**
71 71 *常规推荐
  72 + *1年内追访、3年内随访、5年内随访、阴道镜检查、阴道镜治疗。(1-5)参数
72 73 */
73   - //随访时间段（1年内追访、3年内随访、5年内随访）
74   - //阴道镜检查
75   - //阴道镜治疗
76   -
  74 + private Integer ruleRecommend;
  75 + //推荐预约时间(用于判断满足以上条件，发送短信使用)
  76 + private Date RecommendVisitTime;
77 77 //检査日期
78 78 private Date checkDate;
79 79  
... ... @@ -93,6 +93,22 @@
93 93 private Date modified;
94 94  
95 95  
  96 + public Integer getRuleRecommend() {
  97 + return ruleRecommend;
  98 + }
  99 +
  100 + public void setRuleRecommend(Integer ruleRecommend) {
  101 + this.ruleRecommend = ruleRecommend;
  102 + }
  103 +
  104 + public Date getRecommendVisitTime() {
  105 + return RecommendVisitTime;
  106 + }
  107 +
  108 + public void setRecommendVisitTime(Date recommendVisitTime) {
  109 + RecommendVisitTime = recommendVisitTime;
  110 + }
  111 +
96 112 public String getId() {
97 113 return id;
98 114 }
99 115  
100 116  
101 117  
102 118  
103 119  
104 120  
105 121  
106 122  
107 123  
108 124  
109 125  
110 126  
111 127  
112 128  
113 129  
114 130  
115 131  
... ... @@ -262,75 +278,75 @@
262 278 this.modified = modified;
263 279 }
264 280  
265   - public String getHpv() {
  281 + public Integer getHpv() {
266 282 return hpv;
267 283 }
268 284  
269   - public void setHpv(String hpv) {
  285 + public void setHpv(Integer hpv) {
270 286 this.hpv = hpv;
271 287 }
272 288  
273   - public String getXbx() {
  289 + public Integer getXbx() {
274 290 return xbx;
275 291 }
276 292  
277   - public void setXbx(String xbx) {
  293 + public void setXbx(Integer xbx) {
278 294 this.xbx = xbx;
279 295 }
280 296  
281   - public String getCin() {
  297 + public Integer getCin() {
282 298 return cin;
283 299 }
284 300  
285   - public void setCin(String cin) {
  301 + public void setCin(Integer cin) {
286 302 this.cin = cin;
287 303 }
288 304  
289   - public String getCin23() {
  305 + public Integer getCin23() {
290 306 return cin23;
291 307 }
292 308  
293   - public void setCin23(String cin23) {
  309 + public void setCin23(Integer cin23) {
294 310 this.cin23 = cin23;
295 311 }
296 312  
297   - public String getHpvym() {
  313 + public Integer getHpvym() {
298 314 return hpvym;
299 315 }
300 316  
301   - public void setHpvym(String hpvym) {
  317 + public void setHpvym(Integer hpvym) {
302 318 this.hpvym = hpvym;
303 319 }
304 320  
305   - public String getXshpv() {
  321 + public Integer getXshpv() {
306 322 return xshpv;
307 323 }
308 324  
309   - public void setXshpv(String xshpv) {
  325 + public void setXshpv(Integer xshpv) {
310 326 this.xshpv = xshpv;
311 327 }
312 328  
313   - public String getHpvjc() {
  329 + public Integer getHpvjc() {
314 330 return hpvjc;
315 331 }
316 332  
317   - public void setHpvjc(String hpvjc) {
  333 + public void setHpvjc(Integer hpvjc) {
318 334 this.hpvjc = hpvjc;
319 335 }
320 336  
321   - public String getXsxbx() {
  337 + public Integer getXsxbx() {
322 338 return xsxbx;
323 339 }
324 340  
325   - public void setXsxbx(String xsxbx) {
  341 + public void setXsxbx(Integer xsxbx) {
326 342 this.xsxbx = xsxbx;
327 343 }
328 344  
329   - public String getYdhjzd() {
  345 + public Integer getYdhjzd() {
330 346 return ydhjzd;
331 347 }
332 348  
333   - public void setYdhjzd(String ydhjzd) {
  349 + public void setYdhjzd(Integer ydhjzd) {
334 350 this.ydhjzd = ydhjzd;
335 351 }
336 352 }
platform-dal/src/main/java/com/lyms/platform/pojo/CervixVisitRecordModel.java View file @ eb8ae7f
... ... @@ -3,7 +3,7 @@
3 3 /**
4 4 * @auther sy
5 5 * @createTime 2022年02月10日
6   - * @discription 宫颈追访记录模型
  6 + * @discription 宫颈随访记录模型
7 7 */
8 8  
9 9 import com.lyms.platform.common.result.BaseModel;
... ... @@ -32,6 +32,8 @@
32 32 private String afterVisitResult;
33 33 //追访流程
34 34 private String afterVisitFlowPath;
  35 + //随访状态(0:待随访，1：已随访)
  36 + private Integer type;
35 37  
36 38 /**
37 39 * 是否有效
... ... @@ -39,6 +41,14 @@
39 41 private Integer yn;
40 42  
41 43 private Date created;
  44 +
  45 + public Integer getType() {
  46 + return type;
  47 + }
  48 +
  49 + public void setType(Integer type) {
  50 + this.type = type;
  51 + }
42 52  
43 53 public String getId() {
44 54 return id;
platform-dal/src/main/java/com/lyms/platform/query/CervixVisitQuery.java View file @ eb8ae7f
... ... @@ -3,7 +3,7 @@
3 3 /**
4 4 * @auther sy
5 5 * @createTime 2022年02月10日
6   - * @discription 宫颈追访列表
  6 + * @discription 宫颈随访列表
7 7 */
8 8  
9 9 import com.lyms.platform.common.base.IConvertToNativeQuery;
... ... @@ -57,10 +57,11 @@
57 57 //随访状态(0:待随访，1：已随访)
58 58 private Integer type;
59 59  
60   - //常规推荐
61   - //随访时间段（1年内追访、3年内随访、5年内随访）
62   - //阴道镜检查
63   - //阴道镜治疗
  60 + /**
  61 + *常规推荐
  62 + *1年内追访、3年内随访、5年内随访、阴道镜检查、阴道镜治疗。(1-5)参数
  63 + */
  64 + private Integer ruleRecommend;
64 65  
65 66 /**
66 67 * 是否有效
... ... @@ -68,6 +69,14 @@
68 69 private Integer yn;
69 70  
70 71  
  72 + public Integer getRuleRecommend() {
  73 + return ruleRecommend;
  74 + }
  75 +
  76 + public void setRuleRecommend(Integer ruleRecommend) {
  77 + this.ruleRecommend = ruleRecommend;
  78 + }
  79 +
71 80 public String getId() {
72 81 return id;
73 82 }
... ... @@ -268,6 +277,9 @@
268 277  
269 278 if(null!=type){
270 279 condition=condition.and("type", type, MongoOper.IS);
  280 + }
  281 + if(null!=ruleRecommend){
  282 + condition=condition.and("type", ruleRecommend, MongoOper.IS);
271 283 }
272 284  
273 285 Criteria c = null;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java View file @ eb8ae7f
... ... @@ -170,7 +170,7 @@
170 170 return cervicalCancerService.doSyncCervicalCancer();
171 171 }
172 172 /**
173   - * 宫颈癌追访筛查列表
  173 + * 宫颈癌随访筛查列表
174 174 * @param cervixVisitRequest
175 175 * @param request
176 176 * @return
... ... @@ -183,7 +183,7 @@
183 183 return cervicalCancerService.cervixVisitList(cervixVisitRequest, loginState.getId());
184 184 }
185 185 /**
186   - * 添加宫颈癌追访记录
  186 + * 添加宫颈癌随访记录
187 187 * @param cervixVisitRecordModel
188 188 * @param request
189 189 * @return
... ... @@ -197,7 +197,7 @@
197 197 }
198 198  
199 199 /**
200   - * 宫颈癌追访记录列表
  200 + * 宫颈癌随访记录列表
201 201 * @param id
202 202 * @param request
203 203 * @return
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervixVisitRequest.java View file @ eb8ae7f
... ... @@ -3,7 +3,7 @@
3 3 /**
4 4 * @auther sy
5 5 * @createTime 2022年02月10日
6   - * @discription 宫颈追访列表查询条件
  6 + * @discription 宫颈随访列表查询条件
7 7 */
8 8 public class CervixVisitRequest extends BasePageQueryRequest {
9 9  
10 10  
... ... @@ -33,12 +33,20 @@
33 33 //随访状态(0:待随访，1：已随访)
34 34 private Integer type;
35 35  
36   - //常规推荐
37   - //随访时间段（1年内追访、3年内随访、5年内随访）
38   - //阴道镜检查
39   - //阴道镜治疗
  36 + /**
  37 + *常规推荐
  38 + *1年内追访、3年内随访、5年内随访、阴道镜检查、阴道镜治疗。(1-5)参数
  39 + */
  40 + private Integer ruleRecommend;
40 41  
41 42  
  43 + public Integer getRuleRecommend() {
  44 + return ruleRecommend;
  45 + }
  46 +
  47 + public void setRuleRecommend(Integer ruleRecommend) {
  48 + this.ruleRecommend = ruleRecommend;
  49 + }
42 50  
43 51 public String getCheckDate() {
44 52 return checkDate;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ eb8ae7f
... ... @@ -798,7 +798,7 @@
798 798  
799 799 public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url");
800 800  
801   - //宫颈追访业务 type:1：新增、2：修改
  801 + //宫颈随访业务 type:1：新增、2：修改
802 802 public void cervixVisitAdd(CervicalCancerRequest cervicalCancerRequest,int type) {
803 803 try {
804 804 if(null!=cervicalCancerRequest && MapUtils.isNotEmpty(cervicalCancerRequest.getFormData()) &&
805 805  
806 806  
807 807  
808 808  
809 809  
810 810  
811 811  
812 812  
813 813  
814 814  
815 815  
... ... @@ -806,43 +806,331 @@
806 806 null!=cervicalCancerRequest.getFormData().get("xbx")||
807 807 null!=cervicalCancerRequest.getFormData().get("cin")||
808 808 null!=cervicalCancerRequest.getFormData().get("cin23")||
809   - null!=cervicalCancerRequest.getFormData().get("hpvym")||
810 809 null!=cervicalCancerRequest.getFormData().get("xshpv")||
811 810 null!=cervicalCancerRequest.getFormData().get("hpvjc")||
812 811 null!=cervicalCancerRequest.getFormData().get("xsxbx")||
813 812 null!=cervicalCancerRequest.getFormData().get("ydhjzd")
814 813 )){
815 814 CervixVisitModel cervixVisitModel=new CervixVisitModel();
816   - //下次预约时间逻辑
817   - cervixVisitModel.setNextAfterVisitTime(cervicalCancerRequest.getCreated());
818   - //宫颈检查追访项
  815 + //宫颈检查随访项
  816 + Integer hpv=0,xbx=0,cin=0,cin23=0,xshpv=0,hpvjc=0,xsxbx=0,ydhjzd=0;
819 817 if(null!=cervicalCancerRequest.getFormData().get("hpv")){
820   - cervixVisitModel.setHpv(cervicalCancerRequest.getFormData().get("hpv").toString());
  818 + hpv= (Integer) cervicalCancerRequest.getFormData().get("hpv");
  819 + cervixVisitModel.setHpv(hpv);
821 820 }
822 821 if(null!=cervicalCancerRequest.getFormData().get("xbx")){
823   - cervixVisitModel.setXbx(cervicalCancerRequest.getFormData().get("xbx").toString());
  822 + xbx= (Integer) cervicalCancerRequest.getFormData().get("xbx");
  823 + cervixVisitModel.setXbx(xbx);
824 824 }
825 825 if(null!=cervicalCancerRequest.getFormData().get("cin")){
826   - cervixVisitModel.setCin(cervicalCancerRequest.getFormData().get("cin").toString());
  826 + cin= (Integer) cervicalCancerRequest.getFormData().get("cin");
  827 + cervixVisitModel.setCin(cin);
827 828 }
828 829 if(null!=cervicalCancerRequest.getFormData().get("cin23")){
829   - cervixVisitModel.setCin23(cervicalCancerRequest.getFormData().get("cin23").toString());
  830 + cin23= (Integer) cervicalCancerRequest.getFormData().get("cin23");
  831 + cervixVisitModel.setCin23(cin23);
830 832 }
831   - if(null!=cervicalCancerRequest.getFormData().get("hpvym")){
832   - cervixVisitModel.setHpvym(cervicalCancerRequest.getFormData().get("hpvym").toString());
833   - }
834 833 if(null!=cervicalCancerRequest.getFormData().get("xshpv")){
835   - cervixVisitModel.setXshpv(cervicalCancerRequest.getFormData().get("xshpv").toString());
  834 + xshpv= (Integer) cervicalCancerRequest.getFormData().get("xshpv");
  835 + cervixVisitModel.setXshpv(xshpv);
836 836 }
837 837 if(null!=cervicalCancerRequest.getFormData().get("hpvjc")){
838   - cervixVisitModel.setHpvjc(cervicalCancerRequest.getFormData().get("hpvjc").toString());
  838 + hpvjc= (Integer) cervicalCancerRequest.getFormData().get("hpvjc");
  839 + cervixVisitModel.setHpvjc(hpvjc);
839 840 }
840 841 if(null!=cervicalCancerRequest.getFormData().get("xsxbx")){
841   - cervixVisitModel.setXsxbx(cervicalCancerRequest.getFormData().get("xsxbx").toString());
  842 + xsxbx= (Integer) cervicalCancerRequest.getFormData().get("xsxbx");
  843 + cervixVisitModel.setXsxbx(xsxbx);
842 844 }
843 845 if(null!=cervicalCancerRequest.getFormData().get("ydhjzd")){
844   - cervixVisitModel.setYdhjzd(cervicalCancerRequest.getFormData().get("ydhjzd").toString());
  846 + ydhjzd= (Integer) cervicalCancerRequest.getFormData().get("ydhjzd");
  847 + cervixVisitModel.setYdhjzd(ydhjzd);
845 848 }
  849 + if(hpv==1){//既往史HPV
  850 + if(xshpv==1){//现实HPV
  851 + switch (xsxbx){
  852 + case 2:
  853 + cervixVisitModel.setRuleRecommend(3);
  854 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  855 + break;
  856 + case 3:
  857 + cervixVisitModel.setRuleRecommend(2);
  858 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  859 + break;
  860 + case 4:
  861 + cervixVisitModel.setRuleRecommend(1);
  862 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  863 + break;
  864 + case 5:
  865 + cervixVisitModel.setRuleRecommend(4);
  866 + break;
  867 + case 6:
  868 + cervixVisitModel.setRuleRecommend(4);
  869 + break;
  870 + case 7:
  871 + cervixVisitModel.setRuleRecommend(5);
  872 + break;
  873 + }
  874 + }
  875 + if(xshpv==2){//现实HPV
  876 + if(xsxbx==2){
  877 + cervixVisitModel.setRuleRecommend(1);
  878 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  879 + }
  880 + if(Arrays.asList(3,4).contains(xsxbx)){
  881 + cervixVisitModel.setRuleRecommend(4);
  882 + }
  883 + if(Arrays.asList(5,6,7).contains(xsxbx)){
  884 + cervixVisitModel.setRuleRecommend(5);
  885 + }
  886 + }
  887 + switch (hpvjc){//现实HPV检测手段
  888 + case 1:
  889 + if(Arrays.asList(2,3,4).contains(xsxbx)){
  890 + cervixVisitModel.setRuleRecommend(4);
  891 + }
  892 + if(Arrays.asList(5,6).contains(xsxbx)){
  893 + cervixVisitModel.setRuleRecommend(5);
  894 + }
  895 + if(xsxbx==7){
  896 + cervixVisitModel.setRuleRecommend(6);
  897 + }
  898 + break;
  899 + case 2:
  900 + if(Arrays.asList(2,3,4).contains(xsxbx)){
  901 + cervixVisitModel.setRuleRecommend(4);
  902 + }
  903 + if(Arrays.asList(6,7).contains(xsxbx)){
  904 + cervixVisitModel.setRuleRecommend(5);
  905 + }
  906 + if(xsxbx==5){
  907 + cervixVisitModel.setRuleRecommend(4);
  908 + }
  909 + break;
  910 + case 3:
  911 + if(Arrays.asList(2,3,4).contains(xsxbx)){
  912 + cervixVisitModel.setRuleRecommend(1);
  913 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  914 + }
  915 + if(Arrays.asList(5,6).contains(xsxbx)){
  916 + cervixVisitModel.setRuleRecommend(4);
  917 + }
  918 + if(xsxbx==7){
  919 + cervixVisitModel.setRuleRecommend(5);
  920 + }
  921 + break;
  922 + }
  923 + }
  924 + if(hpv==2) {//既往史HPV
  925 + if(xshpv==1){//现实HPV
  926 + switch (xsxbx){
  927 + case 2:
  928 + cervixVisitModel.setRuleRecommend(3);
  929 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  930 + break;
  931 + case 3:
  932 + cervixVisitModel.setRuleRecommend(2);
  933 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  934 + break;
  935 + case 4:
  936 + cervixVisitModel.setRuleRecommend(1);
  937 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  938 + break;
  939 + }
  940 + if(Arrays.asList(5,6,7).contains(xsxbx)){
  941 + cervixVisitModel.setRuleRecommend(4);
  942 + }
  943 + }
  944 + if(xshpv==2){//现实HPV
  945 + if(Arrays.asList(2,3,4).contains(xsxbx)){
  946 + cervixVisitModel.setRuleRecommend(1);
  947 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  948 + }
  949 + if(Arrays.asList(5,6).contains(xsxbx)){
  950 + cervixVisitModel.setRuleRecommend(4);
  951 + }
  952 + if(xsxbx==7){
  953 + cervixVisitModel.setRuleRecommend(5);
  954 + }
  955 + }
  956 + }
  957 + if(hpv==2&&xbx==2){//既往史HPV和细胞学
  958 + if(xshpv==1) {//现实HPV
  959 + switch (xsxbx){
  960 + case 2:
  961 + cervixVisitModel.setRuleRecommend(3);
  962 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  963 + break;
  964 + case 3:
  965 + cervixVisitModel.setRuleRecommend(2);
  966 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  967 + break;
  968 + case 4:
  969 + cervixVisitModel.setRuleRecommend(1);
  970 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  971 + break;
  972 + }
  973 + if(Arrays.asList(5,6,7).contains(xsxbx)){
  974 + cervixVisitModel.setRuleRecommend(4);
  975 + }
  976 + }
  977 + if(xshpv==2) {//现实HPV
  978 + if(Arrays.asList(2,3,4).contains(xsxbx)){
  979 + cervixVisitModel.setRuleRecommend(1);
  980 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  981 + }
  982 + if(Arrays.asList(5,6).contains(xsxbx)){
  983 + cervixVisitModel.setRuleRecommend(4);
  984 + }
  985 + if(xsxbx==7){
  986 + cervixVisitModel.setRuleRecommend(5);
  987 + }
  988 + }
  989 + if(ydhjzd==1||ydhjzd==2){//现实阴道活检诊断
  990 + cervixVisitModel.setRuleRecommend(1);
  991 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  992 + }
  993 + }
  994 + if(hpv==2&&xbx==3) {//既往史HPV和细胞学
  995 + if(xshpv==1) {//现实HPV
  996 + switch (xsxbx){
  997 + case 2:
  998 + cervixVisitModel.setRuleRecommend(3);
  999 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  1000 + break;
  1001 + case 3:
  1002 + cervixVisitModel.setRuleRecommend(2);
  1003 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  1004 + break;
  1005 + case 4:
  1006 + cervixVisitModel.setRuleRecommend(1);
  1007 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  1008 + break;
  1009 + }
  1010 + if(Arrays.asList(5,6,7).contains(xsxbx)){
  1011 + cervixVisitModel.setRuleRecommend(4);
  1012 + }
  1013 + }
  1014 + if(xshpv==2) {//现实HPV
  1015 + if(xsxbx==2){
  1016 + cervixVisitModel.setRuleRecommend(1);
  1017 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  1018 + }
  1019 + if(Arrays.asList(3,4,5,6).contains(xsxbx)){
  1020 + cervixVisitModel.setRuleRecommend(4);
  1021 + }
  1022 + if(xsxbx==7){
  1023 + cervixVisitModel.setRuleRecommend(5);
  1024 + }
  1025 + }
  1026 + if(ydhjzd==1||ydhjzd==2){//现实阴道活检诊断
  1027 + cervixVisitModel.setRuleRecommend(1);
  1028 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  1029 + }
  1030 + }
  1031 + if(hpv==3&&xbx==4) {//既往史HPV和细胞学
  1032 + if(xshpv==1) {//现实HPV
  1033 + if(Arrays.asList(2,3,4).contains(xsxbx)){
  1034 + cervixVisitModel.setRuleRecommend(1);
  1035 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  1036 + }
  1037 + if(Arrays.asList(5,6).contains(xsxbx)){
  1038 + cervixVisitModel.setRuleRecommend(4);
  1039 + }
  1040 + if(xsxbx==7){
  1041 + cervixVisitModel.setRuleRecommend(5);
  1042 + }
  1043 + }
  1044 + if(xshpv==2) {//现实HPV
  1045 + if(xsxbx==2){
  1046 + cervixVisitModel.setRuleRecommend(1);
  1047 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  1048 + }
  1049 + if(Arrays.asList(3,4,5,6).contains(xsxbx)){
  1050 + cervixVisitModel.setRuleRecommend(4);
  1051 + }
  1052 + if(xsxbx==7){
  1053 + cervixVisitModel.setRuleRecommend(5);
  1054 + }
  1055 + }
  1056 + if(ydhjzd==1||ydhjzd==2){//现实阴道活检诊断
  1057 + cervixVisitModel.setRuleRecommend(1);
  1058 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  1059 + }
  1060 + }
  1061 + if(Arrays.asList(1,2,3).contains(hpv)&&Arrays.asList(5,6,7).contains(xbx)){//既往史HPV和细胞学
  1062 + if(ydhjzd==1||ydhjzd==2){//现实阴道活检诊断
  1063 + cervixVisitModel.setRuleRecommend(1);
  1064 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  1065 + }
  1066 + }
  1067 + if(cin==3){//CIN(因为2个表的CIN条件相同，只需细胞学分别判断)
  1068 + switch (xbx){//细胞学
  1069 + case 3:
  1070 + if(xshpv==1){//现实HPV
  1071 + if(Arrays.asList(2,8).contains(xsxbx)){
  1072 + cervixVisitModel.setRuleRecommend(2);
  1073 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  1074 + }
  1075 + if(Arrays.asList(3,4).contains(xsxbx)){
  1076 + cervixVisitModel.setRuleRecommend(1);
  1077 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  1078 + }
  1079 + if(xsxbx==7){
  1080 + cervixVisitModel.setRuleRecommend(4);
  1081 + }
  1082 + }
  1083 + if(xshpv==2){//现实HPV
  1084 + if(Arrays.asList(2,3,4).contains(xsxbx)){
  1085 + cervixVisitModel.setRuleRecommend(1);
  1086 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  1087 + }
  1088 + if(xsxbx==7){
  1089 + cervixVisitModel.setRuleRecommend(4);
  1090 + }
  1091 + }
  1092 + break;
  1093 + case 7:
  1094 + if(xshpv==1){//现实HPV
  1095 + if(Arrays.asList(2,3,4,8).contains(xsxbx)){
  1096 + cervixVisitModel.setRuleRecommend(1);
  1097 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  1098 + }
  1099 + if(xsxbx==7){
  1100 + cervixVisitModel.setRuleRecommend(5);
  1101 + }
  1102 + }
  1103 + if(xshpv==2){//现实HPV
  1104 + if(Arrays.asList(2,3,4).contains(xsxbx)){
  1105 + cervixVisitModel.setRuleRecommend(4);
  1106 + }
  1107 + if(xsxbx==7){
  1108 + cervixVisitModel.setRuleRecommend(5);
  1109 + }
  1110 + }
  1111 + break;
  1112 + }
  1113 + }
  1114 + if(cin23==2){
  1115 + if(xshpv==1){//现实HPV
  1116 + if(Arrays.asList(2,3,4,8).contains(xsxbx)){
  1117 + cervixVisitModel.setRuleRecommend(1);
  1118 + cervixVisitModel.setRecommendVisitTime(cervicalCancerRequest.getCreated());
  1119 + }
  1120 + if(xsxbx==7){
  1121 + cervixVisitModel.setRuleRecommend(4);
  1122 + }
  1123 + }
  1124 + if(xshpv==2){//现实HPV
  1125 + if(Arrays.asList(2,3,4).contains(xsxbx)){
  1126 + cervixVisitModel.setRuleRecommend(4);
  1127 + }
  1128 + if(xsxbx==7){
  1129 + cervixVisitModel.setRuleRecommend(5);
  1130 + }
  1131 + }
  1132 + }
  1133 +
846 1134 if(type==1) {
847 1135 cervixVisitModel.setParentId(cervicalCancerRequest.getId());
848 1136 cervixVisitModel.setHospitalId(cervicalCancerRequest.getHospitalId());
... ... @@ -873,7 +1161,7 @@
873 1161 }
874 1162  
875 1163 /**
876   - * 宫颈癌追访列表
  1164 + * 宫颈癌随访列表
877 1165 *
878 1166 * @param queryRequest
879 1167 * @param id
... ... @@ -911,7 +1199,7 @@
911 1199 query.setNextAfterVisitTimeStart(DateUtil.parseYMD(arrs[0]));
912 1200 query.setNextAfterVisitTimeEnd(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1));
913 1201 }
914   - //下次追访时间保存时已经加过时间逻辑，这里直接小于等于当前时间（默认规则）
  1202 + //下次随访时间保存时已经加过时间逻辑，这里直接小于等于当前时间（默认规则）
915 1203 query.setNextAfterVisitTime(new Date());
916 1204 //逾期天数
917 1205 if (null != queryRequest.getOverdueStart()) {
... ... @@ -977,7 +1265,7 @@
977 1265 return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(query.getPageInfo());
978 1266 }
979 1267 /**
980   - * 宫颈癌追访记录添加
  1268 + * 宫颈癌随访记录添加
981 1269 *
982 1270 * @param RecordModel
983 1271 * @param id
... ... @@ -1010,7 +1298,7 @@
1010 1298 }
1011 1299  
1012 1300 /**
1013   - * 宫颈癌追访记录列表
  1301 + * 宫颈癌随访记录列表
1014 1302 *
1015 1303 * @param id
1016 1304 * @return
... ... @@ -1023,7 +1311,7 @@
1023 1311 Map map=new HashMap();
1024 1312 map.put("afterVisitTime", DateUtil.getyyyy_MM_dd(recordModel.getAfterVisitTime()));
1025 1313 map.put("afterVisitName", recordModel.getAfterVisitName());
1026   - //追访方式
  1314 + //随访方式
1027 1315 String afterVisitType="";
1028 1316 if(org.apache.commons.lang.StringUtils.isNotEmpty(recordModel.getAfterVisitType())){
1029 1317 if(NumberUtils.isNumber(recordModel.getAfterVisitType())){