jiangjiazhi / regional-platform

Commit d8cb7a63086daeba29a96172a09e8d77fc0d68a9

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

update code

Showing 3 changed files with 355 additions and 70 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.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/utils/FunvCommonUtil.java

...	...	@@ -8,6 +8,7 @@
8	8	import com.lyms.platform.pojo.Patients;
9	9	import com.lyms.platform.query.*;
10	10	import org.apache.commons.lang.*;
	11	+import org.apache.commons.lang.StringUtils;
11	12	import org.apache.commons.lang.math.*;
12	13	import org.springframework.context.ApplicationContext;
13	14	import org.springframework.context.support.ClassPathXmlApplicationContext;
14	15
15	16
16	17
...	...	@@ -41,38 +42,61 @@
41	42	// System.out.print("5878388d0cf235c11f845399".length());
42	43
43	44
44		- String str = "{\"yesOrNo\":\"yes\",\"26cac65c-a040-4898-b7da-8deed3ba0ec3\":{\"checkBox\":true,\"proName\":\"循环系统类\",\"selected\":[\"6c46f0c0-97f1-4b72-a11c-98eacfff9a8f\",\"3beb4592-0fda-4041-b148-97d315fccb94\",\"87f35a26-379d-4a05-8ab8-01e634835474\",\"17e9c0ff-92e6-4f48-9f02-264711a8689d\",\"fd51e86b-d3ef-4b38-9dc3-174cf5431855\",\"f14e3084-2ad5-4e25-a634-196e96949ef3\",\"f9acf716-50b0-4b45-bebc-9d21983c616f\",\"31f9dcd6-d7f0-42b5-bd7d-72dd7fe3b01a\",\"322ad477-8130-46d0-a67c-de1b4dc9c640\",\"e7582017-b94c-46ed-b7fd-e36c747da13a\",\"04f8bb8b-f074-41bc-8f41-d3bedb65874b\"]},\"57e4bedbf0f0baa1bee496cd\":{\"checkBox\":true,\"proName\":\"其他\",\"selected\":\"其他既往史\"}}";
	45	+ System.out.println("abacb".indexOf(","));
	46	+ System.out.println("abacb".substring(0,"abacb".indexOf(",")));
