Commit 116eba7e100f9eb9ec6ebab333ae06d3a960d270
1 parent
76f55cee02
Exists in
master
and in
6 other branches
自测bug提交
Showing 10 changed files with 116 additions and 28 deletions
- platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java
- platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java
- platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryWeightModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java
platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java
View file @
116eba7
| ... | ... | @@ -51,8 +51,17 @@ |
| 51 | 51 | |
| 52 | 52 | private String riskLevelId; |
| 53 | 53 | |
| 54 | + private String hospitalId; | |
| 54 | 55 | |
| 55 | 56 | private Integer yn; |
| 57 | + | |
| 58 | + public String getHospitalId() { | |
| 59 | + return hospitalId; | |
| 60 | + } | |
| 61 | + | |
| 62 | + public void setHospitalId(String hospitalId) { | |
| 63 | + this.hospitalId = hospitalId; | |
| 64 | + } | |
| 56 | 65 | |
| 57 | 66 | public String getRiskLevelId() { |
| 58 | 67 | return riskLevelId; |
platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java
View file @
116eba7
| ... | ... | @@ -61,6 +61,16 @@ |
| 61 | 61 | |
| 62 | 62 | private String riskLevelId; |
| 63 | 63 | |
| 64 | + private String hospitalId; | |
| 65 | + | |
| 66 | + public String getHospitalId() { | |
| 67 | + return hospitalId; | |
| 68 | + } | |
| 69 | + | |
| 70 | + public void setHospitalId(String hospitalId) { | |
| 71 | + this.hospitalId = hospitalId; | |
| 72 | + } | |
| 73 | + | |
| 64 | 74 | public String getRiskLevelId() { |
| 65 | 75 | return riskLevelId; |
| 66 | 76 | } |
platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryWeightModel.java
View file @
116eba7
| ... | ... | @@ -53,6 +53,16 @@ |
| 53 | 53 | |
| 54 | 54 | private String doctorName; |
| 55 | 55 | |
| 56 | + private String hospitalId; | |
| 57 | + | |
| 58 | + public String getHospitalId() { | |
| 59 | + return hospitalId; | |
| 60 | + } | |
| 61 | + | |
| 62 | + public void setHospitalId(String hospitalId) { | |
| 63 | + this.hospitalId = hospitalId; | |
| 64 | + } | |
| 65 | + | |
| 56 | 66 | public String getDoctorName() { |
| 57 | 67 | return doctorName; |
| 58 | 68 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java
View file @
116eba7
| ... | ... | @@ -2,6 +2,7 @@ |
| 2 | 2 | |
| 3 | 3 | import com.lyms.platform.common.annotation.TokenRequired; |
| 4 | 4 | import com.lyms.platform.common.base.BaseController; |
| 5 | +import com.lyms.platform.common.base.LoginContext; | |
| 5 | 6 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 6 | 7 | import com.lyms.platform.common.result.BaseResponse; |
| 7 | 8 | import com.lyms.platform.operate.web.service.ITemporaryBloodService; |
| ... | ... | @@ -9,6 +10,7 @@ |
| 9 | 10 | import org.apache.commons.lang.StringUtils; |
| 10 | 11 | import org.springframework.beans.factory.annotation.Autowired; |
| 11 | 12 | import org.springframework.stereotype.Controller; |
| 13 | +import org.springframework.util.Assert; | |
| 12 | 14 | import org.springframework.web.bind.annotation.*; |
| 13 | 15 | |
| 14 | 16 | import javax.servlet.http.HttpServletRequest; |
| ... | ... | @@ -27,7 +29,7 @@ |
| 27 | 29 | @TokenRequired |
| 28 | 30 | @ResponseBody |
| 29 | 31 | public BaseResponse addTemporaryBlood(@Valid @RequestBody TemporaryBloodModel temporaryBloodModel, HttpServletRequest request) { |
| 30 | - return temporaryBloodService.addTemporaryBlood(temporaryBloodModel); | |
| 32 | + return temporaryBloodService.addTemporaryBlood(temporaryBloodModel, getUserId(request)); | |
| 31 | 33 | } |
| 32 | 34 | |
| 33 | 35 | @RequestMapping(value = "/update", method = RequestMethod.PUT) |
| ... | ... | @@ -53,8 +55,8 @@ |
| 53 | 55 | @RequestMapping(value = "/queryAll", method = RequestMethod.GET) |
| 54 | 56 | @TokenRequired |
| 55 | 57 | @ResponseBody |
| 56 | - public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit) { | |
| 57 | - return temporaryBloodService.queryAll(key, bregmatic, stateWeek, endWeek, page, limit); | |
| 58 | + public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, HttpServletRequest request) { | |
| 59 | + return temporaryBloodService.queryAll(key, bregmatic, stateWeek, endWeek, page, limit, getUserId(request)); | |
| 58 | 60 | } |
| 59 | 61 | |
| 60 | 62 | @ResponseBody |
| 61 | 63 | |
| 62 | 64 | |
| ... | ... | @@ -66,12 +68,17 @@ |
| 66 | 68 | |
| 67 | 69 | @ResponseBody |
| 68 | 70 | @RequestMapping(value = "/presentation/{id}", method = RequestMethod.GET) |
| 69 | - public BaseResponse getXyPresentation(@PathVariable String id) { | |
| 71 | + public BaseResponse getXyPresentation(@PathVariable String id, HttpServletRequest request) { | |
| 70 | 72 | if (StringUtils.isEmpty(id) || "null".equals(id)) { |
| 71 | 73 | return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("id参数不能为空"); |
| 72 | 74 | } |
| 73 | - return temporaryBloodService.getXyPresentation(id); | |
| 75 | + return temporaryBloodService.getXyPresentation(id, getUserId(request)); | |
| 74 | 76 | } |
| 75 | 77 | |
| 78 | + protected Integer getUserId(HttpServletRequest request) { | |
| 79 | + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
| 80 | + Assert.notNull(loginState, "未登录"); | |
| 81 | + return loginState.getId(); | |
| 82 | + } | |
| 76 | 83 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java
View file @
116eba7
| ... | ... | @@ -8,6 +8,7 @@ |
| 8 | 8 | import com.lyms.platform.pojo.TemporaryBloodSugar; |
| 9 | 9 | import org.springframework.beans.factory.annotation.Autowired; |
| 10 | 10 | import org.springframework.stereotype.Controller; |
| 11 | +import org.springframework.util.Assert; | |
| 11 | 12 | import org.springframework.web.bind.annotation.*; |
| 12 | 13 | |
| 13 | 14 | import javax.servlet.http.HttpServletRequest; |
| 14 | 15 | |
| ... | ... | @@ -25,9 +26,9 @@ |
| 25 | 26 | @RequestMapping(value = "/addAndUpate", method = RequestMethod.POST) |
| 26 | 27 | @TokenRequired |
| 27 | 28 | @ResponseBody |
| 28 | - public BaseResponse addTempraryBloodSugar(@Valid @RequestBody TemporaryBloodSugar bloodSugar) { | |
| 29 | + public BaseResponse addTempraryBloodSugar(@Valid @RequestBody TemporaryBloodSugar bloodSugar, HttpServletRequest request) { | |
| 29 | 30 | |
| 30 | - return bloodSugarService.addAndUpdate(bloodSugar); | |
| 31 | + return bloodSugarService.addAndUpdate(bloodSugar, getUserId(request)); | |
| 31 | 32 | } |
| 32 | 33 | |
| 33 | 34 | @RequestMapping(value = "/delete", method = RequestMethod.DELETE) |
| 34 | 35 | |
| ... | ... | @@ -49,11 +50,10 @@ |
| 49 | 50 | @RequestMapping(value = "/queryAll", method = RequestMethod.GET) |
| 50 | 51 | @TokenRequired |
| 51 | 52 | @ResponseBody |
| 52 | - public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit) { | |
| 53 | - return bloodSugarService.queryAll(key, bregmatic, stateWeek, endWeek, page, limit); | |
| 53 | + public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, HttpServletRequest request) { | |
| 54 | + return bloodSugarService.queryAll(key, bregmatic, stateWeek, endWeek, page, limit, getUserId(request)); | |
| 54 | 55 | } |
| 55 | 56 | |
| 56 | - | |
| 57 | 57 | @ResponseBody |
| 58 | 58 | @RequestMapping(value = "/{id}/{type}/{time}", method = RequestMethod.GET) |
| 59 | 59 | @TokenRequired |
| ... | ... | @@ -74,6 +74,12 @@ |
| 74 | 74 | , HttpServletRequest httpServletRequest) { |
| 75 | 75 | LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); |
| 76 | 76 | return bloodSugarService.getSysBloodSugarReport(id, loginState.getId()); |
| 77 | + } | |
| 78 | + | |
| 79 | + protected Integer getUserId(HttpServletRequest request) { | |
| 80 | + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
| 81 | + Assert.notNull(loginState, "未登录"); | |
| 82 | + return loginState.getId(); | |
| 77 | 83 | } |
| 78 | 84 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java
View file @
116eba7
| ... | ... | @@ -7,16 +7,16 @@ |
| 7 | 7 | |
| 8 | 8 | public interface ITemporaryBloodService extends IBaseService { |
| 9 | 9 | |
| 10 | - BaseResponse addTemporaryBlood(TemporaryBloodModel bloodModel); | |
| 10 | + BaseResponse addTemporaryBlood(TemporaryBloodModel bloodModel, Integer userId); | |
| 11 | 11 | |
| 12 | 12 | BaseResponse deleteTemporaryBlood(String id); |
| 13 | 13 | |
| 14 | 14 | BaseResponse queryOne(String id); |
| 15 | 15 | |
| 16 | - BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit); | |
| 16 | + BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId); | |
| 17 | 17 | |
| 18 | 18 | BaseResponse info(String id, Date startDate); |
| 19 | 19 | |
| 20 | - public BaseResponse getXyPresentation(String bloodId); | |
| 20 | + public BaseResponse getXyPresentation(String bloodId, Integer userId); | |
| 21 | 21 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java
View file @
116eba7
| ... | ... | @@ -7,13 +7,13 @@ |
| 7 | 7 | |
| 8 | 8 | public interface ITemporaryBloodSugarService extends IBaseService { |
| 9 | 9 | |
| 10 | - BaseResponse addAndUpdate(TemporaryBloodSugar bloodSugar); | |
| 10 | + BaseResponse addAndUpdate(TemporaryBloodSugar bloodSugar, Integer id); | |
| 11 | 11 | |
| 12 | 12 | BaseResponse deleteBloodSugar(String id); |
| 13 | 13 | |
| 14 | 14 | BaseResponse queryOne(String id); |
| 15 | 15 | |
| 16 | - BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit); | |
| 16 | + BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId); | |
| 17 | 17 | |
| 18 | 18 | BaseResponse info(String parentId, Integer type, Date time); |
| 19 | 19 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java
View file @
116eba7
| ... | ... | @@ -12,11 +12,15 @@ |
| 12 | 12 | import com.lyms.platform.common.utils.DateUtil; |
| 13 | 13 | import com.lyms.platform.common.utils.JsonUtil; |
| 14 | 14 | import com.lyms.platform.common.utils.StringUtils; |
| 15 | +import com.lyms.platform.operate.web.facade.AutoMatchFacade; | |
| 16 | +import com.lyms.platform.operate.web.facade.HealthChargeFacade; | |
| 17 | +import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; | |
| 15 | 18 | import com.lyms.platform.operate.web.service.ITemporaryBloodService; |
| 16 | 19 | import com.lyms.platform.operate.web.service.PatientWeightService; |
| 17 | -import com.lyms.platform.operate.web.utils.LisHandleTask; | |
| 18 | 20 | import com.lyms.platform.operate.web.utils.ReportConfig; |
| 19 | -import com.lyms.platform.pojo.*; | |
| 21 | +import com.lyms.platform.pojo.BasicConfig; | |
| 22 | +import com.lyms.platform.pojo.TemporaryBloodModel; | |
| 23 | +import com.lyms.platform.pojo.XyPresentationModel; | |
| 20 | 24 | import org.apache.commons.collections.CollectionUtils; |
| 21 | 25 | import org.springframework.beans.factory.annotation.Autowired; |
| 22 | 26 | import org.springframework.data.domain.Sort; |
| ... | ... | @@ -33,6 +37,8 @@ |
| 33 | 37 | @Autowired |
| 34 | 38 | private MongoTemplate mongoTemplate; |
| 35 | 39 | |
| 40 | + @Autowired | |
| 41 | + private OrganizationGroupsFacade groupsFacade; | |
| 36 | 42 | |
| 37 | 43 | @Autowired |
| 38 | 44 | private ITemporaryBloodDao temporaryBloodDao; |
| 39 | 45 | |
| ... | ... | @@ -44,8 +50,14 @@ |
| 44 | 50 | @Autowired |
| 45 | 51 | private BasicConfigService basicConfigService; |
| 46 | 52 | |
| 53 | + @Autowired | |
| 54 | + private HealthChargeFacade healthChargeFacade; | |
| 55 | + | |
| 56 | + @Autowired | |
| 57 | + private AutoMatchFacade autoMatchFacade; | |
| 58 | + | |
| 47 | 59 | @Override |
| 48 | - public BaseResponse addTemporaryBlood(TemporaryBloodModel bloodModel) { | |
| 60 | + public BaseResponse addTemporaryBlood(TemporaryBloodModel bloodModel, Integer userId) { | |
| 49 | 61 | List<TemporaryBloodModel> models = mongoTemplate.findAll(TemporaryBloodModel.class); |
| 50 | 62 | if (CollectionUtils.isNotEmpty(models)) { |
| 51 | 63 | TemporaryBloodModel bloodModel1 = mongoTemplate.findOne(Query.query(Criteria.where("phone").is(bloodModel.getPhone())), TemporaryBloodModel.class); |
| ... | ... | @@ -71,6 +83,8 @@ |
| 71 | 83 | } |
| 72 | 84 | } |
| 73 | 85 | bloodModel.setRiskLevelId(JsonUtil.array2JsonString(riskLevelIdList)); |
| 86 | + String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 87 | + bloodModel.setHospitalId(hospitalId); | |
| 74 | 88 | TemporaryBloodModel temporaryBloodModel = temporaryBloodDao.addTemporaryBlood(bloodModel); |
| 75 | 89 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(temporaryBloodModel.getId()); |
| 76 | 90 | } else { |
| 77 | 91 | |
| ... | ... | @@ -160,10 +174,11 @@ |
| 160 | 174 | } |
| 161 | 175 | |
| 162 | 176 | @Override |
| 163 | - public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit) { | |
| 177 | + public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) { | |
| 164 | 178 | boolean flag = false; |
| 165 | - Criteria pCriteria = Criteria.where("yn").ne(0); | |
| 166 | - Criteria criteria = Criteria.where("yn").ne(0); | |
| 179 | + List<String> hospital = groupsFacade.findGroupHospital(userId, false); | |
| 180 | + Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); | |
| 181 | + Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); | |
| 167 | 182 | if (org.apache.commons.lang.StringUtils.isNotBlank(key)) { |
| 168 | 183 | pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key)); |
| 169 | 184 | flag = true; |
| 170 | 185 | |
| ... | ... | @@ -275,10 +290,11 @@ |
| 275 | 290 | } |
| 276 | 291 | |
| 277 | 292 | @Override |
| 278 | - public BaseResponse getXyPresentation(String id) { | |
| 293 | + public BaseResponse getXyPresentation(String id, Integer userId) { | |
| 279 | 294 | //1.通过血压ID 查询到pnationId |
| 280 | 295 | Map<String, Object> datas = new HashMap<>(); |
| 281 | 296 | Map<String, Map<Integer, Double>> series = new HashMap<>(); |
| 297 | + String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 282 | 298 | //BloodPressure bloodPressure = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(bloodId)), BloodPressure.class); |
| 283 | 299 | TemporaryBloodModel bloodModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryBloodModel.class); |
| 284 | 300 | //1.1回去bim值 String getBmi(String weight, String height); |
| ... | ... | @@ -389,6 +405,7 @@ |
| 389 | 405 | } |
| 390 | 406 | datas.put("motion", motionList); |
| 391 | 407 | } |
| 408 | + healthChargeFacade.addHealthCharge(hospitalId, 3, id, 1, 1, userId); | |
| 392 | 409 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas); |
| 393 | 410 | } else { |
| 394 | 411 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("失败").setData("请检查数据是否填写完整!"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java
View file @
116eba7
| ... | ... | @@ -12,6 +12,8 @@ |
| 12 | 12 | import com.lyms.platform.common.utils.JsonUtil; |
| 13 | 13 | import com.lyms.platform.common.utils.StringUtils; |
| 14 | 14 | import com.lyms.platform.operate.web.facade.AutoMatchFacade; |
| 15 | +import com.lyms.platform.operate.web.facade.HealthChargeFacade; | |
| 16 | +import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; | |
| 15 | 17 | import com.lyms.platform.operate.web.service.ITemporaryBloodSugarService; |
| 16 | 18 | import com.lyms.platform.operate.web.service.PatientWeightService; |
| 17 | 19 | import com.lyms.platform.operate.web.utils.ReportConfig; |
| 18 | 20 | |
| ... | ... | @@ -55,9 +57,13 @@ |
| 55 | 57 | private PatientWeightService patientWeightService; |
| 56 | 58 | @Autowired |
| 57 | 59 | private CommonService commonService; |
| 60 | + @Autowired | |
| 61 | + private HealthChargeFacade healthChargeFacade; | |
| 62 | + @Autowired | |
| 63 | + private OrganizationGroupsFacade groupsFacade; | |
| 58 | 64 | |
| 59 | 65 | @Override |
| 60 | - public BaseResponse addAndUpdate(TemporaryBloodSugar bloodSugar) { | |
| 66 | + public BaseResponse addAndUpdate(TemporaryBloodSugar bloodSugar, Integer userId) { | |
| 61 | 67 | List<TemporaryBloodSugar> bloodSugars = mongoTemplate.findAll(TemporaryBloodSugar.class); |
| 62 | 68 | if (CollectionUtils.isNotEmpty(bloodSugars)) { |
| 63 | 69 | TemporaryBloodSugar temporaryBloodSugar = mongoTemplate.findOne(Query.query(Criteria.where("phone").is(bloodSugar.getPhone()).and("bloodSugarType").is(bloodSugar.getBloodSugarType())), TemporaryBloodSugar.class); |
| ... | ... | @@ -79,6 +85,10 @@ |
| 79 | 85 | } |
| 80 | 86 | bloodSugar.setRiskLevelId(JsonUtil.array2JsonString(riskLevelIdList)); |
| 81 | 87 | |
| 88 | + | |
| 89 | + String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 90 | + bloodSugar.setHospitalId(hospitalId); | |
| 91 | + | |
| 82 | 92 | TemporaryBloodSugar bloodSugar1 = temporaryBloodSugarDao.addTemporaryBloodSugar(bloodSugar); |
| 83 | 93 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(bloodSugar1.getId()); |
| 84 | 94 | } |
| 85 | 95 | |
| ... | ... | @@ -158,10 +168,11 @@ |
| 158 | 168 | } |
| 159 | 169 | |
| 160 | 170 | @Override |
| 161 | - public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit) { | |
| 171 | + public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) { | |
| 162 | 172 | boolean flag = false; |
| 163 | - Criteria pCriteria = Criteria.where("yn").ne(0); | |
| 164 | - Criteria criteria = Criteria.where("yn").ne(0); | |
| 173 | + List<String> hospital = groupsFacade.findGroupHospital(userId, false); | |
| 174 | + Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); | |
| 175 | + Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); | |
| 165 | 176 | if (org.apache.commons.lang.StringUtils.isNotBlank(key)) { |
| 166 | 177 | pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key)); |
| 167 | 178 | flag = true; |
| ... | ... | @@ -407,6 +418,7 @@ |
| 407 | 418 | |
| 408 | 419 | resp.setData(data); |
| 409 | 420 | resp.setErrorcode(ResponseCode.SUCCESS.getCode()); |
| 421 | + healthChargeFacade.addHealthCharge(hospitalId, 2, id, 2, 1, userId); | |
| 410 | 422 | resp.setErrormsg("成功"); |
| 411 | 423 | return resp; |
| 412 | 424 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java
View file @
116eba7
| ... | ... | @@ -13,6 +13,8 @@ |
| 13 | 13 | import com.lyms.platform.common.utils.ReflectionUtils; |
| 14 | 14 | import com.lyms.platform.common.utils.StringUtils; |
| 15 | 15 | import com.lyms.platform.operate.web.facade.AutoMatchFacade; |
| 16 | +import com.lyms.platform.operate.web.facade.HealthChargeFacade; | |
| 17 | +import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; | |
| 16 | 18 | import com.lyms.platform.operate.web.service.PatientWeightService; |
| 17 | 19 | import com.lyms.platform.operate.web.service.TemporaryWeightService; |
| 18 | 20 | import com.lyms.platform.operate.web.utils.CollectionUtils; |
| ... | ... | @@ -62,6 +64,12 @@ |
| 62 | 64 | @Autowired |
| 63 | 65 | private UsersService usersService; |
| 64 | 66 | |
| 67 | + @Autowired | |
| 68 | + private OrganizationGroupsFacade groupsFacade; | |
| 69 | + | |
| 70 | + @Autowired | |
| 71 | + private HealthChargeFacade healthChargeFacade; | |
| 72 | + | |
| 65 | 73 | @Override |
| 66 | 74 | public BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId) { |
| 67 | 75 | List<TemporaryWeightModel> weightModel1 = mongoTemplate.findAll(TemporaryWeightModel.class); |
| ... | ... | @@ -85,6 +93,8 @@ |
| 85 | 93 | /* if (MapUtils.isNotEmpty(temporaryWeightModel.getDayWeights())) { |
| 86 | 94 | dayWeights = temporaryWeightModel.getDayWeights(); |
| 87 | 95 | }*/ |
| 96 | + String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 97 | + weightModel.setHospitalId(hospitalId); | |
| 88 | 98 | dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), weightModel.getNowWeight()); |
| 89 | 99 | weightModel.setDayWeights(dayWeights); |
| 90 | 100 | weightModel.setBmi(patientWeightService.getBmi(weightModel.getBeforeWeight(), weightModel.getBeforeHeight())); |
| ... | ... | @@ -106,6 +116,8 @@ |
| 106 | 116 | }*/ |
| 107 | 117 | dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), weightModel.getNowWeight()); |
| 108 | 118 | weightModel.setDayWeights(dayWeights); |
| 119 | + String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 120 | + weightModel.setHospitalId(hospitalId); | |
| 109 | 121 | weightModel.setBmi(patientWeightService.getBmi(weightModel.getBeforeWeight(), weightModel.getBeforeHeight())); |
| 110 | 122 | TemporaryWeightModel temporaryBloodModel = temporaryWeightDao.addTemporaryWeight(weightModel); |
| 111 | 123 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(temporaryBloodModel.getId()); |
| ... | ... | @@ -179,8 +191,9 @@ |
| 179 | 191 | @Override |
| 180 | 192 | public BaseResponse queryAll(String key, Integer stateWeek, Integer endWeek, Integer age, Integer page, Integer limit, Integer userId) { |
| 181 | 193 | boolean flag = false; |
| 182 | - Criteria pCriteria = Criteria.where("yn").ne(0); | |
| 183 | - Criteria criteria = Criteria.where("yn").ne(0); | |
| 194 | + List<String> hospital = groupsFacade.findGroupHospital(userId, false); | |
| 195 | + Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); | |
| 196 | + Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); | |
| 184 | 197 | if (org.apache.commons.lang.StringUtils.isNotBlank(key)) { |
| 185 | 198 | pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key)); |
| 186 | 199 | flag = true; |
| ... | ... | @@ -387,6 +400,7 @@ |
| 387 | 400 | } |
| 388 | 401 | } |
| 389 | 402 | patientWeightService.setReport(map, weights, template.getBeforeWeight(), template.getBmi(), template.getDayWeights(), template.getBregmatic()); |
| 403 | + healthChargeFacade.addHealthCharge(hospitalId, 1, id, 1, 2, userId); | |
| 390 | 404 | CollectionUtils.removeNullValue(map); |
| 391 | 405 | return RespBuilder.buildSuccess(map); |
| 392 | 406 | } |
| ... | ... | @@ -586,6 +600,7 @@ |
| 586 | 600 | public BaseResponse getWeightsReport(String id, Integer userId, String rid) { |
| 587 | 601 | Map<String, Map<Integer, Double>> series = new HashMap<>(); |
| 588 | 602 | Map<String, Map<String, Object>> datas = new TreeMap<>(); |
| 603 | + String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 589 | 604 | TemporaryWeightModel temporary = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryWeightModel.class); |
| 590 | 605 | String weight = temporary.getBeforeWeight(); |
| 591 | 606 | Double heights = Double.valueOf(temporary.getBeforeHeight()).doubleValue() / 100; |
| ... | ... | @@ -728,6 +743,8 @@ |
| 728 | 743 | if (datas.containsKey("3") && datas.containsKey("8")) { |
| 729 | 744 | datas.put("2", datas.get("8")); |
| 730 | 745 | } |
| 746 | + | |
| 747 | + healthChargeFacade.addHealthCharge(hospitalId, 1, id, 2, 2, userId); | |
| 731 | 748 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(this.getFirstOrNull(datas)); |
| 732 | 749 | } |
| 733 | 750 |