diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java index 3f4304a..1acc2a6 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java @@ -121,19 +121,6 @@ public class BabyNutritionModel { private String remark; - /** - * 解读医生 - */ - private String interpretDoctorId; - - public String getInterpretDoctorId() { - return interpretDoctorId; - } - - public void setInterpretDoctorId(String interpretDoctorId) { - this.interpretDoctorId = interpretDoctorId; - } - public List getFoods() { return foods; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java index 9c2c431..70e8d3c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java @@ -71,19 +71,6 @@ public class BloodSugar extends BaseModel { //0 未推送 1已经推送 private Integer sevenSend; - /** - * 报表解读医生 - */ - private String doctorId; - - public String getDoctorId() { - return doctorId; - } - - public void setDoctorId(String doctorId) { - this.doctorId = doctorId; - } - public Integer getExceptionSend() { return exceptionSend; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java index 374a5da..a5be049 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java @@ -122,8 +122,8 @@ public class BabyNutritionController extends BaseController { @RequestMapping(value = "/queryBabyNutritionReport/{id}", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse queryBabyNutritionReport(@PathVariable("id") String id, HttpServletRequest request) { - return babyNutritionFacade.queryBabyNutritionReport(id, getUserId(request)); + public BaseObjectResponse queryBabyNutritionReport(@PathVariable("id") String id, HttpServletRequest request, @RequestParam("doctorId") String doctorId) { + return babyNutritionFacade.queryBabyNutritionReport(id, getUserId(request), doctorId); } /** @@ -132,8 +132,8 @@ public class BabyNutritionController extends BaseController { @RequestMapping(value = "/queryBabyDietReport/{id}", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse queryBabyDietReport(@PathVariable("id") String id, HttpServletRequest request) { - return babyNutritionFacade.queryBabyDietReport(id, getUserId(request)); + public BaseObjectResponse queryBabyDietReport(@PathVariable("id") String id, HttpServletRequest request, @RequestParam("doctorId")String doctorId) { + return babyNutritionFacade.queryBabyDietReport(id, getUserId(request), doctorId); } /** 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 9d3a81f..86e1a41 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 @@ -31,8 +31,8 @@ public class BloodPressureController extends BaseController { @ResponseBody @RequestMapping(method = RequestMethod.POST) @TokenRequired - public BaseResponse addOrUpdate(BloodPressure bloodPressure, HttpServletRequest request, @RequestParam(value = "doctorId", required = false) String doctorId) { - return bloodPressureService.addOrUpdate(getUserId(request), bloodPressure,doctorId); + public BaseResponse addOrUpdate(BloodPressure bloodPressure, HttpServletRequest request) { + return bloodPressureService.addOrUpdate(getUserId(request), bloodPressure); } @ResponseBody @@ -138,11 +138,11 @@ public class BloodPressureController extends BaseController { @ResponseBody @RequestMapping(value = "/getXyPresentation/{bloodId}", method = RequestMethod.GET) @TokenRequired - public BaseResponse getXyPresentation(@PathVariable String bloodId,HttpServletRequest request) { + public BaseResponse getXyPresentation(@PathVariable String bloodId,@RequestParam String doctorId, HttpServletRequest request) { if (StringUtils.isEmpty(bloodId) || "null".equals(bloodId)) { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("bloodId参数不能为空"); } - return bloodPressureService.getXyPresentation(bloodId,getUserId(request)); + return bloodPressureService.getXyPresentation(bloodId,getUserId(request), doctorId); } @Autowired diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java index 4e410b7..5b864c3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java @@ -120,9 +120,10 @@ public class BloodSugarController extends BaseController { @RequestMapping(value = "/getBloodSugarReport/{patientId}", method = RequestMethod.GET) @TokenRequired public BaseResponse getSysBloodSugarReport(@PathVariable String patientId, - @RequestParam(value = "lbsId", required = false) String lbsId, HttpServletRequest httpServletRequest) { + @RequestParam(value = "lbsId", required = false) String lbsId, HttpServletRequest httpServletRequest, + @RequestParam(value = "doctorId") String doctorId) { LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); - return bloodSugarService.getSysBloodSugarReport(patientId, loginState.getId(), lbsId); + return bloodSugarService.getSysBloodSugarReport(patientId, loginState.getId(), lbsId, doctorId); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java index 09c32e1..549c2ed 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java @@ -33,8 +33,8 @@ public class PatientWeightController extends BaseController { @ResponseBody @RequestMapping(method = RequestMethod.POST) @TokenRequired - public BaseResponse addOrUpdate(@RequestParam(value = "doctorId", required = false) String doctorId, PatientWeight patientWeight, HttpServletRequest request) { - return patientWeightService.addOrUpdate(getUserId(request), patientWeight, doctorId); + public BaseResponse addOrUpdate(PatientWeight patientWeight, HttpServletRequest request) { + return patientWeightService.addOrUpdate(getUserId(request), patientWeight); } /** @@ -94,8 +94,9 @@ public class PatientWeightController extends BaseController { public BaseResponse report(@PathVariable String id, HttpServletRequest request, @RequestParam(value = "rid", required = false) String rid, + @RequestParam(value = "doctorId") String doctorId, String version) { - return patientWeightService.report(id, getUserId(request), rid, version); + return patientWeightService.report(id, getUserId(request), rid, version, doctorId); } @@ -273,11 +274,11 @@ public class PatientWeightController extends BaseController { @TokenRequired public BaseResponse getWeightsReport(@PathVariable String pid, HttpServletRequest request, - @RequestParam(value = "rid", required = false) String rid, String version) { + @RequestParam(value = "rid", required = false) String rid, String version,@RequestParam(value = "doctorId") String doctorId) { if (pid.isEmpty() || "null".equals(pid)) { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.USER_PASSWORD_ERROR).setErrormsg("pid值不能为空!"); } - return patientWeightService.getWeightsReport(pid, getUserId(request), rid, version); + return patientWeightService.getWeightsReport(pid, getUserId(request), rid, version, doctorId); } @@ -292,11 +293,11 @@ public class PatientWeightController extends BaseController { @TokenRequired public BaseResponse qhdReport(@PathVariable String pid, HttpServletRequest request, - @RequestParam(value = "rid", required = false) String rid, String version) { + @RequestParam(value = "rid", required = false) String rid, String version,@RequestParam(value = "doctorId") String doctorId) { if (pid.isEmpty() || "null".equals(pid)) { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.USER_PASSWORD_ERROR).setErrormsg("pid值不能为空!"); } - return patientWeightService.qhdHighRiskReport(pid, getUserId(request), rid, version); + return patientWeightService.qhdHighRiskReport(pid, getUserId(request), rid, version, doctorId); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java index 51db65c..20bd615 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java @@ -29,7 +29,7 @@ public class TemporaryBloodController extends BaseController { @TokenRequired @ResponseBody public BaseResponse addTemporaryBlood(@Valid @RequestBody TemporaryBloodModelRequest temporaryBloodModelRequest, HttpServletRequest request) { - return temporaryBloodService.addTemporaryBlood(temporaryBloodModelRequest.getModel(), getUserId(request), temporaryBloodModelRequest.getDoctorId()); + return temporaryBloodService.addTemporaryBlood(temporaryBloodModelRequest.getModel(), getUserId(request)); } @RequestMapping(value = "/update", method = RequestMethod.PUT) @@ -70,11 +70,11 @@ public class TemporaryBloodController extends BaseController { @ResponseBody @RequestMapping(value = "/presentation/{id}", method = RequestMethod.GET) @TokenRequired - public BaseResponse getXyPresentation(@PathVariable String id, HttpServletRequest request) { + public BaseResponse getXyPresentation(@PathVariable String id, HttpServletRequest request, @RequestParam(value = "doctorId") String doctorId) { if (StringUtils.isEmpty(id) || "null".equals(id)) { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("id参数不能为空"); } - return temporaryBloodService.getXyPresentation(id, getUserId(request)); + return temporaryBloodService.getXyPresentation(id, getUserId(request), doctorId); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java index d3a0598..9ce8b3e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java @@ -72,9 +72,9 @@ public class TemporaryBloodSugarController extends BaseController { @RequestMapping(value = "/getBloodSugarReport/{id}", method = RequestMethod.GET) @TokenRequired public BaseResponse getSysBloodSugarReport(@PathVariable String id - , HttpServletRequest httpServletRequest, @RequestParam(value = "lbsId", required = false) String lbsId) { + , HttpServletRequest httpServletRequest, @RequestParam(value = "lbsId", required = false) String lbsId,@RequestParam(value = "doctorId") String doctorId ) { LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); - return bloodSugarService.getSysBloodSugarReport(id, loginState.getId(), lbsId); + return bloodSugarService.getSysBloodSugarReport(id, loginState.getId(), lbsId, doctorId); } protected Integer getUserId(HttpServletRequest request) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java index 5be5444..90aeca6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java @@ -29,7 +29,7 @@ public class TemporaryWeightController extends BaseController { @TokenRequired @ResponseBody public BaseResponse addTemporaryWeight(@Valid @RequestBody TemporaryWeightRequest temporaryWeightRequest, HttpServletRequest request) { - return temporaryWeightService.addTemporaryWeight(temporaryWeightRequest.getModel(), getUserId(request), temporaryWeightRequest.getDoctorId()); + return temporaryWeightService.addTemporaryWeight(temporaryWeightRequest.getModel(), getUserId(request)); } @RequestMapping(value = "/update", method = RequestMethod.PUT) @@ -78,11 +78,12 @@ public class TemporaryWeightController extends BaseController { @TokenRequired public BaseResponse getWeightsReport(@PathVariable String id, HttpServletRequest request, - @RequestParam(value = "rid", required = false) String rid) { + @RequestParam(value = "rid", required = false) String rid, + @RequestParam(value = "doctorId") String doctorId) { if (id.isEmpty() || "null".equals(id)) { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.USER_PASSWORD_ERROR).setErrormsg("pid值不能为空!"); } - return temporaryWeightService.getWeightsReport(id, getUserId(request), rid); + return temporaryWeightService.getWeightsReport(id, getUserId(request), rid, doctorId); } @@ -97,8 +98,9 @@ public class TemporaryWeightController extends BaseController { @TokenRequired public BaseResponse report(@PathVariable String id, HttpServletRequest request, - @RequestParam(value = "rid", required = false) String rid) { - return temporaryWeightService.report(id, getUserId(request), rid); + @RequestParam(value = "rid", required = false) String rid, + @RequestParam(value = "doctorId") String doctorId) { + return temporaryWeightService.report(id, getUserId(request), rid, doctorId); } protected Integer getUserId(HttpServletRequest request) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java index 0ee9010..46a8f0f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java @@ -126,7 +126,7 @@ public class TrackDownController extends BaseController { /** * 手动执行自动任务 * - * @return + * @return/all */ @ResponseBody @RequestMapping(value = "/dandleAutoReachDue", method = RequestMethod.GET) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index 5643331..dd180a9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -322,7 +322,9 @@ public class BabyNutritionFacade { map.put("recordTime", DateUtil.getyyyy_MM_dd(model.getNutritiTime())); // 新增报表解读人和结算状态 - String currInterpretDoctorId = model.getInterpretDoctorId(); + HealthChargeModel chargeModel = mongoTemplate.findOne(Query.query(Criteria.where("babyNutritionId").is(model.getId())), HealthChargeModel.class); + + String currInterpretDoctorId = chargeModel.getDoctorId(); String interpretDoctorName = ""; if (StringUtils.isNotEmpty(currInterpretDoctorId)) { Users users = usersService.getUsers(Integer.parseInt(currInterpretDoctorId)); @@ -357,7 +359,7 @@ public class BabyNutritionFacade { return null; } - public BaseObjectResponse queryBabyNutritionReport(String id, Integer userId) { + public BaseObjectResponse queryBabyNutritionReport(String id, Integer userId, String doctorId) { Map data = new HashMap(); @@ -654,8 +656,7 @@ public class BabyNutritionFacade { data.put("wlysitems", wlysitems); - healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, - userId, model.getInterpretDoctorId(), true, model.getId()); + healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, userId, doctorId, true, model.getId()); } BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(data); @@ -1280,7 +1281,7 @@ public class BabyNutritionFacade { /** * 秦皇岛精简版儿童膳食报告 */ - public BaseObjectResponse queryBabyDietReport(String id, Integer userId) { + public BaseObjectResponse queryBabyDietReport(String id, Integer userId, String doctorId) { BaseObjectResponse objectResponse = new BaseObjectResponse(); Map data = new HashMap(); @@ -1500,8 +1501,7 @@ public class BabyNutritionFacade { } - healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, - userId, model.getInterpretDoctorId(), true, model.getId()); + healthChargeFacade.addHealthCharge(hospitalId, 5, baby.getId(), null, null, userId, doctorId, true, model.getId()); } objectResponse.setData(data); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java index d0038f2..a489e6e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java @@ -188,7 +188,6 @@ public class BabyNutritionRequest implements IBasicRequestConvert series, String bmiStr, String bregmatic); - BaseResponse getWeightsReport(String pid, Integer userId, String rid, String version); + BaseResponse getWeightsReport(String pid, Integer userId, String rid, String version, String doctorId); - BaseResponse qhdHighRiskReport(String pid, Integer userId, String rid, String version); + BaseResponse qhdHighRiskReport(String pid, Integer userId, String rid, String version, String doctorId); public void setReport(Map restMap, Map weights, String beforeWeight, String bmi, Map dayWeights, String bregmatic); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java index 3513846..9c2f62a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java @@ -6,7 +6,7 @@ import org.springframework.data.mongodb.core.query.Query; public interface TemporaryWeightService extends IBaseService { - BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId, String doctorId); + BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId); void updateTemporaryWeight(Query query, TemporaryWeightModel weightModel); @@ -18,8 +18,8 @@ public interface TemporaryWeightService extends IBaseService { BaseResponse info(String id); - BaseResponse getWeightsReport(String phone, Integer userId, String rid); + BaseResponse getWeightsReport(String phone, Integer userId, String rid, String doctorId); - BaseResponse report(String id, Integer userId, String rid); + BaseResponse report(String id, Integer userId, String rid, String doctorId); } 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 0431901..6fe0c6e 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 @@ -173,7 +173,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP } @Override - public BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure, String doctorId) { + public BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure) { String hospitalId = autoMatchFacade.getHospitalId(userId); Map temp = new LinkedHashMap<>(); bloodPressure.setModified(new Date()); @@ -182,7 +182,6 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP temp.put("pulse", bloodPressure.getPulse()); temp.put("timestamp", DateUtil.getyyyy_MM_dd_hms(new Date())); temp.put("hospitalId", hospitalId); - temp.put("doctorId", doctorId); // BloodPressure bp = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(bloodPressure.getParentId()).and("yn").ne(0)), BloodPressure.class); Patients p = mongoTemplate.findById(bloodPressure.getParentId(), Patients.class); BloodPressure bp = null; @@ -678,7 +677,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP } @Override - public BaseResponse getXyPresentation(String bloodId, Integer userId) { + public BaseResponse getXyPresentation(String bloodId, Integer userId, String doctorId) { //1.通过血压ID 查询到pnationId Map datas = new HashMap<>(); Map> series = new HashMap<>(); @@ -791,18 +790,6 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP } datas.put("motion", motionList); } - Map> infos = bloodPressure.getInfos(); - String doctorId = ""; - if (infos != null && infos.size() > 0){ - String currentDateKey = DateUtil.getyyyy_MM_dd(new Date()); - Map stringObjectMap = infos.get(currentDateKey); - if (stringObjectMap != null){ - Object doctorIdObj = stringObjectMap.get("doctorId"); - if (doctorIdObj != null){ - doctorId = doctorIdObj.toString(); - } - } - } healthChargeFacade.addHealthCharge(bloodPressure.getHospitalId(), 3, bloodPressure.getParentId(), 1, 1, userId, doctorId, false); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas); 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 6e470ce..5bb03ac 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 @@ -106,10 +106,6 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga if (one != null) { one.setModified(new Date()); one.setBloodSugar(bloodSugar.getBloodSugar()); - String doctorId = bloodSugar.getDoctorId(); - if (StringUtils.isNotEmpty(doctorId)) { - one.setDoctorId(doctorId); - } bloodSugarService.update(one); return RespBuilder.buildSuccess(one.getId()); } @@ -1056,7 +1052,7 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga } @Override - public BaseResponse getSysBloodSugarReport(String patientId, Integer userId, String lsbId) { + public BaseResponse getSysBloodSugarReport(String patientId, Integer userId, String lsbId, String doctorId) { String version = null; BaseObjectResponse resp = new BaseObjectResponse(); @@ -1166,30 +1162,6 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga } data.put("weekRange", weekRange); - // 添加报告解读人 - List bloodSugars = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId).and("created").gt(DateUtil.getYMDTime())), BloodSugar.class); - List dateList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(bloodSugars)) { - for (BloodSugar sugar : bloodSugars) { - Date created = sugar.getCreated(); - if (created != null) { - String dbCreated = DateUtil.getyyyy_MM_dd(created); - String currentDate = DateUtil.getyyyy_MM_dd(new Date()); - if (dbCreated.equals(currentDate)) { - dateList.add(created); - } - } - } - } - String doctorId = ""; - if (CollectionUtils.isNotEmpty(dateList)) { - Date maxDate = Collections.max(dateList); - List sugarList = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId).and("created").is(maxDate)), BloodSugar.class); - if (CollectionUtils.isNotEmpty(sugarList)) { - BloodSugar bloodSugar = sugarList.get(0); - doctorId = bloodSugar.getDoctorId(); - } - } healthChargeFacade.addHealthCharge(hospitalId, 2, patientId, 1, 1, userId, doctorId, false); resp.setData(data); 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 13707bc..55c8064 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 @@ -108,7 +108,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient @Override - public BaseResponse addOrUpdate(Integer userId, PatientWeight patientWeight, String doctorId) { + public BaseResponse addOrUpdate(Integer userId, PatientWeight patientWeight) { String hospitalId = autoMatchFacade.getHospitalId(userId); String nowWeight = patientWeight.getNowWeight(); Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class); @@ -173,7 +173,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient map.put("hospitalName", couponMapper.getHospitalName(hospitalId)); map.put("date", ymdDate); map.put("nowWeight", nowWeight); - map.put("doctorId", doctorId); + /*map.put("doctorId", doctorId);*/ } } @@ -183,7 +183,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient m.put("hospitalName", couponMapper.getHospitalName(hospitalId)); m.put("date", ymdDate); m.put("nowWeight", nowWeight); - m.put("doctorId", doctorId); + /*m.put("doctorId", doctorId);*/ dayWeights2.add(m); } pw.setDayWeights2(dayWeights2); @@ -213,7 +213,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient m.put("hospitalName", couponMapper.getHospitalName(hospitalId)); m.put("date", DateUtil.getyyyy_MM_dd(new Date())); m.put("nowWeight", nowWeight); - m.put("doctorId", doctorId); + /*m.put("doctorId", doctorId);*/ dayWeights2.add(m); patientWeight.setDayWeights2(dayWeights2); @@ -631,7 +631,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } @Override - public BaseResponse report(String id, Integer userId, String rid, String version) { + public BaseResponse report(String id, Integer userId, String rid, String version, String doctorId) { String hospitalId = autoMatchFacade.getHospitalId(userId); Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId)); @@ -761,9 +761,6 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient setReport(map, weights, patientWeight.getBeforeWeight(), patientWeight.getBmi(), patientWeight.getDayWeights(), patientWeight.getBregmatic()); CollectionUtils.removeNullValue(map); - List> dayWeights2 = patientWeight.getDayWeights2(); - String doctorId = getDoctorId(dayWeights2); - healthChargeFacade.addHealthCharge(hospitalId, 1, patientWeight.getPatientId(), 1, 1, userId, doctorId, false); PatientWeight patientWeight1 = new PatientWeight(); patientWeight1.setPrintingTime(new Date()); @@ -2147,7 +2144,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } @Override - public BaseResponse getWeightsReport(String pid, Integer userId, String rid, String version) { + public BaseResponse getWeightsReport(String pid, Integer userId, String rid, String version, String doctorId) { Map> series = new HashMap<>(); Map> datas = new TreeMap<>(); PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(pid)), PatientWeight.class); @@ -2284,7 +2281,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } } if (datas.size() == 0) { - BaseResponse baseResponse = this.report(pid, userId, rid, version); + BaseResponse baseResponse = this.report(pid, userId, rid, version, doctorId); return baseResponse; } //同时出现高血压和肝硬化或肝功能不全则按照肝硬化或肝功能不全 @@ -2292,23 +2289,6 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient datas.put("2", datas.get("8")); } - List> dayWeights2 = patientWeight.getDayWeights2(); - String doctorId = ""; - if (CollectionUtils.isNotEmpty(dayWeights2)) { - for (Map map : dayWeights2) { - Object data = map.get("data"); - if (data != null) { - String dbData = data.toString(); - String currentDate = DateUtil.getyyyy_MM_dd(new Date()); - if (dbData.equals(currentDate)) { - Object doctorIdObj = map.get("doctorId"); - if (doctorId != null) { - doctorId = (String) doctorIdObj; - } - } - } - } - } healthChargeFacade.addHealthCharge(patientWeight.getHospitalId(), 1, patientWeight.getPatientId(), 2, 1, userId, doctorId, false); PatientWeight patientWeight1 = new PatientWeight(); @@ -2321,7 +2301,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient * 秦皇岛高危报告 */ @Override - public BaseResponse qhdHighRiskReport(String pid, Integer userId, String rid, String version) { + public BaseResponse qhdHighRiskReport(String pid, Integer userId, String rid, String version, String doctorId) { Map> series = new HashMap<>(); Map> datas = new TreeMap<>(); PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(pid)), PatientWeight.class); @@ -2422,7 +2402,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } } if (datas.size() == 0) { - BaseResponse baseResponse = this.report(pid, userId, rid, "1"); + BaseResponse baseResponse = this.report(pid, userId, rid, "1", doctorId); return baseResponse; } /*//同时出现高血压和肝硬化或肝功能不全则按照肝硬化或肝功能不全 @@ -2430,7 +2410,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient datas.put("2", datas.get("8")); }*/ - List> dayWeights2 = patientWeight.getDayWeights2(); + /*List> dayWeights2 = patientWeight.getDayWeights2(); String doctorId = ""; if (CollectionUtils.isNotEmpty(dayWeights2)) { for (Map map : dayWeights2) { @@ -2446,7 +2426,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } } } - } + }*/ healthChargeFacade.addHealthCharge(patientWeight.getHospitalId(), 1, patientWeight.getPatientId(), 2, 1, userId, doctorId, false); PatientWeight patientWeight1 = new PatientWeight(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java index d4f488b..36b34d2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java @@ -58,7 +58,7 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo @Override - public BaseResponse addTemporaryBlood(TemporaryBloodModel bloodPressure, Integer userId, String doctorId) { + public BaseResponse addTemporaryBlood(TemporaryBloodModel bloodPressure, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); Map temp = new LinkedHashMap<>(); bloodPressure.setModified(new Date()); @@ -67,9 +67,7 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo temp.put("pulse", bloodPressure.getPulse()); temp.put("timestamp", DateUtil.getyyyy_MM_dd_hms(new Date())); temp.put("hospitalId", hospitalId); - if (StringUtils.isNotEmpty(doctorId)){ - temp.put("doctorId", doctorId); - } + TemporaryUserModel temporaryUserModel = mongoTemplate.findById(bloodPressure.getTemporaryUserId(), TemporaryUserModel.class); TemporaryBloodModel bp = null; if (temporaryUserModel != null) { @@ -272,7 +270,7 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } @Override - public BaseResponse getXyPresentation(String id, Integer userId) { + public BaseResponse getXyPresentation(String id, Integer userId, String doctorId) { //1.通过血压ID 查询到pnationId Map datas = new HashMap<>(); Map> series = new HashMap<>(); @@ -388,18 +386,6 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } datas.put("motion", motionList); } - Map> infos = temporaryBloo.getInfos(); - String doctorId = ""; - if (infos != null){ - String currentDateKey = DateUtil.getyyyy_MM_dd(new Date()); - Map stringObjectMap = infos.get(currentDateKey); - if (stringObjectMap != null){ - Object doctorIdObj = stringObjectMap.get("doctorId"); - if (doctorIdObj != null){ - doctorId = doctorIdObj.toString(); - } - } - } healthChargeFacade.addHealthCharge(hospitalId, 3, temporaryBloo.getTemporaryUserId(), 1, 2, userId, doctorId, false); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas); } else { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java index 94c5228..64dcd1e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java @@ -294,7 +294,7 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I @Override - public BaseResponse getSysBloodSugarReport(String id, Integer userId, String lbsId) { + public BaseResponse getSysBloodSugarReport(String id, Integer userId, String lbsId, String doctorId) { String version = null; BaseObjectResponse resp = new BaseObjectResponse(); @@ -405,31 +405,6 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I } data.put("weekRange", weekRange); - // 添加报告解读人 - List bloodSugars = mongoTemplate.find(Query.query(Criteria.where("temporaryUserId").is(id).and("created").gt(DateUtil.getYMDTime())), TemporaryBloodSugar.class); - List dateList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(bloodSugars)) { - for (TemporaryBloodSugar sugar : bloodSugars) { - Date created = sugar.getCreated(); - if (created != null) { - String dbCreated = DateUtil.getyyyy_MM_dd(created); - String currentDate = DateUtil.getyyyy_MM_dd(new Date()); - if (dbCreated.equals(currentDate)) { - dateList.add(created); - } - } - } - } - String doctorId = ""; - if (CollectionUtils.isNotEmpty(dateList)) { - Date maxDate = Collections.max(dateList); - List sugarList = mongoTemplate.find(Query.query(Criteria.where("temporaryUserId").is(id).and("created").is(maxDate)), TemporaryBloodSugar.class); - if (CollectionUtils.isNotEmpty(sugarList)) { - TemporaryBloodSugar bloodSugar = sugarList.get(0); - doctorId = bloodSugar.getDoctorId(); - } - } - healthChargeFacade.addHealthCharge(hospitalId, 2, id, 1, 2, userId, doctorId, false); resp.setData(data); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java index 66a2779..1b9c1ad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java @@ -75,7 +75,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo private CouponMapper couponMapper; @Override - public BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId, String doctorId) { + public BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); String nowWeight = weightModel.getNowWeight(); TemporaryUserModel temporaryUser = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(weightModel.getTemporaryUserId())), TemporaryUserModel.class); @@ -104,7 +104,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo map.put("date", ymdDate); map.put("nowWeight", nowWeight); // 报表解读人 - map.put("doctorId", doctorId); + /*map.put("doctorId", doctorId);*/ } } if (flag) { @@ -113,7 +113,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo m.put("hospitalName", couponMapper.getHospitalName(hospitalId)); m.put("date", ymdDate); m.put("nowWeight", nowWeight); - m.put("doctorId", doctorId); + /*m.put("doctorId", doctorId);*/ dayWeights2.add(m); } pw.setDayWeights2(dayWeights2); @@ -136,7 +136,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo m.put("hospitalName", couponMapper.getHospitalName(hospitalId)); m.put("date", DateUtil.getyyyy_MM_dd(new Date())); m.put("nowWeight", nowWeight); - m.put("doctorId", doctorId); + /*m.put("doctorId", doctorId);*/ dayWeights2.add(m); weightModel.setDayWeights2(dayWeights2); @@ -420,7 +420,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo * 体重标准报告 */ @Override - public BaseResponse report(String id, Integer userId, String rid) { + public BaseResponse report(String id, Integer userId, String rid, String doctorId) { String version = null; String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -503,8 +503,10 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo patientWeightService.setReport(map, weights, temporaryUser.getBeforeWeight(), temporaryWeight.getBmi(), temporaryWeight.getDayWeights(), temporaryUser.getBregmatic()); CollectionUtils.removeNullValue(map); List> dayWeights2 = temporaryWeight.getDayWeights2(); - String doctorId = patientWeightService.getDoctorId(dayWeights2); - healthChargeFacade.addHealthCharge(hospitalId, 1, temporaryWeight.getTemporaryUserId(), 1, 2, userId, doctorId, false); + //String doctorId = patientWeightService.getDoctorId(dayWeights2); + if (doctorId != null) { + healthChargeFacade.addHealthCharge(hospitalId, 1, temporaryWeight.getTemporaryUserId(), 1, 2, userId, doctorId, false); + } TemporaryWeightModel patientWeight1 = new TemporaryWeightModel(); patientWeight1.setPrintingTime(new Date()); @@ -705,7 +707,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo } @Override - public BaseResponse getWeightsReport(String id, Integer userId, String rid) { + public BaseResponse getWeightsReport(String id, Integer userId, String rid, String doctorId) { Map> series = new HashMap<>(); Map> datas = new TreeMap<>(); String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -845,16 +847,13 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo // } if (datas.size() == 0) { - BaseResponse baseResponse = this.report(id, userId, rid); + BaseResponse baseResponse = this.report(id, userId, rid, doctorId); return baseResponse; } //同时出现高血压和肝硬化或肝功能不全则按照肝硬化或肝功能不全 if (datas.containsKey("3") && datas.containsKey("8")) { datas.put("2", datas.get("8")); } - List> dayWeights2 = temporary.getDayWeights2(); - String doctorId = patientWeightService.getDoctorId(dayWeights2); - healthChargeFacade.addHealthCharge(hospitalId, 1, temporary.getTemporaryUserId(), 2, 2, userId, doctorId, false); TemporaryWeightModel patientWeight1 = new TemporaryWeightModel(); patientWeight1.setPrintingTime(new Date());