jiangjiazhi / regional-platform

Download as
Browse Code »

Commit be1932398aa20a722ea65d83b8cb1aa834d6ac2b

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

update

Showing 8 changed files with 566 additions and 10 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java View file @ be19323
... ... @@ -25,6 +25,21 @@
25 25  
26 26 private String bim;
27 27 private String testName;
  28 + private String month; //实际月龄
  29 + private String ddz; //大动作
  30 + private String sxdz; //数细动作
  31 + private String rs; //认识
  32 + private String yy;// 言语
  33 + private String sqxw;// 社区行为
  34 + private String slpj; //商力平均值
  35 +
  36 + private String xlddz; //大动作(心理月龄)
  37 + private String xlsxdz; //数细动作(心理月龄)
  38 + private String xlrs; //认识(心理月龄)
  39 + private String xlyy;// 言语(心理月龄)
  40 + private String xlsqxw;// 社区行为(心理月龄)
  41 + private String xlpj; //心里平均值(心理月龄)
  42 +
28 43 private Integer yn;
29 44  
30 45 private String buildId;
... ... @@ -1859,6 +1874,72 @@
1859 1874 this.hematuria = hematuria;
1860 1875 }
1861 1876  
  1877 + public String getMonth() {
  1878 + return month;
  1879 + }
  1880 +
  1881 + public void setMonth(String month) {
  1882 + this.month = month;
  1883 + }
  1884 +
  1885 +
  1886 +
  1887 + public String getDdz() {
  1888 + return ddz;
  1889 + }
  1890 +
  1891 + public void setDdz(String ddz) {
  1892 + this.ddz = ddz;
  1893 + }
  1894 +
  1895 + public String getSxdz() {
  1896 + return sxdz;
  1897 + }
  1898 +
  1899 + public void setSxdz(String sxdz) {
  1900 + this.sxdz = sxdz;
  1901 + }
  1902 +
  1903 + public String getRs() {
  1904 + return rs;
  1905 + }
  1906 +
  1907 + public void setRs(String rs) {
  1908 + this.rs = rs;
  1909 + }
  1910 +
  1911 + public String getYy() {
  1912 + return yy;
  1913 + }
  1914 +
  1915 + public void setYy(String yy) {
  1916 + this.yy = yy;
  1917 + }
  1918 +
  1919 + public String getSqxw() {
  1920 + return sqxw;
  1921 + }
  1922 +
  1923 + public void setSqxw(String sqxw) {
  1924 + this.sqxw = sqxw;
  1925 + }
  1926 +
  1927 + public String getXlpj() {
  1928 + return xlpj;
  1929 + }
  1930 +
  1931 + public void setXlpj(String xlpj) {
  1932 + this.xlpj = xlpj;
  1933 + }
  1934 +
  1935 + public String getSlpj() {
  1936 + return slpj;
  1937 + }
  1938 +
  1939 + public void setSlpj(String slpj) {
  1940 + this.slpj = slpj;
  1941 + }
  1942 +
1862 1943 public String getOtherUrine() {
1863 1944 return otherUrine;
1864 1945 }
... ... @@ -1889,6 +1970,46 @@
1889 1970  
1890 1971 public void setCheckDate(Date checkDate) {
1891 1972 this.checkDate = checkDate;
  1973 + }
  1974 +
  1975 + public String getXlddz() {
  1976 + return xlddz;
  1977 + }
  1978 +
  1979 + public void setXlddz(String xlddz) {
  1980 + this.xlddz = xlddz;
  1981 + }
  1982 +
  1983 + public String getXlsxdz() {
  1984 + return xlsxdz;
  1985 + }
  1986 +
  1987 + public void setXlsxdz(String xlsxdz) {
  1988 + this.xlsxdz = xlsxdz;
  1989 + }
  1990 +
  1991 + public String getXlrs() {
  1992 + return xlrs;
  1993 + }
  1994 +
  1995 + public void setXlrs(String xlrs) {
  1996 + this.xlrs = xlrs;
  1997 + }
  1998 +
  1999 + public String getXlyy() {
  2000 + return xlyy;
  2001 + }
  2002 +
  2003 + public void setXlyy(String xlyy) {
  2004 + this.xlyy = xlyy;
  2005 + }
  2006 +
  2007 + public String getXlsqxw() {
  2008 + return xlsqxw;
  2009 + }
  2010 +
  2011 + public void setXlsqxw(String xlsqxw) {
  2012 + this.xlsqxw = xlsqxw;
1892 2013 }
1893 2014  
1894 2015 public String getBuildId() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ be19323
... ... @@ -222,6 +222,21 @@
222 222 model.setWeightEvaluateStandard(request.getWeightEvaluateStandard());
223 223 model.setBim(request.getBim());
224 224 model.setTestName(request.getTestName());
  225 +
  226 + model.setMonth(request.getMonth());
  227 + model.setDdz(request.getDdz());
  228 + model.setSxdz(request.getSxdz());
  229 + model.setRs(request.getRs());
  230 + model.setYy(request.getYy());
  231 + model.setSqxw(request.getSqxw());
  232 + model.setSlpj(request.getSlpj());
  233 +
  234 + model.setXlddz(request.getXlddz());
  235 + model.setXlsxdz(request.getXlsxdz());
  236 + model.setXlrs(request.getXlrs());
  237 + model.setXlyy(request.getXlyy());
  238 + model.setXlpj(request.getXlpj());
  239 +