45	47
46		- //既往史
47		- String pastHistory = "";
48		- if (org.apache.commons.lang.StringUtils.isNotEmpty(str))
49		- {
50		- Map map = JsonUtil.str2Obj(str, Map.class);
51		- String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString();
52		- if ("no".equals(yesOrNo))
53		- {
54		- pastHistory = "无";
55		- }
56		- else if ("yes".equals(yesOrNo))
57		- {
58		-
59		- for(Object key : map.keySet())
60		- {
61		- Object obj = map.get(key);
62		- if (obj != null && !"yes".equals(obj.toString()))
63		- {
64		- System.out.println(obj.toString());
65		-// Map itemMap = JsonUtil.str2Obj(obj.toString(), Map.class);
66		-// if (itemMap != null && itemMap.size() > 0)
	48	+// String str = "{\"yesOrNo\":\"yes\",\"26cac65c-a040-4898-b7da-8deed3ba0ec3\":{\"checkBox\":true,\"proName\":\"循环系统类\",\"selected\":[\"6c46f0c0-97f1-4b72-a11c-98eacfff9a8f\",\"3beb4592-0fda-4041-b148-97d315fccb94\",\"87f35a26-379d-4a05-8ab8-01e634835474\",\"17e9c0ff-92e6-4f48-9f02-264711a8689d\",\"fd51e86b-d3ef-4b38-9dc3-174cf5431855\",\"f14e3084-2ad5-4e25-a634-196e96949ef3\",\"f9acf716-50b0-4b45-bebc-9d21983c616f\",\"31f9dcd6-d7f0-42b5-bd7d-72dd7fe3b01a\",\"322ad477-8130-46d0-a67c-de1b4dc9c640\",\"e7582017-b94c-46ed-b7fd-e36c747da13a\",\"04f8bb8b-f074-41bc-8f41-d3bedb65874b\"]},\"57e4bedbf0f0baa1bee496cd\":{\"checkBox\":true,\"proName\":\"其他\",\"selected\":\"其他既往史\"}}";
	49	+//
	50	+// //既往史
	51	+// String pastHistory = "";
	52	+// if (org.apache.commons.lang.StringUtils.isNotEmpty(str))
	53	+// {
	54	+// Map map = JsonUtil.jkstr2Obj(str, Map.class);
	55	+// String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString();
	56	+// if ("no".equals(yesOrNo))
	57	+// {
	58	+// pastHistory = "无";
	59	+// }
	60	+// else if ("yes".equals(yesOrNo))
	61	+// {
	62	+//
	63	+// for(Object key : map.keySet())
	64	+// {
	65	+// Object obj = map.get(key);
	66	+// if (obj != null && !"yes".equals(obj.toString()))
	67	+// {
	68	+// String item = obj.toString().substring(1).substring(0,obj.toString().length()-2);
	69	+// System.out.println(item);
	70	+// if (StringUtils.isNotEmpty(item))
67	71	// {
68		-// String proName = itemMap.get("proName") == null ? "" : itemMap.get("proName").toString();
69		-// String selected = itemMap.get("selected") == null ? "" : itemMap.get("selected").toString();
	72	+// if (item.contains("selected=[") && item.contains("]"))
	73	+// {
	74	+// String selecteds = item.substring(item.indexOf("[")+1,item.indexOf("]"));
	75	+// String[] items = selecteds.split(",");
	76	+// for (int i = 0,len = items.length; i < len;i++)
	77	+// {
	78	+// String selectedId = items[i].trim();
	79	+// }
	80	+// }
	81	+// else
	82	+// {
	83	+// String[] items = item.split(",");
	84	+// for (int i = 0,len = items.length; i < len;i++)
	85	+// {
	86	+// if (items[i].contains("selected="))
	87	+// {
	88	+// String otherSelected = items[i].substring(items[i].indexOf("selected="));
	89	+// otherSelected = otherSelected.substring(otherSelected.indexOf("=")+1);
	90	+// System.out.println(otherSelected);
	91	+// }
	92	+// }
	93	+// }
70	94	// }
71		- }
72		- }
73		- }
74		- }
75		- System.out.println(pastHistory);
	95	+// }
	96	+// }
	97	+// }
	98	+// }
	99	+
76	100	}
77	101	}

...	...	@@ -1882,29 +1882,31 @@
1882	1882	}
1883	1883	else if ("yes".equals(yesOrNo))
1884	1884	{
1885		- String qt = map.get("qt") == null ? "" : map.get("qt").toString();
1886		- if ("true".equals(qt))
1887		- {
1888		- String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString();
1889		- drugGllergic+=" "+qtText;
1890		- }
1891	1885
	1886	+
1892	1887	String qmsgm = map.get("qmsgm") == null ? "" : map.get("qmsgm").toString();
1893	1888	if ("true".equals(qmsgm))
1894	1889	{
1895		- drugGllergic+=" 青霉素过敏";
	1890	+ drugGllergic+=" 青霉素过敏,";
1896	1891	}
1897	1892	String halyw = map.get("halyw") == null ? "" : map.get("halyw").toString();
1898	1893	if ("true".equals(halyw))
1899	1894	{
1900		- drugGllergic+=" 磺胺类药物";
	1895	+ drugGllergic+=" 磺胺类药物,";
1901	1896	}
1902	1897	String xfmsgm = map.get("xfmsgm") == null ? "" : map.get("xfmsgm").toString();
1903	1898	if ("true".equals(xfmsgm))
1904	1899	{
1905		- drugGllergic+=" 先锋霉素过敏";
	1900	+ drugGllergic+=" 先锋霉素过敏,";
1906	1901	}
1907	1902
	1903	+ String qt = map.get("qt") == null ? "" : map.get("qt").toString();
	1904	+ if ("true".equals(qt))
	1905	+ {
	1906	+ String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString();
	1907	+ drugGllergic+=" "+qtText;
	1908	+ }
	1909	+ FunvCommonUtil.spitd(drugGllergic);
1908	1910	}
1909	1911	}
1910	1912
...	...	@@ -1927,7 +1929,7 @@
1927	1929	*/
1928	1930	public BaseObjectResponse getResidentsPageById(String id) {
1929	1931	BaseObjectResponse br = new BaseObjectResponse();
1930		- ResidentsArchiveResult result = new ResidentsArchiveResult();
	1932	+ ResidentsPageResult result = new ResidentsPageResult();
1931	1933
1932	1934	ResidentsArchiveQuery query = new ResidentsArchiveQuery();
1933	1935	query.setYn(YnEnums.YES.getId());
1934	1936
...	...	@@ -1946,10 +1948,10 @@
1946	1948	}
1947	1949
1948	1950
1949		- private ResidentsArchiveResult getResidentsPageResult(ResidentsArchiveModel model) {
	1951	+ private ResidentsPageResult getResidentsPageResult(ResidentsArchiveModel model) {
1950	1952	ResidentsPageResult result = new ResidentsPageResult();
1951	1953	result.setUsername(model.getUsername());
1952		- result.setSex(SexEnum.getTextById(Integer.valueOf(model.getSex())));
	1954	+ result.setSex(getBasicConfig(model.getSex()));
1953	1955	result.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirthday()));
1954	1956	result.setCountry(getBasicConfig(model.getCountryId()));
1955	1957	result.setNation(getBasicConfig(model.getNationId()));
...	...	@@ -1957,7 +1959,7 @@
1957	1959	result.setCertificateType(FunvCommonUtil.getBaseicConfigByid(model.getCertificateTypeId(), basicConfigService));
1958	1960	result.setCertificateNum(model.getCertificateNum());
1959	1961	result.setCensusType(FunvCommonUtil.getBaseicConfigByid(model.getLevelTypeId(), basicConfigService));
1960		- result.setLevelType(FunvCommonUtil.getBaseicConfigByid(model.getLiveTypeId(), basicConfigService));
	1962	+ result.setLiveType(FunvCommonUtil.getBaseicConfigByid(model.getLiveTypeId(), basicConfigService));
