Commit d5b7a09245aa2e81841322989f98803b7dd3e97c
1 parent
e9cab3e4a4
Exists in
master
and in
6 other branches
秦皇岛快速测量
Showing 3 changed files with 272 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
View file @
d5b7a09
... | ... | @@ -7,10 +7,7 @@ |
7 | 7 | import com.lyms.platform.common.result.BaseResponse; |
8 | 8 | import com.lyms.platform.operate.web.facade.MeasureInfoFacade; |
9 | 9 | import com.lyms.platform.operate.web.facade.TempFacade; |
10 | -import com.lyms.platform.operate.web.request.MeasureInfoRequest; | |
11 | -import com.lyms.platform.operate.web.request.NutritionInfoRequest; | |
12 | -import com.lyms.platform.operate.web.request.SmsTemplateRequest; | |
13 | -import com.lyms.platform.operate.web.request.TempAddRequest; | |
10 | +import com.lyms.platform.operate.web.request.*; | |
14 | 11 | import com.lyms.platform.pojo.BloodSugar; |
15 | 12 | import org.springframework.beans.factory.annotation.Autowired; |
16 | 13 | import org.springframework.stereotype.Controller; |
... | ... | @@ -51,7 +48,7 @@ |
51 | 48 | @RequestParam(value = "age", required = false) String age, |
52 | 49 | HttpServletRequest request |
53 | 50 | ) { |
54 | - return measureInfoFacade.queryMeasureInfoList(queryNo,valueType,vcCardNo,recordTime,age,page,limit,getUserId(request)); | |
51 | + return measureInfoFacade.queryMeasureInfoList(queryNo, valueType, vcCardNo, recordTime, age, page, limit, getUserId(request)); | |
55 | 52 | } |
56 | 53 | |
57 | 54 | |
... | ... | @@ -68,6 +65,7 @@ |
68 | 65 | } |
69 | 66 | |
70 | 67 | |
68 | + | |
71 | 69 | /** |
72 | 70 | * 添加测量用户的基本信息(面部识别,指纹识别,证件类型) |
73 | 71 | * @param measureInfoRequest |
... | ... | @@ -82,6 +80,8 @@ |
82 | 80 | |
83 | 81 | |
84 | 82 | |
83 | + | |
84 | + | |
85 | 85 | /** |
86 | 86 | * 查询录入测量用户基本信息 |
87 | 87 | * @param certType |
88 | 88 | |
89 | 89 | |
... | ... | @@ -279,8 +279,48 @@ |
279 | 279 | } |
280 | 280 | |
281 | 281 | |
282 | + /**------start-------秦皇岛改版快速测量接口---------------**/ | |
282 | 283 | |
283 | 284 | |
285 | + /** | |
286 | + * 住院号类型 : certType:1 | |
287 | + * 其他类型根据院内系统类型传 | |
288 | + * | |
289 | + * 查询测量用户,如果用户在随心测没有建档就 建档并返回结果 | |
290 | + * @param measureAllInfoRequest | |
291 | + * @return | |
292 | + */ | |
293 | + @RequestMapping(method = RequestMethod.POST, value = "/queryMeasureUserInfo") | |
294 | + @ResponseBody | |
295 | + public BaseResponse queryMeasureUserInfo(@RequestBody MeasureAllInfoRequest measureAllInfoRequest) { | |
296 | + return measureInfoFacade.queryMeasureUserInfo(measureAllInfoRequest); | |
297 | + } | |
284 | 298 | |
299 | + /** | |
300 | + * 添加指纹信息 | |
301 | + * @param measureInfoRequest hospitalId finger certNo | |
302 | + * @param request | |
303 | + * @return | |
304 | + */ | |
305 | + @RequestMapping(method = RequestMethod.POST, value = "/updateMeasureFingerInfo") | |
306 | + @ResponseBody | |
307 | + public BaseResponse updateMeasureFingerInfo(@RequestBody MeasureInfoRequest measureInfoRequest, HttpServletRequest request) { | |
308 | + return measureInfoFacade.updateMeasureFingerInfo(measureInfoRequest); | |
309 | + } | |
310 | + | |
311 | + | |
312 | + /** | |
313 | + * 秦皇岛添加所有测量接口 | |
314 | + * @param measureAllInfoRequest | |
315 | + * @return | |
316 | + */ | |
317 | + @RequestMapping(method = RequestMethod.POST, value = "/addAllMeasureDataInfo") | |
318 | + @ResponseBody | |
319 | + public BaseResponse addAllMeasureDataInfo(@RequestBody MeasureAllInfoRequest measureAllInfoRequest) { | |
320 | + return measureInfoFacade.addAllMeasureDataInfo(measureAllInfoRequest); | |
321 | + } | |
322 | + | |
323 | + | |
324 | + /**------end-------秦皇岛改版快速测量接口---------------**/ | |
285 | 325 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
View file @
d5b7a09
... | ... | @@ -11,6 +11,7 @@ |
11 | 11 | import com.lyms.platform.common.result.RespBuilder; |
12 | 12 | import com.lyms.platform.common.utils.DateUtil; |
13 | 13 | import com.lyms.platform.common.utils.ExceptionUtils; |
14 | +import com.lyms.platform.operate.web.request.MeasureAllInfoRequest; | |
14 | 15 | import com.lyms.platform.operate.web.request.MeasureInfoRequest; |
15 | 16 | import com.lyms.platform.operate.web.request.NutritionInfoRequest; |
16 | 17 | import com.lyms.platform.operate.web.result.MeasureBaseInfoResult; |
... | ... | @@ -541,6 +542,70 @@ |
541 | 542 | } |
542 | 543 | |
543 | 544 | |
545 | + | |
546 | + public BaseResponse addAllMeasureDataInfo(MeasureAllInfoRequest request) { | |
547 | + BaseObjectResponse baseResponse = new BaseObjectResponse(); | |
548 | + | |
549 | + if (StringUtils.isNotEmpty(request.getCertType()) && StringUtils.isNotEmpty(request.getCertNo())) | |
550 | + { | |
551 | + | |
552 | + MeasureUserInfoQuery queryUser = new MeasureUserInfoQuery(); | |
553 | + queryUser.setCertNo(request.getCertNo()); | |
554 | + queryUser.setCertType(request.getCertType()); | |
555 | + if (StringUtils.isNotEmpty(request.getHospitalId())) | |
556 | + { | |
557 | + queryUser.setHospitalId(request.getHospitalId()); | |
558 | + } | |
559 | + | |
560 | + List<MeasureUserInfoModel> listUsers = mysqlMeasureUserInfoService.queryMeasureUserInfoList(queryUser); | |
561 | + if (!CollectionUtils.isNotEmpty(listUsers)) | |
562 | + { | |
563 | + baseResponse.setErrorcode(ErrorCodeConstants.USER_NOT_EXISTS); | |
564 | + baseResponse.setErrormsg("您还没有录入基本信息,暂时不能测量"); | |
565 | + return baseResponse; | |
566 | + } | |
567 | + | |
568 | + if (StringUtils.isNotEmpty(request.getWeight()) && StringUtils.isNotEmpty(request.getHeight())) | |
569 | + { | |
570 | + MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); | |
571 | + measureInfoRequest.setHospitalId(request.getHospitalId()); | |
572 | + measureInfoRequest.setCertType(request.getCertType()); | |
573 | + measureInfoRequest.setCertNo(request.getCertNo()); | |
574 | + measureInfoRequest.setValueType(1); | |
575 | + measureInfoRequest.setValueOne(request.getWeight()); | |
576 | + measureInfoRequest.setValueTwo(request.getHeight()); | |
577 | + addMeasureDataInfo(measureInfoRequest); | |
578 | + } | |
579 | + if (StringUtils.isNotEmpty(request.getBloodPressure()) && StringUtils.isNotEmpty(request.getPulse())) | |
580 | + { | |
581 | + MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); | |
582 | + measureInfoRequest.setHospitalId(request.getHospitalId()); | |
583 | + measureInfoRequest.setCertType(request.getCertType()); | |
584 | + measureInfoRequest.setCertNo(request.getCertNo()); | |
585 | + measureInfoRequest.setValueType(2); | |
586 | + measureInfoRequest.setValueOne(request.getBloodPressure()); | |
587 | + measureInfoRequest.setValueTwo(request.getPulse()); | |
588 | + addMeasureDataInfo(measureInfoRequest); | |
589 | + } | |
590 | + | |
591 | + if (StringUtils.isNotEmpty(request.getTemperature())) | |
592 | + { | |
593 | + MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); | |
594 | + measureInfoRequest.setHospitalId(request.getHospitalId()); | |
595 | + measureInfoRequest.setCertType(request.getCertType()); | |
596 | + measureInfoRequest.setCertNo(request.getCertNo()); | |
597 | + measureInfoRequest.setValueType(3); | |
598 | + measureInfoRequest.setValueOne(request.getTemperature()); | |
599 | + addMeasureDataInfo(measureInfoRequest); | |
600 | + } | |
601 | + } | |
602 | + | |
603 | + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); | |
604 | + baseResponse.setErrormsg("保存成功"); | |
605 | + return baseResponse; | |
606 | + } | |
607 | + | |
608 | + | |
544 | 609 | private MeasureDataInfoModel getDataModel(MeasureInfoRequest measureInfoRequest) |
545 | 610 | { |
546 | 611 | MeasureDataInfoModel model = new MeasureDataInfoModel(); |
... | ... | @@ -1267,5 +1332,73 @@ |
1267 | 1332 | } |
1268 | 1333 | |
1269 | 1334 | |
1335 | + public BaseResponse updateMeasureFingerInfo(MeasureInfoRequest measureInfoRequest) { | |
1336 | + | |
1337 | + BaseResponse baseResponse = new BaseResponse(); | |
1338 | + try | |
1339 | + { | |
1340 | + MeasureUserInfoQuery queryUser = new MeasureUserInfoQuery(); | |
1341 | + queryUser.setCertNo(measureInfoRequest.getCertNo()); | |
1342 | + queryUser.setHospitalId(measureInfoRequest.getHospitalId()); | |
1343 | + List<MeasureUserInfoModel> listUsers = mysqlMeasureUserInfoService.queryMeasureUserInfoList(queryUser); | |
1344 | + if (CollectionUtils.isNotEmpty(listUsers)) { | |
1345 | + MeasureUserInfoModel modelUser = listUsers.get(0); | |
1346 | + MeasureUserInfoModel userModel = new MeasureUserInfoModel(); | |
1347 | + userModel.setId(modelUser.getId()); | |
1348 | + userModel.setFinger(measureInfoRequest.getFinger()); | |
1349 | + userModel.setModified(new Date()); | |
1350 | + mysqlMeasureUserInfoService.updateMeasureUserInfo(userModel); | |
1351 | + } | |
1352 | + } | |
1353 | + catch (Exception e) | |
1354 | + { | |
1355 | + baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); | |
1356 | + baseResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); | |
1357 | + return baseResponse; | |
1358 | + } | |
1359 | + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); | |
1360 | + baseResponse.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); | |
1361 | + return baseResponse; | |
1362 | + } | |
1363 | + | |
1364 | + public BaseResponse queryMeasureUserInfo(MeasureAllInfoRequest measureAllInfoRequest) { | |
1365 | + MeasureUserInfoQuery query = new MeasureUserInfoQuery(); | |
1366 | + MeasureBaseInfoResult result = new MeasureBaseInfoResult(); | |
1367 | + | |
1368 | + //表示传递的是住院号 | |
1369 | + if ("1".equals(measureAllInfoRequest.getCertType())) | |
1370 | + { | |
1371 | + | |
1372 | + } | |
1373 | + else | |
1374 | + { | |
1375 | + query.setHospitalId(measureAllInfoRequest.getHospitalId()); | |
1376 | + query.setCertType(measureAllInfoRequest.getCertType()); | |
1377 | + query.setCertNo(measureAllInfoRequest.getCertNo()); | |
1378 | + query.setNeed("true"); | |
1379 | + query.setSort(" created desc "); | |
1380 | + List<MeasureUserInfoModel> models = mysqlMeasureUserInfoService.queryMeasureUserInfoList(query); | |
1381 | + if (CollectionUtils.isNotEmpty(models)) | |
1382 | + { | |
1383 | + MeasureUserInfoModel userInfoModel = models.get(0); | |
1384 | + result.setUserName(userInfoModel.getUserName()); | |
1385 | + result.setCertNo(userInfoModel.getCertNo()); | |
1386 | + result.setCertType(userInfoModel.getCertType()); | |
1387 | + result.setAge(userInfoModel.getAge()); | |
1388 | + result.setSex(String.valueOf(userInfoModel.getSex())); | |
1389 | + result.setFace(userInfoModel.getFace()); | |
1390 | + result.setFinger(userInfoModel.getFinger()); | |
1391 | + result.setAddress(userInfoModel.getAddress()); | |
1392 | + result.setPhone(userInfoModel.getPhone()); | |
1393 | + result.setVcCardNo(userInfoModel.getVcCardNo()); | |
1394 | + } | |
1395 | + } | |
1396 | + | |
1397 | + BaseObjectResponse objectResponse = new BaseObjectResponse(); | |
1398 | + objectResponse.setData(result); | |
1399 | + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); | |
1400 | + objectResponse.setErrormsg("成功"); | |
1401 | + return objectResponse; | |
1402 | + } | |
1270 | 1403 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureAllInfoRequest.java
View file @
d5b7a09
1 | +package com.lyms.platform.operate.web.request; | |
2 | + | |
3 | + | |
4 | +/** | |
5 | + * Created by Administrator on 2018-01-10. | |
6 | + */ | |
7 | +public class MeasureAllInfoRequest { | |
8 | + | |
9 | + //证件类型 | |
10 | + private String certType; | |
11 | + //证件号 | |
12 | + private String certNo; | |
13 | + | |
14 | + //身高 | |
15 | + private String height; | |
16 | + | |
17 | + //体重 | |
18 | + private String weight; | |
19 | + | |
20 | + //血压 | |
21 | + private String bloodPressure; | |
22 | + | |
23 | + //脉搏 | |
24 | + private String pulse; | |
25 | + | |
26 | + //体温 | |
27 | + private String temperature; | |
28 | + | |
29 | + private String hospitalId; | |
30 | + | |
31 | + public String getHospitalId() { | |
32 | + return hospitalId; | |
33 | + } | |
34 | + | |
35 | + public void setHospitalId(String hospitalId) { | |
36 | + this.hospitalId = hospitalId; | |
37 | + } | |
38 | + | |
39 | + public String getTemperature() { | |
40 | + return temperature; | |
41 | + } | |
42 | + | |
43 | + public void setTemperature(String temperature) { | |
44 | + this.temperature = temperature; | |
45 | + } | |
46 | + | |
47 | + public String getPulse() { | |
48 | + return pulse; | |
49 | + } | |
50 | + | |
51 | + public void setPulse(String pulse) { | |
52 | + this.pulse = pulse; | |
53 | + } | |
54 | + | |
55 | + public String getCertType() { | |
56 | + return certType; | |
57 | + } | |
58 | + | |
59 | + public void setCertType(String certType) { | |
60 | + this.certType = certType; | |
61 | + } | |
62 | + | |
63 | + public String getCertNo() { | |
64 | + return certNo; | |
65 | + } | |
66 | + | |
67 | + public void setCertNo(String certNo) { | |
68 | + this.certNo = certNo; | |
69 | + } | |
70 | + | |
71 | + public String getHeight() { | |
72 | + return height; | |
73 | + } | |
74 | + | |
75 | + public void setHeight(String height) { | |
76 | + this.height = height; | |
77 | + } | |
78 | + | |
79 | + public String getWeight() { | |
80 | + return weight; | |
81 | + } | |
82 | + | |
83 | + public void setWeight(String weight) { | |
84 | + this.weight = weight; | |
85 | + } | |
86 | + | |
87 | + public String getBloodPressure() { | |
88 | + return bloodPressure; | |
89 | + } | |
90 | + | |
91 | + public void setBloodPressure(String bloodPressure) { | |
92 | + this.bloodPressure = bloodPressure; | |
93 | + } | |
94 | +} |