jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8ece787c9746e5a09d57f69f547544a914e33cf6

Authored by wtt
1 parent 5399826dfb
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 4 changed files with 69 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 8ece787
... ... @@ -24,6 +24,7 @@
24 24 import com.lyms.platform.operate.web.request.AntExListQueryRequest;
25 25 import com.lyms.platform.operate.web.result.HighScoreResult;
26 26 import com.lyms.platform.operate.web.result.MaternalDeliverResult;
  27 +import com.lyms.platform.operate.web.service.BabyEyeCheckService;
27 28 import com.lyms.platform.operate.web.service.IBloodPressureService;
28 29 import com.lyms.platform.operate.web.service.SyncDataTaskService;
29 30 import com.lyms.platform.operate.web.worker.*;
30 31  
... ... @@ -64,8 +65,9 @@
64 65  
65 66 @Autowired
66 67 private MongoTemplate mongoTemplate;
67   -
68 68 @Autowired
  69 + private BabyEyeCheckService babyEyeCheckService;
  70 + @Autowired
69 71 private MatDeliverFollowService matDeliverFollowService;
70 72  
71 73 @Autowired
... ... @@ -230,6 +232,19 @@
230 232 }
231 233  
232 234 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(integer1.toString());
  235 + }
  236 + /**
  237 + * 处理历史眼保健数据，冗余到儿童档案
  238 + *
  239 + * @param startDate 眼保健检查开始时间
  240 + * @param endDate 眼保健检查结束时间
  241 + * @Author: 武涛涛
  242 + * @Date: 2020/8/7 15:45
  243 + */
  244 + @ResponseBody
  245 + @RequestMapping(value = "/babyEyeCheckUpdateBaby" , method = RequestMethod.GET)
  246 + public BaseResponse babyEyeCheckUpdateBaby(@RequestParam(required = false) String startDate,@RequestParam(required = false) String endDate) {
  247 + return babyEyeCheckService.updateBaby(startDate, endDate);
233 248 }
234 249  
235 250 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java View file @ 8ece787
... ... @@ -269,6 +269,18 @@
269 269 babyQuery.setYn(YnEnums.YES.getId());
270 270 babyQuery.setHospitalId(hospitalId);
271 271 babyQuery.setSort(null);
  272 + if(babyQuery.getBuildDateEnd()!=null){
  273 + babyQuery.setBuildDateEnd(DateUtil.addDay(babyQuery.getBuildDateEnd(), 1));
  274 + }
  275 + if(babyQuery.getCheckDateEnd()!=null){
  276 + babyQuery.setCheckDateEnd(DateUtil.addDay(babyQuery.getCheckDateEnd(), 1));
  277 + }
  278 + if(babyQuery.getNextDateEnd()!=null){
  279 + babyQuery.setNextDateEnd(DateUtil.addDay(babyQuery.getNextDateEnd(), 1));
  280 + }
  281 + if(babyQuery.getBirthEnd()!=null){
  282 + babyQuery.setBirthEnd(DateUtil.addDay(babyQuery.getBirthEnd(), 1));
  283 + }
272 284 babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery);
273 285 }
274 286 for (int i = 0; i < babySpecialDiseaseClinicModels.size(); i++) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java View file @ 8ece787
... ... @@ -13,6 +13,7 @@
13 13 public interface BabyEyeCheckService extends IBaseService {
14 14 BaseObjectResponse init();
15 15  
  16 + BaseResponse updateBaby(String startDate, String endDate);
16 17 BaseResponse addOrUpdate(Integer userId, BabyEyeCheck babyEyeCheck);
17 18 BaseResponse addOrUpdateQhd(Integer userId, BabyEyeCheck babyEyeCheck);
18 19  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java View file @ 8ece787
... ... @@ -98,6 +98,46 @@
98 98 return RespBuilder.buildSuccess("eyePosition", eyePosition, "addSubtract", addSubtract, "checkMonth", checkMonth, "checkMonthQhdEnums", checkMonthQhdEnums, "highRisk", highRisk, "highRiskQhd", highRiskQhd, "handleOpinions", handleOpinions);
99 99 }
100 100  
  101 + /**
  102 + * 处理历史眼保健数据，冗余到儿童档案
  103 + * @Author: 武涛涛
  104 + * @Date: 2020/8/7 15:29
  105 + */
  106 + @Override
  107 + public BaseResponse updateBaby(String startDate, String endDate) {
  108 +
  109 + //1 查询所有的眼保健检查，获取儿童档案ids,去重后获取建档儿童id
  110 + List<String> redundancyBabyCheck = new ArrayList<>();
  111 + List<String> babyIds = new ArrayList<>();
  112 + Criteria criteria = Criteria.where("yn").ne("0");
  113 + if (startDate != null && endDate != null) {
  114 + criteria.and("checkTime").gte( DateUtil.parseYMD(startDate)).lt(DateUtil.addDay(DateUtil.parseYMD(endDate), 1));
  115 + }
  116 + List<BabyEyeCheck> babyEyeChecks = mongoUtil.findField(BabyEyeCheck.class, criteria, "babyId");
  117 + babyIds = CollectionUtils.getId(babyEyeChecks, "babyId", String.class);
  118 + if (CollectionUtils.isNotEmpty(babyIds)) {
  119 + babyIds = new ArrayList<String>(new LinkedHashSet<String>(babyIds));
  120 + }
  121 + for (int i = 0; i <babyIds.size() ; i++) {
  122 +
  123 + //2 根据儿童档案id，单个查询获取到最后一个眼保健检查。
  124 + List<BabyEyeCheck> checkModels = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyIds.get(i)).and("yn").is("1"))
  125 + .with(new Sort(Sort.Direction.DESC, "created")), BabyEyeCheck.class);
  126 + if(CollectionUtils.isNotEmpty(checkModels)){
  127 + BabyEyeCheck babyEyeCheck = checkModels.get(0);
  128 +
  129 + //3 使用最后检查，更新到儿童档案中。
  130 + BabyModel babyModel = mongoTemplate.findById(babyEyeCheck.getBabyId(), BabyModel.class);
  131 + if (babyModel != null) {
  132 + babyModel.setDisplayState("1");
  133 + redundancyBabyCheck(babyEyeCheck, babyModel, "ADD");
  134 + redundancyBabyCheck.add(babyModel.getMphone());
  135 + }
  136 + }
  137 + }
  138 + return RespBuilder.buildSuccess("redundancyBabyCheck",redundancyBabyCheck,"redundancyBabyCheck.seiz",redundancyBabyCheck.size());
  139 + }
  140 +
101 141 @Override
102 142 public BaseResponse addOrUpdate(Integer userId, BabyEyeCheck babyEyeCheck) {
103 143 String hospitalId = autoMatchFacade.getHospitalId(userId);