jiangjiazhi / regional-platform

Commit 69bf5ea773dfeb1e48d5cea0ef75d6950c9818c2

Authored by liquanyu over 2 years ago

Exists in master and in 6 other branches

工位统计

Showing 2 changed files with 58 additions and 55 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java

...	...	@@ -5358,6 +5358,7 @@
5358	5358	and("fillDate").gte(DateUtil.parseYMD(startDate)).lte(DateUtil.parseYMD(endDate)));
5359	5359	List<PreEugenicsBaseModel> modelList = mongoTemplate.find(query, PreEugenicsBaseModel.class);
5360	5360	if (CollectionUtils.isNotEmpty(modelList)) {
	5361	+ System.out.println("孕前优生数据"+modelList);
5361	5362	for(PreEugenicsBaseModel model : modelList)
5362	5363	{
5363	5364	int zc = 0;
...	...	@@ -5427,6 +5428,7 @@
5427	5428	Update update = MongoConvertHelper
5428	5429	.convertToNativeUpdate(ReflectionUtils.getUpdateField(model));
5429	5430	mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(model.getId())), update, PreEugenicsBaseModel.class);
	5431	+ System.out.println("yqys update "+model.getId());
5430	5432	}else if (zc < 9 && wifeClinical != null && wifeClinical.size() > 0 && wifeClinical.get("xxbfx") != null)
5431	5433	{
5432	5434	wifeClinical.put("xxbfxzc",2);
...	...	@@ -5434,6 +5436,7 @@
5434	5436	Update update = MongoConvertHelper
5435	5437	.convertToNativeUpdate(ReflectionUtils.getUpdateField(model));
5436	5438	mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(model.getId())), update, PreEugenicsBaseModel.class);
	5439	+ System.out.println("yqys update "+model.getId());
5437	5440	}
5438	5441	}
5439	5442	}

...	...	@@ -1874,7 +1874,7 @@
1874	1874	}
1875	1875	//本年度计划怀孕夫妇数
1876	1876	int jhhyCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId).and("fillDate").gte(start).lte(end)), PreEugenicsBaseModel.class);
1877		- datas.add(jhhyCount);
	1877	+ datas.add(jhhyCount);//1
1878	1878
1879	1879	//检查人数男
1880	1880	int manCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
...	...	@@ -1883,11 +1883,11 @@
1883	1883	//检查人数女
1884	1884	int womanCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
1885	1885	.and("fillDate").gte(start).lte(end).and("wifeBaseInfo").exists(true)), PreEugenicsBaseModel.class);
1886		- datas.add(manCount+womanCount);//检查男女合计
1887		- datas.add(manCount);
1888		- datas.add(womanCount);
1889		- datas.add(manCount+womanCount);//优生健康教育人数
1890		- datas.add(manCount+womanCount);//病史询问人数
	1886	+ datas.add(manCount+womanCount);//检查男女合计//2
	1887	+ datas.add(manCount);//3
	1888	+ datas.add(womanCount);//4
	1889	+ datas.add(manCount+womanCount);//优生健康教育人数//5
	1890	+ datas.add(manCount+womanCount);//病史询问人数//6
1891	1891
1892	1892	//病史询问异常人数男
1893	1893	int manCountExc = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
...	...	@@ -1903,8 +1903,8 @@
1903	1903	Criteria.where("wifeBaseInfo.jbs").in(true))),
1904	1904	PreEugenicsBaseModel.class);
1905	1905
1906		- datas.add(manCount+womanCount-manCountExc-womanCountExc);//正常人数
1907		- datas.add(manCountExc+womanCountExc);//异常人数
	1906	+ datas.add(manCount+womanCount-manCountExc-womanCountExc);//正常人数//7
	1907	+ datas.add(manCountExc+womanCountExc);//异常人数//8
1908	1908	//datas.add(0);//合计
1909	1909
1910	1910	//体格检查异常人数男
...	...	@@ -1960,8 +1960,8 @@
1960	1960	Criteria.where("wifePhysiqueCheck.szjz").in(1)
1961	1961	))
1962	1962	,PreEugenicsBaseModel.class);
1963		- datas.add(manCount+womanCount-manTgjcCount-womanTgjcCount);//正常人数
1964		- datas.add(manTgjcCount+womanTgjcCount);//异常人数
	1963	+ datas.add(manCount+womanCount-manTgjcCount-womanTgjcCount);//正常人数//9
	1964	+ datas.add(manTgjcCount+womanTgjcCount);//异常人数//10
