Commit ee50ff2b4b229d9c108f91793e4dd1aa01d31399
1 parent
eb8ae7f81e
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 3 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
View file @
ee50ff2
| ... | ... | @@ -1199,8 +1199,6 @@ |
| 1199 | 1199 | query.setNextAfterVisitTimeStart(DateUtil.parseYMD(arrs[0])); |
| 1200 | 1200 | query.setNextAfterVisitTimeEnd(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1)); |
| 1201 | 1201 | } |
| 1202 | - //下次随访时间保存时已经加过时间逻辑，这里直接小于等于当前时间（默认规则） | |
| 1203 | - query.setNextAfterVisitTime(new Date()); | |
| 1204 | 1202 | //逾期天数 |
| 1205 | 1203 | if (null != queryRequest.getOverdueStart()) { |
| 1206 | 1204 | Calendar instance = Calendar.getInstance(); |
| ... | ... | @@ -1229,10 +1227,8 @@ |
| 1229 | 1227 | query.setCityId(queryRequest.getCityId()); |
| 1230 | 1228 | query.setAreaId(queryRequest.getAreaId()); |
| 1231 | 1229 | query.setStreetId(queryRequest.getStreetId()); |
| 1232 | - //常规推荐 | |
| 1233 | - //随访时间段（1年内追访、3年内随访、5年内随访） | |
| 1234 | - //阴道镜检查 | |
| 1235 | - //阴道镜治疗 | |
| 1230 | + //常规推荐 1年内追访、3年内随访、5年内随访、阴道镜检查、阴道镜治疗。(1-5)参数 | |
| 1231 | + query.setRuleRecommend(queryRequest.getRuleRecommend()); | |
| 1236 | 1232 | //追访状态 |
| 1237 | 1233 | query.setType(queryRequest.getType()); |
| 1238 | 1234 | List list = new ArrayList(); |
| ... | ... | @@ -1255,6 +1251,7 @@ |
| 1255 | 1251 | } |
| 1256 | 1252 | } |
| 1257 | 1253 | map.put("yqsj",yqsj); |
| 1254 | + map.put("ruleRecommend", model.getRuleRecommend()); | |
| 1258 | 1255 | map.put("afterVisitTime", DateUtil.getyyyy_MM_dd(model.getAfterVisitTime()));//随访时间 |
| 1259 | 1256 | map.put("nextAfterVisitTime", DateUtil.getyyyy_MM_dd(model.getNextAfterVisitTime()));//下次预约时间 |
| 1260 | 1257 | map.put("checkDate", DateUtil.getyyyy_MM_dd(model.getCheckDate()));//检査日期 |