diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index ddd34c1..e975b4b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -1218,14 +1218,13 @@ public class AntenatalExaminationFacade { public void run() { try { //获取优惠劵类型 - Map param = new HashMap<>(); - param.put("hospitalId",hospitalId); + Map param = new HashMap<>(); + param.put("hospitalId", hospitalId); param.put("code", code); - Map couponInfo = couponService.findCouponByCode(param); + Map couponInfo = couponService.findCouponByCode(param); - if (couponInfo == null || couponInfo.size() == 0) - { - return ; + if (couponInfo == null || couponInfo.size() == 0) { + return; } PatientsQuery patientsQuery = new PatientsQuery(); @@ -1234,8 +1233,7 @@ public class AntenatalExaminationFacade { List list = patientsService.queryPatient1(patientsQuery, "created"); QhdDjq model = new QhdDjq(); - if (CollectionUtils.isNotEmpty(list)) - { + if (CollectionUtils.isNotEmpty(list)) { Patients patient = list.get(0); model.setPatName(patient.getUsername()); model.setPatIdCardNo(patient.getCardNo()); @@ -1249,12 +1247,10 @@ public class AntenatalExaminationFacade { antExChuQuery1.setParentId(patient.getId()); antExChuQuery1.setYn(YnEnums.YES.getId()); List data = antenatalExaminationService.queryAntExChu(antExChuQuery1); - Integer gravidity = 1; //孕次 - if (CollectionUtils.isNotEmpty(data)) - { + Integer gravidity = 1; //孕次 + if (CollectionUtils.isNotEmpty(data)) { AntExChuModel chuModel = data.get(0); - if (chuModel != null && chuModel.getPregnancyTimes() != null) - { + if (chuModel != null && chuModel.getPregnancyTimes() != null) { gravidity = chuModel.getPregnancyTimes(); } } @@ -1285,30 +1281,26 @@ public class AntenatalExaminationFacade { Users users = usersService.getUsers(userId); if (users != null) { model.setWorkerId(users.getAccount()); - } - else - { + } else { model.setWorkerId(""); } } System.out.println(model.toString()); - String result = HospitalCouponPrintUtils.qhdCouponUse(model); - if("0".equals(result)){ - int count = couponService.updateCouponStatus(param); + String result = HospitalCouponPrintUtils.qhdCouponUse(model); + if ("0".equals(result)) { + int count = couponService.updateCouponStatus(param); System.out.println("update coupon count " + count); } - } - catch (Exception e) - { - System.out.println("秦皇岛优惠劵传入his失败"+e.toString()); + } catch (Exception e) { + System.out.println("秦皇岛优惠劵传入his失败" + e.toString()); } } }); } - public void saveTrackCount(Date nextCheckTime,Patients patients) + public TrackCountRecord saveTrackCount(Date nextCheckTime,Patients patients) { TrackCountRecord record = new TrackCountRecord(); record.setHospitalId(patients.getHospitalId()); @@ -1318,6 +1310,7 @@ public class AntenatalExaminationFacade { record.setCreated(new Date()); record.setModified(new Date()); mongoTemplate.save(record); + return record; } public void updateTrackCount(Date checkTime,Date nextCheckTime,Patients patients) @@ -1335,6 +1328,12 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(recordModels) && recordModels.size() > 1) { TrackCountRecord record = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients.getPid())).with(new Sort(Sort.Direction.DESC, "created")), TrackCountRecord.class); + + if (record == null) + { + record = saveTrackCount(nextCheckTime,patients); + } + System.out.println("record="+record); AntExRecordModel recordModel = recordModels.get(1); System.out.println("recordModel="+recordModel);