1965	1965
1966	1966	//检查生殖正常人数男
1967	1967	int manSzCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
1968	1968
...	...	@@ -1989,16 +1989,16 @@
1989	1989	.and("wifePhysiqueCheck.zgbk").in(0)
1990	1990	.and("wifePhysiqueCheck.zgscfj").in(0)
1991	1991	), PreEugenicsBaseModel.class);
1992		- datas.add(manSzCount+womanSzCount);//正常人数
1993		- datas.add(manCount+womanCount-manSzCount-womanSzCount);//异常人数
	1992	+ datas.add(manSzCount+womanSzCount);//正常人数//11
	1993	+ datas.add(manCount+womanCount-manSzCount-womanSzCount);//异常人数//12
1994	1994
1995	1995	//检查白带异常人数
1996	1996	int womanBdCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
1997	1997	.and("fillDate").gte(start).lte(end)
1998	1998	.and("wifeClinicalCheck.bdjc").in(1)
1999	1999	), PreEugenicsBaseModel.class);
2000		- datas.add(womanCount-womanBdCount);//正常人数
2001		- datas.add(womanBdCount);//异常人数
	2000	+ datas.add(womanCount-womanBdCount);//正常人数//13
	2001	+ datas.add(womanBdCount);//异常人数//14
2002	2002
2003	2003	//淋球
2004	2004	int womanlqCount = 0;
...	...	@@ -2029,10 +2029,10 @@
2029	2029
2030	2030	}
2031	2031	}
2032		- datas.add(womanCount-womanlqCount);//阴性人数
2033		- datas.add(womanlqCount);//阳性人数
2034		- datas.add(womanCount-womansyCount);//阴性人数
2035		- datas.add(womansyCount);//阳性人数
	2032	+ datas.add(womanCount-womanlqCount);//阴性人数//15
	2033	+ datas.add(womanlqCount);//阳性人数//16
	2034	+ datas.add(womanCount-womansyCount);//阴性人数//17
	2035	+ datas.add(womansyCount);//阳性人数//18
2036	2036
2037	2037
2038	2038	//血常规
...	...	@@ -2045,8 +2045,8 @@
2045	2045	.and("wifeClinicalCheck.xxbfxzc").is(2)
2046	2046	), PreEugenicsBaseModel.class);
2047	2047
2048		- datas.add(womanXcgCount);//血常规正常人数
2049		- datas.add(womanXcgCountyc);//血常规异常人数
	2048	+ datas.add(womanXcgCount);//血常规正常人数//19
	2049	+ datas.add(womanXcgCountyc);//血常规异常人数//20
2050	2050
2051	2051	//检查尿常规异常人数
2052	2052	int womanncgCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
...	...	@@ -2054,8 +2054,8 @@
2054	2054	.and("wifeClinicalCheck.ncg").in(1)
2055	2055	), PreEugenicsBaseModel.class);
2056	2056
2057		- datas.add(womanCount-womanncgCount);//正常人数
2058		- datas.add(womanncgCount);//正常人数
	2057	+ datas.add(womanCount-womanncgCount);//正常人数//21
	2058	+ datas.add(womanncgCount);//正常人数//22
2059	2059
2060	2060
2061	2061	//rh 阳性
...	...	@@ -2070,8 +2070,8 @@
2070	2070	.and("husbandClinicalCheck.rh").is(1)
2071	2071	), PreEugenicsBaseModel.class);
2072	2072
2073		- datas.add(womanCount+manCount-manRhCount-womanRhCount);//正常人数
2074		- datas.add(manRhCount+womanRhCount);//异常人数
	2073	+ datas.add(womanCount+manCount-manRhCount-womanRhCount);//正常人数//23
	2074	+ datas.add(manRhCount+womanRhCount);//异常人数//24
2075	2075
2076	2076
2077	2077	//血糖
...	...	@@ -2079,8 +2079,8 @@
2079	2079	.and("fillDate").gte(start).lte(end)
2080	2080	.and("wifeClinicalCheck.xuetang").gte("3.9").lte("6.1")
2081	2081	), PreEugenicsBaseModel.class);
2082		- datas.add(womanXuetangCount);//正常人数
2083		- datas.add(womanCount-womanXuetangCount);//异常人数
	2082	+ datas.add(womanXuetangCount);//正常人数//25
	2083	+ datas.add(womanCount-womanXuetangCount);//异常人数//26