1961	1963	result.setLevelType(FunvCommonUtil.getBaseicConfigByid(model.getLevelTypeId(), basicConfigService));
1962	1964	result.setProfessionType(FunvCommonUtil.getBaseicConfigByid(model.getProfessionTypeId(), basicConfigService));
1963	1965	result.setAge(DateUtil.getAge(model.getBirthday(), new Date()));
1964	1966
1965	1967
...	...	@@ -1975,14 +1977,14 @@
1975	1977	result.setAddressRegister(addressRegister);
1976	1978	result.setLiveAddress(liveAddress);
1977	1979	//既往史
1978		- String pastHistory = "";
1979		- if (StringUtils.isNotEmpty(model.getPastHistory()))
	1980	+ StringBuffer pastHistory = new StringBuffer();
	1981	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(model.getPastHistory()))
1980	1982	{
1981		- Map map = JsonUtil.str2Obj(model.getPastHistory(), Map.class);
	1983	+ Map map = JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class);
1982	1984	String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString();
1983	1985	if ("no".equals(yesOrNo))
1984	1986	{
1985		- pastHistory = "无";
	1987	+ pastHistory.append("无");
1986	1988	}
1987	1989	else if ("yes".equals(yesOrNo))
1988	1990	{
1989	1991
1990	1992
1991	1993
1992	1994
1993	1995
1994	1996
1995	1997
...	...	@@ -1990,33 +1992,280 @@
1990	1992	for(Object key : map.keySet())
1991	1993	{
1992	1994	Object obj = map.get(key);
1993		- if (obj != null && !"yesOrNo".equals(obj.toString()))
	1995	+ if (obj != null && !"yes".equals(obj.toString()))
1994	1996	{
1995		- Map itemMap = JsonUtil.str2Obj(obj.toString(), Map.class);
1996		- if (itemMap != null && itemMap.size() > 0)
	1997	+
	1998	+ String title = getBasicConfig(key.toString());
	1999	+ pastHistory.append(title);
	2000	+ String item = obj.toString().substring(1).substring(0, obj.toString().length() - 2);
	2001	+ if (StringUtils.isNotEmpty(item))
1997	2002	{
1998		- String proName = itemMap.get("proName") == null ? "" : itemMap.get("proName").toString();
1999		- String selected = itemMap.get("selected") == null ? "" : itemMap.get("selected").toString();
	2003	+ if (item.contains("selected=[") && item.contains("]"))
	2004	+ {
	2005	+ String selecteds = item.substring(item.indexOf("[")+1,item.indexOf("]"));
	2006	+ String[] items = selecteds.split(",");
	2007	+ String temp = "";
	2008	+ if (items != null && items.length > 0)
	2009	+ {
	2010	+ temp += " (";
	2011	+ for (int i = 0,len = items.length; i < len;i++)
	2012	+ {
	2013	+ String selectedId = items[i].trim();
	2014	+ String value = getBasicConfig(selectedId);
	2015	+ if (i != len -1)
	2016	+ {
	2017	+ temp+=value+",";
	2018	+ }
	2019	+ else
	2020	+ {
	2021	+ temp+=value;
	2022	+ }
	2023	+ }
	2024	+ temp += " ),";
	2025	+
	2026	+ pastHistory.append(temp);
	2027	+ }
	2028	+
	2029	+ }
	2030	+ else
	2031	+ {
	2032	+ String[] items = item.split(",");
	2033	+ for (int i = 0,len = items.length; i < len;i++)
	2034	+ {
	2035	+ if (items[i].contains("selected="))
	2036	+ {
	2037	+ String otherSelected = items[i].substring(items[i].indexOf("selected="));
	2038	+ otherSelected = otherSelected.substring(otherSelected.indexOf("=")+1);
	2039	+ pastHistory.append(otherSelected);
	2040	+ }
	2041	+ }
	2042	+ }
2000	2043	}
2001	2044	}
2002	2045	}
2003	2046	}
2004	2047	}
	2048	+ result.setPastHistory(pastHistory.toString());
