jiangjiazhi / regional-platform

Commit 1ea1c9589f9653c349af79839d0823e2b2cdd619

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

初诊添加字段

Showing 3 changed files with 178 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java

...	...	@@ -342,6 +342,27 @@
342	342	private String xqjq;
343	343	// 血尿素氮
344	344	private String xnsd;
	345	+
	346	+
	347	+ // 乙肝表面抗原
	348	+ private String ygbmkyValue;
	349	+ //乙肝表面抗体
	350	+ private String ygbmktValue;
	351	+ //乙肝e抗原
	352	+ private String ygekyValue;
	353	+ // 乙肝e抗体
	354	+ private String ygektValue;
	355	+ // 乙肝核心抗体
	356	+ private String yghxktValue;
	357	+
	358	+
	359	+ //hit抗体检测
	360	+ private String hivktValue;
	361	+
	362	+ //实验结果
	363	+ private String syjgValue;
	364	+
	365	+
345	366	// 梅毒血清实验
346	367	// private String mdxqsy;
347	368	// hit抗体检测
...	...	@@ -1808,6 +1829,62 @@
1808	1829
1809	1830	public void setLastMenses(Date lastMenses) {
1810	1831	this.lastMenses = lastMenses;
	1832	+ }
	1833	+
	1834	+ public String getYgbmkyValue() {
	1835	+ return ygbmkyValue;
	1836	+ }
	1837	+
	1838	+ public void setYgbmkyValue(String ygbmkyValue) {
	1839	+ this.ygbmkyValue = ygbmkyValue;
	1840	+ }
	1841	+
	1842	+ public String getYgbmktValue() {
	1843	+ return ygbmktValue;
	1844	+ }
	1845	+
	1846	+ public void setYgbmktValue(String ygbmktValue) {
	1847	+ this.ygbmktValue = ygbmktValue;
	1848	+ }
	1849	+
	1850	+ public String getYgekyValue() {
	1851	+ return ygekyValue;
	1852	+ }
	1853	+
	1854	+ public void setYgekyValue(String ygekyValue) {
	1855	+ this.ygekyValue = ygekyValue;
	1856	+ }
	1857	+
	1858	+ public String getYgektValue() {
	1859	+ return ygektValue;
	1860	+ }
	1861	+
	1862	+ public void setYgektValue(String ygektValue) {
	1863	+ this.ygektValue = ygektValue;
	1864	+ }
	1865	+
	1866	+ public String getYghxktValue() {
	1867	+ return yghxktValue;
	1868	+ }
	1869	+
	1870	+ public void setYghxktValue(String yghxktValue) {
	1871	+ this.yghxktValue = yghxktValue;
	1872	+ }
	1873	+
	1874	+ public String getHivktValue() {
	1875	+ return hivktValue;
	1876	+ }
	1877	+
	1878	+ public void setHivktValue(String hivktValue) {
	1879	+ this.hivktValue = hivktValue;
	1880	+ }
	1881	+
	1882	+ public String getSyjgValue() {
	1883	+ return syjgValue;
	1884	+ }
	1885	+
	1886	+ public void setSyjgValue(String syjgValue) {
	1887	+ this.syjgValue = syjgValue;
1811	1888	}
1812	1889	}

...	...	@@ -1922,6 +1922,18 @@
1922	1922	map.put("ygekt", FunvCommonUtil.checkYiGan(data.getYgekt()));
1923	1923	map.put("yghxkt", FunvCommonUtil.checkYiGan(data.getYghxkt()));
1924	1924
	1925	+
	1926	+
	1927	+ map.put("ygbmkyValue", data.getYgbmkyValue() == null ? "" : data.getYgbmkyValue());
	1928	+ map.put("ygbmktValue", data.getYgbmktValue() == null ? "" : data.getYgbmktValue());
	1929	+ map.put("ygekyValue", data.getYgekyValue() == null ? "" : data.getYgekyValue());
	1930	+ map.put("ygektValue", data.getYgektValue() == null ? "" : data.getYgektValue());
	1931	+ map.put("yghxktValue", data.getYghxktValue() == null ? "" : data.getYghxktValue());
	1932	+
	1933	+
	1934	+ map.put("syjgValue", data.getSyjgValue() == null ? "" : data.getSyjgValue());
	1935	+ map.put("hivktValue", data.getHivktValue() == null ? "" :data.getHivktValue());
	1936	+
1925	1937	map.put("xqjq", UnitUtils.unitSplice(data.getXqjq(), UnitConstants.UMOLL));
1926	1938	map.put("xnsd", UnitUtils.unitSplice(data.getXnsd(), UnitConstants.MMOLL));
1927	1939

