jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6d942fd16018600aa99fb5d117ceb70e558d460f

Authored by liquanyu
1 parent 13d1293916
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

修改查看bug、

Showing 4 changed files with 36 additions and 26 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 6d942fd
... ... @@ -1776,8 +1776,12 @@
1776 1776 }
1777 1777 }
1778 1778  
1779   - checkupResult.setMenarcheAge(UnitHandle(result.getMenarcheAge(),UnitConstants.SUI));
1780   - checkupResult.setMenstrualCycle(UnitHandle(result.getMenstrualCycle(),UnitConstants.DAY));
  1779 + checkupResult.setMenarcheAge(UnitHandle(result.getMenarcheAge(), UnitConstants.SUI));
  1780 + if (result.getMenstrualCycle() != null && !"/".equals(result.getMenstrualCycle()))
  1781 + {
  1782 + checkupResult.setMenstrualCycle(UnitHandle(result.getMenstrualCycle(),UnitConstants.DAY));
  1783 + }
  1784 +
1781 1785 checkupResult.setMenstrualAmount(result.getMenstrualAmount());
1782 1786 checkupResult.setLastMenses(result.getLastMenses());
1783 1787 String menorrhalgia= "";
... ... @@ -1904,10 +1908,12 @@
1904 1908 }
1905 1909 checkupResult.setTeShuTiTai(teShuTiTai);
1906 1910  
1907   - checkupResult.setHeight(UnitHandle(result.getHeight(),UnitConstants.CM));
1908   - checkupResult.setWeight(UnitHandle(result.getWeight(),UnitConstants.KG));
1909   - checkupResult.setBp(UnitHandle(result.getBp(),UnitConstants.MMHG));
1910   -
  1911 + checkupResult.setHeight(UnitHandle(result.getHeight(), UnitConstants.CM));
  1912 + checkupResult.setWeight(UnitHandle(result.getWeight(), UnitConstants.KG));
  1913 + if (result.getBp() != null && !"/".equals(result.getBp()))
  1914 + {
  1915 + checkupResult.setBp(UnitHandle(result.getBp(),UnitConstants.MMHG));
  1916 + }
