diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index d427f63..a9a6372 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -1776,22 +1776,31 @@ public class TestController extends BaseController { return "handleSieveTime ....."; } - @RequestMapping(value="/his/getLcdcfyByZyhHis") +// @RequestMapping(value="/his/getLcdcfyByZyhHis") +// @ResponseBody +// public Map getLcdcfyByZyhHis(@RequestParam("zyNo")String zyNo){ +// List list = new ArrayList<>(); +// Map data = new HashMap<>(); +// data.put("vcCardNo","4352345"); +// data.put("name","张三"); +// data.put("sex","女"); +// data.put("birthday","2001-01-01"); +// data.put("bhnum","54345"); +// data.put("phone","15622222222"); +// data.put("idCard","510106200101010807"); +// data.put("addr","四川省成都市武侯区"); +// list.add(data); +// Map map = new HashMap(); +// map.put("hisPatient", list); +// return map; +// } + + + @RequestMapping(value="/his/getClFyIdByVcCardNo") @ResponseBody - public Map getLcdcfyByZyhHis(@RequestParam("zyNo")String zyNo){ - List list = new ArrayList<>(); - Map data = new HashMap<>(); - data.put("vcCardNo","4352345"); - data.put("name","张三"); - data.put("sex","女"); - data.put("birthday","2001-01-01"); - data.put("bhnum","54345"); - data.put("phone","15622222222"); - data.put("idCard","510106200101010807"); - data.put("addr","四川省成都市武侯区"); - list.add(data); + public Map getLcdcfyByZyhHis(@RequestParam("vcCardNo")String vcCardNo){ Map map = new HashMap(); - map.put("hisPatient", list); + map.put("id", "1236544"); return map; } 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 626c51b..76d8daa 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 @@ -729,10 +729,10 @@ public class MeasureInfoFacade { patInfo.put("age",DateUtil.getAge(pat.getBirth())+"岁"); patInfo.put("week",DateUtil.getWeekDesc(pat.getLastMenses(), new Date())); patInfo.put("dueDate",DateUtil.getyyyy_MM_dd(DateUtil.addDay(pat.getLastMenses(), 280))); - patInfo.put("phone",pat.getPhone()); - patInfo.put("vcCardNo",pat.getVcCardNo()); - patInfo.put("certType",String.valueOf(certType)); - patInfo.put("certNo",pat.getCardNo()); + patInfo.put("phone", pat.getPhone()); + patInfo.put("vcCardNo", pat.getVcCardNo()); + patInfo.put("certType", String.valueOf(certType)); + patInfo.put("certNo", pat.getCardNo()); String beforeWeight = ""; String beforeHeight = ""; @@ -767,14 +767,14 @@ public class MeasureInfoFacade { } } - patInfo.put("beforeWeight",beforeWeight); - patInfo.put("beforeHeight",beforeHeight); - patInfo.put("tireNumber",tireNumber); - patInfo.put("bmi",bmi); - patInfo.put("currentWeight",currentWeight); - patInfo.put("patientId",pat.getId()); - patInfo.put("lastWeight",lastWeight); - patInfo.put("pid",pat.getPid()); + patInfo.put("beforeWeight", beforeWeight); + patInfo.put("beforeHeight", beforeHeight); + patInfo.put("tireNumber", tireNumber); + patInfo.put("bmi", bmi); + patInfo.put("currentWeight", currentWeight); + patInfo.put("patientId", pat.getId()); + patInfo.put("lastWeight", lastWeight); + patInfo.put("pid", pat.getPid()); return patInfo; } @@ -839,14 +839,17 @@ public class MeasureInfoFacade { patientWeight.setPatientId(patients.getId()); patientWeight.setBeforeWeight(nutritionInfoRequest.getBeforeWeight()); patientWeight.setBeforeHeight(nutritionInfoRequest.getBeforeHeight()); - if (nutritionInfoRequest.getTireNumber() != null && Integer.valueOf(nutritionInfoRequest.getTireNumber()) < 3) + if (StringUtils.isNotEmpty(nutritionInfoRequest.getTireNumber())) { - patientWeight.setBregmatic(nutritionInfoRequest.getTireNumber()); - } - else - { - patientWeight.setBregmatic(3+""); - patientWeight.setBregmaticOther(nutritionInfoRequest.getTireNumber()); + if (Integer.valueOf(nutritionInfoRequest.getTireNumber()) < 3) + { + patientWeight.setBregmatic(nutritionInfoRequest.getTireNumber()); + } + else + { + patientWeight.setBregmatic(3+""); + patientWeight.setBregmaticOther(nutritionInfoRequest.getTireNumber()); + } } dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), currentWeight);