2005	2049
2006		- result.setPastHistory(pastHistory);
	2050	+ //家族史
	2051	+ String familyHistory = "";
	2052	+ if (StringUtils.isNotEmpty(model.getFamilyHistory()))
	2053	+ {
	2054	+ Map map = JsonUtil.str2Obj(model.getFamilyHistory(), Map.class);
	2055	+ String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString();
	2056	+ if ("no".equals(yesOrNo))
	2057	+ {
	2058	+ familyHistory = "无";
	2059	+ }
	2060	+ else if ("yes".equals(yesOrNo))
	2061	+ {
	2062	+ String qmsgm = map.get("ycxjbs") == null ? "" : map.get("ycxjbs").toString();
	2063	+ if ("true".equals(qmsgm))
	2064	+ {
	2065	+ familyHistory+=" 遗传性疾病史,";
	2066	+ }
	2067	+ String halyw = map.get("cel") == null ? "" : map.get("cel").toString();
	2068	+ if ("true".equals(halyw))
	2069	+ {
	2070	+ familyHistory+=" 唇腭裂,";
	2071	+ }
	2072	+ String xfmsgm = map.get("jh") == null ? "" : map.get("jh").toString();
	2073	+ if ("true".equals(xfmsgm))
	2074	+ {
	2075	+ familyHistory+=" 结核,";
	2076	+ }
2007	2077
	2078	+ String jsjbs = map.get("jsjbs") == null ? "" : map.get("jsjbs").toString();
	2079	+ if ("true".equals(jsjbs))
	2080	+ {
	2081	+ familyHistory+=" 精神疾病史,";
	2082	+ }
2008	2083
2009		-// //既往史
2010		-// private String pastHistory;
2011		-// //家族史
2012		-// private String familyHistory;
2013		-// //个人史
2014		-// private String personalHistory;
2015		-// //药物过敏史
2016		-// private String ywgmHistory;
2017		-// //现病史
2018		-// private String presentHistory;
	2084	+ String xyb = map.get("xyb") == null ? "" : map.get("xyb").toString();
	2085	+ if ("true".equals(xyb))
	2086	+ {
	2087	+ familyHistory+=" 血友病,";
	2088	+ }
2019	2089
	2090	+
	2091	+ String xtjx = map.get("xtjx") == null ? "" : map.get("xtjx").toString();
	2092	+ if ("true".equals(xtjx))
	2093	+ {
	2094	+ familyHistory+=" 先天畸形,";
	2095	+ }
	2096	+
	2097	+
	2098	+ String sm = map.get("sm") == null ? "" : map.get("sm").toString();
	2099	+ if ("true".equals(sm))
	2100	+ {
	2101	+ familyHistory+=" 色盲,";
	2102	+ }
	2103	+ String xtyx = map.get("xtyx") == null ? "" : map.get("xtyx").toString();
	2104	+ if ("true".equals(xtyx))
	2105	+ {
	2106	+ familyHistory+=" 先天愚型,";
	2107	+ }
	2108	+
	2109	+ String npx = map.get("npx") == null ? "" : map.get("npx").toString();
	2110	+ if ("true".equals(npx))
	2111	+ {
	2112	+ familyHistory+=" 牛皮癣,";
	2113	+ }
	2114	+
	2115	+
	2116	+ String ly = map.get("ly") == null ? "" : map.get("ly").toString();
	2117	+ if ("true".equals(ly))
	2118	+ {
	2119	+ familyHistory+=" 聋哑,";
	2120	+ }
	2121	+
	2122	+
	2123	+ String st = map.get("st") == null ? "" : map.get("st").toString();
	2124	+ if ("true".equals(st))
	2125	+ {
	2126	+ familyHistory+=" 双胎,";
	2127	+ }
	2128	+
	2129	+
	2130	+ String mr = map.get("mr") == null ? "" : map.get("mr").toString();
	2131	+ if ("true".equals(mr))
	2132	+ {
	2133	+ familyHistory+=" 盲人,";
	2134	+ }
	2135	+
	2136	+ String gb = map.get("gb") == null ? "" : map.get("gb").toString();
	2137	+ if ("true".equals(gb))
	2138	+ {
	2139	+ familyHistory+=" 肝病,";
	2140	+ }
	2141	+
	2142	+ String qt = map.get("qt") == null ? "" : map.get("qt").toString();
	2143	+ if ("true".equals(qt))
	2144	+ {
	2145	+ String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString();
	2146	+ familyHistory+=" "+qtText;
	2147	+ }
	2148	+ FunvCommonUtil.spitd(familyHistory);
	2149	+ }
	2150	+ }
	2151	+
	2152	+ result.setFamilyHistory(familyHistory);
	2153	+
	2154	+ //个人史
	2155	+ String personalHistory ="";
	2156	+ if (StringUtils.isNotEmpty(model.getPersonalHistory()))
	2157	+ {
	2158	+ Map map = JsonUtil.str2Obj(model.getPersonalHistory(), Map.class);
	2159	+ String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString();
	2160	+ if ("no".equals(yesOrNo))
	2161	+ {
	2162	+ personalHistory = "无";
	2163	+ }
	2164	+ else if ("yes".equals(yesOrNo))
	2165	+ {
	2166	+ String xy = map.get("xy") == null ? "" : map.get("xy").toString();
	2167	+ if ("true".equals(xy))
	2168	+ {
	2169	+ personalHistory+=" 吸烟,";
	2170	+ }
	2171	+ String yj = map.get("yj") == null ? "" : map.get("yj").toString();
	2172	+ if ("true".equals(yj))
	2173	+ {
	2174	+ personalHistory+=" 饮酒,";
	2175	+ }
	2176	+ String fyyw = map.get("fyyw") == null ? "" : map.get("fyyw").toString();
	2177	+ if ("true".equals(fyyw))
	2178	+ {
	2179	+ personalHistory+=" 服用药物,";
	2180	+ }
	2181	+
	2182	+ String jcydwz = map.get("jcydwz,") == null ? "" : map.get("jcydwz").toString();
	2183	+ if ("true".equals(jcydwz))
	2184	+ {
	2185	+ personalHistory+=" 接触有毒有害物质,";
	2186	+ }
	2187	+
	2188	+ String jcfsx = map.get("jcfsx") == null ? "" : map.get("jcfsx").toString();
	2189	+ if ("true".equals(jcfsx))
	2190	+ {
	2191	+ personalHistory+=" 接触放射线,";
	2192	+ }
	2193	+
	2194	+ String qt = map.get("qt") == null ? "" : map.get("qt").toString();
	2195	+ if ("true".equals(qt))
	2196	+ {
	2197	+ String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString();
	2198	+ personalHistory+=" "+qtText;
	2199	+ }
	2200	+
	2201	+ FunvCommonUtil.spitd(familyHistory);
	2202	+ }
	2203	+ }
	2204	+
	2205	+ result.setPersonalHistory(personalHistory);
	2206	+
	2207	+
	2208	+ //药物过敏史
	2209	+ String ywgmHistory = "";
	2210	+
	2211	+ if (StringUtils.isNotEmpty(model.getYwgmHistory()))
	2212	+ {
	2213	+ Map map = JsonUtil.str2Obj(model.getYwgmHistory(), Map.class);
	2214	+ String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString();
	2215	+ if ("no".equals(yesOrNo))
	2216	+ {
	2217	+ ywgmHistory = "无";
	2218	+ }
	2219	+ else if ("yes".equals(yesOrNo))
	2220	+ {
	2221	+
	2222	+
	2223	+ String qmsgm = map.get("qmsgm") == null ? "" : map.get("qmsgm").toString();
	2224	+ if ("true".equals(qmsgm))
	2225	+ {
	2226	+ ywgmHistory+=" 青霉素过敏,";
	2227	+ }
	2228	+ String halyw = map.get("halyw") == null ? "" : map.get("halyw").toString();
	2229	+ if ("true".equals(halyw))
	2230	+ {
	2231	+ ywgmHistory+=" 磺胺类药物,";
	2232	+ }
	2233	+ String xfmsgm = map.get("xfmsgm") == null ? "" : map.get("xfmsgm").toString();
	2234	+ if ("true".equals(xfmsgm))
	2235	+ {
	2236	+ ywgmHistory+=" 先锋霉素过敏,";
	2237	+ }
	2238	+
	2239	+ String qt = map.get("qt") == null ? "" : map.get("qt").toString();
	2240	+ if ("true".equals(qt))
	2241	+ {
	2242	+ String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString();
	2243	+ ywgmHistory+=" "+qtText;
	2244	+ }
	2245	+ FunvCommonUtil.spitd(familyHistory);
	2246	+ }
	2247	+ }
	2248	+ result.setYwgmHistory(ywgmHistory);
	2249	+
	2250	+ //现病史
	2251	+ String presentHistory = "";
	2252	+ if (StringUtils.isNotEmpty(model.getPresentHistory()))
	2253	+ {
	2254	+ Map map = JsonUtil.str2Obj(model.getPresentHistory(), Map.class);
	2255	+ String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString();
	2256	+ if ("no".equals(yesOrNo))
	2257	+ {
	2258	+ presentHistory = "无";
	2259	+ }
	2260	+ else if ("yes".equals(yesOrNo))
	2261	+ {
	2262	+ String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString();
	2263	+ presentHistory+=qtText;
	2264	+ }
	2265	+ }
	2266	+ result.setPresentHistory(presentHistory);
	2267	+
	2268	+
