diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java index 14e6049..798961b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java @@ -43,10 +43,16 @@ public class TempController extends BaseController { @Autowired private TempFacade tempFacade; + @ResponseBody + @RequestMapping(value = "/findid/{pid}", method = RequestMethod.GET) + public String findIdByPid(@PathVariable String pid) { + return tempFacade.findIdByPid(pid); + } + /** * 获取体温记录(小程序) */ - @RequestMapping(value = "/wx/get/{parentId}",method = RequestMethod.GET) + @RequestMapping(value = "/wx/get/{parentId}", method = RequestMethod.GET) @ResponseBody public BaseResponse getTemp(@PathVariable String parentId) { return tempFacade.getTemp(parentId); @@ -55,7 +61,7 @@ public class TempController extends BaseController { /** * 增加一条体温记录(小程序) */ - @RequestMapping(value = "/wx/add",method = RequestMethod.POST) + @RequestMapping(value = "/wx/add", method = RequestMethod.POST) @ResponseBody public BaseResponse addWxTemp(TempModel tempModel) { return tempFacade.addWxTemp(tempModel); @@ -68,11 +74,11 @@ public class TempController extends BaseController { * @return */ @TokenRequired - @RequestMapping(value = "/add",method = RequestMethod.POST) + @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public BaseResponse addOnceTemp(@Valid TempAddRequest tempRequest,HttpServletRequest request) { + public BaseResponse addOnceTemp(@Valid TempAddRequest tempRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return tempFacade.addOrUpdateOneTemp(tempRequest,loginState.getId()); + return tempFacade.addOrUpdateOneTemp(tempRequest, loginState.getId()); } /** @@ -82,9 +88,9 @@ public class TempController extends BaseController { * @return */ @TokenRequired - @RequestMapping(value = "/list",method = RequestMethod.GET) + @RequestMapping(value = "/list", method = RequestMethod.GET) @ResponseBody - public BaseResponse findTempDataList(@Valid TempQueryRequest queryRequest,HttpServletRequest request){ + public BaseResponse findTempDataList(@Valid TempQueryRequest queryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return tempFacade.findTempDataList(queryRequest, loginState.getId()); } @@ -96,10 +102,10 @@ public class TempController extends BaseController { * @return */ @TokenRequired - @RequestMapping(value = "/report/{id}/{time}",method = RequestMethod.GET) + @RequestMapping(value = "/report/{id}/{time}", method = RequestMethod.GET) @ResponseBody - public Map report(@PathVariable String id,HttpServletRequest request,@PathVariable String time){ + public Map report(@PathVariable String id, HttpServletRequest request, @PathVariable String time) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return tempFacade.reportList(loginState.getId(),id,time); + return tempFacade.reportList(loginState.getId(), id, time); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java index bacd678..84d7996 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java @@ -67,7 +67,20 @@ public class TempFacade { @Autowired private OrganizationGroupsFacade groupsFacade; @Autowired -private AccessPermissionFacade accessPermissionFacade; + private AccessPermissionFacade accessPermissionFacade; + + public String findIdByPid(String pid) { + if (StringUtils.isBlank(pid)) { + return ""; + } + TempQuery tempQuery = new TempQuery(); + tempQuery.setYn(YnEnums.YES.getId()); + List list = new ArrayList<>(); + list.add(pid); + tempQuery.setpIds(list); + List data = tempService.queryTemp(tempQuery); + return CollectionUtils.isNotEmpty(data) ? data.get(0).getId() : ""; + } public BaseResponse addOrUpdateOneTemp(TempAddRequest addRequest, Integer userId) { @@ -113,7 +126,7 @@ private AccessPermissionFacade accessPermissionFacade; } public BaseResponse findTempDataList(TempQueryRequest queryRequest, Integer userId) { - List hospital = groupsFacade.findGroupHospital(userId,true) ; + List hospital = groupsFacade.findGroupHospital(userId, true); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setCardNo(queryRequest.getCardNo()); patientsQuery.setVcCardNo(queryRequest.getVcCardNo()); @@ -198,8 +211,8 @@ private AccessPermissionFacade accessPermissionFacade; str = "超高热"; } else if (36 <= temp && 37.4 >= temp) { str = "标准"; - }else if(36>temp){ - str="体温过低"; + } else if (36 > temp) { + str = "体温过低"; } return str; } @@ -212,7 +225,7 @@ private AccessPermissionFacade accessPermissionFacade; * @param id 记录id * @return */ - public Map reportList(Integer userId, String id,String date) { + public Map reportList(Integer userId, String id, String date) { TempQuery tempQuery = new TempQuery(); tempQuery.setpIds(Arrays.asList(new String[]{id})); List tem = tempService.queryTemp(tempQuery); @@ -246,7 +259,13 @@ private AccessPermissionFacade accessPermissionFacade; } public BaseResponse addWxTemp(TempModel tempModel) { - TempModel temp = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(tempModel.getParentId())), TempModel.class); + TempModel temp = null; + if (StringUtils.isNotBlank(tempModel.getPid())) { + temp = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(tempModel.getPid())), TempModel.class); + } else { + temp = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(tempModel.getParentId())), TempModel.class); + } + Date date = new Date(); LinkedHashMap data = temp == null ? new LinkedHashMap() : temp.getTempList(); data.put(DateUtil.getYyyyMmDd(new Date()), Double.valueOf(tempModel.getNow()));