225 240 //结案
226 241 /*model.setEndCase(request.getEndCase());
227 242 //表示选中结案
... ... @@ -1468,6 +1483,18 @@
1468 1483 result.setId(model.getId());
1469 1484 result.setPid(model.getPid());
1470 1485 result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
  1486 + Integer days = DateUtil.getDays(model.getBirth(), new Date());
  1487 + Double tureMonthAge= 0.0;
  1488 + if(days!=null){
  1489 + Double aDouble = Double.valueOf(days.toString());
  1490 + aDouble = aDouble / 3;
  1491 + if(aDouble.toString().contains(".")){
  1492 + String substring = aDouble.toString().substring(0, aDouble.toString().indexOf(".") + 2);
  1493 + result.setTureMonthAge(substring);
  1494 + }
  1495 + }
  1496 +// tureMonthAge = Math.ceil(aDouble);
  1497 +// result.setTureMonthAge(tureMonthAge.toString());
1471 1498 result.setGender(SexEnum.getTextById(model.getSex()));
1472 1499 result.setName(model.getName());
1473 1500 result.setBirth(DateUtil.getyyyy_MM_dd(model.getBirth()));
... ... @@ -1604,6 +1631,22 @@
1604 1631 /*秦皇岛儿保检查使用*/
1605 1632 model.setBim(checkModel.getBim());
1606 1633 model.setTestName(checkModel.getTestName());
  1634 +
  1635 + model.setMonth(checkModel.getMonth());
  1636 + model.setDdz(checkModel.getDdz());
  1637 + model.setSxdz(checkModel.getSxdz());
  1638 + model.setRs(checkModel.getRs());
  1639 + model.setYy(checkModel.getYy());
  1640 + model.setSqxw(checkModel.getSqxw());
  1641 + model.setSlpj(checkModel.getSlpj());
  1642 +
  1643 + model.setXlddz(checkModel.getXlddz());
  1644 + model.setXlsxdz(checkModel.getXlsxdz());
  1645 + model.setXlrs(checkModel.getXlrs());
  1646 + model.setXlyy(checkModel.getXlyy());
  1647 + model.setXlpj(checkModel.getXlpj());
  1648 + model.setXlsqxw(checkModel.getXlsqxw());
  1649 +
1607 1650 model.setExercise(checkModel.getExercise());
1608 1651 model.setLanguage(checkModel.getLanguage());
1609 1652 model.setSocialContact(checkModel.getSocialContact());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ be19323
... ... @@ -5255,6 +5255,23 @@
5255 5255 /*秦皇岛儿保检查使用*/
5256 5256 model.setBim(checkModel.getBim());
5257 5257 model.setTestName(checkModel.getTestName());
  5258 +
  5259 + model.setMonth(checkModel.getMonth());
  5260 + model.setDdz(checkModel.getDdz());
  5261 + model.setSxdz(checkModel.getSxdz());
  5262 + model.setRs(checkModel.getRs());
  5263 + model.setYy(checkModel.getYy());
  5264 + model.setSqxw(checkModel.getSqxw());
  5265 + model.setSlpj(checkModel.getSlpj());
  5266 +
  5267 + model.setXlddz(checkModel.getXlddz());
  5268 + model.setXlsxdz(checkModel.getXlsxdz());
  5269 + model.setXlrs(checkModel.getXlrs());
  5270 + model.setXlyy(checkModel.getXlyy());
  5271 + model.setXlpj(checkModel.getXlpj());
  5272 + model.setXlsqxw(checkModel.getXlsqxw());
  5273 +
  5274 +
