From e5c881adf437488fcd23960726fa123baed88795 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 2 Apr 2019 16:30:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msg/service/impl/MsgGenerateServiceImpl.java | 6 +++++- .../msg/worker/YunAmsMsgGenerateWorker.java | 24 ++++++++++++++++++++-- .../web/controller/BloodPressureController.java | 5 +++-- .../operate/web/service/IBloodPressureService.java | 2 +- .../web/service/impl/BloodPressureServiceImpl.java | 12 ++++++----- .../web/service/impl/BloodSugarServiceImpl.java | 7 +++++++ .../web/service/impl/PatientWeightServiceImpl.java | 11 ++++++---- 7 files changed, 52 insertions(+), 15 deletions(-) diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java index 58ef70a..120ce21 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java @@ -12,6 +12,7 @@ import com.lyms.platform.msg.worker.*; import com.lyms.platform.permission.service.BabyPatientExtendEarFollowUpService; import com.lyms.platform.permission.service.BabyPatientExtendEarHearingDiagnoseService; import com.lyms.platform.permission.service.BabyPatientExtendEarScreenService; +import com.lyms.platform.permission.service.PatientServiceService; import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.CourseModel; import com.lyms.platform.pojo.SmsConfigModel; @@ -78,6 +79,9 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService { @Autowired private BasicConfigService basicConfigService; + @Autowired + private PatientServiceService patientServiceService; + /** * 生成孕妇的AMS推送消息 @@ -97,7 +101,7 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService { end = configModels.size(); } YunAmsMsgGenerateWorker checkPointCountWorker = new YunAmsMsgGenerateWorker(configModels.subList(i,end), - baseService,yunBookbuildingService,week,highRiskService); + baseService,yunBookbuildingService,week,highRiskService, patientServiceService); pool.execute(checkPointCountWorker); } diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java index 3827ee2..559cd2e 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java @@ -13,6 +13,9 @@ import com.lyms.platform.msg.remote.SaveMessageService; import com.lyms.platform.msg.service.IBaseService; import com.lyms.platform.msg.utils.DateUtils; import com.lyms.platform.msg.utils.HelperUtils; +import com.lyms.platform.permission.model.PatientService; +import com.lyms.platform.permission.model.PatientServiceQuery; +import com.lyms.platform.permission.service.PatientServiceService; import com.lyms.platform.pojo.HighRiskSmsModel; import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.SmsConfigModel; @@ -43,10 +46,11 @@ public class YunAmsMsgGenerateWorker implements Runnable { private String week; private HighRiskService highRiskService; + private PatientServiceService patientServiceService; public YunAmsMsgGenerateWorker(List configs,IBaseService baseService, YunBookbuildingService yunBookbuildingService, - String week,HighRiskService highRiskService) + String week,HighRiskService highRiskService,PatientServiceService patientServiceService) { this.configs = configs; this.baseService = baseService; @@ -242,6 +246,9 @@ public class YunAmsMsgGenerateWorker implements Runnable { List messageContents = amsSmses.get(yunWeek); if (CollectionUtils.isNotEmpty(messageContents) && serviceYbzd > 0) { + + String serDoct = getDoctorId(pat.getId()); + for (MessageContent message : messageContents) { //判断当前短信是否已经发送 通过短信ID和孕妇ID boolean isExist = SaveMessageService.isExistMsg(pat.getId(), message.getId()); @@ -255,7 +262,7 @@ public class YunAmsMsgGenerateWorker implements Runnable { String messageContent = "【" + messagePrefix + "】" + message.getContent(); MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.YBZD.getId(), - pat.getHospitalId(), message.getId(), pat.getId(), weekDay, title, "", + pat.getHospitalId(), message.getId(), pat.getId(), weekDay, title,serDoct, WxTempleteIdEnums.YUN_YI_BAN_ZHI_DAO.getId(), serviceYbzd); messages.add(request); @@ -269,4 +276,17 @@ public class YunAmsMsgGenerateWorker implements Runnable { } } } + + public String getDoctorId(String patientId) + { + PatientServiceQuery patientQuery = new PatientServiceQuery(); + patientQuery.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId()); + List patientServices = patientServiceService.queryPatientService(patientQuery); + if (CollectionUtils.isNotEmpty(patientServices)) + { + String serDoct = patientServices.get(0).getSerDoct(); + return serDoct == null ? "" : serDoct; + } + return ""; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java index e1d157b..6c5e1d1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java @@ -145,11 +145,12 @@ public class BloodPressureController extends BaseController { //血压报告 @ResponseBody @RequestMapping(value = "/getXyPresentation/{bloodId}", method = RequestMethod.GET) - public BaseResponse getXyPresentation(@PathVariable String bloodId) { + @TokenRequired + public BaseResponse getXyPresentation(@PathVariable String bloodId,HttpServletRequest request) { if (StringUtils.isEmpty(bloodId) || "null".equals(bloodId)) { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("bloodId参数不能为空"); } - return bloodPressureService.getXyPresentation(bloodId); + return bloodPressureService.getXyPresentation(bloodId,getUserId(request)); } @Autowired diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java index e9c6b28..9baa717 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java @@ -30,5 +30,5 @@ public interface IBloodPressureService extends IBaseService { BaseResponse getBloodPressures(String doctorId, Integer type, Integer status, String keyword); - BaseResponse getXyPresentation(String id); + BaseResponse getXyPresentation(String id,Integer userId); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index 641ab64..6008db6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -15,10 +15,7 @@ import com.lyms.platform.common.result.PageResult; import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; -import com.lyms.platform.operate.web.facade.AccessPermissionFacade; -import com.lyms.platform.operate.web.facade.AutoMatchFacade; -import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; -import com.lyms.platform.operate.web.facade.SmsConfigFacade; +import com.lyms.platform.operate.web.facade.*; import com.lyms.platform.operate.web.service.IBloodPressureService; import com.lyms.platform.operate.web.service.PatientWeightService; import com.lyms.platform.operate.web.utils.CollectionUtils; @@ -73,6 +70,9 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP @Autowired private PatientWeightService patientWeightService; + @Autowired + private HealthChargeFacade healthChargeFacade; + private static Map typeGuideMap = new HashMap<>(); static { @@ -677,7 +677,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP } @Override - public BaseResponse getXyPresentation(String bloodId) { + public BaseResponse getXyPresentation(String bloodId,Integer userId) { //1.通过血压ID 查询到pnationId Map datas = new HashMap<>(); Map> series = new HashMap<>(); @@ -790,6 +790,8 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP } datas.put("motion", motionList); } + + healthChargeFacade.addHealthCharge(bloodPressure.getHospitalId(),3,bloodPressure.getParentId(),1,1,userId); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas); } else { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("失败").setData("请检查数据是否填写完整！"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index bef237f..343b9a8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -93,6 +93,10 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga @Autowired private PatientWeightService patientWeightService; + + @Autowired + private HealthChargeFacade healthChargeFacade; + @Autowired private UsersService usersService; @@ -1258,6 +1262,9 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga } data.put("weekRange",weekRange); + + healthChargeFacade.addHealthCharge(hospitalId, 2, patientId, 1, 1, userId); + resp.setData(data); resp.setErrorcode(ResponseCode.SUCCESS.getCode()); resp.setErrormsg("成功"); 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 62142c8..e16f3ee 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 @@ -9,10 +9,7 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.*; import com.lyms.platform.common.utils.*; -import com.lyms.platform.operate.web.facade.AutoMatchFacade; -import com.lyms.platform.operate.web.facade.OperateLogFacade; -import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; -import com.lyms.platform.operate.web.facade.SmsConfigFacade; +import com.lyms.platform.operate.web.facade.*; import com.lyms.platform.operate.web.service.PatientWeightService; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.MathUtil; @@ -96,6 +93,9 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient /*@Autowired private PatientWeightService patientWeightService;*/ + @Autowired + private HealthChargeFacade healthChargeFacade; + /** * 最低：0~13 : 0~1.9 13~40 1.9~11.9 @@ -662,6 +662,9 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } setReport(map, weights, patientWeight.getBeforeWeight(), patientWeight.getBmi(), patientWeight.getDayWeights(), patientWeight.getBregmatic()); CollectionUtils.removeNullValue(map); + + + healthChargeFacade.addHealthCharge(hospitalId,1,patientWeight.getPatientId(),1,1,userId); return RespBuilder.buildSuccess(map); } return RespBuilder.buildSuccess(); -- 1.8.3.1