Commit 442b4b167c900ae98f1c47f8b87bf9bd06eab037
1 parent
a8fdeea82b
Exists in
master
and in
6 other branches
update code
Showing 2 changed files with 19 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
442b4b1
| ... | ... | @@ -1776,8 +1776,8 @@ |
| 1776 | 1776 | } |
| 1777 | 1777 | } |
| 1778 | 1778 | |
| 1779 | - checkupResult.setMenarcheAge(result.getMenarcheAge()); | |
| 1780 | - checkupResult.setMenstrualCycle(result.getMenstrualCycle()); | |
| 1779 | + checkupResult.setMenarcheAge(result.getMenarcheAge()+UnitConstants.SUI); | |
| 1780 | + checkupResult.setMenstrualCycle(result.getMenstrualCycle()+UnitConstants.DAY); | |
| 1781 | 1781 | checkupResult.setMenstrualAmount(result.getMenstrualAmount()); |
| 1782 | 1782 | checkupResult.setLastMenses(result.getLastMenses()); |
| 1783 | 1783 | String menorrhalgia= ""; |
| 1784 | 1784 | |
| 1785 | 1785 | |
| 1786 | 1786 | |
| 1787 | 1787 | |
| 1788 | 1788 | |
| ... | ... | @@ -1904,32 +1904,31 @@ |
| 1904 | 1904 | } |
| 1905 | 1905 | checkupResult.setTeShuTiTai(teShuTiTai); |
| 1906 | 1906 | |
| 1907 | - checkupResult.setHeight(result.getHeight()); | |
| 1908 | - checkupResult.setWeight(result.getWeight()); | |
| 1909 | - checkupResult.setBp(result.getBp()); | |
| 1907 | + checkupResult.setHeight(result.getHeight()+UnitConstants.CM); | |
| 1908 | + checkupResult.setWeight(result.getWeight()+UnitConstants.KG); | |
| 1909 | + checkupResult.setBp(result.getBp()+UnitConstants.MMHG); | |
| 1910 | 1910 | |
| 1911 | 1911 | String piFu = ""; |
| 1912 | 1912 | if (result.getPiFu() != null && result.getPiFu() == 1) |
| 1913 | 1913 | { |
| 1914 | 1914 | |
| 1915 | - piFu+="是"; | |
| 1916 | 1915 | String content = ""; |
| 1917 | 1916 | if (result.getPiZheng() != null) |
| 1918 | 1917 | { |
| 1919 | - content = strPj(content,"皮疹:"+result.getPiZheng()); | |
| 1918 | + content += "皮疹"+strPj("",result.getPiZheng())+","; | |
| 1920 | 1919 | } |
| 1921 | 1920 | |
| 1922 | 1921 | if (result.getBiHan() != null) |
| 1923 | 1922 | { |
| 1924 | - content = strPj(content,"闭汗:"+result.getBiHan()); | |
| 1923 | + content += "闭汗"+strPj("",result.getBiHan())+","; | |
| 1925 | 1924 | } |
| 1926 | 1925 | if (result.getGanJue() != null) |
| 1927 | 1926 | { |
| 1928 | - content = strPj(content,"感觉异常:"+result.getGanJue()); | |
| 1927 | + content += "感觉异常"+strPj("",result.getGanJue())+","; | |
| 1929 | 1928 | } |
| 1930 | 1929 | if (StringUtils.isNotEmpty(content)) |
| 1931 | 1930 | { |
| 1932 | - piFu+=content; | |
| 1931 | + piFu+=subLastChar(content); | |
| 1933 | 1932 | } |
| 1934 | 1933 | |
| 1935 | 1934 | } |
| ... | ... | @@ -2355,6 +2354,15 @@ |
| 2355 | 2354 | return value+ unit; |
| 2356 | 2355 | } |
| 2357 | 2356 | return ""; |
| 2357 | + } | |
| 2358 | + | |
| 2359 | + private String subLastChar(String str) | |
| 2360 | + { | |
| 2361 | + if (StringUtils.isNotEmpty(str)) | |
| 2362 | + { | |
| 2363 | + return str.substring(0,str.length()-1); | |
| 2364 | + } | |
| 2365 | + return ""; | |
| 2358 | 2366 | } |
| 2359 | 2367 | |
| 2360 | 2368 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java
View file @
442b4b1