2084	2084
2085	2085
2086	2086	//谷丙转氨酶和肌酐
...	...	@@ -2097,8 +2097,8 @@
2097	2097	.and("husbandClinicalCheck.jigan").gte("57").lte("97")
2098	2098	), PreEugenicsBaseModel.class);
2099	2099	//肝功
2100		- datas.add(womanGbzamCount+manGbzamCount);//正常人数
2101		- datas.add(womanCount+manCount-womanGbzamCount-manGbzamCount);//异常人数
	2100	+ datas.add(womanGbzamCount+manGbzamCount);//正常人数//27
	2101	+ datas.add(womanCount+manCount-womanGbzamCount-manGbzamCount);//异常人数//28
2102	2102
2103	2103
2104	2104	//乙肝异常
2105	2105
2106	2106
...	...	@@ -2112,20 +2112,20 @@
2112	2112	.and("fillDate").gte(start).lte(end)
2113	2113	.and("husbandClinicalCheck.yigan").in(1)
2114	2114	), PreEugenicsBaseModel.class);
2115		- datas.add(womanCount+manCount-manYgCount-womanYgCount);//正常人数
2116		- datas.add(womanYgCount+manYgCount);//异常人数
	2115	+ datas.add(womanCount+manCount-manYgCount-womanYgCount);//正常人数//29
	2116	+ datas.add(womanYgCount+manYgCount);//异常人数//30
2117	2117
2118	2118	//肾功
2119		- datas.add(womanGbzamCount+manGbzamCount);//正常人数
2120		- datas.add(womanCount+manCount-womanGbzamCount-manGbzamCount);//异常人数
	2119	+ datas.add(womanGbzamCount+manGbzamCount);//正常人数//31
	2120	+ datas.add(womanCount+manCount-womanGbzamCount-manGbzamCount);//异常人数//32
2121	2121
2122	2122
2123	2123	int womanCjzxjsCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
2124	2124	.and("fillDate").gte(start).lte(end)
2125	2125	.and("wifeClinicalCheck.cjzxjs").gte("0.35").lte("5.1")
2126	2126	), PreEugenicsBaseModel.class);
2127		- datas.add(womanCjzxjsCount);//正常人数
2128		- datas.add(womanCount-womanCjzxjsCount);//异常人数
	2127	+ datas.add(womanCjzxjsCount);//正常人数//33
	2128	+ datas.add(womanCount-womanCjzxjsCount);//异常人数//34
2129	2129
2130	2130	//梅毒螺旋体
2131	2131	int manMdCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
...	...	@@ -2139,8 +2139,8 @@
2139	2139	.and("husbandClinicalCheck.meidu").is(1)
2140	2140	), PreEugenicsBaseModel.class);
2141	2141
2142		- datas.add(womanCount+manCount-womanMdCount-manMdCount);//正常人数
2143		- datas.add(manMdCount+womanMdCount);//异常人数
	2142	+ datas.add(womanCount+manCount-womanMdCount-manMdCount);//正常人数//35
	2143	+ datas.add(manMdCount+womanMdCount);//异常人数//36
2144	2144
2145	2145	//风疹病毒IgG
2146	2146	int manFzbdCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
2147	2147
2148	2148
...	...	@@ -2148,24 +2148,24 @@
2148	2148	.and("wifeClinicalCheck.fzbd").is(1)
2149	2149	), PreEugenicsBaseModel.class);
2150	2150
2151		- datas.add(womanCount - manFzbdCount);//正常人数
2152		- datas.add(manFzbdCount);//异常人数
	2151	+ datas.add(womanCount - manFzbdCount);//正常人数//37
	2152	+ datas.add(manFzbdCount);//异常人数//38
2153	2153
2154	2154	int womanjxbbdIgMCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
2155	2155	.and("fillDate").gte(start).lte(end)
2156	2156	.and("wifeClinicalCheck.jxbbdIgM").is(1)
2157	2157	), PreEugenicsBaseModel.class);
2158	2158
2159		- datas.add(womanCount - womanjxbbdIgMCount);//正常人数
2160		- datas.add(womanjxbbdIgMCount);//异常人数
	2159	+ datas.add(womanCount - womanjxbbdIgMCount);//正常人数//39
	2160	+ datas.add(womanjxbbdIgMCount);//异常人数//40
