diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java index 846a773..4040404 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java @@ -721,7 +721,7 @@ public class LhxfyService { if (CollectionUtils.isNotEmpty(premaritalCheckupList)) { for (PremaritalCheckup premaritalCheckup : premaritalCheckupList) { - premaritalCheckup.setLhHiv("2"); + // premaritalCheckup.setLhHiv("2"); //获取lis检查数据 List lisReportModels = getLhxfyLis(premaritalCheckup.getCertificateNum()); if(CollectionUtils.isNotEmpty(lisReportModels)){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 6b5820f..5a547ae 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -7,7 +7,7 @@ import com.lyms.hospitalapi.lhxfy.LhxfyService; import com.lyms.hospitalapi.lhxfy.LhxfyZjkService; import com.lyms.hospitalapi.qhdfy.QhdfyFmService; import com.lyms.hospitalapi.qhdfy.QhdfyHisService; -import com.lyms.hospitalapi.qhdfy.QhdfyZyFmService; +//import com.lyms.hospitalapi.qhdfy.QhdfyZyFmService; import com.lyms.hospitalapi.qhdfy.SyncQhdBaseInfoService; import com.lyms.hospitalapi.rcfy.RcGlxtService; import com.lyms.hospitalapi.zcfy.ZcPrenatalService; @@ -163,8 +163,8 @@ public class TestController extends BaseController { @Autowired private PatientFacade patientFacade; - @Autowired - private QhdfyZyFmService qhdfyZyFmService; +// @Autowired +// private QhdfyZyFmService qhdfyZyFmService; @Autowired private BabySieveFacede babySieveFacede; @@ -5187,84 +5187,98 @@ public class TestController extends BaseController { ExcelUtil.toExcel(out, list, cnames); } - /** - * 隆化-儿童眼保套餐历史数据处理 - * 把之前 1-3岁 套餐值12；4-6岁 套餐值48； 改为各个月龄套餐值参考EyeCheckMonthEnums类, - * 根据眼保健操检查表中的检查时间和生日推算出当时月龄匹配相应套餐 - * @param hospitalId 地区id 必填 - * @param checkMonthId 套餐值 - * @return - */ - @RequestMapping(value = "/syncBabyEyeCheckMonthId", method = RequestMethod.GET) - @ResponseBody - @TokenRequired - public BaseObjectResponse syncBabyEyeCheckMonthId(@RequestParam(required = false) String hospitalId, - @RequestParam(required = false) String checkMonthId) { - return babySieveFacede.syncBabyEyeCheckMonthId(hospitalId,checkMonthId); - } - - /** - * 隆化眼保健异常的增加global字段为2。新需求异常字段 - * @return - */ - @RequestMapping(value = "/syncBabyEyeGlobal", method = RequestMethod.GET) - @ResponseBody - @TokenRequired - public BaseObjectResponse syncBabyEyeGlobal() { - return babySieveFacede.syncBabyEyeGlobal(); - } - - - @RequestMapping(value = "/qhdfyZyFmService", method = RequestMethod.GET) - @ResponseBody - public String qhdfyZyFmService(String start,String end,@RequestParam(required = false)String cardNo) { - qhdfyZyFmService.queryZyfmPatient(start,end,cardNo); - return "success"; - } +// /** +// * 隆化-儿童眼保套餐历史数据处理 +// * 把之前 1-3岁 套餐值12；4-6岁 套餐值48； 改为各个月龄套餐值参考EyeCheckMonthEnums类, +// * 根据眼保健操检查表中的检查时间和生日推算出当时月龄匹配相应套餐 +// * @param hospitalId 地区id 必填 +// * @param checkMonthId 套餐值 +// * @return +// */ +// @RequestMapping(value = "/syncBabyEyeCheckMonthId", method = RequestMethod.GET) +// @ResponseBody +// @TokenRequired +// public BaseObjectResponse syncBabyEyeCheckMonthId(@RequestParam(required = false) String hospitalId, +// @RequestParam(required = false) String checkMonthId) { +// return babySieveFacede.syncBabyEyeCheckMonthId(hospitalId,checkMonthId); +// } +// +// /** +// * 隆化眼保健异常的增加global字段为2。新需求异常字段 +// * @return +// */ +// @RequestMapping(value = "/syncBabyEyeGlobal", method = RequestMethod.GET) +// @ResponseBody +// @TokenRequired +// public BaseObjectResponse syncBabyEyeGlobal() { +// return babySieveFacede.syncBabyEyeGlobal(); +// } +// +// +// @RequestMapping(value = "/qhdfyZyFmService", method = RequestMethod.GET) +// @ResponseBody +// public String qhdfyZyFmService(String start,String end,@RequestParam(required = false)String cardNo) { +// qhdfyZyFmService.queryZyfmPatient(start,end,cardNo); +// return "success"; +// } @RequestMapping(value = "/syncPreEugebicsToHj", method = RequestMethod.GET) @ResponseBody public String syncPreEugebicsToHj() { - Query query = Query.query(Criteria.where("hospitalId").is("2100001605").and("wifeBCheck").exists(true)); - //query.addCriteria(Criteria.where("id").is("62e874db9932b2eeb3fe9a6c")); - List modelList = mongoTemplate.find(query,PreEugenicsBaseModel.class); - if (CollectionUtils.isNotEmpty(modelList)) + String startDate1 = ""; + String endDate1 = ""; + Date date1 = DateUtil.parseYMD("2021-09-01"); + for(int i=1 ;i < 15;i++) { - System.out.println("size==="+modelList.size()); - for (PreEugenicsBaseModel model : modelList) + startDate1 = DateUtil.getyyyy_MM_dd(date1); + date1 = DateUtil.addMonth(date1,1); + endDate1 = DateUtil.getyyyy_MM_dd(date1); + Query query = Query.query(Criteria.where("hospitalId").is("2100001605").and("wifeBCheck").exists(true).and("fillDate").gte(DateUtil.parseYMD(startDate1)).lte(DateUtil.parseYMD(endDate1))); + //query.addCriteria(Criteria.where("id").is("62e874db9932b2eeb3fe9a6c")); + System.out.println("============="+query.toString()); + List modelList = mongoTemplate.find(query,PreEugenicsBaseModel.class); + if (CollectionUtils.isNotEmpty(modelList)) { - String cardNo = model.getWifeCardNo(); - Query query1 = Query.query(Criteria.where("certificateNum").is(cardNo).and("xRay").exists(true)); - List checkupList = mongoTemplate.find(query1,PremaritalCheckup.class); - if (CollectionUtils.isNotEmpty(checkupList)) + System.out.println("size==="+modelList.size()); + for (PreEugenicsBaseModel model : modelList) { - PremaritalCheckup checkup = checkupList.get(0); - if (model.getWifeBCheck() != null && model.getWifeBCheck().size() > 0 && model.getWifeBCheck().get("bcjc") != null) + String cardNo = model.getWifeCardNo(); + if (StringUtils.isEmpty(cardNo)) { - Object obj = model.getWifeBCheck().get("bcjc"); - List list = (ArrayList)obj; - if (CollectionUtils.isNotEmpty(list)) + continue; + } + Query query1 = Query.query(Criteria.where("certificateNum").is(cardNo).and("xRay").exists(true)); + List checkupList = mongoTemplate.find(query1,PremaritalCheckup.class); + if (CollectionUtils.isNotEmpty(checkupList)) + { + PremaritalCheckup checkup = checkupList.get(0); + if (model.getWifeBCheck() != null && model.getWifeBCheck().size() > 0 && model.getWifeBCheck().get("bcjc") != null) { - Integer status = (Integer)list.get(0); - String content = (String)list.get(1); - checkup.setLhbc(String.valueOf(status+1)); - checkup.setLhbcms(content); - if (list.size() == 3) + Object obj = model.getWifeBCheck().get("bcjc"); + List list = (ArrayList)obj; + if (CollectionUtils.isNotEmpty(list)) { - String code = (String)list.get(2); - checkup.setLhbcjch(code); + Integer status = (Integer)list.get(0); + String content = (String)list.get(1); + checkup.setLhbc(String.valueOf(status+1)); + checkup.setLhbcms(content); + if (list.size() == 3) + { + String code = (String)list.get(2); + checkup.setLhbcjch(code); + } + System.out.println("id==="+checkup.getId()); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(checkup)); + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(checkup.getId())), update, PremaritalCheckup.class); } - Update update = MongoConvertHelper - .convertToNativeUpdate(ReflectionUtils.getUpdateField(checkup)); - mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(checkup.getId())), update, PremaritalCheckup.class); } } } } } - return "success"; } }