From 7e13170156bf2971d8f853a123414002a58bef39 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 25 Jan 2019 13:57:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E4=BD=93=E9=87=8D=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E6=B5=8B=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/common/utils/DateUtil.java | 18 +++---- .../web/controller/MeasureInfoController.java | 21 ++++++++ .../operate/web/facade/MeasureInfoFacade.java | 63 +++++++++++++++++++--- .../web/service/impl/BloodPressureServiceImpl.java | 4 ++ .../web/service/impl/BloodSugarServiceImpl.java | 4 ++ .../web/service/impl/PatientWeightServiceImpl.java | 4 ++ 6 files changed, 98 insertions(+), 16 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 08fc7c5..df1a8bf 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -1556,15 +1556,15 @@ public class DateUtil { // int weeks = daysBetween(baby, new Date()) / 7; // String weekAge = String.valueOf(weeks); - Date startDate = addDay(new Date(),-10-1); - Date endDate = addDay(new Date(), -10); - - String start = getyyyy_MM_dd(startDate); - String end = getyyyy_MM_dd(endDate); - - System.out.println(start+"=="+end); - - Date baby = parseDate("2018-12-28"); +// Date startDate = addDay(new Date(),-10-1); +// Date endDate = addDay(new Date(), -10); +// +// String start = getyyyy_MM_dd(startDate); +// String end = getyyyy_MM_dd(endDate); +// +// System.out.println(start+"=="+end); + + Date baby = parseDate("2019-01-24"); System.out.println(baby.getTime()); } 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 3d3a281..3c7ec92 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 @@ -322,4 +322,25 @@ public class MeasureInfoController extends BaseController { /**------end-------秦皇岛改版快速测量接口---------------**/ + + + /** + * 儿童快速测量信息查询 + * @param certType + * @param certNo + * @param hospitalId + * @param request + * @return + */ + @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 + ) + { + return measureInfoFacade.getBabyMeasureInfo(certType, certNo, hospitalId); + } + } 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 943561d..32efa1d 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 @@ -926,9 +926,6 @@ public class MeasureInfoFacade { * @return */ public BaseObjectResponse getNutritionPatientInfo(Integer certType, String certNo, String hospitalId) { - - System.out.println("getNutritionPatientInfo:certType" + certType + ";certNo="+certNo+";hospitalId="+hospitalId); - BaseObjectResponse objectResponse = new BaseObjectResponse(); PatientsQuery patientsQuery = new PatientsQuery(); if (1 == certType) @@ -1019,10 +1016,6 @@ public class MeasureInfoFacade { public BaseObjectResponse addNutritionInfo(NutritionInfoRequest nutritionInfoRequest) { - System.out.println("patientId="+nutritionInfoRequest.getPatientId()+";beforeWeight=" - +nutritionInfoRequest.getBeforeWeight()+";beforeHeight="+nutritionInfoRequest.getBeforeHeight() - +"currentWeight="+nutritionInfoRequest.getCurrentWeight()); - Patients patients = patientsService.findOnePatientById(nutritionInfoRequest.getPatientId()); List patientWeights = patientWeightService2.queryPatientWeight(Query.query(Criteria.where("patientId").is(nutritionInfoRequest.getPatientId()))); String hospitalId = nutritionInfoRequest.getHospitalId(); @@ -1530,5 +1523,61 @@ public class MeasureInfoFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + + + @Autowired + private BabyBookbuildingService babyBookbuildingService; + + public BaseObjectResponse getBabyMeasureInfo(String certType, String certNo, String hospitalId) { + BaseObjectResponse br = new BaseObjectResponse(); + BabyModelQuery query = new BabyModelQuery(); + query.setHospitalId(hospitalId); + query.setYn(YnEnums.YES.getId()); + if ("1".equals(certType)) + { + query.setVcCardNo(certNo); + } + else + { + query.setMcertNo(certNo); + } + + List models = babyBookbuildingService.queryBabyBuildByCond(query); + if (CollectionUtils.isEmpty(models)) + { + br.setErrorcode(ErrorCodeConstants.USER_NOT_EXISTS); + br.setErrormsg("没有儿童档案，请到儿童中心创建档案"); + return br; + } + + Map data = new HashMap(); + Map mother = new HashMap(); + mother.put("motherCardNo",models.get(0).getMcertNo()); + mother.put("motherPhone",models.get(0).getMphone()); + mother.put("motherName",models.get(0).getMname()); + mother.put("motherAge",models.get(0).getMbirth() == null ? "" : DateUtil.getAge(models.get(0).getMbirth(), new Date())); + + List babies = new ArrayList<>(); + for (BabyModel baby : models) + { + Map map = new HashMap(); + map.put("id",baby.getId()); + map.put("babyName",baby.getName()); + map.put("sex",SexEnum.getTextById(baby.getSex())); + map.put("birth",DateUtil.getyyyy_MM_dd(baby.getBirth())); + map.put("vcCardNo",baby.getVcCardNo()); + + babies.add(map); + } + + data.put("babies",babies); + data.put("mother",mother); + + br.setData(data); + return br; + } + + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index d5c254f..d448587 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -563,6 +563,10 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP mr.setKeyword1("产检医生"); } } + else + { + mr.setKeyword1("产检医生"); + } mr.setKeyword2(DateUtil.getyyyy_MM_dd(new Date())); mr.setRemark(""); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index 3b007f1..0a2b99b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -1316,6 +1316,10 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga mr.setKeyword1("产检医生"); } } + else + { + mr.setKeyword1("产检医生"); + } mr.setKeyword2(DateUtil.getyyyy_MM_dd(new Date())); mr.setRemark(""); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index c98ee29..cc31974 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -1866,6 +1866,10 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient mr.setKeyword1("产检医生"); } } + else + { + mr.setKeyword1("产检医生"); + } mr.setKeyword2(DateUtil.getyyyy_MM_dd(new Date())); mr.setRemark(""); -- 1.8.3.1