2161	2161
2162	2162	int womanjxbbdCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
2163	2163	.and("fillDate").gte(start).lte(end)
2164	2164	.and("wifeClinicalCheck.jxbbd").is(1)
2165	2165	), PreEugenicsBaseModel.class);
2166	2166
2167		- datas.add(womanCount - womanjxbbdCount);//正常人数
2168		- datas.add(womanjxbbdCount);//异常人数
	2167	+ datas.add(womanCount - womanjxbbdCount);//正常人数//41
	2168	+ datas.add(womanjxbbdCount);//异常人数//42
2169	2169
2170	2170
2171	2171	int womangxtIgMCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
2172	2172
2173	2173
...	...	@@ -2173,24 +2173,24 @@
2173	2173	.and("wifeClinicalCheck.gxtIgM").is(1)
2174	2174	), PreEugenicsBaseModel.class);
2175	2175
2176		- datas.add(womanCount - womangxtIgMCount);//正常人数
2177		- datas.add(womangxtIgMCount);//异常人数
	2176	+ datas.add(womanCount - womangxtIgMCount);//正常人数//43
	2177	+ datas.add(womangxtIgMCount);//异常人数//44
2178	2178
2179	2179	int womangxtCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
2180	2180	.and("fillDate").gte(start).lte(end)
2181	2181	.and("wifeClinicalCheck.gxt").is(1)
2182	2182	), PreEugenicsBaseModel.class);
2183	2183
2184		- datas.add(womanCount - womangxtCount);//正常人数
2185		- datas.add(womangxtCount);//异常人数
	2184	+ datas.add(womanCount - womangxtCount);//正常人数//45
	2185	+ datas.add(womangxtCount);//异常人数//46
2186	2186
2187	2187	//超声检查
2188	2188	int womanCsjcCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
2189	2189	.and("fillDate").gte(start).lte(end)
2190	2190	.and("wifeBCheck.bcjc").in(1)
2191	2191	), PreEugenicsBaseModel.class);
2192		- datas.add(womanCount - womanCsjcCount);//正常人数
2193		- datas.add(womanCsjcCount);//异常人数
	2192	+ datas.add(womanCount - womanCsjcCount);//正常人数//47
	2193	+ datas.add(womanCsjcCount);//异常人数//48
2194	2194
2195	2195	int womanGwCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
2196	2196	.and("fillDate").gte(start).lte(end)
2197	2197
2198	2198
2199	2199
...	...	@@ -2201,25 +2201,25 @@
2201	2201	.and("fillDate").gte(start).lte(end)
2202	2202	.and("resultAdvice.husbandType").is("3")
2203	2203	), PreEugenicsBaseModel.class);
2204		- datas.add(womanGwCount+manGwCount);//高危合计人数
2205		- datas.add(manGwCount);//高危男人数
2206		- datas.add(womanGwCount);//高危女人数
	2204	+ datas.add(womanGwCount+manGwCount);//高危合计人数//49
	2205	+ datas.add(manGwCount);//高危男人数//50
	2206	+ datas.add(womanGwCount);//高危女人数//51
2207	2207
2208		- datas.add(manCount+womanCount);//咨询指导人数
	2208	+ datas.add(manCount+womanCount);//咨询指导人数//52
2209	2209
2210	2210	//早孕
2211	2211	int zyCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
2212	2212	.and("writeDate").gte(start).lte(end)
2213	2213	), LhBabyPregnancyFollowTabModel.class);
2214	2214
2215		- datas.add(zyCount);//早孕人数
	2215	+ datas.add(zyCount);//早孕人数//53
2216	2216
2217	2217	// 妊娠结局
2218	2218	int rsjjCount = (int)mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId)
2219	2219	.and("writeDate").gte(start).lte(end)
2220	2220	), LhBabyGravidityEndingTabModel.class);
2221	2221
2222		- datas.add(rsjjCount);//妊娠结局人数
	2222	+ datas.add(rsjjCount);//妊娠结局人数//54
2223	2223
2224	2224	int all = 0;
2225	2225	for(int i= 9; i <=39;i++)
...	...	@@ -2227,7 +2227,7 @@
2227	2227	all+=datas.get(i);
2228	2228	}
2229	2229
2230		- datas.add(8,all);
	2230	+ datas.add(8,all);//55
2231	2231
2232	2232	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas);
2233	2233	}