Commit 1b6c0f30438f48b7ddb7c31f6fcbae74b47b1018
1 parent
e30dc79cdb
Exists in
master
and in
6 other branches
测量
Showing 2 changed files with 45 additions and 33 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
1b6c0f3
| ... | ... | @@ -1776,22 +1776,31 @@ |
| 1776 | 1776 | return "handleSieveTime ....."; |
| 1777 | 1777 | } |
| 1778 | 1778 | |
| 1779 | - @RequestMapping(value="/his/getLcdcfyByZyhHis") | |
| 1779 | +// @RequestMapping(value="/his/getLcdcfyByZyhHis") | |
| 1780 | +// @ResponseBody | |
| 1781 | +// public Map<String,Object> getLcdcfyByZyhHis(@RequestParam("zyNo")String zyNo){ | |
| 1782 | +// List<Map> list = new ArrayList<>(); | |
| 1783 | +// Map<String,String> data = new HashMap<>(); | |
| 1784 | +// data.put("vcCardNo","4352345"); | |
| 1785 | +// data.put("name","张三"); | |
| 1786 | +// data.put("sex","女"); | |
| 1787 | +// data.put("birthday","2001-01-01"); | |
| 1788 | +// data.put("bhnum","54345"); | |
| 1789 | +// data.put("phone","15622222222"); | |
| 1790 | +// data.put("idCard","510106200101010807"); | |
| 1791 | +// data.put("addr","四川省成都市武侯区"); | |
| 1792 | +// list.add(data); | |
| 1793 | +// Map<String, Object> map = new HashMap<String, Object>(); | |
| 1794 | +// map.put("hisPatient", list); | |
| 1795 | +// return map; | |
| 1796 | +// } | |
| 1797 | + | |
| 1798 | + | |
| 1799 | + @RequestMapping(value="/his/getClFyIdByVcCardNo") | |
| 1780 | 1800 | @ResponseBody |
| 1781 | - public Map<String,Object> getLcdcfyByZyhHis(@RequestParam("zyNo")String zyNo){ | |
| 1782 | - List<Map> list = new ArrayList<>(); | |
| 1783 | - Map<String,String> data = new HashMap<>(); | |
| 1784 | - data.put("vcCardNo","4352345"); | |
| 1785 | - data.put("name","张三"); | |
| 1786 | - data.put("sex","女"); | |
| 1787 | - data.put("birthday","2001-01-01"); | |
| 1788 | - data.put("bhnum","54345"); | |
| 1789 | - data.put("phone","15622222222"); | |
| 1790 | - data.put("idCard","510106200101010807"); | |
| 1791 | - data.put("addr","四川省成都市武侯区"); | |
| 1792 | - list.add(data); | |
| 1801 | + public Map<String,Object> getLcdcfyByZyhHis(@RequestParam("vcCardNo")String vcCardNo){ | |
| 1793 | 1802 | Map<String, Object> map = new HashMap<String, Object>(); |
| 1794 | - map.put("hisPatient", list); | |
| 1803 | + map.put("id", "1236544"); | |
| 1795 | 1804 | return map; |
| 1796 | 1805 | } |
| 1797 | 1806 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
View file @
1b6c0f3
| ... | ... | @@ -729,10 +729,10 @@ |
| 729 | 729 | patInfo.put("age",DateUtil.getAge(pat.getBirth())+"岁"); |
| 730 | 730 | patInfo.put("week",DateUtil.getWeekDesc(pat.getLastMenses(), new Date())); |
| 731 | 731 | patInfo.put("dueDate",DateUtil.getyyyy_MM_dd(DateUtil.addDay(pat.getLastMenses(), 280))); |
| 732 | - patInfo.put("phone",pat.getPhone()); | |
| 733 | - patInfo.put("vcCardNo",pat.getVcCardNo()); | |
| 734 | - patInfo.put("certType",String.valueOf(certType)); | |
| 735 | - patInfo.put("certNo",pat.getCardNo()); | |
| 732 | + patInfo.put("phone", pat.getPhone()); | |
| 733 | + patInfo.put("vcCardNo", pat.getVcCardNo()); | |
| 734 | + patInfo.put("certType", String.valueOf(certType)); | |
| 735 | + patInfo.put("certNo", pat.getCardNo()); | |
| 736 | 736 | |
| 737 | 737 | String beforeWeight = ""; |
| 738 | 738 | String beforeHeight = ""; |
| ... | ... | @@ -767,14 +767,14 @@ |
| 767 | 767 | } |
| 768 | 768 | } |
| 769 | 769 | |
| 770 | - patInfo.put("beforeWeight",beforeWeight); | |
| 771 | - patInfo.put("beforeHeight",beforeHeight); | |
| 772 | - patInfo.put("tireNumber",tireNumber); | |
| 773 | - patInfo.put("bmi",bmi); | |
| 774 | - patInfo.put("currentWeight",currentWeight); | |
| 775 | - patInfo.put("patientId",pat.getId()); | |
| 776 | - patInfo.put("lastWeight",lastWeight); | |
| 777 | - patInfo.put("pid",pat.getPid()); | |
| 770 | + patInfo.put("beforeWeight", beforeWeight); | |
| 771 | + patInfo.put("beforeHeight", beforeHeight); | |
| 772 | + patInfo.put("tireNumber", tireNumber); | |
| 773 | + patInfo.put("bmi", bmi); | |
| 774 | + patInfo.put("currentWeight", currentWeight); | |
| 775 | + patInfo.put("patientId", pat.getId()); | |
| 776 | + patInfo.put("lastWeight", lastWeight); | |
| 777 | + patInfo.put("pid", pat.getPid()); | |
| 778 | 778 | return patInfo; |
| 779 | 779 | |
| 780 | 780 | } |
| 781 | 781 | |
| ... | ... | @@ -839,14 +839,17 @@ |
| 839 | 839 | patientWeight.setPatientId(patients.getId()); |
| 840 | 840 | patientWeight.setBeforeWeight(nutritionInfoRequest.getBeforeWeight()); |
| 841 | 841 | patientWeight.setBeforeHeight(nutritionInfoRequest.getBeforeHeight()); |
| 842 | - if (nutritionInfoRequest.getTireNumber() != null && Integer.valueOf(nutritionInfoRequest.getTireNumber()) < 3) | |
| 842 | + if (StringUtils.isNotEmpty(nutritionInfoRequest.getTireNumber())) | |
| 843 | 843 | { |
| 844 | - patientWeight.setBregmatic(nutritionInfoRequest.getTireNumber()); | |
| 845 | - } | |
| 846 | - else | |
| 847 | - { | |
| 848 | - patientWeight.setBregmatic(3+""); | |
| 849 | - patientWeight.setBregmaticOther(nutritionInfoRequest.getTireNumber()); | |
| 844 | + if (Integer.valueOf(nutritionInfoRequest.getTireNumber()) < 3) | |
| 845 | + { | |
| 846 | + patientWeight.setBregmatic(nutritionInfoRequest.getTireNumber()); | |
| 847 | + } | |
| 848 | + else | |
| 849 | + { | |
| 850 | + patientWeight.setBregmatic(3+""); | |
| 851 | + patientWeight.setBregmaticOther(nutritionInfoRequest.getTireNumber()); | |
| 852 | + } | |
| 850 | 853 | } |
| 851 | 854 | |
| 852 | 855 | dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), currentWeight); |