jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ba30b63437a3500d0c0958703d6db6503ef37ca1

Authored by jiangjiazhi
1 parent 9aaa1e3de0
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

增加查询id的接口

Showing 2 changed files with 41 additions and 16 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java View file @ ba30b63
... ... @@ -43,10 +43,16 @@
43 43 @Autowired
44 44 private TempFacade tempFacade;
45 45  
  46 + @ResponseBody
  47 + @RequestMapping(value = "/findid/{pid}", method = RequestMethod.GET)
  48 + public String findIdByPid(@PathVariable String pid) {
  49 + return tempFacade.findIdByPid(pid);
  50 + }
  51 +
46 52 /**
47 53 * 获取体温记录（小程序）
48 54 */
49   - @RequestMapping(value = "/wx/get/{parentId}",method = RequestMethod.GET)
  55 + @RequestMapping(value = "/wx/get/{parentId}", method = RequestMethod.GET)
50 56 @ResponseBody
51 57 public BaseResponse getTemp(@PathVariable String parentId) {
52 58 return tempFacade.getTemp(parentId);
... ... @@ -55,7 +61,7 @@
55 61 /**
56 62 * 增加一条体温记录（小程序）
57 63 */
58   - @RequestMapping(value = "/wx/add",method = RequestMethod.POST)
  64 + @RequestMapping(value = "/wx/add", method = RequestMethod.POST)
59 65 @ResponseBody
60 66 public BaseResponse addWxTemp(TempModel tempModel) {
61 67 return tempFacade.addWxTemp(tempModel);
62 68  
63 69  
... ... @@ -68,11 +74,11 @@
68 74 * @return
69 75 */
70 76 @TokenRequired
71   - @RequestMapping(value = "/add",method = RequestMethod.POST)
  77 + @RequestMapping(value = "/add", method = RequestMethod.POST)
72 78 @ResponseBody
73   - public BaseResponse addOnceTemp(@Valid TempAddRequest tempRequest,HttpServletRequest request) {
  79 + public BaseResponse addOnceTemp(@Valid TempAddRequest tempRequest, HttpServletRequest request) {
74 80 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
75   - return tempFacade.addOrUpdateOneTemp(tempRequest,loginState.getId());
  81 + return tempFacade.addOrUpdateOneTemp(tempRequest, loginState.getId());
76 82 }
77 83  
78 84 /**
79 85  
... ... @@ -82,9 +88,9 @@
82 88 * @return
83 89 */
84 90 @TokenRequired
85   - @RequestMapping(value = "/list",method = RequestMethod.GET)
  91 + @RequestMapping(value = "/list", method = RequestMethod.GET)
86 92 @ResponseBody
87   - public BaseResponse findTempDataList(@Valid TempQueryRequest queryRequest,HttpServletRequest request){
  93 + public BaseResponse findTempDataList(@Valid TempQueryRequest queryRequest, HttpServletRequest request) {
88 94 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
89 95 return tempFacade.findTempDataList(queryRequest, loginState.getId());
90 96 }
91 97  
92 98  
... ... @@ -96,11 +102,11 @@
96 102 * @return
97 103 */
98 104 @TokenRequired
99   - @RequestMapping(value = "/report/{id}/{time}",method = RequestMethod.GET)
  105 + @RequestMapping(value = "/report/{id}/{time}", method = RequestMethod.GET)
100 106 @ResponseBody
101   - public Map report(@PathVariable String id,HttpServletRequest request,@PathVariable String time){
  107 + public Map report(@PathVariable String id, HttpServletRequest request, @PathVariable String time) {
102 108 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
103   - return tempFacade.reportList(loginState.getId(),id,time);
  109 + return tempFacade.reportList(loginState.getId(), id, time);
104 110 }
105 111 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java View file @ ba30b63
... ... @@ -67,9 +67,22 @@
67 67 @Autowired
68 68 private OrganizationGroupsFacade groupsFacade;
69 69 @Autowired
70   -private AccessPermissionFacade accessPermissionFacade;
  70 + private AccessPermissionFacade accessPermissionFacade;
71 71  
  72 + public String findIdByPid(String pid) {
  73 + if (StringUtils.isBlank(pid)) {
  74 + return "";
  75 + }
  76 + TempQuery tempQuery = new TempQuery();
  77 + tempQuery.setYn(YnEnums.YES.getId());
  78 + List<String> list = new ArrayList<>();
  79 + list.add(pid);
  80 + tempQuery.setpIds(list);
  81 + List<TempModel> data = tempService.queryTemp(tempQuery);
  82 + return CollectionUtils.isNotEmpty(data) ? data.get(0).getId() : "";
  83 + }
72 84  
  85 +
73 86 public BaseResponse addOrUpdateOneTemp(TempAddRequest addRequest, Integer userId) {
74 87 Assert.notNull(addRequest, "请求为空.");
75 88 String hospital = autoMatchFacade.getHospitalId(userId);
... ... @@ -113,7 +126,7 @@
113 126 }
114 127  
115 128 public BaseResponse findTempDataList(TempQueryRequest queryRequest, Integer userId) {
116   - List<String> hospital = groupsFacade.findGroupHospital(userId,true) ;
  129 + List<String> hospital = groupsFacade.findGroupHospital(userId, true);
117 130 PatientsQuery patientsQuery = new PatientsQuery();
118 131 patientsQuery.setCardNo(queryRequest.getCardNo());
119 132 patientsQuery.setVcCardNo(queryRequest.getVcCardNo());
... ... @@ -198,8 +211,8 @@
198 211 str = "超高热";
199 212 } else if (36 <= temp && 37.4 >= temp) {
200 213 str = "标准";
201   - }else if(36>temp){
202   - str="体温过低";
  214 + } else if (36 > temp) {
  215 + str = "体温过低";
203 216 }
204 217 return str;
205 218 }
... ... @@ -212,7 +225,7 @@
212 225 * @param id 记录id
213 226 * @return
214 227 */
215   - public Map reportList(Integer userId, String id,String date) {
  228 + public Map reportList(Integer userId, String id, String date) {
216 229 TempQuery tempQuery = new TempQuery();
217 230 tempQuery.setpIds(Arrays.asList(new String[]{id}));
218 231 List<TempModel> tem = tempService.queryTemp(tempQuery);
... ... @@ -246,7 +259,13 @@
246 259 }
247 260  
248 261 public BaseResponse addWxTemp(TempModel tempModel) {
249   - TempModel temp = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(tempModel.getParentId())), TempModel.class);
  262 + TempModel temp = null;
  263 + if (StringUtils.isNotBlank(tempModel.getPid())) {
  264 + temp = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(tempModel.getPid())), TempModel.class);
  265 + } else {
  266 + temp = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(tempModel.getParentId())), TempModel.class);
  267 + }
  268 +
250 269 Date date = new Date();
251 270 LinkedHashMap data = temp == null ? new LinkedHashMap<String, Double>() : temp.getTempList();
252 271 data.put(DateUtil.getYyyyMmDd(new Date()), Double.valueOf(tempModel.getNow()));