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 74e4676..d7645cc 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 @@ -1,148 +1,150 @@ -package com.lyms.platform.operate.web.controller; - -import com.lyms.platform.common.annotation.TokenRequired; -import com.lyms.platform.common.base.BaseController; -import com.lyms.platform.common.result.BaseListResponse; -import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.operate.web.facade.MeasureInfoFacade; -import com.lyms.platform.operate.web.request.MeasureInfoRequest; -import com.lyms.platform.operate.web.request.SmsTemplateRequest; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import java.util.Date; - -/** - * 测量血糖和脉搏、身高和体重的值 - * - * Created by Administrator on 2018-01-10. - */ -@Controller -public class MeasureInfoController extends BaseController { - - @Autowired - private MeasureInfoFacade measureInfoFacade; - /** - * 血糖和脉搏 身高和体重的值列表 - * valueType 值类型: 1 体重和身高 2 血压和脉搏 - * @return - */ - @RequestMapping(method = RequestMethod.GET, value = "/queryMeasureInfoList") - @ResponseBody - @TokenRequired - public BaseListResponse queryMeasureInfoList(@RequestParam(value = "queryNo", required = false) String queryNo, - @RequestParam("page") Integer page, - @RequestParam("limit") Integer limit, - @RequestParam("valueType") Integer valueType, - @RequestParam(value = "vcCardNo", required = false) String vcCardNo, - @RequestParam(value = "recordTime", required = false) String recordTime, - @RequestParam(value = "age", required = false) Integer age, - HttpServletRequest request - ) { - return measureInfoFacade.queryMeasureInfoList(queryNo,valueType,vcCardNo,recordTime,age,page,limit,getUserId(request)); - } - - - /** - * 添加 血糖和脉搏 身高和体重的值列表 - * @param measureInfoRequest - * @param request - * @return - */ - @RequestMapping(method = RequestMethod.POST, value = "/addMeasureInfo") - @ResponseBody - public BaseResponse addMeasureInfo(MeasureInfoRequest measureInfoRequest, HttpServletRequest request) { - return measureInfoFacade.addMeasureInfo(measureInfoRequest); - } - - /** - * 添加血压和脉搏信息 - * @param request - * @return - */ - @RequestMapping(method = RequestMethod.GET, value = "/addXueYaInfo") - @ResponseBody - public BaseResponse addXueYaInfo( - @RequestParam(value = "userName", required = false) String userName, - @RequestParam(value = "certType", required = false) String certType, - @RequestParam(value = "certNo", required = false) String certNo, - @RequestParam(value = "sex", required = false) Integer sex, - @RequestParam(value = "vcCardNo", required = false) String vcCardNo, - @RequestParam(value = "valueOne", required = false) String valueOne, - @RequestParam(value = "valueTwo", required = false) String valueTwo, - @RequestParam(value = "wxCode", required = false) String wxCode, - @RequestParam(value = "hospitalId", required = false) String hospitalId, - @RequestParam(value = "age", required = false) Integer age, - @RequestParam(value = "phone", required = false) String phone, - HttpServletRequest request) { - MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); - measureInfoRequest.setUserName(userName); - measureInfoRequest.setCertType(certType); - measureInfoRequest.setCertNo(certNo); - measureInfoRequest.setHospitalId(hospitalId); - measureInfoRequest.setVcCardNo(vcCardNo); - measureInfoRequest.setValueOne(valueOne); - measureInfoRequest.setValueTwo(valueTwo); - measureInfoRequest.setWxCode(wxCode); - measureInfoRequest.setAge(age); - measureInfoRequest.setPhone(phone); - measureInfoRequest.setSex(sex); - measureInfoRequest.setRecordTime(new Date().getTime()); - measureInfoRequest.setRecordCount(1); - measureInfoRequest.setValueType(2); - return measureInfoFacade.addMeasureInfo(measureInfoRequest); - } - - /** - * 体重和身高 - * @param request - * @return - */ - @RequestMapping(method = RequestMethod.GET, value = "/addTzSgInfo") - @ResponseBody - public BaseResponse addTzSgInfo( - @RequestParam(value = "userName", required = false) String userName, - @RequestParam(value = "certType", required = false) String certType, - @RequestParam(value = "certNo", required = false) String certNo, - @RequestParam(value = "sex", required = false) Integer sex, - @RequestParam(value = "vcCardNo", required = false) String vcCardNo, - @RequestParam(value = "valueOne", required = false) String valueOne, - @RequestParam(value = "valueTwo", required = false) String valueTwo, - @RequestParam(value = "wxCode", required = false) String wxCode, - @RequestParam(value = "hospitalId", required = false) String hospitalId, - @RequestParam(value = "age", required = false) Integer age, - @RequestParam(value = "phone", required = false) String phone, - HttpServletRequest request) { - MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); - measureInfoRequest.setUserName(userName); - measureInfoRequest.setCertType(certType); - measureInfoRequest.setCertNo(certNo); - measureInfoRequest.setHospitalId(hospitalId); - measureInfoRequest.setVcCardNo(vcCardNo); - measureInfoRequest.setValueOne(valueOne); - measureInfoRequest.setValueTwo(valueTwo); - measureInfoRequest.setWxCode(wxCode); - measureInfoRequest.setAge(age); - measureInfoRequest.setPhone(phone); - measureInfoRequest.setSex(sex); - measureInfoRequest.setRecordTime(new Date().getTime()); - measureInfoRequest.setRecordCount(1); - measureInfoRequest.setValueType(1); - return measureInfoFacade.addMeasureInfo(measureInfoRequest); - } - - - /** - * 更新数据 - * @param measureInfoRequest - * @param request - * @return - */ - @RequestMapping(method = RequestMethod.POST, value = "/updateMeasureInfo") - @ResponseBody - public BaseResponse updateMeasureInfo(@RequestBody MeasureInfoRequest measureInfoRequest, HttpServletRequest request) { - return measureInfoFacade.updateMeasureInfo(measureInfoRequest); - } -} +package com.lyms.platform.operate.web.controller; + +import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.facade.MeasureInfoFacade; +import com.lyms.platform.operate.web.request.MeasureInfoRequest; +import com.lyms.platform.operate.web.request.SmsTemplateRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.Date; + +/** + * 测量血糖和脉搏、身高和体重的值 + * + * Created by Administrator on 2018-01-10. + */ +@Controller +public class MeasureInfoController extends BaseController { + + @Autowired + private MeasureInfoFacade measureInfoFacade; + /** + * 血糖和脉搏 身高和体重的值列表 + * valueType 值类型: 1 体重和身高 2 血压和脉搏 + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/queryMeasureInfoList") + @ResponseBody + @TokenRequired + public BaseListResponse queryMeasureInfoList(@RequestParam(value = "queryNo", required = false) String queryNo, + @RequestParam("page") Integer page, + @RequestParam("limit") Integer limit, + @RequestParam("valueType") Integer valueType, + @RequestParam(value = "vcCardNo", required = false) String vcCardNo, + @RequestParam(value = "recordTime", required = false) String recordTime, + @RequestParam(value = "age", required = false) Integer age, + HttpServletRequest request + ) { + return measureInfoFacade.queryMeasureInfoList(queryNo,valueType,vcCardNo,recordTime,age,page,limit,getUserId(request)); + } + + + /** + * 添加 血糖和脉搏 身高和体重的值列表 + * @param measureInfoRequest + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/addMeasureInfo") + @ResponseBody + public BaseResponse addMeasureInfo(MeasureInfoRequest measureInfoRequest, HttpServletRequest request) { + return measureInfoFacade.addMeasureInfo(measureInfoRequest); + } + + /** + * 添加血压和脉搏信息 + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/addXueYaInfo") + @ResponseBody + public BaseResponse addXueYaInfo( + @RequestParam(value = "userName", required = false) String userName, + @RequestParam(value = "certType", required = false) String certType, + @RequestParam(value = "certNo", required = false) String certNo, + @RequestParam(value = "sex", required = false) Integer sex, + @RequestParam(value = "vcCardNo", required = false) String vcCardNo, + @RequestParam(value = "valueOne", required = false) String valueOne, + @RequestParam(value = "valueTwo", required = false) String valueTwo, + @RequestParam(value = "wxCode", required = false) String wxCode, + @RequestParam(value = "hospitalId", required = false) String hospitalId, + @RequestParam(value = "age", required = false) Integer age, + @RequestParam(value = "phone", required = false) String phone, + HttpServletRequest request) { + MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); + measureInfoRequest.setUserName(userName); + measureInfoRequest.setCertType(certType); + measureInfoRequest.setCertNo(certNo); + measureInfoRequest.setHospitalId(hospitalId); + measureInfoRequest.setVcCardNo(vcCardNo); + measureInfoRequest.setValueOne(valueOne); + measureInfoRequest.setValueTwo(valueTwo); + measureInfoRequest.setWxCode(wxCode); + measureInfoRequest.setAge(age); + measureInfoRequest.setPhone(phone); + measureInfoRequest.setSex(sex); + measureInfoRequest.setRecordTime(new Date().getTime()); + measureInfoRequest.setRecordCount(1); + measureInfoRequest.setValueType(2); + System.out.println(" 添加血压和脉搏请求参数:"+measureInfoRequest.toString()); + return measureInfoFacade.addMeasureInfo(measureInfoRequest); + } + + /** + * 体重和身高 + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/addTzSgInfo") + @ResponseBody + public BaseResponse addTzSgInfo( + @RequestParam(value = "userName", required = false) String userName, + @RequestParam(value = "certType", required = false) String certType, + @RequestParam(value = "certNo", required = false) String certNo, + @RequestParam(value = "sex", required = false) Integer sex, + @RequestParam(value = "vcCardNo", required = false) String vcCardNo, + @RequestParam(value = "valueOne", required = false) String valueOne, + @RequestParam(value = "valueTwo", required = false) String valueTwo, + @RequestParam(value = "wxCode", required = false) String wxCode, + @RequestParam(value = "hospitalId", required = false) String hospitalId, + @RequestParam(value = "age", required = false) Integer age, + @RequestParam(value = "phone", required = false) String phone, + HttpServletRequest request) { + MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); + measureInfoRequest.setUserName(userName); + measureInfoRequest.setCertType(certType); + measureInfoRequest.setCertNo(certNo); + measureInfoRequest.setHospitalId(hospitalId); + measureInfoRequest.setVcCardNo(vcCardNo); + measureInfoRequest.setValueOne(valueOne); + measureInfoRequest.setValueTwo(valueTwo); + measureInfoRequest.setWxCode(wxCode); + measureInfoRequest.setAge(age); + measureInfoRequest.setPhone(phone); + measureInfoRequest.setSex(sex); + measureInfoRequest.setRecordTime(new Date().getTime()); + measureInfoRequest.setRecordCount(1); + measureInfoRequest.setValueType(1); + System.out.println("添加体重和身高请求参数:"+measureInfoRequest.toString()); + return measureInfoFacade.addMeasureInfo(measureInfoRequest); + } + + + /** + * 更新数据 + * @param measureInfoRequest + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/updateMeasureInfo") + @ResponseBody + public BaseResponse updateMeasureInfo(@RequestBody MeasureInfoRequest measureInfoRequest, HttpServletRequest request) { + return measureInfoFacade.updateMeasureInfo(measureInfoRequest); + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureInfoRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureInfoRequest.java index 7edc69d..7d7732d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureInfoRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureInfoRequest.java @@ -1,161 +1,171 @@ -package com.lyms.platform.operate.web.request; - - -/** - * Created by Administrator on 2018-01-10. - */ -public class MeasureInfoRequest { - //用户姓名 - private String userName; - //证件类型 - private String certType; - //证件号 - private String certNo; - //性别 - private Integer sex; - //就诊卡号 - private String vcCardNo; - //血压/体重 - private String valueOne; - //脉搏/身高 - private String valueTwo; - //值类型: 1 体重和身高 2 血压和脉搏 - private Integer valueType; - //记录时间 - private Long recordTime; - //微信号 - private String wxCode; - //记录总次数 - private Integer recordCount; - //openId - private String openId; - - //医院id - private String hospitalId; - - //年龄 - private Integer age; - - //手机号码 - private String phone; - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public Integer getAge() { - return age; - } - - public void setAge(Integer age) { - this.age = age; - } - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - 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 Integer getSex() { - return sex; - } - - public void setSex(Integer sex) { - this.sex = sex; - } - - public String getVcCardNo() { - return vcCardNo; - } - - public void setVcCardNo(String vcCardNo) { - this.vcCardNo = vcCardNo; - } - - public String getValueOne() { - return valueOne; - } - - public void setValueOne(String valueOne) { - this.valueOne = valueOne; - } - - public String getValueTwo() { - return valueTwo; - } - - public void setValueTwo(String valueTwo) { - this.valueTwo = valueTwo; - } - - public Integer getValueType() { - return valueType; - } - - public void setValueType(Integer valueType) { - this.valueType = valueType; - } - - public Long getRecordTime() { - return recordTime; - } - - public void setRecordTime(Long recordTime) { - this.recordTime = recordTime; - } - - public String getWxCode() { - return wxCode; - } - - public void setWxCode(String wxCode) { - this.wxCode = wxCode; - } - - public Integer getRecordCount() { - return recordCount; - } - - public void setRecordCount(Integer recordCount) { - this.recordCount = recordCount; - } - - public String getOpenId() { - return openId; - } - - public void setOpenId(String openId) { - this.openId = openId; - } - - public String getHospitalId() { - return hospitalId; - } - - public void setHospitalId(String hospitalId) { - this.hospitalId = hospitalId; - } -} +package com.lyms.platform.operate.web.request; + + +/** + * Created by Administrator on 2018-01-10. + */ +public class MeasureInfoRequest { + //用户姓名 + private String userName; + //证件类型 + private String certType; + //证件号 + private String certNo; + //性别 + private Integer sex; + //就诊卡号 + private String vcCardNo; + //血压/体重 + private String valueOne; + //脉搏/身高 + private String valueTwo; + //值类型: 1 体重和身高 2 血压和脉搏 + private Integer valueType; + //记录时间 + private Long recordTime; + //微信号 + private String wxCode; + //记录总次数 + private Integer recordCount; + //openId + private String openId; + + //医院id + private String hospitalId; + + //年龄 + private Integer age; + + //手机号码 + private String phone; + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + 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 Integer getSex() { + return sex; + } + + public void setSex(Integer sex) { + this.sex = sex; + } + + public String getVcCardNo() { + return vcCardNo; + } + + public void setVcCardNo(String vcCardNo) { + this.vcCardNo = vcCardNo; + } + + public String getValueOne() { + return valueOne; + } + + public void setValueOne(String valueOne) { + this.valueOne = valueOne; + } + + public String getValueTwo() { + return valueTwo; + } + + public void setValueTwo(String valueTwo) { + this.valueTwo = valueTwo; + } + + public Integer getValueType() { + return valueType; + } + + public void setValueType(Integer valueType) { + this.valueType = valueType; + } + + public Long getRecordTime() { + return recordTime; + } + + public void setRecordTime(Long recordTime) { + this.recordTime = recordTime; + } + + public String getWxCode() { + return wxCode; + } + + public void setWxCode(String wxCode) { + this.wxCode = wxCode; + } + + public Integer getRecordCount() { + return recordCount; + } + + public void setRecordCount(Integer recordCount) { + this.recordCount = recordCount; + } + + public String getOpenId() { + return openId; + } + + public void setOpenId(String openId) { + this.openId = openId; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + @Override + public String toString() { + return "MeasureInfoRequest [userName=" + userName + ", certType=" + certType + ", certNo=" + certNo + ", sex=" + + sex + ", vcCardNo=" + vcCardNo + ", valueOne=" + valueOne + ", valueTwo=" + valueTwo + ", valueType=" + + valueType + ", recordTime=" + recordTime + ", wxCode=" + wxCode + ", recordCount=" + recordCount + + ", openId=" + openId + ", hospitalId=" + hospitalId + ", age=" + age + ", phone=" + phone + "]"; + } + + +}