jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 065557a9a1926277aa87fd649294ec41fd5f3774

Authored by jiangjiazhi
2 parents 1ad45e18cf 82b2b04b85
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge branch 'master' of https://git.healthbaby.com.cn/jiangjiazhi/regional-platform.git

Showing 5 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java View file @ 065557a
... ... @@ -59,6 +59,26 @@
59 59 @Autowired
60 60 private BasicConfigService basicConfigService;
61 61  
  62 + private static Map<Integer,String> node_map = new HashMap<>();
  63 + //0:0～12 孕周 1: 16～20 孕周 2: 21～24 孕周 3:28～36 孕周 4:37～ 分娩
  64 + //--0～12 孕周,16～20 孕周,21～24 孕周,28～36 孕周,37～ 分娩
  65 + static {
  66 + node_map.put(0,"0～12 孕周");
  67 + node_map.put(1,"16～20 孕周");
  68 + node_map.put(2,"21～24 孕周");
  69 + node_map.put(3,"28～36 孕周");
  70 + node_map.put(4,"37～ 分娩");
  71 + }
  72 +
  73 + private static String getNodeName(Integer nodeName)
  74 + {
  75 + if (nodeName == null)
  76 + {
  77 + return "";
  78 + }
  79 + return node_map.get(nodeName);
  80 + }
  81 +
62 82 public BaseResponse getTicketUsedCount(String time, String hospitalId,
63 83 String provinceId,String cityId,
64 84 String areaId, Integer userId) {
... ... @@ -541,6 +561,8 @@
541 561 pageSql+=sql;
542 562 pageSql+=") A WHERE ROWNUM <= " + end + " ) WHERE RN >= " + start;
543 563  
  564 + System.out.println("pageSql===="+pageSql);
  565 + System.out.println("countSql====" + sqlCount);
544 566 List<Map<String, Object>> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, pageSql);
545 567 int count = 0;
546 568 Object totalCountObj = JdbcUtil.getOralceSingleObjBySql(DRIVER, JDBC, NAME, PWD, sqlCount);
... ... @@ -675,25 +697,25 @@
675 697 allHospitalList.addAll(hospitalList);
676 698 return allHospitalList;
677 699 }
678   -// //条件查询未空就返回条件查询的结果
679   -// if (CollectionUtils.isEmpty(orgHospitalList))
680   -// {
681   -// return orgHospitalList;
682   -// }
683   -//
684   -// //取所拥有的医院和查询条件查询的医院的交集
685   -// if (CollectionUtils.isNotEmpty(allHospitalList))
686   -// {
687   -// for(String hp : allHospitalList)
688   -// {
689   -// if (orgHospitalList.contains(hp))
690   -// {
691   -// hospitalList.add(hp);
692   -// }
693   -// }
694   -// }
695   -// return hospitalList;
696   - return orgHospitalList;
  700 + //条件查询未空就返回条件查询的结果
  701 + if (CollectionUtils.isEmpty(orgHospitalList))
  702 + {
  703 + return orgHospitalList;
  704 + }
  705 +
  706 + //取所拥有的医院和查询条件查询的医院的交集
  707 + if (CollectionUtils.isNotEmpty(allHospitalList))
  708 + {
  709 + for(String hp : allHospitalList)
  710 + {
  711 + if (orgHospitalList.contains(hp))
  712 + {
  713 + hospitalList.add(hp);
  714 + }
  715 + }
  716 + }
  717 + return hospitalList;
  718 +// return orgHospitalList;