5258 5275 model.setExercise(checkModel.getExercise());
5259 5276 model.setLanguage(checkModel.getLanguage());
5260 5277 model.setSocialContact(checkModel.getSocialContact());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java View file @ be19323
... ... @@ -27,6 +27,22 @@
27 27 private String mainFoster;
28 28 private String bim;
29 29 private String testName;
  30 + private String month; //实际月龄
  31 +
  32 + private String ddz; //大动作
  33 + private String sxdz; //数细动作
  34 + private String rs; //认识
  35 + private String yy;// 言语
  36 + private String sqxw;// 社区行为
  37 + private String slpj; //商力平均值
  38 +
  39 + private String xlddz; //大动作(心理月龄)
  40 + private String xlsxdz; //数细动作(心理月龄)
  41 + private String xlrs; //认识(心理月龄)
  42 + private String xlyy;// 言语(心理月龄)
  43 + private String xlsqxw;// 社区行为(心理月龄)
  44 + private String xlpj; //心里平均值(心理月龄)
  45 +
30 46 //喂养方式
31 47 private String feedType;
32 48 //小便
... ... @@ -712,10 +728,6 @@
712 728 return assistFood;
713 729 }
714 730  
715   - public void setAssistFood(Map assistFood) {
716   - this.assistFood = assistFood;
717   - }
718   -
719 731 public String getCyNum() {
720 732 return cyNum;
721 733 }
... ... @@ -1869,6 +1881,115 @@
1869 1881  
1870 1882 public void setTestName(String testName) {
1871 1883 this.testName = testName;
  1884 + }
  1885 + public String getMonth() {
  1886 + return month;
  1887 + }
  1888 +
  1889 + public void setMonth(String month) {
  1890 + this.month = month;
  1891 + }
  1892 +
  1893 +
  1894 +
  1895 + public String getDdz() {
  1896 + return ddz;
  1897 + }
  1898 +
  1899 + public void setDdz(String ddz) {
  1900 + this.ddz = ddz;
  1901 + }
  1902 +
  1903 + public String getSxdz() {
  1904 + return sxdz;
  1905 + }
  1906 +
  1907 + public void setSxdz(String sxdz) {
  1908 + this.sxdz = sxdz;
  1909 + }
  1910 +
  1911 + public String getRs() {
  1912 + return rs;
  1913 + }
  1914 +
  1915 + public void setRs(String rs) {
  1916 + this.rs = rs;
  1917 + }
  1918 +
  1919 + public String getYy() {
  1920 + return yy;
  1921 + }
  1922 +
  1923 + public void setYy(String yy) {
  1924 + this.yy = yy;
  1925 + }
  1926 +
  1927 + public String getSqxw() {
  1928 + return sqxw;
  1929 + }
  1930 +
  1931 + public void setSqxw(String sqxw) {
  1932 + this.sqxw = sqxw;
  1933 + }
  1934 +
  1935 + public String getXlpj() {
  1936 + return xlpj;
  1937 + }
  1938 +
  1939 + public void setXlpj(String xlpj) {
  1940 + this.xlpj = xlpj;
  1941 + }
  1942 +
  1943 + public String getSlpj() {
  1944 + return slpj;
  1945 + }
  1946 +
  1947 + public String getXlddz() {
  1948 + return xlddz;
  1949 + }
  1950 +
  1951 + public void setXlddz(String xlddz) {
  1952 + this.xlddz = xlddz;
  1953 + }
  1954 +
  1955 + public String getXlsxdz() {
  1956 + return xlsxdz;
  1957 + }
  1958 +
  1959 + public void setXlsxdz(String xlsxdz) {
  1960 + this.xlsxdz = xlsxdz;
  1961 + }
  1962 +
  1963 + public String getXlrs() {
  1964 + return xlrs;
  1965 + }
  1966 +
  1967 + public void setXlrs(String xlrs) {
  1968 + this.xlrs = xlrs;
  1969 + }
  1970 +
  1971 + public String getXlyy() {
  1972 + return xlyy;
  1973 + }
  1974 +
  1975 + public void setXlyy(String xlyy) {
  1976 + this.xlyy = xlyy;
  1977 + }
  1978 +
  1979 + public String getXlsqxw() {
  1980 + return xlsqxw;
  1981 + }
  1982 +
  1983 + public void setXlsqxw(String xlsqxw) {
  1984 + this.xlsqxw = xlsqxw;
  1985 + }
  1986 +
  1987 + public void setAssistFood(Map<String, String> assistFood) {
  1988 + this.assistFood = assistFood;
  1989 + }
  1990 +
  1991 + public void setSlpj(String slpj) {
  1992 + this.slpj = slpj;
1872 1993 }
1873 1994 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java View file @ be19323
... ... @@ -11,6 +11,133 @@
11 11 /*秦皇岛修改的儿保检查内容*/
12 12 private String bim;
13 13 private String testName;
  14 + private String month; //实际月龄
  15 + private String xlvalue; //心理月龄
  16 + private String ddz; //大动作
  17 + private String sxdz; //数细动作
  18 + private String rs; //认识
  19 + private String yy;// 言语
  20 + private String sqxw;// 社区行为
  21 + private String xlpj; //心里平均值
  22 + private String slpj; //商力平均值
  23 + private String xlddz; //大动作(心理月龄)
  24 + private String xlsxdz; //数细动作(心理月龄)
  25 + private String xlrs; //认识(心理月龄)
  26 + private String xlyy;// 言语(心理月龄)
  27 + private String xlsqxw;// 社区行为(心理月龄)
  28 +
  29 + public String getXlddz() {
  30 + return xlddz;
  31 + }
  32 +
  33 + public void setXlddz(String xlddz) {
  34 + this.xlddz = xlddz;
  35 + }
  36 +
  37 + public String getXlsxdz() {
  38 + return xlsxdz;
  39 + }
  40 +
  41 + public void setXlsxdz(String xlsxdz) {
  42 + this.xlsxdz = xlsxdz;
  43 + }
  44 +
  45 + public String getXlrs() {
  46 + return xlrs;
  47 + }
  48 +
  49 + public void setXlrs(String xlrs) {
  50 + this.xlrs = xlrs;
  51 + }
  52 +
  53 + public String getXlyy() {
  54 + return xlyy;
  55 + }
  56 +
  57 + public void setXlyy(String xlyy) {
  58 + this.xlyy = xlyy;
  59 + }
  60 +
  61 + public String getXlsqxw() {
  62 + return xlsqxw;
  63 + }
  64 +
  65 + public void setXlsqxw(String xlsqxw) {
  66 + this.xlsqxw = xlsqxw;
  67 + }
  68 +
  69 + public String getMonth() {
  70 + return month;
  71 + }
  72 +
  73 + public void setMonth(String month) {
  74 + this.month = month;
  75 + }
  76 +
  77 + public String getXlvalue() {
  78 + return xlvalue;
  79 + }
  80 +
  81 + public void setXlvalue(String xlvalue) {
  82 + this.xlvalue = xlvalue;
  83 + }
  84 +
  85 + public String getDdz() {
  86 + return ddz;
  87 + }
  88 +
  89 + public void setDdz(String ddz) {
  90 + this.ddz = ddz;
  91 + }
  92 +
  93 + public String getSxdz() {
  94 + return sxdz;
  95 + }
  96 +
  97 + public void setSxdz(String sxdz) {
  98 + this.sxdz = sxdz;
  99 + }
  100 +
  101 + public String getRs() {
  102 + return rs;
  103 + }
  104 +
  105 + public void setRs(String rs) {
  106 + this.rs = rs;
  107 + }
  108 +
  109 + public String getYy() {
  110 + return yy;
  111 + }
  112 +
  113 + public void setYy(String yy) {
  114 + this.yy = yy;
  115 + }
  116 +
  117 + public String getSqxw() {
  118 + return sqxw;
  119 + }
  120 +
  121 + public void setSqxw(String sqxw) {
  122 + this.sqxw = sqxw;
  123 + }
  124 +
  125 + public String getXlpj() {
  126 + return xlpj;
  127 + }
  128 +
  129 + public void setXlpj(String xlpj) {
  130 + this.xlpj = xlpj;
  131 + }
  132 +
  133 + public String getSlpj() {
  134 + return slpj;
  135 + }
  136 +
  137 + public void setSlpj(String slpj) {
  138 + this.slpj = slpj;
  139 + }
  140 +
