jiangjiazhi / regional-platform

Commit 910bdaee2271c0c13a8c088f699c0e3dc4f047bf

Authored by liquanyu almost 3 years ago

Exists in master and in 6 other branches

两癌

Showing 3 changed files with 107 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerExamineRequest.java

...	...	@@ -251,5 +251,14 @@
251	251	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
252	252	return cancerScreenService.queryCancerExamineRecord(parentId, loginState.getId());
253	253	}
	254	+
	255	+
	256	+ @ResponseBody
	257	+ @RequestMapping(method = RequestMethod.GET,value = "/setCancerExamineStatus/{type}/{status}/{id}")
	258	+ @TokenRequired
	259	+ public BaseResponse setCancerExamineStatus(@PathVariable Integer type,@PathVariable Integer status,@PathVariable String id, HttpServletRequest request) {
	260	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	261	+ return cancerScreenService.setCancerExamineStatus(type,status,id, loginState.getId());
	262	+ }
254	263	}

...	...	@@ -1063,12 +1063,58 @@
1063	1063	{
1064	1064	Criteria c = Criteria.where("areaId").is(organization.getAreaId());
1065	1065	query.addCriteria(c);
	1066	+ if (request.getPosition() != null)
	1067	+ {
	1068	+ Criteria c1 = Criteria.where("position").is(request.getPosition());
	1069	+ query.addCriteria(c1);
	1070	+ }
1066	1071	}
1067	1072	else if (request.getPosition() == 3)
1068	1073	{
1069	1074	Criteria c = Criteria.where("cityId").is(organization.getCityId());
1070	1075	query.addCriteria(c);
	1076	+ if (request.getPosition() != null)
	1077	+ {
	1078	+ Criteria c1 = Criteria.where("position").is(request.getPosition());
	1079	+ query.addCriteria(c1);
	1080	+ }
1071	1081	}
	1082	+
	1083	+ if (StringUtils.isNotEmpty(request.getOptDate())) {
	1084	+ String[] arrs = request.getOptDate().split(" - ");
	1085	+ Date start = DateUtil.parseYMD(arrs[0]);
	1086	+ Date end = DateUtil.parseYMD(arrs[1]);
	1087	+ end = DateUtil.getDayLastSecond(end);
	1088	+ query.addCriteria(Criteria.where("optDate").gte(start).lte(end));
	1089	+ }
	1090	+
	1091	+ if (StringUtils.isNotEmpty(request.getExamineDate())) {
	1092	+ String[] arrs = request.getExamineDate().split(" - ");
	1093	+ Date start = DateUtil.parseYMD(arrs[0]);
	1094	+ Date end = DateUtil.parseYMD(arrs[1]);
	1095	+ end = DateUtil.getDayLastSecond(end);
	1096	+ query.addCriteria(Criteria.where("examineDate").gte(start).lte(end));
	1097	+ }
	1098	+
	1099	+ if (request.getStartYear() != null && request.getEndYear() != null) {
	1100	+ query.addCriteria(Criteria.where("year").gte(request.getStartYear()).lte(request.getEndYear()));
	1101	+ }
	1102	+ if (request.getStartQuarter() != null && request.getEndquarter() != null) {
	1103	+ query.addCriteria(Criteria.where("quarter").gte(request.getStartQuarter()).lte(request.getEndquarter()));
	1104	+ }
	1105	+ if (StringUtils.isNotEmpty(request.getOptUser()))
	1106	+ {
	1107	+ Criteria c = Criteria.where("optUser").is(request.getOptUser());
	1108	+ query.addCriteria(c);
	1109	+ }
	1110	+
	1111	+ if (StringUtils.isNotEmpty(request.getOptHospital()))
	1112	+ {
	1113	+ Criteria c = Criteria.where("optHospital").is(request.getOptUser());
	1114	+ query.addCriteria(c);
	1115	+ }
	1116	+
	1117	+
1072	1118	Criteria c = Criteria.where("type").is(request.getType());
1073	1119	query.addCriteria(c);
1074	1120	List<CancerExamineModel> list = mongoTemplate.find(query, CancerExamineModel.class);
...	...	@@ -1137,6 +1183,15 @@
1137	1183	}
1138	1184	}
1139	1185	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas);
	1186	+ }
	1187	+
	1188	+ public BaseResponse setCancerExamineStatus(Integer type,Integer status, String id, Integer userId) {
	1189	+ CancerExamineModel cancerExamineModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(id)), CancerExamineModel.class);
	1190	+
	1191	+ Update update=MongoConvertHelper
	1192	+ .convertToNativeUpdate(ReflectionUtils.getUpdateField(cancerExamineModel));
	1193	+ mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(cancerExamineModel.getId())), update, CancerExamineModel.class);
	1194	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
1140	1195	}
1141	1196	}

...	...	@@ -9,14 +9,53 @@
9	9
10	10	private Integer year; //上报年份
11	11	private Integer quarter; //季度
12		- private String optUser; //录入用户
13		- private String optHospital; //录入单位
14		- private String optDate; //录入时间
	12	+
15	13	private Integer type;//1 宫颈癌 2 乳腺癌
16	14
	15	+
	16	+ private Integer status; // 0 录入 1 审核中 2 审核通过 3 驳回
	17	+
17	18	private String examineDate;//审核时间/驳回时间
18	19	private Integer position;//1 机构 2 县 3 市
19		- private Integer status; // 0 录入 1 审核中 2 审核通过 3 驳回
	20	+ private String optUser; //录入用户
	21	+ private String optHospital; //录入单位
	22	+ private String optDate; //录入时间
	23	+ private Integer startYear; //上报年份
	24	+ private Integer endYear; //上报年份
	25	+ private Integer startQuarter; //季度
	26	+ private Integer endquarter; //季度
	27	+
	28	+ public Integer getStartYear() {
	29	+ return startYear;
	30	+ }
	31	+
	32	+ public void setStartYear(Integer startYear) {
	33	+ this.startYear = startYear;
	34	+ }
	35	+
	36	+ public Integer getEndYear() {
	37	+ return endYear;
	38	+ }
	39	+
	40	+ public void setEndYear(Integer endYear) {
	41	+ this.endYear = endYear;
	42	+ }
	43	+
	44	+ public Integer getStartQuarter() {
	45	+ return startQuarter;
	46	+ }
	47	+
	48	+ public void setStartQuarter(Integer startQuarter) {
	49	+ this.startQuarter = startQuarter;
	50	+ }
	51	+
	52	+ public Integer getEndquarter() {
	53	+ return endquarter;
	54	+ }
	55	+
	56	+ public void setEndquarter(Integer endquarter) {
	57	+ this.endquarter = endquarter;
	58	+ }
20	59
21	60	public String getHospitalId() {
22	61	return hospitalId;