jiangjiazhi / regional-platform

Commit 579390c0173c98801ff17e8e53a2ac35350879a3

Authored by liquanyu over 8 years ago

Exists in master and in 8 other branches

code update

Showing 3 changed files with 45 additions and 9 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/WyTypeEnums.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java

...	...	@@ -14,7 +14,7 @@
14	14	*/
15	15	public enum WyTypeEnums {
16	16
17		- MR(0,"纯母乳喂养"),HH(1,"混合喂养"),RG(2,"人工喂养");
	17	+ MR(0,"母乳喂养"),HH(1,"混合喂养"),RG(2,"人工喂养");
18	18
19	19	private WyTypeEnums(int id, String name) {
20	20	this.id = id;
...	...	@@ -25,6 +25,15 @@
25	25	for(WyTypeEnums s : values()){
26	26	if(id==s.id){
27	27	return s.getName();
	28	+ }
	29	+ }
	30	+ return "";
	31	+ }
	32	+
	33	+ public static String getIdByName(String name){
	34	+ for(WyTypeEnums s : values()){
	35	+ if(s.name.equals(name)){
	36	+ return String.valueOf(s.getId());
28	37	}
29	38	}
30	39	return "";

...	...	@@ -166,7 +166,7 @@
166	166	@RequestMapping(value = "/queryChanJianReport", method = RequestMethod.GET)
167	167	@ResponseBody
168	168	@TokenRequired
169		- public BaseObjectResponse queryChanJianReport(HttpServletRequest request,
	169	+ public BaseListResponse queryChanJianReport(HttpServletRequest request,
170	170	@RequestParam(required = false) String exDateStart,
171	171	@RequestParam(required = false) String exDateEnd,
172	172	@RequestParam(required = false) String name,
...	...	@@ -184,7 +184,7 @@
184	184	@RequestParam(required = false) Integer limit
185	185	){
186	186	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
187		- BaseObjectResponse objectResponse = bookbuildingFacade.queryChanJianReport(loginState.getId(),
	187	+ BaseListResponse objectResponse = bookbuildingFacade.queryChanJianReport(loginState.getId(),
188	188	exDateStart,
189	189	exDateEnd,
190	190	name,

...	...	@@ -4,6 +4,7 @@
4	4	import com.lyms.hospitalapi.v2.HisService;
5	5	import com.lyms.platform.biz.dal.IPersonDao;
6	6	import com.lyms.platform.biz.service.*;
	7	+import com.lyms.platform.common.base.PageInfo;
7	8	import com.lyms.platform.common.enums.*;
8	9	import com.lyms.platform.common.result.BaseListResponse;
9	10	import com.lyms.platform.common.result.BaseResponse;
...	...	@@ -1049,7 +1050,7 @@
1049	1050	return objectResponse;
1050	1051	}
1051	1052
1052		- public BaseObjectResponse queryChanJianReport(Integer userId, String exDateStart,
	1053	+ public BaseListResponse queryChanJianReport(Integer userId, String exDateStart,
1053	1054	String exDateEnd,
1054	1055	String name,
1055	1056	Integer weekStarts,
1056	1057
...	...	@@ -1074,7 +1075,13 @@
1074	1075	start = (page -1) * limit+1;
1075	1076	end = page*limit;
1076	1077	}
	1078	+ String countSql =" SELECT count(*) as allCount "+
	1079	+ "FROM ODS_F_AUXILIARY_EXAMI A\n" +
	1080	+ "INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.RECORD_ID=B.RECORD_ID\n" +
	1081	+ "INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO AND C.VER_NO=2\n" +
	1082	+ "WHERE C.YCY_STSTEM_ID= '"+hospitalId +"'";
1077	1083
	1084	+
1078	1085	String sql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM ( SELECT A.EXAMINE_DATE,\n" +
1079	1086	" A.NAME,\n" +
1080	1087	" A.AGE,\n" +
1081	1088
1082	1089
1083	1090
1084	1091
1085	1092
1086	1093
1087	1094
1088	1095
1089	1096
1090	1097
1091	1098
1092	1099
1093	1100
1094	1101
1095	1102
...	...	@@ -1114,73 +1121,93 @@
1114	1121	if (StringUtils.isNotEmpty(exDateStart))
1115	1122	{
1116	1123	sql += " AND A.EXAMINE_DATE>= to_date('"+exDateStart+"','yyyy-MM-dd')";
	1124	+ countSql += " AND A.EXAMINE_DATE>= to_date('"+exDateStart+"','yyyy-MM-dd')";
1117	1125	}
1118	1126	if (StringUtils.isNotEmpty(exDateEnd))
1119	1127	{
1120	1128	sql += " AND A.EXAMINE_DATE <= to_date('"+exDateEnd+"','yyyy-MM-dd')";
	1129	+ countSql += " AND A.EXAMINE_DATE <= to_date('"+exDateEnd+"','yyyy-MM-dd')";
1121	1130	}
1122	1131
1123	1132	if (StringUtils.isNotEmpty(name))
1124	1133	{
1125	1134	sql += " AND A.NAME LIKE '%"+name+"%'";
	1135	+ countSql += " AND A.NAME LIKE '%"+name+"%'";
1126	1136	}
1127	1137
1128	1138	if (weekStarts != null)
1129	1139	{
1130	1140	sql += " AND A.NOW_WEEKS>= "+weekStarts;
	1141	+ countSql += " AND A.NOW_WEEKS>= "+weekStarts;
1131	1142	}
1132	1143
1133	1144	if (weekEnds != null)
1134	1145	{
1135	1146	sql += " AND A.NOW_WEEKS>= "+weekEnds;
	1147	+ countSql += " AND A.NOW_WEEKS>= "+weekEnds;
1136	1148	}
1137	1149
1138	1150	if (StringUtils.isNotEmpty(hbsag))
1139	1151	{
1140	1152	sql += " AND A.HBSAG = "+hbsag;
	1153	+ countSql += " AND A.HBSAG = "+hbsag;
1141	1154	}
1142	1155
1143	1156	if (StringUtils.isNotEmpty(hbeag))
1144	1157	{
1145	1158	sql += " AND A.HBEAG = "+hbeag;
	1159	+ countSql += " AND A.HBEAG = "+hbeag;
1146	1160	}
1147	1161
1148	1162	if (StringUtils.isNotEmpty(hbeab))
1149	1163	{
1150	1164	sql += " AND A.HBEAB = "+hbeab;
	1165	+ countSql += " AND A.HBEAB = "+hbeab;
1151	1166	}
1152	1167
1153	1168	if (StringUtils.isNotEmpty(hbcab))
1154	1169	{
1155	1170	sql += " AND A.HBCAB = "+hbcab;
	1171	+ countSql += " AND A.HBCAB = "+hbcab;
1156	1172	}
1157	1173	if (StringUtils.isNotEmpty(syphilis))
1158	1174	{
1159	1175	sql += " AND A.SYPHILIS = "+syphilis;
	1176	+ countSql += " AND A.SYPHILIS = "+syphilis;
1160	1177	}
1161	1178
1162	1179	if (StringUtils.isNotEmpty(hiv))
1163	1180	{
1164	1181	sql += " AND A.HIV = "+hiv;
	1182	+ countSql += " AND A.HIV = "+hiv;
1165	1183	}
1166	1184
1167	1185	if (StringUtils.isNotEmpty(hcv))
1168	1186	{
1169	1187	sql += " AND A.HCV = "+hcv;
	1188	+ countSql += " AND A.HCV = "+hcv;
1170	1189	}
1171	1190	if (StringUtils.isNotEmpty(doctorNo))
1172	1191	{
1173	1192	sql += " AND A.DOCTOR_NO = "+doctorNo;
	1193	+ countSql += " AND A.DOCTOR_NO = "+doctorNo;
1174	1194	}
1175	1195	sql+=" ) A WHERE ROWNUM <= "+end+" ) WHERE RN >= "+start;
1176	1196
	1197	+
1177	1198	List<Map<String,Object>> list = JdbcUtil.getListDataBySql(sql);
1178		- BaseObjectResponse objectResponse = new BaseObjectResponse();
1179		- objectResponse.setData(list);
1180	1199
1181		- objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
1182		- objectResponse.setErrormsg("成功");
1183		- return objectResponse;
	1200	+ Integer count = (Integer)JdbcUtil.getOralceSingleObjBySql(countSql);
	1201	+ BaseListResponse listResponse= new BaseListResponse();
	1202	+ listResponse.setData(list);
	1203	+
	1204	+ PageInfo pageInfo = new PageInfo(page, 0,count,limit);
	1205	+
	1206	+ listResponse.setPageInfo(pageInfo);
	1207	+
	1208	+ listResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	1209	+ listResponse.setErrormsg("成功");
	1210	+ return listResponse;
1184	1211	}
1185	1212	}