From d5b7a09245aa2e81841322989f98803b7dd3e97c Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 2 Jul 2018 16:02:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B=E5=BF=AB=E9=80=9F?= =?UTF-8?q?=E6=B5=8B=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/MeasureInfoController.java | 50 +++++++- .../operate/web/facade/MeasureInfoFacade.java | 133 +++++++++++++++++++++ .../operate/web/request/MeasureAllInfoRequest.java | 94 +++++++++++++++ 3 files changed, 272 insertions(+), 5 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureAllInfoRequest.java diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java index 1ab8391..3d3a281 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java @@ -7,10 +7,7 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.facade.MeasureInfoFacade; import com.lyms.platform.operate.web.facade.TempFacade; -import com.lyms.platform.operate.web.request.MeasureInfoRequest; -import com.lyms.platform.operate.web.request.NutritionInfoRequest; -import com.lyms.platform.operate.web.request.SmsTemplateRequest; -import com.lyms.platform.operate.web.request.TempAddRequest; +import com.lyms.platform.operate.web.request.*; import com.lyms.platform.pojo.BloodSugar; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -51,7 +48,7 @@ public class MeasureInfoController extends BaseController { @RequestParam(value = "age", required = false) String age, HttpServletRequest request ) { - return measureInfoFacade.queryMeasureInfoList(queryNo,valueType,vcCardNo,recordTime,age,page,limit,getUserId(request)); + return measureInfoFacade.queryMeasureInfoList(queryNo, valueType, vcCardNo, recordTime, age, page, limit, getUserId(request)); } @@ -68,6 +65,7 @@ public class MeasureInfoController extends BaseController { } + /** * 添加测量用户的基本信息（面部识别，指纹识别，证件类型） * @param measureInfoRequest @@ -82,6 +80,8 @@ public class MeasureInfoController extends BaseController { + + /** * 查询录入测量用户基本信息 * @param certType @@ -279,7 +279,47 @@ public class MeasureInfoController extends BaseController { } + /**------start-------秦皇岛改版快速测量接口---------------**/ + + + /** + * 住院号类型 ： certType：1 + * 其他类型根据院内系统类型传 + * + * 查询测量用户，如果用户在随心测没有建档就 建档并返回结果 + * @param measureAllInfoRequest + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/queryMeasureUserInfo") + @ResponseBody + public BaseResponse queryMeasureUserInfo(@RequestBody MeasureAllInfoRequest measureAllInfoRequest) { + return measureInfoFacade.queryMeasureUserInfo(measureAllInfoRequest); + } + /** + * 添加指纹信息 + * @param measureInfoRequest hospitalId finger certNo + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/updateMeasureFingerInfo") + @ResponseBody + public BaseResponse updateMeasureFingerInfo(@RequestBody MeasureInfoRequest measureInfoRequest, HttpServletRequest request) { + return measureInfoFacade.updateMeasureFingerInfo(measureInfoRequest); + } + + + /** + * 秦皇岛添加所有测量接口 + * @param measureAllInfoRequest + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/addAllMeasureDataInfo") + @ResponseBody + public BaseResponse addAllMeasureDataInfo(@RequestBody MeasureAllInfoRequest measureAllInfoRequest) { + return measureInfoFacade.addAllMeasureDataInfo(measureAllInfoRequest); + } + /**------end-------秦皇岛改版快速测量接口---------------**/ } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index 5c43c2e..1030349 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -11,6 +11,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExceptionUtils; +import com.lyms.platform.operate.web.request.MeasureAllInfoRequest; import com.lyms.platform.operate.web.request.MeasureInfoRequest; import com.lyms.platform.operate.web.request.NutritionInfoRequest; import com.lyms.platform.operate.web.result.MeasureBaseInfoResult; @@ -541,6 +542,70 @@ public class MeasureInfoFacade { } + + public BaseResponse addAllMeasureDataInfo(MeasureAllInfoRequest request) { + BaseObjectResponse baseResponse = new BaseObjectResponse(); + + if (StringUtils.isNotEmpty(request.getCertType()) && StringUtils.isNotEmpty(request.getCertNo())) + { + + MeasureUserInfoQuery queryUser = new MeasureUserInfoQuery(); + queryUser.setCertNo(request.getCertNo()); + queryUser.setCertType(request.getCertType()); + if (StringUtils.isNotEmpty(request.getHospitalId())) + { + queryUser.setHospitalId(request.getHospitalId()); + } + + List listUsers = mysqlMeasureUserInfoService.queryMeasureUserInfoList(queryUser); + if (!CollectionUtils.isNotEmpty(listUsers)) + { + baseResponse.setErrorcode(ErrorCodeConstants.USER_NOT_EXISTS); + baseResponse.setErrormsg("您还没有录入基本信息，暂时不能测量"); + return baseResponse; + } + + if (StringUtils.isNotEmpty(request.getWeight()) && StringUtils.isNotEmpty(request.getHeight())) + { + MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); + measureInfoRequest.setHospitalId(request.getHospitalId()); + measureInfoRequest.setCertType(request.getCertType()); + measureInfoRequest.setCertNo(request.getCertNo()); + measureInfoRequest.setValueType(1); + measureInfoRequest.setValueOne(request.getWeight()); + measureInfoRequest.setValueTwo(request.getHeight()); + addMeasureDataInfo(measureInfoRequest); + } + if (StringUtils.isNotEmpty(request.getBloodPressure()) && StringUtils.isNotEmpty(request.getPulse())) + { + MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); + measureInfoRequest.setHospitalId(request.getHospitalId()); + measureInfoRequest.setCertType(request.getCertType()); + measureInfoRequest.setCertNo(request.getCertNo()); + measureInfoRequest.setValueType(2); + measureInfoRequest.setValueOne(request.getBloodPressure()); + measureInfoRequest.setValueTwo(request.getPulse()); + addMeasureDataInfo(measureInfoRequest); + } + + if (StringUtils.isNotEmpty(request.getTemperature())) + { + MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); + measureInfoRequest.setHospitalId(request.getHospitalId()); + measureInfoRequest.setCertType(request.getCertType()); + measureInfoRequest.setCertNo(request.getCertNo()); + measureInfoRequest.setValueType(3); + measureInfoRequest.setValueOne(request.getTemperature()); + addMeasureDataInfo(measureInfoRequest); + } + } + + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + baseResponse.setErrormsg("保存成功"); + return baseResponse; + } + + private MeasureDataInfoModel getDataModel(MeasureInfoRequest measureInfoRequest) { MeasureDataInfoModel model = new MeasureDataInfoModel(); @@ -1267,5 +1332,73 @@ public class MeasureInfoFacade { } + public BaseResponse updateMeasureFingerInfo(MeasureInfoRequest measureInfoRequest) { + + BaseResponse baseResponse = new BaseResponse(); + try + { + MeasureUserInfoQuery queryUser = new MeasureUserInfoQuery(); + queryUser.setCertNo(measureInfoRequest.getCertNo()); + queryUser.setHospitalId(measureInfoRequest.getHospitalId()); + List listUsers = mysqlMeasureUserInfoService.queryMeasureUserInfoList(queryUser); + if (CollectionUtils.isNotEmpty(listUsers)) { + MeasureUserInfoModel modelUser = listUsers.get(0); + MeasureUserInfoModel userModel = new MeasureUserInfoModel(); + userModel.setId(modelUser.getId()); + userModel.setFinger(measureInfoRequest.getFinger()); + userModel.setModified(new Date()); + mysqlMeasureUserInfoService.updateMeasureUserInfo(userModel); + } + } + catch (Exception e) + { + baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + baseResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); + return baseResponse; + } + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + baseResponse.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); + return baseResponse; + } + + public BaseResponse queryMeasureUserInfo(MeasureAllInfoRequest measureAllInfoRequest) { + MeasureUserInfoQuery query = new MeasureUserInfoQuery(); + MeasureBaseInfoResult result = new MeasureBaseInfoResult(); + + //表示传递的是住院号 + if ("1".equals(measureAllInfoRequest.getCertType())) + { + + } + else + { + query.setHospitalId(measureAllInfoRequest.getHospitalId()); + query.setCertType(measureAllInfoRequest.getCertType()); + query.setCertNo(measureAllInfoRequest.getCertNo()); + query.setNeed("true"); + query.setSort(" created desc "); + List models = mysqlMeasureUserInfoService.queryMeasureUserInfoList(query); + if (CollectionUtils.isNotEmpty(models)) + { + MeasureUserInfoModel userInfoModel = models.get(0); + result.setUserName(userInfoModel.getUserName()); + result.setCertNo(userInfoModel.getCertNo()); + result.setCertType(userInfoModel.getCertType()); + result.setAge(userInfoModel.getAge()); + result.setSex(String.valueOf(userInfoModel.getSex())); + result.setFace(userInfoModel.getFace()); + result.setFinger(userInfoModel.getFinger()); + result.setAddress(userInfoModel.getAddress()); + result.setPhone(userInfoModel.getPhone()); + result.setVcCardNo(userInfoModel.getVcCardNo()); + } + } + + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(result); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureAllInfoRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureAllInfoRequest.java new file mode 100644 index 0000000..3f10185 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureAllInfoRequest.java @@ -0,0 +1,94 @@ +package com.lyms.platform.operate.web.request; + + +/** + * Created by Administrator on 2018-01-10. + */ +public class MeasureAllInfoRequest { + + //证件类型 + private String certType; + //证件号 + private String certNo; + + //身高 + private String height; + + //体重 + private String weight; + + //血压 + private String bloodPressure; + + //脉搏 + private String pulse; + + //体温 + private String temperature; + + private String hospitalId; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getPulse() { + return pulse; + } + + public void setPulse(String pulse) { + this.pulse = pulse; + } + + public String getCertType() { + return certType; + } + + public void setCertType(String certType) { + this.certType = certType; + } + + public String getCertNo() { + return certNo; + } + + public void setCertNo(String certNo) { + this.certNo = certNo; + } + + public String getHeight() { + return height; + } + + public void setHeight(String height) { + this.height = height; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String getBloodPressure() { + return bloodPressure; + } + + public void setBloodPressure(String bloodPressure) { + this.bloodPressure = bloodPressure; + } +} -- 1.8.3.1