...	...	@@ -248,6 +248,21 @@
248	248	private String ygekt;
249	249	// 乙肝核心抗体
250	250	private String yghxkt;
	251	+
	252	+
	253	+
	254	+ // 乙肝表面抗原
	255	+ private String ygbmkyValue;
	256	+ //乙肝表面抗体
	257	+ private String ygbmktValue;
	258	+ //乙肝e抗原
	259	+ private String ygekyValue;
	260	+ // 乙肝e抗体
	261	+ private String ygektValue;
	262	+ // 乙肝核心抗体
	263	+ private String yghxktValue;
	264	+
	265	+
251	266	//血清肌
252	267	private String xqjq;
253	268	//血尿素氮
...	...	@@ -256,6 +271,13 @@
256	271	private String mdxqsy;
257	272	//hit抗体检测
258	273	private String hivkt;
	274	+
	275	+ //hit抗体检测
	276	+ private String hivktValue;
	277	+
	278	+ //实验结果
	279	+ private String syjgValue;
	280	+
259	281	//阴道分泌物
260	282	private Map ydfmw;
261	283	//阴道清洁度
...	...	@@ -1852,6 +1874,62 @@
1852	1874	this.pid = pid;
1853	1875	}
1854	1876
	1877	+ public String getYgbmkyValue() {
	1878	+ return ygbmkyValue;
	1879	+ }
	1880	+
	1881	+ public void setYgbmkyValue(String ygbmkyValue) {
	1882	+ this.ygbmkyValue = ygbmkyValue;
	1883	+ }
	1884	+
	1885	+ public String getYgbmktValue() {
	1886	+ return ygbmktValue;
	1887	+ }
	1888	+
	1889	+ public void setYgbmktValue(String ygbmktValue) {
	1890	+ this.ygbmktValue = ygbmktValue;
	1891	+ }
	1892	+
	1893	+ public String getYgekyValue() {
	1894	+ return ygekyValue;
	1895	+ }
	1896	+
	1897	+ public void setYgekyValue(String ygekyValue) {
	1898	+ this.ygekyValue = ygekyValue;
	1899	+ }
	1900	+
	1901	+ public String getYgektValue() {
	1902	+ return ygektValue;
	1903	+ }
	1904	+
	1905	+ public void setYgektValue(String ygektValue) {
	1906	+ this.ygektValue = ygektValue;
	1907	+ }
	1908	+
	1909	+ public String getYghxktValue() {
	1910	+ return yghxktValue;
	1911	+ }
	1912	+
	1913	+ public void setYghxktValue(String yghxktValue) {
	1914	+ this.yghxktValue = yghxktValue;
	1915	+ }
	1916	+
	1917	+ public String getHivktValue() {
	1918	+ return hivktValue;
	1919	+ }
	1920	+
	1921	+ public void setHivktValue(String hivktValue) {
	1922	+ this.hivktValue = hivktValue;
	1923	+ }
	1924	+
	1925	+ public String getSyjgValue() {
	1926	+ return syjgValue;
	1927	+ }
	1928	+
	1929	+ public void setSyjgValue(String syjgValue) {
	1930	+ this.syjgValue = syjgValue;
	1931	+ }
	1932	+
1855	1933	@Override
1856	1934	public AntExChuModel convertToDataModel() {
1857	1935	AntExChuModel antExChuModel = new AntExChuModel();
...	...	@@ -1960,6 +2038,13 @@
1960	2038	antExChuModel.setYgeky(ygeky);
1961	2039	antExChuModel.setYgekt(ygekt);
1962	2040	antExChuModel.setYghxkt(yghxkt);
	2041	+
	2042	+ antExChuModel.setYgbmkyValue(ygbmkyValue);
	2043	+ antExChuModel.setYgbmktValue(ygbmktValue);
	2044	+ antExChuModel.setYgekyValue(ygekyValue);
	2045	+ antExChuModel.setYgektValue(ygektValue);
	2046	+ antExChuModel.setYghxktValue(yghxktValue);
	2047	+
1963	2048	antExChuModel.setXqjq(xqjq);
1964	2049	antExChuModel.setXnsd(xnsd);
1965	2050	antExChuModel.setHeart(heart);
...	...	@@ -1974,6 +2059,10 @@
1974	2059	}
1975	2060	// antExChuModel.setMdxqsy(mdxqsy);
1976	2061	antExChuModel.setHivkt(hivkt);
	2062	+
	2063	+ antExChuModel.setHivktValue(hivktValue);
	2064	+ antExChuModel.setSyjgValue(syjgValue);
	2065	+
1977	2066	antExChuModel.setYdfmw(JsonUtil.obj2JsonString(ydfmw));
1978	2067	antExChuModel.setYdqjd(ydqjd);
1979	2068	antExChuModel.setPregnancyTimes(pregnancyTimes);