2020	2269	result.setVcCardNo(model.getVcCardNo());
2021	2270	if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getBuildDoctor())) {
2022	2271	if ("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29".equals(model.getBuildDoctor())) {
2023	2272
2024	2273
...	...	@@ -2024,21 +2273,24 @@
2024	2273	}
2025	2274	else
2026	2275	{
2027		- Users users = usersService.getUsers(Integer.parseInt(model.getBuildDoctor()));
2028		- if (users!=null && users.getYn()==YnEnums.YES.getId()){
2029		- String name = users.getName();
2030		- result.setBuildDoctor(name);
	2276	+ try {
	2277	+ Users users = usersService.getUsers(Integer.parseInt(model.getBuildDoctor()));
	2278	+ if (users!=null && users.getYn()==YnEnums.YES.getId()){
	2279	+ String name = users.getName();
	2280	+ result.setBuildDoctor(name);
	2281	+ }
	2282	+ } catch (Exception e)
	2283	+ {
	2284	+ result.setBuildDoctor(model.getBuildDoctor());
2031	2285	}
	2286	+
2032	2287	}
2033	2288	}
2034	2289
2035	2290	result.setBuildDate(DateUtil.getyyyy_MM_dd(model.getBuildDay()));
2036	2291	result.setId(model.getId());
2037	2292
2038		-
2039		-
2040		-
2041		- return null;
	2293	+ return result;
2042	2294	}
2043	2295	}

...	...	@@ -455,6 +455,15 @@
455	455	return "";
456	456	}
457	457
	458	+ public static String spitd(String str)
	459	+ {
	460	+ if(str.indexOf(",") > 0)
	461	+ {
	462	+ return str.substring(0, str.indexOf(","));
	463	+ }
	464	+ return str;
	465	+ }
	466	+
458	467
459	468	}