14 141 //运动
15 142 private String exercise ;
16 143 //语言
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java View file @ be19323
... ... @@ -10,6 +10,124 @@
10 10 private String id;
11 11 private String bim;
12 12 private String testName;
  13 + private String month; //实际月龄
  14 + private String ddz; //大动作
  15 + private String sxdz; //数细动作
  16 + private String rs; //认识
  17 + private String yy;// 言语
  18 + private String sqxw;// 社区行为
  19 + private String xlpj; //心里平均值
  20 + private String slpj; //商力平均值
  21 + private String xlddz; //大动作(心理月龄)
  22 + private String xlsxdz; //数细动作(心理月龄)
  23 + private String xlrs; //认识(心理月龄)
  24 + private String xlyy;// 言语(心理月龄)
  25 + private String xlsqxw;// 社区行为(心理月龄)
  26 +
  27 + public String getXlddz() {
  28 + return xlddz;
  29 + }
  30 +
  31 + public void setXlddz(String xlddz) {
  32 + this.xlddz = xlddz;
  33 + }
  34 +
  35 + public String getXlsxdz() {
  36 + return xlsxdz;
  37 + }
  38 +
  39 + public void setXlsxdz(String xlsxdz) {
  40 + this.xlsxdz = xlsxdz;
  41 + }
  42 +
  43 + public String getXlrs() {
  44 + return xlrs;
  45 + }
  46 +
  47 + public void setXlrs(String xlrs) {
  48 + this.xlrs = xlrs;
  49 + }
  50 +
  51 + public String getXlyy() {
  52 + return xlyy;
  53 + }
  54 +
  55 + public void setXlyy(String xlyy) {
  56 + this.xlyy = xlyy;
  57 + }
  58 +
  59 + public String getXlsqxw() {
  60 + return xlsqxw;
  61 + }
  62 +
  63 + public void setXlsqxw(String xlsqxw) {
  64 + this.xlsqxw = xlsqxw;
  65 + }
  66 +
  67 + public String getMonth() {
  68 + return month;
  69 + }
  70 +
  71 + public void setMonth(String month) {
  72 + this.month = month;
  73 + }
  74 +
  75 +
  76 + public String getDdz() {
  77 + return ddz;
  78 + }
  79 +
  80 + public void setDdz(String ddz) {
  81 + this.ddz = ddz;
  82 + }
  83 +
  84 + public String getSxdz() {
  85 + return sxdz;
  86 + }
  87 +
  88 + public void setSxdz(String sxdz) {
  89 + this.sxdz = sxdz;
  90 + }
  91 +
  92 + public String getRs() {
  93 + return rs;
  94 + }
  95 +
  96 + public void setRs(String rs) {
  97 + this.rs = rs;
  98 + }
  99 +
  100 + public String getYy() {
  101 + return yy;
  102 + }
  103 +
  104 + public void setYy(String yy) {
  105 + this.yy = yy;
  106 + }
  107 +
  108 + public String getSqxw() {
  109 + return sqxw;
  110 + }
  111 +
  112 + public void setSqxw(String sqxw) {
  113 + this.sqxw = sqxw;
  114 + }
  115 +
  116 + public String getXlpj() {
  117 + return xlpj;
  118 + }
  119 +
  120 + public void setXlpj(String xlpj) {
  121 + this.xlpj = xlpj;
  122 + }
  123 +
  124 + public String getSlpj() {
  125 + return slpj;
  126 + }
  127 +
  128 + public void setSlpj(String slpj) {
  129 + this.slpj = slpj;
  130 + }
