From bff95241757171d2abf8c8fd37d28b97316040b2 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Thu, 25 Apr 2019 16:41:18 +0800 Subject: [PATCH] update --- .../com/lyms/platform/pojo/PihParameterModel.java | 10 +++++----- .../operate/web/controller/pihController.java | 4 ++-- .../platform/operate/web/service/PihService.java | 2 +- .../operate/web/service/impl/PihServiceImpl.java | 21 +++++++++++++-------- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PihParameterModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PihParameterModel.java index c8de555..710f69d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PihParameterModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PihParameterModel.java @@ -33,7 +33,7 @@ public class PihParameterModel { private String pulse;//脉搏波形 private String measureEnd;//测量结束 private String exit;//非正常退出 - private String pid;//病人id + private String patientId;// patient的主键 private String hospitalId;//医院id private String IDCard;//病人身份证号 private Date created;//创建时间 @@ -74,12 +74,12 @@ public class PihParameterModel { this.yn = yn; } - public String getPid() { - return pid; + public String getPatientId() { + return patientId; } - public void setPid(String pid) { - this.pid = pid; + public void setPatientId(String patientId) { + this.patientId = patientId; } public String getHospitalId() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/pihController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/pihController.java index 21f5b21..ade980e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/pihController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/pihController.java @@ -52,8 +52,8 @@ public class pihController extends BaseController { @RequestMapping(value = "/report/{id}", method = RequestMethod.GET) @ResponseBody - public BaseResponse getPinReport(@PathVariable(value = "id") String id) { - return pihService.getPinReport(id); + public BaseResponse getPinReport(@PathVariable(value = "id") String id, HttpServletRequest request) { + return pihService.getPinReport(id, getUserId(request)); } protected Integer getUserId(HttpServletRequest request) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PihService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PihService.java index 55be585..ebff91d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PihService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PihService.java @@ -10,6 +10,6 @@ public interface PihService { public BaseResponse queyAll(String key, Integer weekStart, Integer weekEnd, Integer age, String type, Integer page, Integer limit, Integer userId); - public BaseResponse getPinReport(String id); + public BaseResponse getPinReport(String id, Integer userId); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java index 6b082d3..a73f179 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java @@ -1,7 +1,5 @@ package com.lyms.platform.operate.web.service.impl; -import com.alibaba.druid.proxy.jdbc.JdbcParameter; -import com.lyms.platform.biz.dal.IFolicAcidDao; import com.lyms.platform.biz.service.CommonService; import com.lyms.platform.common.enums.PihEnums; import com.lyms.platform.common.result.BaseResponse; @@ -9,10 +7,11 @@ 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.AutoMatchFacade; +import com.lyms.platform.operate.web.facade.HealthChargeFacade; import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; import com.lyms.platform.operate.web.service.PihService; import com.lyms.platform.operate.web.utils.CollectionUtils; -import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.PihModel; import com.lyms.platform.pojo.PihParameterModel; @@ -37,6 +36,11 @@ public class PihServiceImpl extends BaseServiceImpl implements PihService { @Autowired private CommonService commonService; + @Autowired + private HealthChargeFacade healthChargeFacade; + + @Autowired + private AutoMatchFacade autoMatchFacade; @Override public void addPih(PihParameterModel parameterModel) { @@ -94,14 +98,14 @@ public class PihServiceImpl extends BaseServiceImpl implements PihService { ids.add(pih.getId()); } } - criteria.and("pid").in(ids); + criteria.and("patientId").in(ids); } PageResult pageResult = findMongoPage(PihParameterModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit); List pihParameterModelList = (List) pageResult.getGrid(); List> restList = new ArrayList<>(); for (PihParameterModel pihParameterModel : pihParameterModelList) { Map map = new HashMap(); - Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(pihParameterModel.getPid())), Patients.class); + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(pihParameterModel.getPatientId())), Patients.class); if (null != patients) { map.put("id", pihParameterModel.getId()); map.put("username", patients.getUsername()); @@ -140,12 +144,13 @@ public class PihServiceImpl extends BaseServiceImpl implements PihService { * 妊高症报告 */ @Override - public BaseResponse getPinReport(String id) { + public BaseResponse getPinReport(String id, Integer userId) { if (StringUtils.isNotEmpty(id)) { + String hospitalId = autoMatchFacade.getHospitalId(userId); Map datas = new HashMap<>(); PihParameterModel parameterModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), PihParameterModel.class); if (null != parameterModel) { - Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(parameterModel.getPid())), Patients.class); + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(parameterModel.getPatientId())), Patients.class); if (patients != null) { Map userInfo = new HashMap<>(); userInfo.put("username", patients.getUsername()); @@ -223,11 +228,11 @@ public class PihServiceImpl extends BaseServiceImpl implements PihService { } } } - } } } } + healthChargeFacade.addHealthCharge(hospitalId, 4, id, 1, 2, userId); return RespBuilder.buildSuccess(datas); } return RespBuilder.buildSuccess("请选择一条记录"); -- 1.8.3.1