Commit 14c5345219f6fa03318c68546238b97de2bd84ac
1 parent
99b79fbfc7
Exists in
master
and in
6 other branches
update code
Showing 3 changed files with 44 additions and 2 deletions
platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java
View file @
14c5345
| ... | ... | @@ -154,7 +154,7 @@ |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | public static void main(String[] args) { |
| 157 | - Map<String,List<MessageContent>> list = getMessageTemplateMap("199", | |
| 157 | + Map<String,List<MessageContent>> list = getMessageTemplateMap("1000000115", | |
| 158 | 158 | AmsServiceTypeEnum.YUN_GUIDE); |
| 159 | 159 | List<MessageContent> msgs = list.get("年龄≥35岁"); |
| 160 | 160 | System.out.println(list); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
View file @
14c5345
| ... | ... | @@ -13,6 +13,7 @@ |
| 13 | 13 | |
| 14 | 14 | import javax.servlet.http.HttpServletRequest; |
| 15 | 15 | import java.util.Date; |
| 16 | +import java.util.Map; | |
| 16 | 17 | |
| 17 | 18 | /** |
| 18 | 19 | * 测量血糖和脉搏、身高和体重的值 |
| ... | ... | @@ -199,6 +200,22 @@ |
| 199 | 200 | @ResponseBody |
| 200 | 201 | public BaseResponse updateMeasureInfo(@RequestBody MeasureInfoRequest measureInfoRequest, HttpServletRequest request) { |
| 201 | 202 | return measureInfoFacade.updateMeasureInfo(measureInfoRequest); |
| 203 | + } | |
| 204 | + | |
| 205 | + | |
| 206 | + /** | |
| 207 | + * 查询测量基本信息 | |
| 208 | + * valueType 值类型: 1 体重和身高 2 血压和脉搏 3 体温 | |
| 209 | + * @return | |
| 210 | + */ | |
| 211 | + @RequestMapping(method = RequestMethod.GET, value = "/queryClBaseInfo") | |
| 212 | + @ResponseBody | |
| 213 | + public Map queryClBaseInfo(@RequestParam(value = "certType", required = true) String certType, | |
| 214 | + @RequestParam(value = "certNo", required = true) String certNo, | |
| 215 | + @RequestParam(value = "hospitalId", required = true) String hospitalId, | |
| 216 | + HttpServletRequest request | |
| 217 | + ) { | |
| 218 | + return measureInfoFacade.queryClBaseInfo(certType, certNo, hospitalId); | |
| 202 | 219 | } |
| 203 | 220 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
View file @
14c5345
| ... | ... | @@ -204,7 +204,7 @@ |
| 204 | 204 | { |
| 205 | 205 | message = "信息记录成功,今天您还可以测量"+count+"次体温"; |
| 206 | 206 | } |
| 207 | - map.put("errormsg",message); | |
| 207 | + map.put("errormsg", message); | |
| 208 | 208 | return map; |
| 209 | 209 | } |
| 210 | 210 | |
| ... | ... | @@ -256,6 +256,31 @@ |
| 256 | 256 | model.setZyNo(measureInfoRequest.getZyNo()); |
| 257 | 257 | model.setVisitId(measureInfoRequest.getVisitId()); |
| 258 | 258 | return model; |
| 259 | + } | |
| 260 | + | |
| 261 | + public Map queryClBaseInfo(String certType, String certNo,String hospitalId) { | |
| 262 | + Map<String,String> map = new HashMap<>(); | |
| 263 | + MeasureInfoQuery query = new MeasureInfoQuery(); | |
| 264 | + query.setHospitalId(hospitalId); | |
| 265 | + query.setCertType(certType); | |
| 266 | + query.setCertNo(certNo); | |
| 267 | + query.setSort(" record_time desc "); | |
| 268 | + query.setNeed("true"); | |
| 269 | + List<MeasureInfoModel> list = mysqlMeasureInfoService.queryMeasureInfoList(query); | |
| 270 | + if (CollectionUtils.isNotEmpty(list)) | |
| 271 | + { | |
| 272 | + MeasureInfoModel model = list.get(0); | |
| 273 | + map.put("userName",model.getUserName() == null ? "" : model.getUserName()); | |
| 274 | + map.put("certType",model.getCertType() == null ? "" : model.getCertType()); | |
| 275 | + map.put("certNo",model.getCertNo() == null ? "" : model.getCertNo()); | |
| 276 | + map.put("sex",String.valueOf(model.getSex())); | |
| 277 | + map.put("age",model.getAge() == null ? "" : String.valueOf(model.getAge())); | |
| 278 | + map.put("vcCardNo",model.getVcCardNo() == null ? "" : model.getVcCardNo()); | |
| 279 | + map.put("phone",model.getPhone() == null ? "" : model.getPhone()); | |
| 280 | + map.put("zyNo",model.getZyNo() == null ? "" : model.getZyNo()); | |
| 281 | + map.put("visitId",model.getVisitId() == null ? "" : model.getVisitId()); | |
| 282 | + } | |
| 283 | + return map; | |
| 259 | 284 | } |
| 260 | 285 | } |