697 719 }
698 720  
699 721 /**
... ... @@ -759,6 +781,8 @@
759 781  
760 782 }
761 783 sql+=" ) AA ON C.RECORD_ID=AA.RECORD_ID INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID";
  784 +
  785 + System.out.println("sql===="+sql);
762 786 List<Map<String, Object>> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql);
763 787  
764 788 List<Map<String,Object>> results = new ArrayList<>();
... ... @@ -859,6 +883,7 @@
859 883 }
860 884  
861 885 }
  886 + System.out.println("sql===="+sql);
862 887 List<Map<String, Object>> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql);
863 888  
864 889 List<Map<String,Object>> results = new ArrayList<>();
... ... @@ -891,7 +916,7 @@
891 916 cnames.put("hospitalName","产检机构"); //产检机构
892 917 cnames.put("doctorName","产检医生"); //产检医生
893 918 cnames.put("ffHospitalName","产检券发放机构"); //产检券发放机构
894   - cnames.put("telNo","联系电话"); //联系电话
  919 + cnames.put("telNo", "联系电话"); //联系电话
895 920  
896 921 ResponseUtil.responseExcel(cnames,results,httpServletResponse);
897 922 }
... ... @@ -1060,7 +1085,8 @@
1060 1085 " SUM(CASE WHEN B.NODE_NAME='28～36 孕周' THEN 1 ELSE 0 END) AS NUM_36,\n" +
1061 1086 " SUM(CASE WHEN B.NODE_NAME='37～ 分娩' THEN 1 ELSE 0 END) AS NUM_40\n" +
1062 1087 "FROM ODS_D_HOSPITAL A\n" +
1063   - "LEFT JOIN ODS_F_EXAMINE_HISTORY B ON A.HOSPITAL_NO=B.HOSPITAL_NO ";
  1088 + "LEFT JOIN ODS_F_EXAMINE_HISTORY B ON A.HOSPITAL_NO=B.HOSPITAL_NO "+
  1089 + " INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID ";
1064 1090 if (pointType != null && pointType == 1){
1065 1091 countSql+=" AND B.NODE_ID=2 ";
1066 1092 }
... ... @@ -1198,7 +1224,8 @@
1198 1224 " SUM(CASE WHEN B.NODE_NAME='28～36 孕周' THEN 1 ELSE 0 END) AS NUM_36,\n" +
1199 1225 " SUM(CASE WHEN B.NODE_NAME='37～ 分娩' THEN 1 ELSE 0 END) AS NUM_40\n" +
1200 1226 " FROM ODS_D_HOSPITAL A\n" +
1201   - " LEFT JOIN ODS_F_EXAMINE_HISTORY B ON A.HOSPITAL_NO=B.HOSPITAL_NO ";
  1227 + " LEFT JOIN ODS_F_EXAMINE_HISTORY B ON A.HOSPITAL_NO=B.HOSPITAL_NO "+
  1228 + " INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID ";
1202 1229 if (pointType != null && pointType == 1){
1203 1230 sql+=" AND B.NODE_ID=2 ";
1204 1231 }
1205 1232  
... ... @@ -1248,8 +1275,9 @@
1248 1275 " A.YCY_STSTEM_ID\n" +
1249 1276 " ) BB ON AA.HOSPITAL_NO=BB.HOSPITAL_NO\n" +
1250 1277 " ORDER BY 1,2,3";
  1278 + System.out.println("sql===="+sql);
  1279 + System.out.println("countSql===="+countSql);
1251 1280  
1252   -
1253 1281 List<String> chartData = new ArrayList<>();
1254 1282 List<Integer> num12 = new ArrayList<>();
1255 1283 List<Integer> num20 = new ArrayList<>();
... ... @@ -1324,7 +1352,8 @@
1324 1352 end = page * limit;
1325 1353 }
1326 1354  
1327   - String countSql = "SELECT COUNT(C.NAME) AS ALLCOUNT FROM ODS_F_GRAVIDA_RECORD C INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID WHERE 1 = 1";
  1355 + String countSql = "SELECT COUNT(C.NAME) AS ALLCOUNT FROM ODS_F_GRAVIDA_RECORD C INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID " +
  1356 + " INNER JOIN ODS_D_HOSPITAL A ON C.HOSPITAL_NO=A.HOSPITAL_NO WHERE 1 = 1";
1328 1357  
1329 1358 String sql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM ( SELECT C.CREATE_DATE,\n" +
1330 1359 " C.NAME,\n" +
... ... @@ -1433,9 +1462,9 @@
1433 1462 sql+=" AND CC.NODE_ID=2 ";
1434 1463 countSql+=" AND CC.NODE_ID=2 ";
1435 1464 }
1436   - if (nodeName != null){
1437   - sql+=" AND CC.NODE_NAME= " + nodeName;
1438   - countSql+=" AND CC.NODE_NAME= " + nodeName;
  1465 + if (StringUtils.isNotEmpty(getNodeName(nodeName))){
  1466 + sql+=" AND CC.NODE_NAME= '" +getNodeName(nodeName)+"'";
  1467 + countSql+=" AND CC.NODE_NAME= '" + getNodeName(nodeName)+"'";
1439 1468 }
1440 1469 //" AND CC.NODE_NAME=''\n" +
1441 1470 if (StringUtils.isNotEmpty(time))
... ... @@ -1478,6 +1507,9 @@
1478 1507  
1479 1508 }
1480 1509 sql+=") A WHERE ROWNUM <= " + end + " ) WHERE RN >= " + start;
  1510 +
  1511 + System.out.println("sql===="+sql);
  1512 + System.out.println("countSql===="+countSql);
1481 1513 int count = 0;
1482 1514 Object totalCountObj = JdbcUtil.getOralceSingleObjBySql(DRIVER, JDBC, NAME, PWD, countSql);
1483 1515 if (totalCountObj != null)
... ... @@ -1512,8 +1544,8 @@
1512 1544 if (pointType != null && pointType == 1){
1513 1545 sql+=" AND CC.NODE_ID=2 ";
1514 1546 }
1515   - if (nodeName != null && nodeName == 1){
1516   - sql+=" AND CC.NODE_NAME= "+nodeName;
  1547 + if (StringUtils.isNotEmpty(getNodeName(nodeName))){
  1548 + sql+=" AND CC.NODE_NAME= '" + getNodeName(nodeName)+"'";
1517 1549 }
1518 1550 //" AND CC.NODE_NAME=''\n" +
1519 1551 if (StringUtils.isNotEmpty(time))
... ... @@ -1549,6 +1581,8 @@
1549 1581 }
1550 1582  
1551 1583 }
  1584 +
  1585 + System.out.println("sql===="+sql);
1552 1586 List<Map<String, Object>> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql);
1553 1587  
1554 1588 List<Map<String,Object>> results = new ArrayList<>();
... ... @@ -1582,7 +1616,8 @@
1582 1616 ResponseUtil.responseExcel(cnames,results,httpServletResponse);
1583 1617 }
1584 1618  
1585   - public void getCheckPointBuildDetailExport(String time, String hospitalId, String provinceId, String cityId, String areaId, Integer userId, HttpServletResponse httpServletResponse) {
  1619 + public void getCheckPointBuildDetailExport(String time, String hospitalId, String provinceId, String cityId, String areaId,
  1620 + Integer userId, HttpServletResponse httpServletResponse) {
1586 1621  
1587 1622 String sql ="SELECT C.CREATE_DATE,\n" +
1588 1623 " C.NAME,\n" +
... ... @@ -1595,7 +1630,8 @@
1595 1630 " D.PROVINCE||D.CITY||D.AREA_COUNTY AS HJ_ADDR,\n" +
1596 1631 " C.TEL_NO\n" +
1597 1632 " FROM ODS_F_GRAVIDA_RECORD C " +
1598   - " INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID"+
  1633 + " INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID" +
  1634 + " INNER JOIN ODS_D_HOSPITAL A ON C.HOSPITAL_NO=A.HOSPITAL_NO "+
1599 1635 " WHERE 1=1 ";
1600 1636  
1601 1637  
1602 1638  
1603 1639  
1604 1640  
1605 1641  
1606 1642  
... ... @@ -1607,31 +1643,33 @@
1607 1643 }
1608 1644 if (StringUtils.isNotEmpty(provinceId))
1609 1645 {
1610   - sql += " AND C.PROVINCE_ID= '"+provinceId+"'";
  1646 + sql += " AND A.PROVINCE_ID= '"+provinceId+"'";
1611 1647 }
1612 1648  
1613 1649 if (StringUtils.isNotEmpty(cityId))
1614 1650 {
1615   - sql+= " AND C.CITY_ID= '" +cityId+"'";
  1651 + sql+= " AND A.CITY_ID= '" +cityId+"'";
1616 1652 }
1617 1653  
1618 1654 if (StringUtils.isNotEmpty(areaId))
1619 1655 {
1620   - sql+= " AND C.AREA_COUNTY_ID= '" +areaId+"'";
  1656 + sql+= " AND A.AREA_COUNTY_ID= '" +areaId+"'";
1621 1657 }
1622 1658 if (StringUtils.isNotEmpty(hospitalId))
1623 1659 {
1624   - sql+=" AND C.YCY_STSTEM_ID= '" +hospitalId+"'";
  1660 + sql+=" AND A.YCY_STSTEM_ID= '" +hospitalId+"'";
1625 1661 }
1626 1662 else
1627 1663 {
1628 1664 String hospitals = getPermissionStr(userId,provinceId,cityId,areaId);
1629 1665 if (StringUtils.isNotEmpty(hospitals))
1630 1666 {
1631   - sql+=" AND C.YCY_STSTEM_ID IN " +hospitals;
  1667 + sql+=" AND A.YCY_STSTEM_ID IN " +hospitals;
1632 1668 }
1633 1669  
1634 1670 }
  1671 +
  1672 + System.out.println("sql===="+sql);
1635 1673 List<Map<String, Object>> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql);
1636 1674  
1637 1675 List<Map<String,Object>> results = new ArrayList<>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 065557a
... ... @@ -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  
... ... @@ -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 }
2160 2165  
... ... @@ -2165,11 +2170,11 @@
2165 2170 if (result.getJingMai() != null) {
2166 2171 String zuo = result.getJingMaiZuo()==null ? "" :result.getJingMaiZuo();
2167 2172 String you = result.getJingMaiYou()==null ? "" :result.getJingMaiYou();
2168   - if (result.getJingMai() == 1)
  2173 + if (result.getJingMai() == 2)
2169 2174 {
2170 2175 jingMai = "无";
2171 2176 }
2172   - else if (result.getJingMai() == 2)
  2177 + else if (result.getJingMai() == 1)
2173 2178 {
2174 2179 jingMai = "有"+"(左 "+zuo + "/右 "+you+")";
2175 2180 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 065557a
... ... @@ -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 @ 065557a
... ... @@ -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 @ 065557a
... ... @@ -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