From afcdb189c5ba9e91e584103ccd3e5cc8e6ca855f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 25 Jan 2019 18:01:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=BF=AB=E9=80=9F=E6=B5=8B?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/service/BabyBookbuildingService.java | 9 + .../dao/master/MeasureDataInfoMapper.java | 9 + .../dao/master/MeasureUserInfoMapper.java | 2 + .../permission/service/MeasureDataInfoService.java | 8 + .../service/impl/MeasureDataInfoServiceImpl.java | 21 +++ .../service/impl/MeasureUserInfoServiceImpl.java | 2 + .../mainOrm/master/MeasureDataInfoMapper.xml | 141 +++++++++++++++ .../mainOrm/master/MeasureUserInfoMapper.xml | 1 + .../lyms/platform/pojo/MeasureBabyInfoModel.java | 130 ++++++++++++++ .../platform/query/MeasureBabyDataInfoQuery.java | 189 +++++++++++++++++++++ .../web/controller/MeasureInfoController.java | 39 +++++ .../operate/web/facade/MeasureInfoFacade.java | 128 +++++++++++++- .../web/request/MeasureBabyInfoRequest.java | 91 ++++++++++ 13 files changed, 766 insertions(+), 4 deletions(-) create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/MeasureBabyInfoModel.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/query/MeasureBabyDataInfoQuery.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureBabyInfoRequest.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java index ee7991c..644e6ae 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java @@ -97,6 +97,15 @@ public class BabyBookbuildingService { return babyBookBuildingDao.queryBabyWithQuery(query.addOrder(Sort.Direction.DESC, "created")); } + public BabyModel queryBabyBuildById(String id) { + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setId(id); + babyQuery.setYn(YnEnums.YES.getId()); + MongoQuery query = babyQuery.convertToQuery(); + List list = babyBookBuildingDao.queryBabyWithQuery(query); + return CollectionUtils.isNotEmpty(list) ? list.get(0) : null; + } + public List queryBabyBuildByCond(BabyModelQuery babyQuery,String sortkey,Sort.Direction sort) { MongoQuery query = babyQuery.convertToQuery(); if (StringUtils.isNotEmpty(babyQuery.getNeed())) { diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureDataInfoMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureDataInfoMapper.java index f34692f..19d0ff3 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureDataInfoMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureDataInfoMapper.java @@ -1,11 +1,14 @@ package com.lyms.platform.permission.dao.master; +import com.lyms.platform.pojo.MeasureBabyInfoModel; import com.lyms.platform.pojo.MeasureDataInfoModel; import com.lyms.platform.pojo.MeasureInfoModel; +import com.lyms.platform.query.MeasureBabyDataInfoQuery; import com.lyms.platform.query.MeasureDataInfoQuery; import com.lyms.platform.query.MeasureInfoQuery; import java.util.List; +import java.util.Map; /** * Created by Administrator on 2018-01-10. @@ -22,4 +25,10 @@ public interface MeasureDataInfoMapper { List queryMeasureList(MeasureDataInfoQuery query); int queryMeasureListCount(MeasureDataInfoQuery query); + + void addMeasureBabyDataInfo(MeasureBabyInfoModel model); + + List queryMeasureBabyInfoList(MeasureBabyDataInfoQuery query); + int queryMeasureBabyInfoCount(MeasureBabyDataInfoQuery query); + int updateMeasureBabyDataInfo(MeasureBabyInfoModel model); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureUserInfoMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureUserInfoMapper.java index 594f5e0..f231086 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureUserInfoMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureUserInfoMapper.java @@ -1,5 +1,6 @@ package com.lyms.platform.permission.dao.master; +import com.lyms.platform.pojo.MeasureBabyInfoModel; import com.lyms.platform.pojo.MeasureUserInfoModel; import com.lyms.platform.pojo.MeasureInfoModel; import com.lyms.platform.pojo.MeasureUserInfoModel; @@ -18,4 +19,5 @@ public interface MeasureUserInfoMapper { int updateMeasureUserInfo(MeasureUserInfoModel model); int queryMeasureUserInfoListCount(MeasureUserInfoQuery query); + } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/MeasureDataInfoService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/MeasureDataInfoService.java index abdeecc..417f563 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/MeasureDataInfoService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/MeasureDataInfoService.java @@ -1,11 +1,14 @@ package com.lyms.platform.permission.service; +import com.lyms.platform.pojo.MeasureBabyInfoModel; import com.lyms.platform.pojo.MeasureDataInfoModel; import com.lyms.platform.pojo.MeasureInfoModel; +import com.lyms.platform.query.MeasureBabyDataInfoQuery; import com.lyms.platform.query.MeasureDataInfoQuery; import com.lyms.platform.query.MeasureInfoQuery; import java.util.List; +import java.util.Map; /** * Created by Administrator on 2018-01-10. @@ -18,4 +21,9 @@ public interface MeasureDataInfoService { int updateMeasureDataInfo(MeasureDataInfoModel model); List queryMeasureList(MeasureDataInfoQuery query); + + void addMeasureBabyInfo(MeasureBabyInfoModel model); + + List queryMeasureBabyInfoList(MeasureBabyDataInfoQuery query); + int updateMeasureBabyDataInfo(MeasureBabyInfoModel model); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureDataInfoServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureDataInfoServiceImpl.java index cf933a8..63a96e8 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureDataInfoServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureDataInfoServiceImpl.java @@ -2,14 +2,17 @@ package com.lyms.platform.permission.service.impl; import com.lyms.platform.permission.dao.master.MeasureDataInfoMapper; import com.lyms.platform.permission.service.MeasureDataInfoService; +import com.lyms.platform.pojo.MeasureBabyInfoModel; import com.lyms.platform.pojo.MeasureDataInfoModel; import com.lyms.platform.pojo.MeasureInfoModel; +import com.lyms.platform.query.MeasureBabyDataInfoQuery; import com.lyms.platform.query.MeasureDataInfoQuery; import com.lyms.platform.query.MeasureInfoQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * Created by Administrator on 2018-01-10. @@ -46,4 +49,22 @@ public class MeasureDataInfoServiceImpl implements MeasureDataInfoService { } return measureDataInfoMapper.queryMeasureList(query); } + + @Override + public void addMeasureBabyInfo(MeasureBabyInfoModel model) { + measureDataInfoMapper.addMeasureBabyDataInfo(model); + } + + @Override + public List queryMeasureBabyInfoList(MeasureBabyDataInfoQuery query) { + if (query.getNeed() != null) { + query.mysqlBuild(measureDataInfoMapper.queryMeasureBabyInfoCount(query)); + } + return measureDataInfoMapper.queryMeasureBabyInfoList(query); + } + + @Override + public int updateMeasureBabyDataInfo(MeasureBabyInfoModel model) { + return measureDataInfoMapper.updateMeasureBabyDataInfo(model); + } } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureUserInfoServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureUserInfoServiceImpl.java index db17072..24d5c3b 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureUserInfoServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureUserInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.lyms.platform.permission.service.impl; import com.lyms.platform.permission.dao.master.MeasureUserInfoMapper; import com.lyms.platform.permission.service.MeasureUserInfoService; +import com.lyms.platform.pojo.MeasureBabyInfoModel; import com.lyms.platform.pojo.MeasureUserInfoModel; import com.lyms.platform.query.MeasureUserInfoQuery; import org.springframework.beans.factory.annotation.Autowired; @@ -36,4 +37,5 @@ public class MeasureUserInfoServiceImpl implements MeasureUserInfoService { public int updateMeasureUserInfo(MeasureUserInfoModel model) { return measureUserInfoMapper.updateMeasureUserInfo(model); } + } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml index 91fc16f..a8199d2 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml @@ -328,4 +328,145 @@ + + + INSERT INTO measure_baby_info( + value_one,value_two,value_three,value_type + ,record_count,created,modified,today_count,remark_value,hospital_id,baby_id) + VALUES (#{valueOne} + ,#{valueTwo},#{valueThree},#{valueType},#{recordCount},#{created},#{modified},#{todayCount},#{remarkValue},#{hospitalId},#{babyId}) + + + + + + + + + + + + + + + + + + + + + + 1 = 1 + + and id = #{id,jdbcType=INTEGER} + + + and value_one = #{valueOne,jdbcType=VARCHAR} + + + and value_two = #{valueTwo,jdbcType=VARCHAR} + + + and value_three = #{valueThree,jdbcType=VARCHAR} + + + and value_type = #{valueType,jdbcType=INTEGER} + + + AND date_format(created,'%Y-%m-%d') = #{created} + + + and record_count = #{recordCount,jdbcType=INTEGER} + + + + and baby_id = #{babyId,jdbcType=VARCHAR} + + + + AND created >= date_format(#{createdTimeStart},'%Y-%m-%d') + + + AND + + + + AND modified >= date_format(#{modifiedTimeStart},'%Y-%m-%d') + + + AND + + + + AND today_count = #{todayCount,jdbcType=INTEGER} + + + + and baby_id in + + #{bid} + + + + + + + + + + + + + + + UPDATE + measure_baby_info + + + id = #{id,jdbcType=INTEGER}, + + + baby_id = #{babyId}, + + + + value_one = #{valueOne,jdbcType=VARCHAR}, + + + value_two = #{valueTwo,jdbcType=VARCHAR}, + + + value_three = #{valueThree,jdbcType=VARCHAR}, + + + value_type = #{valueType,jdbcType=INTEGER}, + + + record_count = #{recordCount,jdbcType=INTEGER}, + + + + created = #{created}, + + + modified = #{modified}, + + + today_count = #{todayCount,jdbcType=INTEGER}, + + + remark_value = #{remarkValue,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=INTEGER} + \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MeasureUserInfoMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/MeasureUserInfoMapper.xml index 0cb9e86..85e7d23 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MeasureUserInfoMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MeasureUserInfoMapper.xml @@ -204,4 +204,5 @@ + \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MeasureBabyInfoModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MeasureBabyInfoModel.java new file mode 100644 index 0000000..34244d8 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MeasureBabyInfoModel.java @@ -0,0 +1,130 @@ +package com.lyms.platform.pojo; + + +import java.util.Date; + +/** + * 儿童体重 + */ +public class MeasureBabyInfoModel { + + private Integer id; + //血压/体重/血糖 + private String valueOne; + //脉搏/身高 + private String valueTwo; + //体重测量存BMI值 + private String valueThree; + + //值类型： 1 体重和身高 2 血压和脉搏 3、体温 4、血糖 + private Integer valueType; + + //医院id + private String hospitalId; + + private String babyId; + + private Date created; + private Date modified; + private String remarkValue; + //记录总次数 + private Integer recordCount; + //当天记录次数 + private Integer todayCount; + + public String getRemarkValue() { + return remarkValue; + } + + public void setRemarkValue(String remarkValue) { + this.remarkValue = remarkValue; + } + + public Integer getRecordCount() { + return recordCount; + } + + public void setRecordCount(Integer recordCount) { + this.recordCount = recordCount; + } + + public Integer getTodayCount() { + return todayCount; + } + + public void setTodayCount(Integer todayCount) { + this.todayCount = todayCount; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + 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 String getValueThree() { + return valueThree; + } + + public void setValueThree(String valueThree) { + this.valueThree = valueThree; + } + + public Integer getValueType() { + return valueType; + } + + public void setValueType(Integer valueType) { + this.valueType = valueType; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getBabyId() { + return babyId; + } + + public void setBabyId(String babyId) { + this.babyId = babyId; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MeasureBabyDataInfoQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MeasureBabyDataInfoQuery.java new file mode 100644 index 0000000..195beea --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/MeasureBabyDataInfoQuery.java @@ -0,0 +1,189 @@ +package com.lyms.platform.query; + + +import com.lyms.platform.common.dao.BaseQuery; + +import java.util.Date; +import java.util.List; + + +/** + */ +public class MeasureBabyDataInfoQuery extends BaseQuery { + + private String id; + //医院id + private String hospitalId; + + private String babyId; + private List babyIds; + + //创建时间 + private Date createdTimeStart; + private Date createdTimeEnd; + + private Date modifiedTimeStart; + + private Date modifiedTimeEnd; + + + //血压/体重/体温 + private String valueOne; + //脉搏/身高 + private String valueTwo; + //体重测量存BMI值 + private String valueThree; + + //值类型： 1 体重和身高 2 血压和脉搏 3、体温 + private Integer valueType; + + //记录总次数 + private Integer recordCount; + + //创建时间 + private String created; + //修改时间 + private String modified; + + //当天记录次数 + private Integer todayCount; + + //备注值 + private String remarkValue; + + public List getBabyIds() { + return babyIds; + } + + public void setBabyIds(List babyIds) { + this.babyIds = babyIds; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getBabyId() { + return babyId; + } + + public void setBabyId(String babyId) { + this.babyId = babyId; + } + + public Date getCreatedTimeStart() { + return createdTimeStart; + } + + public void setCreatedTimeStart(Date createdTimeStart) { + this.createdTimeStart = createdTimeStart; + } + + public Date getCreatedTimeEnd() { + return createdTimeEnd; + } + + public void setCreatedTimeEnd(Date createdTimeEnd) { + this.createdTimeEnd = createdTimeEnd; + } + + public Date getModifiedTimeStart() { + return modifiedTimeStart; + } + + public void setModifiedTimeStart(Date modifiedTimeStart) { + this.modifiedTimeStart = modifiedTimeStart; + } + + public Date getModifiedTimeEnd() { + return modifiedTimeEnd; + } + + public void setModifiedTimeEnd(Date modifiedTimeEnd) { + this.modifiedTimeEnd = modifiedTimeEnd; + } + + 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 String getValueThree() { + return valueThree; + } + + public void setValueThree(String valueThree) { + this.valueThree = valueThree; + } + + public Integer getValueType() { + return valueType; + } + + public void setValueType(Integer valueType) { + this.valueType = valueType; + } + + public Integer getRecordCount() { + return recordCount; + } + + public void setRecordCount(Integer recordCount) { + this.recordCount = recordCount; + } + + public String getCreated() { + return created; + } + + public void setCreated(String created) { + this.created = created; + } + + public String getModified() { + return modified; + } + + public void setModified(String modified) { + this.modified = modified; + } + + public Integer getTodayCount() { + return todayCount; + } + + public void setTodayCount(Integer todayCount) { + this.todayCount = todayCount; + } + + public String getRemarkValue() { + return remarkValue; + } + + public void setRemarkValue(String remarkValue) { + this.remarkValue = remarkValue; + } +} 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 3c7ec92..89c00d4 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 @@ -343,4 +343,43 @@ public class MeasureInfoController extends BaseController { return measureInfoFacade.getBabyMeasureInfo(certType, certNo, hospitalId); } + + /** + * 添加儿童体重测量 + * @param measureBabyInfoRequest + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/addMeasureBabyDataInfo") + @ResponseBody + public BaseResponse addMeasureDataInfo(@RequestBody MeasureBabyInfoRequest measureBabyInfoRequest, HttpServletRequest request) { + return measureInfoFacade.addMeasureBabyDataInfo(measureBabyInfoRequest); + } + + + /** + * 儿童体重 + * @param queryNo + * @param page + * @param limit + * @param valueType + * @param vcCardNo + * @param recordTime + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/queryMeasureBabyDataList") + @ResponseBody + @TokenRequired + public BaseResponse queryMeasureBabyDataList(@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 + , HttpServletRequest request) { + return measureInfoFacade.queryMeasureBabyDataList(queryNo,page,limit,valueType,vcCardNo,recordTime,getUserId(request)); + } + + } 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 32efa1d..b7717db 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 @@ -12,6 +12,7 @@ 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.MeasureBabyInfoRequest; import com.lyms.platform.operate.web.request.MeasureInfoRequest; import com.lyms.platform.operate.web.request.NutritionInfoRequest; import com.lyms.platform.operate.web.result.MeasureBaseInfoResult; @@ -91,6 +92,8 @@ public class MeasureInfoFacade { @Autowired private BasicConfigService basicConfigService; + @Autowired + private AutoMatchFacade autoMatchFacade; private static String[] blood_item = new String[]{"--","--","--","--","--","--","--","--","--"}; @@ -1525,10 +1528,6 @@ public class MeasureInfoFacade { } - - @Autowired - private BabyBookbuildingService babyBookbuildingService; - public BaseObjectResponse getBabyMeasureInfo(String certType, String certNo, String hospitalId) { BaseObjectResponse br = new BaseObjectResponse(); BabyModelQuery query = new BabyModelQuery(); @@ -1579,5 +1578,126 @@ public class MeasureInfoFacade { } + public BaseResponse addMeasureBabyDataInfo(MeasureBabyInfoRequest measureBabyInfoRequest) { + + MeasureBabyInfoModel measureBabyInfoModel = measureBabyInfoRequest.convertToDataModel(); + MeasureBabyDataInfoQuery query = new MeasureBabyDataInfoQuery(); + query.setBabyId(measureBabyInfoRequest.getBabyId()); + List models = mysqlMeasureDataInfoService.queryMeasureBabyInfoList(query); + + if (CollectionUtils.isNotEmpty(models)) + { + int todayCount = 0; + MeasureBabyInfoModel model = models.get(0); + if (DateUtil.getyyyy_MM_dd(model.getModified()).equals(DateUtil.getyyyy_MM_dd(new Date()))) { + todayCount = model.getTodayCount() + 1; + } + else + { + todayCount = 1; + } + model.setTodayCount(todayCount); + model.setRecordCount(model.getRecordCount() + 1); + model.setValueOne(measureBabyInfoRequest.getValueOne()); + model.setValueTwo(measureBabyInfoRequest.getValueTwo()); + model.setModified(new Date()); + mysqlMeasureDataInfoService.updateMeasureBabyDataInfo(model); + } + else + { + measureBabyInfoModel.setModified(new Date()); + measureBabyInfoModel.setTodayCount(1); + measureBabyInfoModel.setRecordCount(1); + mysqlMeasureDataInfoService.addMeasureBabyInfo(measureBabyInfoModel); + } + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + + @Autowired + private BabyBookbuildingService babyBookbuildingService; + + public BaseResponse queryMeasureBabyDataList(String queryNo, Integer page, Integer limit, Integer valueType, String vcCardNo, String recordTime, Integer userId) { + + + List babyIds = new ArrayList<>(); + if (StringUtils.isNotEmpty(vcCardNo) || StringUtils.isNotEmpty(queryNo) ) + { + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setVcCardNo(vcCardNo); + babyQuery.setQueryNo(queryNo); + + List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if (CollectionUtils.isNotEmpty(babyModels)) + { + for (BabyModel model : babyModels) + { + babyIds.add(model.getId()); + } + } + } + + + MeasureBabyDataInfoQuery query = new MeasureBabyDataInfoQuery(); + String hospitalId = autoMatchFacade.getHospitalId(userId); + query.setBabyIds(babyIds); + query.setHospitalId(hospitalId); + query.setValueType(valueType); + query.setLimit(limit); + query.setPage(page); + query.setNeed("true"); + if (StringUtils.isNotEmpty(recordTime)) { + String[] dates = recordTime.split(" - "); + query.setCreatedTimeStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) { + query.setCreatedTimeEnd(DateUtil.addDay(DateUtil.parseYMD(dates[1]), 1)); + } + } + + List list = new ArrayList<>(); + + List models = mysqlMeasureDataInfoService.queryMeasureBabyInfoList(query); + if (CollectionUtils.isNotEmpty(models)) + { + for (MeasureBabyInfoModel model : models) + { + Map map = new HashMap(); + + BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getBabyId()); + if (babyModel != null ) + { + map.put("babyName",babyModel.getName()); + map.put("sex",SexEnum.getTextById(babyModel.getSex())); + map.put("monthAge",DateUtil.getMonthDesc(babyModel.getBirth(), model.getModified())); + map.put("motherName",babyModel.getMname()); + map.put("phone",babyModel.getMphone()); + map.put("vcCardNo",babyModel.getVcCardNo()); + map.put("weight",model.getValueOne()); + map.put("height",model.getValueTwo()); + map.put("recordTime",DateUtil.getyyyy_MM_dd(model.getModified())); + map.put("recordCount",model.getRecordCount()); + + String hospital = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(model.getHospitalId())) { + Organization organization = organizationService.getOrganization(Integer.parseInt(model.getHospitalId())); + if (organization != null && organization.getYn() == YnEnums.YES.getId()) { + hospital = organization.getName(); + } + } + map.put("hospialName",hospital); + list.add(map); + } + } + } + + BaseListResponse objectResponse = new BaseListResponse(); + objectResponse.setPageInfo(query.getPageInfo()); + objectResponse.setData(list); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureBabyInfoRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureBabyInfoRequest.java new file mode 100644 index 0000000..10966b1 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureBabyInfoRequest.java @@ -0,0 +1,91 @@ +package com.lyms.platform.operate.web.request; + + +import com.lyms.platform.common.base.IBasicRequestConvert; +import com.lyms.platform.pojo.MeasureBabyInfoModel; +import com.lyms.platform.pojo.ModularFunctionConfigModel; + +import java.util.Date; + +/** + * Created by Administrator on 2018-01-10. + */ +public class MeasureBabyInfoRequest implements IBasicRequestConvert { + + + //血压/体重/血糖 + private String valueOne; + //脉搏/身高 + private String valueTwo; + //体重测量存BMI值 + private String valueThree; + + //值类型： 1 体重和身高 2 血压和脉搏 3、体温 4、血糖 + private Integer valueType; + + //医院id + private String hospitalId; + + private String babyId; + + public String getBabyId() { + return babyId; + } + + public void setBabyId(String babyId) { + this.babyId = babyId; + } + + 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 String getValueThree() { + return valueThree; + } + + public void setValueThree(String valueThree) { + this.valueThree = valueThree; + } + + public Integer getValueType() { + return valueType; + } + + public void setValueType(Integer valueType) { + this.valueType = valueType; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + @Override + public MeasureBabyInfoModel convertToDataModel() { + MeasureBabyInfoModel model = new MeasureBabyInfoModel(); + model.setHospitalId(hospitalId); + model.setValueOne(valueOne); + model.setValueTwo(valueTwo); + model.setValueThree(valueThree); + model.setCreated(new Date()); + model.setBabyId(babyId); + model.setValueType(valueType); + return model; + } +} -- 1.8.3.1