From af8cfd37ca1f2f34518a0be9680dd54b24e8d46d Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Wed, 12 Jun 2019 10:46:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E4=BF=9D=E4=BD=93=E9=87=8D=E6=B5=8B?= =?UTF-8?q?=E9=87=8F=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/master/MeasureDataInfoMapper.java | 4 + .../permission/service/MeasureDataInfoService.java | 3 + .../service/impl/MeasureDataInfoServiceImpl.java | 6 + .../mainOrm/master/MeasureDataInfoMapper.xml | 917 +++++++++++---------- .../web/controller/MeasureInfoController.java | 148 ++-- .../operate/web/facade/BabyCheckFacade.java | 24 +- .../operate/web/facade/MeasureInfoFacade.java | 2 + .../operate/web/result/BabyBasicResult.java | 22 + 8 files changed, 602 insertions(+), 524 deletions(-) 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 19d0ff3..477c29c 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 @@ -29,6 +29,10 @@ public interface MeasureDataInfoMapper { void addMeasureBabyDataInfo(MeasureBabyInfoModel model); List queryMeasureBabyInfoList(MeasureBabyDataInfoQuery query); + int queryMeasureBabyInfoCount(MeasureBabyDataInfoQuery query); + int updateMeasureBabyDataInfo(MeasureBabyInfoModel model); + + MeasureBabyInfoModel queryOneMeasureBaby(MeasureBabyDataInfoQuery 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 417f563..7825958 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 @@ -25,5 +25,8 @@ public interface MeasureDataInfoService { void addMeasureBabyInfo(MeasureBabyInfoModel model); List queryMeasureBabyInfoList(MeasureBabyDataInfoQuery query); + int updateMeasureBabyDataInfo(MeasureBabyInfoModel model); + + MeasureBabyInfoModel queryOneMeasureBaby(MeasureBabyDataInfoQuery query); } 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 63a96e8..0462870 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 @@ -67,4 +67,10 @@ public class MeasureDataInfoServiceImpl implements MeasureDataInfoService { public int updateMeasureBabyDataInfo(MeasureBabyInfoModel model) { return measureDataInfoMapper.updateMeasureBabyDataInfo(model); } + + @Override + public MeasureBabyInfoModel queryOneMeasureBaby(MeasureBabyDataInfoQuery query) { + return measureDataInfoMapper.queryOneMeasureBaby(query); + } + } 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 a8199d2..e49c8fe 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml @@ -1,58 +1,58 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO measure_data_info(measure_user_id, value_one,value_two,value_three,value_type ,record_count,created,modified,today_count,remark_value,record_content) @@ -60,276 +60,275 @@ ,#{valueTwo},#{valueThree},#{valueType},#{recordCount},#{created},#{modified},#{todayCount},#{remarkValue},#{recordContent}) - - - - - - - 1 = 1 - - and m.id = #{id,jdbcType=INTEGER} - - - and m.value_one = #{valueOne,jdbcType=VARCHAR} - - - and m.value_two = #{valueTwo,jdbcType=VARCHAR} - - - and m.value_three = #{valueThree,jdbcType=VARCHAR} - - - and m.value_type = #{valueType,jdbcType=INTEGER} - - - AND date_format(m.created,'%Y-%m-%d') = #{created} - - - and m.record_count = #{m.recordCount,jdbcType=INTEGER} - - - - AND date_format(m.modified,'%Y-%m-%d') = #{modified} - - - - AND m.created >= date_format(#{createdTimeStart},'%Y-%m-%d') - - - AND - - - - AND m.modified >= date_format(#{modifiedTimeStart},'%Y-%m-%d') - - - AND - - - - m.today_count = #{todayCount,jdbcType=INTEGER}, - - - - and (u.phone = #{queryNo,jdbcType=VARCHAR} or u.cert_no = #{queryNo,jdbcType=VARCHAR} - or u.user_name = #{queryNo,jdbcType=VARCHAR}) - - - - and u.hospital_id = #{hospitalId,jdbcType=VARCHAR} - - - and u.hospital_id in - - #{item} - - - - and u.address = #{address,jdbcType=VARCHAR} - - - and u.face = #{face,jdbcType=VARCHAR} - - - and u.finger = #{finger,jdbcType=VARCHAR} - - - - and u.user_name = #{userName,jdbcType=VARCHAR} - - - and u.cert_type = #{certType,jdbcType=VARCHAR} - - - and u.cert_no = #{certNo,jdbcType=VARCHAR} - - - and u.age = #{age,jdbcType=VARCHAR} - - - and u.phone = #{phone,jdbcType=VARCHAR} - - - and u.sex = #{sex,jdbcType=INTEGER} - - - and u.vc_card_no = #{vcCardNo,jdbcType=VARCHAR} - - - and u.zy_no = #{zyNo,jdbcType=VARCHAR} - - - and u.visit_id = #{visitId,jdbcType=VARCHAR} - - - and u.patient_id = #{valueOne,jdbcType=VARCHAR} - - - - - - - - - - - - - - - - UPDATE - measure_data_info - - - id = #{id,jdbcType=INTEGER}, - - - measure_user_id = #{measureUserId}, - - - - 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}, - - - record_content = #{recordContent,jdbcType=VARCHAR}, - - - created = #{created}, - - - modified = #{modified}, - - - today_count = #{todayCount,jdbcType=INTEGER}, - - - remark_value = #{remarkValue,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - - - - order by ${sort} - - limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} - - - - - - - - 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 measure_user_id = #{measureUserId,jdbcType=INTEGER} - - - - and record_content = #{recordContent,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} - - - - - + + + + + + 1 = 1 + + and m.id = #{id,jdbcType=INTEGER} + + + and m.value_one = #{valueOne,jdbcType=VARCHAR} + + + and m.value_two = #{valueTwo,jdbcType=VARCHAR} + + + and m.value_three = #{valueThree,jdbcType=VARCHAR} + + + and m.value_type = #{valueType,jdbcType=INTEGER} + + + AND date_format(m.created,'%Y-%m-%d') = #{created} + + + and m.record_count = #{m.recordCount,jdbcType=INTEGER} + + + + AND date_format(m.modified,'%Y-%m-%d') = #{modified} + + + + AND m.created >= date_format(#{createdTimeStart},'%Y-%m-%d') + + + AND + + + + AND m.modified >= date_format(#{modifiedTimeStart},'%Y-%m-%d') + + + AND + + + + m.today_count = #{todayCount,jdbcType=INTEGER}, + + + + and (u.phone = #{queryNo,jdbcType=VARCHAR} or u.cert_no = #{queryNo,jdbcType=VARCHAR} + or u.user_name = #{queryNo,jdbcType=VARCHAR}) + + + + and u.hospital_id = #{hospitalId,jdbcType=VARCHAR} + + + and u.hospital_id in + + #{item} + + + + and u.address = #{address,jdbcType=VARCHAR} + + + and u.face = #{face,jdbcType=VARCHAR} + + + and u.finger = #{finger,jdbcType=VARCHAR} + + + + and u.user_name = #{userName,jdbcType=VARCHAR} + + + and u.cert_type = #{certType,jdbcType=VARCHAR} + + + and u.cert_no = #{certNo,jdbcType=VARCHAR} + + + and u.age = #{age,jdbcType=VARCHAR} + + + and u.phone = #{phone,jdbcType=VARCHAR} + + + and u.sex = #{sex,jdbcType=INTEGER} + + + and u.vc_card_no = #{vcCardNo,jdbcType=VARCHAR} + + + and u.zy_no = #{zyNo,jdbcType=VARCHAR} + + + and u.visit_id = #{visitId,jdbcType=VARCHAR} + + + and u.patient_id = #{valueOne,jdbcType=VARCHAR} + + + + + + + + + + + + + + + UPDATE + measure_data_info + + + id = #{id,jdbcType=INTEGER}, + + + measure_user_id = #{measureUserId}, + + + + 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}, + + + record_content = #{recordContent,jdbcType=VARCHAR}, + + + created = #{created}, + + + modified = #{modified}, + + + today_count = #{todayCount,jdbcType=INTEGER}, + + + remark_value = #{remarkValue,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=INTEGER} + + + + + + order by ${sort} + + limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + + + + + + + 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 measure_user_id = #{measureUserId,jdbcType=INTEGER} + + + + and record_content = #{recordContent,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} + + + + + 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) @@ -338,135 +337,147 @@ - - - - - - - - - - - - - - - - - - - 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} - + + + + + + + + + + + + + + + + + + + 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-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 89c00d4..ad94a4d 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 @@ -19,7 +19,7 @@ import java.util.Map; /** * 测量血糖和脉搏、身高和体重的值 - * + *

* Created by Administrator on 2018-01-10. */ @Controller @@ -34,26 +34,28 @@ public class MeasureInfoController extends BaseController { /** * 血糖和脉搏 身高和体重的值列表 * valueType 值类型： 1 体重和身高 2 血压和脉搏 3 体温 4血糖 + * * @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) String age, + @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) String age, HttpServletRequest request - ) { + ) { return measureInfoFacade.queryMeasureInfoList(queryNo, valueType, vcCardNo, recordTime, age, page, limit, getUserId(request)); } /** * 添加 血糖和脉搏 身高和体重的值列表/体温 + * * @param measureInfoRequest * @param request * @return @@ -65,9 +67,9 @@ public class MeasureInfoController extends BaseController { } - /** * 添加测量用户的基本信息（面部识别，指纹识别，证件类型） + * * @param measureInfoRequest * @param request * @return @@ -79,11 +81,9 @@ public class MeasureInfoController extends BaseController { } - - - /** - * 查询录入测量用户基本信息 + * 查询录入测量用户基本信息 + * * @param certType * @param certNo * @param hospitalId @@ -93,17 +93,17 @@ public class MeasureInfoController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/getMeasureBaseInfo") @ResponseBody public BaseObjectResponse queryClBaseInfo(@RequestParam(value = "certType", required = true) String certType, - @RequestParam(value = "certNo", required = true) String certNo, - @RequestParam(value = "hospitalId", required = true) String hospitalId, - HttpServletRequest request - ) - { + @RequestParam(value = "certNo", required = true) String certNo, + @RequestParam(value = "hospitalId", required = true) String hospitalId, + HttpServletRequest request + ) { return measureInfoFacade.getMeasureBaseInfo(certType, certNo, hospitalId); } /** * 查询院内系统孕妇基本信息 只查询院内系统 + * * @param certType * @param certNo * @param hospitalId @@ -113,17 +113,17 @@ public class MeasureInfoController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/getSystemPatientBaseInfo") @ResponseBody public BaseObjectResponse getSystemPatientBaseInfo(@RequestParam(value = "certType", required = true) String certType, - @RequestParam(value = "certNo", required = true) String certNo, - @RequestParam(value = "hospitalId", required = true) String hospitalId, - HttpServletRequest request - ) - { + @RequestParam(value = "certNo", required = true) String certNo, + @RequestParam(value = "hospitalId", required = true) String hospitalId, + HttpServletRequest request + ) { return measureInfoFacade.getSystemPatientBaseInfo(certType, certNo, hospitalId); } /** - * 查询测量人的信息 + * 查询测量人的信息 + * * @param certType * @param certNo * @param hospitalId @@ -133,18 +133,18 @@ public class MeasureInfoController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/getMeasurePatientInfo") @ResponseBody public BaseObjectResponse getMeasurePatientInfo(@RequestParam(value = "certType", required = true) String certType, - @RequestParam(value = "certNo", required = true) String certNo, - @RequestParam(value = "hospitalId", required = true) String hospitalId, - HttpServletRequest request - ) - { + @RequestParam(value = "certNo", required = true) String certNo, + @RequestParam(value = "hospitalId", required = true) String hospitalId, + HttpServletRequest request + ) { return measureInfoFacade.getMeasurePatientInfo(certType, certNo, hospitalId); } /** * 体重与营养管理，获取孕妇基本信息 - * @param certType 1身份证 2就诊卡 + * + * @param certType 1身份证 2就诊卡 * @param certNo * @param hospitalId * @param request @@ -153,32 +153,32 @@ public class MeasureInfoController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/getNutritionPatientInfo") @ResponseBody public BaseObjectResponse getNutritionPatientInfo(@RequestParam(value = "certType", required = true) Integer certType, - @RequestParam(value = "certNo", required = true) String certNo, - @RequestParam(value = "hospitalId", required = true) String hospitalId, - HttpServletRequest request - ) - { + @RequestParam(value = "certNo", required = true) String certNo, + @RequestParam(value = "hospitalId", required = true) String hospitalId, + HttpServletRequest request + ) { return measureInfoFacade.getNutritionPatientInfo(certType, certNo, hospitalId); } /** * 体重与营养管理 保存体重测量数据 + * * @param request * @return */ @RequestMapping(method = RequestMethod.POST, value = "/addNutritionInfo") @ResponseBody public BaseObjectResponse addNutritionInfo(@RequestBody NutritionInfoRequest nutritionInfoRequest, - HttpServletRequest request - ) - { + HttpServletRequest request + ) { return measureInfoFacade.addNutritionInfo(nutritionInfoRequest); } /** * 获取面部信息 + * * @param patientId * @param request * @return @@ -186,15 +186,15 @@ public class MeasureInfoController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/getFaceInfo") @ResponseBody public BaseObjectResponse getFaceInfo(@RequestParam(value = "patientId", required = true) String patientId, - HttpServletRequest request - ) - { + HttpServletRequest request + ) { return measureInfoFacade.getFaceInfo(patientId); } /** * 面部识别以及获取信息 + * * @param nutritionInfoRequest * @param request * @return @@ -203,14 +203,14 @@ public class MeasureInfoController extends BaseController { @ResponseBody public BaseObjectResponse getFacePairMatching(@RequestBody NutritionInfoRequest nutritionInfoRequest, HttpServletRequest request - ) - { + ) { return measureInfoFacade.getFacePairMatching(nutritionInfoRequest); } /** * 添加面部信息 + * * @param nutritionInfoRequest * @param request * @return @@ -218,15 +218,15 @@ public class MeasureInfoController extends BaseController { @RequestMapping(method = RequestMethod.POST, value = "/addFaceInfo") @ResponseBody public BaseResponse addFaceInfo(@RequestBody NutritionInfoRequest nutritionInfoRequest, - HttpServletRequest request - ) - { + HttpServletRequest request + ) { return measureInfoFacade.addFaceInfo(nutritionInfoRequest); } /** * 添加体温 + * * @param nutritionInfoRequest * @param request * @return @@ -234,9 +234,8 @@ public class MeasureInfoController extends BaseController { @RequestMapping(method = RequestMethod.POST, value = "/addNutritionTemp") @ResponseBody public BaseResponse addNutritionTemp(@RequestBody NutritionInfoRequest nutritionInfoRequest, - HttpServletRequest request - ) - { + HttpServletRequest request + ) { TempAddRequest addRequest = new TempAddRequest(); addRequest.setParentId(nutritionInfoRequest.getPatientId()); addRequest.setPid(nutritionInfoRequest.getPid()); @@ -247,6 +246,7 @@ public class MeasureInfoController extends BaseController { /** * 添加血压 + * * @param nutritionInfoRequest * @param request * @return @@ -255,8 +255,7 @@ public class MeasureInfoController extends BaseController { @ResponseBody public BaseResponse addBloodPressure(@RequestBody NutritionInfoRequest nutritionInfoRequest, HttpServletRequest request - ) - { + ) { return measureInfoFacade.addBloodPressure(nutritionInfoRequest); } @@ -264,6 +263,7 @@ public class MeasureInfoController extends BaseController { /** * 添加血糖 + * * @param bloodSugar * @param request * @return @@ -271,9 +271,8 @@ public class MeasureInfoController extends BaseController { @RequestMapping(method = RequestMethod.POST, value = "/addBloodSugar") @ResponseBody public BaseResponse addBloodSugar(@RequestBody BloodSugar bloodSugar, - HttpServletRequest request - ) - { + HttpServletRequest request + ) { return measureInfoFacade.addBloodSugar(bloodSugar); } @@ -285,8 +284,9 @@ public class MeasureInfoController extends BaseController { /** * 住院号类型 ： certType：1 * 其他类型根据院内系统类型传 - * + *

* 查询测量用户，如果用户在随心测没有建档就 建档并返回结果 + * * @param measureAllInfoRequest * @return */ @@ -298,7 +298,8 @@ public class MeasureInfoController extends BaseController { /** * 添加指纹信息 - * @param measureInfoRequest hospitalId finger certNo + * + * @param measureInfoRequest hospitalId finger certNo * @param request * @return */ @@ -311,6 +312,7 @@ public class MeasureInfoController extends BaseController { /** * 秦皇岛添加所有测量接口 + * * @param measureAllInfoRequest * @return */ @@ -326,6 +328,7 @@ public class MeasureInfoController extends BaseController { /** * 儿童快速测量信息查询 + * * @param certType * @param certNo * @param hospitalId @@ -335,17 +338,17 @@ public class MeasureInfoController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/getBabyMeasureInfo") @ResponseBody public BaseObjectResponse getBabyMeasureInfo(@RequestParam(value = "certType", required = true) String certType, - @RequestParam(value = "certNo", required = true) String certNo, - @RequestParam(value = "hospitalId", required = true) String hospitalId, - HttpServletRequest request - ) - { + @RequestParam(value = "certNo", required = true) String certNo, + @RequestParam(value = "hospitalId", required = true) String hospitalId, + HttpServletRequest request + ) { return measureInfoFacade.getBabyMeasureInfo(certType, certNo, hospitalId); } /** * 添加儿童体重测量 + * * @param measureBabyInfoRequest * @param request * @return @@ -359,6 +362,7 @@ public class MeasureInfoController extends BaseController { /** * 儿童体重 + * * @param queryNo * @param page * @param limit @@ -372,14 +376,24 @@ public class MeasureInfoController extends BaseController { @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 + @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)); + return measureInfoFacade.queryMeasureBabyDataList(queryNo, page, limit, valueType, vcCardNo, recordTime, getUserId(request)); } + /** + * 获取一个儿童的体重身高 + */ + @RequestMapping(method = RequestMethod.GET, value = "/queryOneMeasureBaby") + @ResponseBody + @TokenRequired + public BaseResponse queryOneMeasureBaby(@RequestParam(value = "babyId", required = false) String queryNo, + @RequestParam(value = "hospitalId", required = false) String hospitalId) { + return null; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index ec96ded..37e14b3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -21,10 +21,7 @@ import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.PatientService; import com.lyms.platform.permission.model.Users; -import com.lyms.platform.permission.service.CouponService; -import com.lyms.platform.permission.service.OrganizationService; -import com.lyms.platform.permission.service.PatientServiceService; -import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; @@ -107,6 +104,8 @@ public class BabyCheckFacade { @Autowired private AreaCountFacade areaCountFacade; + @Autowired + private MeasureDataInfoService measureDataInfoService; public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); @@ -880,6 +879,23 @@ public class BabyCheckFacade { base.setPregnantCertificateTypeId(model.getMcertTypeId()); base.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); base.setMonth(DateUtil.getMonth(model.getBirth(), new Date())); + /** + * 查询儿童测量体重数据 + * */ + if (StringUtils.isNotEmpty(model.getId()) && StringUtils.isNotEmpty(model.getHospitalId())) { + MeasureBabyDataInfoQuery measureBabyDataInfoQuery = new MeasureBabyDataInfoQuery(); + measureBabyDataInfoQuery.setBabyId(model.getId()); + System.out.println(model.getId()); + System.out.println(model.getHospitalId()); + measureBabyDataInfoQuery.setHospitalId(model.getHospitalId()); + MeasureBabyInfoModel measureBabyInfoModel = measureDataInfoService.queryOneMeasureBaby(measureBabyDataInfoQuery); + if (null != measureBabyInfoModel) { + base.setBabyHeight(measureBabyInfoModel.getValueTwo()); + base.setBabyWeight(measureBabyInfoModel.getValueOne()); + } + } + + //计算儿童的预产期 if (model.getBirth() != null && model.getDueWeek() != null && model.getDueWeek() < 37) {//早产儿，根据出生孕周计算末次月经，在根据末次月经计算预产期 String birthStr = DateUtil.getyyyy_MM_dd(model.getBirth()); 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 d7d3b01..571bcb8 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 @@ -1546,5 +1546,7 @@ public class MeasureInfoFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java index e92a6ca..22aeb1c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java @@ -75,11 +75,33 @@ public class BabyBasicResult { private String correctValue; + /** * 增值服务name list */ private List serviceList; + + private String babyHeight; + + private String babyWeight; + + public String getBabyHeight() { + return babyHeight; + } + + public void setBabyHeight(String babyHeight) { + this.babyHeight = babyHeight; + } + + public String getBabyWeight() { + return babyWeight; + } + + public void setBabyWeight(String babyWeight) { + this.babyWeight = babyWeight; + } + public Integer getMonth() { return month; } -- 1.8.3.1