diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/RemoteServerEnmus.java b/platform-common/src/main/java/com/lyms/platform/common/enums/RemoteServerEnmus.java index ed373cd..cbc7e06 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/RemoteServerEnmus.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/RemoteServerEnmus.java @@ -3,7 +3,7 @@ package com.lyms.platform.common.enums; public enum RemoteServerEnmus { // LOCAL("http://localhost:9091", "本地环境"), // TEST("https://dev-rp-api.healthbaby.com.cn", "测试环境"), - ON_LINE("https://rp-api.healthbaby.com.cn", "线上"), +// ON_LINE("https://rp-api.healthbaby.com.cn", "线上"), LC("https://area-lc-api.healthbaby.com.cn:55581", "聊城"), DZ("https://area-dz-api.healthbaby.com.cn:12356", "德州"), QHD("https://area-qhd-api.healthbaby.com.cn:18019", "秦皇岛"), diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java index 953983e..d9fe88b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java @@ -31,6 +31,17 @@ public class ReportController extends BaseController { private IReportService reportService; /** + * 未发放优惠券统计 + */ + @RequestMapping(value = "/unissued", method = RequestMethod.POST) + @ResponseBody + @TokenRequired + public BaseObjectResponse unissued(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, HttpServletRequest request) { + return reportService.unissued(startDate, endDate, provinceId, cityId, areaId, hospitalId, getUserId(request)); + } + + + /** * 产检次数分布统计(已废弃 采用 getCheckNumber) * * @param startDate 建档开始时间 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java index 8726fcc..72ca2e2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java @@ -83,4 +83,6 @@ public interface IReportService extends IBaseService { BaseObjectResponse getCheckNumberInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, Integer id, Integer currentPage, Integer pageSize); void checkNumberInfoExport(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, Integer id, HttpServletResponse resp); + + BaseObjectResponse unissued(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer userId); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 397af20..48e396d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -155,6 +155,16 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient patientWeight.setDayWeights2(dayWeights2); patientWeightService2.add(patientWeight); + + // 绑定医生和患者的关系 + String patSerSyncUrl = Config.getItem("patSer_sync_url", "0"); + Map param = new HashMap<>(); + param.put("doctorId", userId + ""); + param.put("patientId", patients.getId()); + patSerSyncUrl = "http://localhost:9092"; +// String s = HttpClientUtil.doPost(patSerSyncUrl + "/grWeContr/bindDoctorUser", param, "UTF-8"); + String s = HttpClientUtil.doPost("http://localhost:9092/grWeContr/bindDoctorUser", param, "UTF-8"); + System.out.println("绑定医生和患者的关系>>. " + s + " param: " + param); return RespBuilder.buildSuccess(patientWeight.getId()); } else { patientWeight.setOperaterId(userId.toString()); @@ -361,26 +371,58 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class); PatientWeight pw = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patientWeight.getPid())), PatientWeight.class); Map dayWeights = new LinkedHashMap<>(); + List> dayWeights2 = new ArrayList<>(); + String ymdDate = DateUtil.getyyyy_MM_dd(new Date()); + String hospitalId = patientWeight.getHospitalId(); + if(pw == null && StringUtils.isEmpty(patientWeight.getBeforeWeight())) { return RespBuilder.buildErro(ResponseCode.NEED_ADD_PATIENT_WEIGHT); } if(pw != null && StringUtils.isNotEmpty(patientWeight.getBeforeWeight())) { return RespBuilder.buildErro(ResponseCode.PATIENT_WEIGHT_IS_EXIST); } - if(pw != null) { + if(pw != null) { // 修改 if(MapUtils.isNotEmpty(pw.getDayWeights())) { dayWeights = pw.getDayWeights(); } dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), nowWeight); pw.setNowWeight(nowWeight); pw.setDayWeights(dayWeights); -// Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(pw)); -// mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(pw.getId())), update, PatientWeight.class); + + if(CollectionUtils.isNotEmpty(pw.getDayWeights2())) { + dayWeights2 = pw.getDayWeights2(); + } + boolean flag = true; + for (Map map : dayWeights2) { + if(map.get("date").equals(ymdDate)) { + flag = false; + if(hospitalId.equals(map.get("hospitalId") + "")) { + map.put("hospitalId", hospitalId); + map.put("hospitalName", couponMapper.getHospitalName(hospitalId)); + map.put("date", ymdDate); + map.put("nowWeight", nowWeight); + } + } + } + if(flag) { + Map m = new HashMap<>(); + m.put("hospitalId", hospitalId); + m.put("hospitalName", couponMapper.getHospitalName(hospitalId)); + m.put("date", ymdDate); + m.put("nowWeight", nowWeight); + dayWeights2.add(m); + } patientWeightService2.update(Query.query(Criteria.where("id").is(pw.getId())), pw); -// return RespBuilder.buildSuccess(pw.getId()); return RespBuilder.buildSuccess(pw); } + + Map m = new HashMap<>(); + m.put("hospitalId", hospitalId); + m.put("hospitalName", couponMapper.getHospitalName(hospitalId)); + m.put("date", ymdDate); + m.put("nowWeight", nowWeight); + dayWeights2.add(m); if(StringUtils.isEmpty(patientWeight.getId()) && patients != null) { patientWeight.setCreated(new Date()); patientWeight.setHospitalId(patients.getHospitalId()); @@ -389,13 +431,10 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } patientWeight.setYn("1"); patientWeight.setPid(patients.getPid()); + pw.setDayWeights2(dayWeights2); patientWeightService2.add(patientWeight); return RespBuilder.buildSuccess(patientWeight); } else { -// Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(patientWeight)); -// mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(patientWeight.getId())), update, PatientWeight.class); - /* patientWeightService2.update(Query.query(Criteria.where("id").is(patientWeight.getId())), patientWeight); - return RespBuilder.buildSuccess(patientWeight.getId());*/ patientWeight.setCreated(new Date()); patientWeight.setHospitalId(patients.getHospitalId()); if(StringUtils.isNotBlank(patientWeight.getBeforeWeight()) && patientWeight.getBeforeHeight() != null) { @@ -473,6 +512,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient patientWeight.setDayWeights2(dayWeights2); patientWeight.setDayWeights(dayWeights); + patientWeight.setBmi(getBmi(beforeWeight, beforeHeight)); } patientWeightService2.update(Query.query(Criteria.where("id").is(id)), patientWeight); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index d7ee3d5..42f3fec 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -487,6 +487,22 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } @Override + public BaseObjectResponse unissued(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer userId) { + List hospitalIds = new ArrayList<>(); + if(StringUtils.isEmpty(hospitalId)) { + hospitalIds.addAll(accessPermissionFacade.getCurrentUserHospPermissions(userId)); + } else { + hospitalIds.add(hospitalId); + } + + if(CollectionUtils.isNotEmpty(hospitalIds)) { + + } + + return RespBuilder.buildSuccess(); + } + + @Override public BaseObjectResponse coupon(Map param) { if(StringUtils.isBlank((String) param.get("hospitalId"))) { param.put("hospitalId", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + ""))); /** 模拟根据登陆人id 查询出来的医院 */