13 131  
14 132 //运动
15 133 private String exercise ;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java View file @ be19323
... ... @@ -9,10 +9,19 @@
9 9 private String birth;
10 10 private String gender;
11 11 private String monthAge;
  12 + private String tureMonthAge;
12 13 private String pid;
13 14 private String hospitalId;
14 15 private String hospitalName;
15 16 private String blNo;
  17 +
  18 + public String getTureMonthAge() {
  19 + return tureMonthAge;
  20 + }
  21 +
  22 + public void setTureMonthAge(String tureMonthAge) {
  23 + this.tureMonthAge = tureMonthAge;
  24 + }
16 25  
17 26 public String getBlNo() {
18 27 return blNo;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ be19323
... ... @@ -346,12 +346,12 @@
346 346 *
347 347 * @param month 实际月龄
348 348 * @param xlvalue 心理月龄
349   - * @param ddz
350   - * @param sxdz
351   - * @param rs
352   - * @param yy
353   - * @param sqxw
354   - * @param type 1大动作,2数细动作 3认识 4言语 5社区行为 6平均值
  349 + * @param ddz 大动作
  350 + * @param sxdz 数细动作
  351 + * @param rs 认识
  352 + * @param yy 言语
  353 + * @param sqxw 社区行为
  354 + * @param type 6平均值
355 355 * @Author: 武涛涛
356 356 * @Date: 2020/7/31 13:16
357 357 */