1911 1917 String piFu = "";
1912 1918 if (result.getPiFu() != null && result.getPiFu() == 1)
1913 1919 {
1914 1920  
1915 1921  
1916 1922  
1917 1923  
... ... @@ -1945,24 +1951,23 @@
1945 1951 String maoFa = "";
1946 1952 if (result.getMaoFa() != null && result.getMaoFa() == 1)
1947 1953 {
1948   - maoFa+="是";
1949 1954 String content = "";
1950 1955 if (result.getFenBu() != null)
1951 1956 {
1952   - content = strPj(content,"分布:"+result.getFenBu());
  1957 + content += "分布"+strPj("",result.getFenBu());
1953 1958 }
1954 1959  
1955 1960 if (result.getYanSe() != null)
1956 1961 {
1957   - content = strPj(content,"颜色:"+result.getYanSe());
  1962 + content += "颜色"+strPj("",result.getYanSe());
1958 1963 }
1959 1964 if (result.getBuWei() != null)
1960 1965 {
1961   - content = strPj(content,"脱离部位:"+result.getBuWei());
  1966 + content = "脱离部位"+strPj("",result.getBuWei());
1962 1967 }
1963 1968 if (StringUtils.isNotEmpty(content))
1964 1969 {
1965   - maoFa+=content;
  1970 + maoFa=subLastChar(content);
1966 1971 }
1967 1972  
1968 1973 }
1969 1974  
... ... @@ -2132,12 +2137,12 @@
2132 2137 if (result.getGaoWan() != null) {
2133 2138 String zuo = result.getGaoWanZuo()==null ? "" :result.getGaoWanZuo();
2134 2139 String you = result.getGaoWanYou()==null ? "" :result.getGaoWanYou();
2135   - if (result.getGaoWan() == 1)
  2140 + if (result.getGaoWan() == 2)
2136 2141 {
2137 2142  
2138 2143 gaowan = "扪及"+"(左 "+zuo + "/右 "+you+")";
2139 2144 }
2140   - else if (result.getGaoWan() == 2)
  2145 + else if (result.getGaoWan() == 1)
2141 2146 {
2142 2147 gaowan = "未扪及"+"(左 "+zuo + "/右 "+you+")";
2143 2148 }
2144 2149  
... ... @@ -2149,11 +2154,11 @@
2149 2154 if (result.getFuGao() != null) {
2150 2155 String zuo = result.getFuGaoZuo()==null ? "" :result.getFuGaoZuo();
2151 2156 String you = result.getFuGaoYou()==null ? "" :result.getFuGaoYou();
2152   - if (result.getFuGao() == 1)
  2157 + if (result.getFuGao() == 2)
2153 2158 {
2154 2159 fugao = "正常";
2155 2160 }
2156   - else if (result.getFuGao() == 2)
  2161 + else if (result.getFuGao() == 1)
2157 2162 {
2158 2163 fugao = "结节"+"(左 "+zuo + "/右 "+you+")";
2159 2164 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 6d942fd
... ... @@ -1977,12 +1977,16 @@
1977 1977 result.setMarriage(FunvCommonUtil.getBaseicConfigByid(model.getMarriageId(), basicConfigService));
1978 1978 result.setCertificateType(FunvCommonUtil.getBaseicConfigByid(model.getCertificateTypeId(), basicConfigService));
1979 1979 result.setCertificateNum(model.getCertificateNum());
1980   - result.setCensusType(FunvCommonUtil.getBaseicConfigByid(model.getLevelTypeId(), basicConfigService));
  1980 + result.setCensusType(FunvCommonUtil.getBaseicConfigByid(model.getCensusTypeId(), basicConfigService));
1981 1981 result.setLiveType(FunvCommonUtil.getBaseicConfigByid(model.getLiveTypeId(), basicConfigService));
1982 1982 result.setLevelType(FunvCommonUtil.getBaseicConfigByid(model.getLevelTypeId(), basicConfigService));
1983 1983 result.setProfessionType(FunvCommonUtil.getBaseicConfigByid(model.getProfessionTypeId(), basicConfigService));
1984   - result.setAge(DateUtil.getAge(model.getBirthday(), new Date()));
  1984 + if (model.getBirthday() != null)
  1985 + {
  1986 + result.setAge(com.lyms.platform.common.utils.StringUtils.unitHandle(DateUtil.getAge(model.getBirthday(), new Date()).toString(),UnitConstants.SUI));
  1987 + }
1985 1988  
  1989 +
1986 1990 result.setPhone(model.getPhone());
1987 1991 result.setWorkUnit(model.getWorkUnit());
1988 1992 //居住地
... ... @@ -2198,7 +2202,7 @@
2198 2202 personalHistory+=" 服用药物,";
2199 2203 }
2200 2204  
2201   - String jcydwz = map.get("jcydwz,") == null ? "" : map.get("jcydwz").toString();
  2205 + String jcydwz = map.get("jcydwz") == null ? "" : map.get("jcydwz").toString();
2202 2206 if ("true".equals(jcydwz))
2203 2207 {
2204 2208 personalHistory+=" 接触有毒有害物质,";
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java View file @ 6d942fd
... ... @@ -514,14 +514,14 @@
514 514 setMommyBirthday(DateUtil.getyyyy_MM_dd(destModel.getMbirth()));
515 515 if (destModel.getMbirth() != null)
516 516 {
517   - setMommyAge(DateUtil.getAge(destModel.getMbirth(), new Date()) + "岁");
  517 + setMommyAge(DateUtil.getAge(destModel.getMbirth(), new Date()) + UnitConstants.SUI);
518 518 }
519 519  
520 520 setFatherName(destModel.getFname());
521 521 setFatherBirthday(DateUtil.getyyyy_MM_dd(destModel.getFbirth()));
522 522 if (destModel.getFbirth() != null)
523 523 {
524   - setFatherAge(DateUtil.getAge(destModel.getFbirth(), new Date()) + "岁");
  524 + setFatherAge(DateUtil.getAge(destModel.getFbirth(), new Date()) + UnitConstants.SUI);
525 525 }
526 526  
527 527 setFatherPhone(destModel.getFphone());
528 528  
529 529  
... ... @@ -535,17 +535,18 @@
535 535  
536 536 if (StringUtils.isNotEmpty(destModel.getFetusCount()) && StringUtils.isNotEmpty(destModel.getDueCount()))
537 537 {
538   - setFetusCount("第"+destModel.getFetusCount()+"胎/第"+destModel.getDueCount()+"次");
  538 + setFetusCount("第"+destModel.getFetusCount()+"胎/第"+destModel.getDueCount()+"产");
539 539 }
540 540  
541 541 setBabyWeight(StringUtils.unitHandle(destModel.getBabyWeight(), UnitConstants.KG));
542 542  
543 543 setBabyHeight(StringUtils.unitHandle(destModel.getBabyHeight(), UnitConstants.CM));
544 544 setBabyHead(StringUtils.unitHandle(destModel.getBabyHead(), UnitConstants.CM));
545   - if (StringUtils.isNotEmpty(destModel.getApgarScore()))
  545 + if (StringUtils.isNotEmpty(destModel.getApgarScore()) && !"{}".equals(destModel.getApgarScore()))
546 546 {
547 547 Map<String,String> map = JsonUtil.getMap(destModel.getApgarScore());
548   - String as = (map.get("pf1") == null ? "" : map.get("pf1"))+"分 - "+(map.get("pf5") == null ? "" : map.get("pf5"))+"分 - " +(map.get("pf10") == null ? "" : map.get("pf10"))+"分";
  548 + String as = (map.get("pf1") == null ? "" : map.get("pf1"))+"分 - "+(map.get("pf5") == null ?
  549 + "" : map.get("pf5"))+"分 - " +(map.get("pf10") == null ? "" : map.get("pf10"))+"分";
549 550 setApgarScore(as);
550 551 }
551 552  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsPageResult.java View file @ 6d942fd
... ... @@ -32,7 +32,7 @@
32 32 //职业类别
33 33 private String professionType;
34 34 //年龄
35   - private Integer age;
  35 + private String age;
36 36  
37 37 /************联系方式*************/
38 38  
39 39  
... ... @@ -168,11 +168,11 @@
168 168 this.professionType = professionType;
169 169 }
170 170  
171   - public Integer getAge() {
  171 + public String getAge() {
172 172 return age;
173 173 }
174 174  
175   - public void setAge(Integer age) {
  175 + public void setAge(String age) {
176 176 this.age = age;
177 177 }
178 178