jiangjiazhi / regional-platform

Authored by shiyang about 3 years ago

Exists in master and in 6 other branches

Showing 9 changed files with 105 additions and 3 deletions

...	...	@@ -642,6 +642,20 @@
642	642	//入园体检检查id
643	643	private String babyKindergartenCheckId;
644	644
	645	+ /**
	646	+ * 中医指导类型
	647	+ */
	648	+ private List<Integer> articleTypes;
	649	+
	650	+
	651	+ public List<Integer> getArticleTypes() {
	652	+ return articleTypes;
	653	+ }
	654	+
	655	+ public void setArticleTypes(List<Integer> articleTypes) {
	656	+ this.articleTypes = articleTypes;
	657	+ }
	658	+
645	659	public String getLhEyeCheckId() {
646	660	return lhEyeCheckId;
647	661	}

...	...	@@ -49,6 +49,11 @@
49	49	private Integer type;
50	50
51	51	/**
	52	+ * 多文章类型list
	53	+ */
	54	+ private List<Integer> articleTypes;
	55	+
	56	+ /**
52	57	* 月龄范围开始
53	58	*/
54	59	private Integer monthAgeStart;
...	...	@@ -72,6 +77,9 @@
72	77	if (null != type) {
73	78	condition = condition.and("type", type, MongoOper.IS);
74	79	}
	80	+ if (CollectionUtils.isNotEmpty(articleTypes)) {
	81	+ condition = condition.and("type", articleTypes, MongoOper.IN);
	82	+ }
75	83	if (StringUtils.isNotEmpty( title)) {
76	84	condition = condition.and("title", title, MongoOper.LIKE);
77	85	}
...	...	@@ -169,6 +177,14 @@
169	177
170	178	public void setMonthAgeEnd(Integer monthAgeEnd) {
171	179	this.monthAgeEnd = monthAgeEnd;
	180	+ }
	181	+
	182	+ public List<Integer> getArticleTypes() {
	183	+ return articleTypes;
	184	+ }
	185	+
	186	+ public void setArticleTypes(List<Integer> articleTypes) {
	187	+ this.articleTypes = articleTypes;
172	188	}
173	189	}

...	...	@@ -39,6 +39,7 @@
39	39	* @return
40	40	*/
41	41	@RequestMapping(value = "/addOrUpdate", method = RequestMethod.POST)
	42	+ @TokenRequired
42	43	@ResponseBody
43	44	public BaseResponse addOrUpdate(@RequestBody MedicineArticleModel model, HttpServletRequest request){
44	45	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
...	...	@@ -51,6 +52,7 @@
51	52	* @return
52	53	*/
53	54	@RequestMapping(value = "/delData", method = RequestMethod.DELETE)
	55	+ @TokenRequired
54	56	@ResponseBody
55	57	public BaseResponse delData(String id, HttpServletRequest request){
56	58	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
...	...	@@ -67,6 +69,18 @@
67	69	public BaseResponse queryUpDate(String id) {
68	70
69	71	return medicineArticleFacade.queryUpDate(id);
	72	+ }
	73	+ /**
	74	+ * 儿保检查-根据文章类型查询
	75	+ * @param modelQuery
	76	+ * @return
	77	+ */
	78	+ @ResponseBody
	79	+ @TokenRequired
	80	+ @RequestMapping(value = "/queryBabyCheckArticleTypes",method = RequestMethod.GET)
	81	+ public BaseResponse queryUpDate(MedicineArticleQuery modelQuery, HttpServletRequest request) {
	82	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	83	+ return medicineArticleFacade.queryBabyCheckArticleTypes(modelQuery,loginState.getId());
70	84	}
71	85
72	86	/**

...	...	@@ -704,6 +704,8 @@
704	704	model.setLhEyeCheckId(request.getLhEyeCheckId());
705	705	model.setOralCheckId(request.getOralCheckId());
706	706	model.setBabyKindergartenCheckId(request.getBabyKindergartenCheckId());
	707	+ //中医指导类型
	708	+ model.setArticleTypes(request.getArticleTypes());
707	709	return model;
708	710	}
709	711
...	...	@@ -2651,7 +2653,8 @@
2651	2653	model.setLhEyeCheckId(checkModel.getLhEyeCheckId());
2652	2654	model.setOralCheckId(checkModel.getOralCheckId());
2653	2655	model.setBabyKindergartenCheckId(checkModel.getBabyKindergartenCheckId());
2654		-
	2656	+ //中医指导类型
	2657	+ model.setArticleTypes(checkModel.getArticleTypes());
2655	2658	return model;
2656	2659
2657	2660	}

...	...	@@ -80,11 +80,25 @@
80	80	br.setErrormsg("成功");
81	81	return br;
82	82	}
	83	+
83	84	public BaseResponse queryUpDate(String id) {
84		- MedicineArticleModel model = medicineArticleService.queryById(id);
	85	+ MedicineArticleModel result=medicineArticleService.queryById(id);
85	86	BaseObjectResponse br = new BaseObjectResponse();
86	87	br.setErrorcode(ErrorCodeConstants.SUCCESS);
87		- br.setData(model);
	88	+ br.setData(result);
	89	+ br.setErrormsg("成功");
	90	+ return br;
	91	+ }
	92	+
	93	+ public BaseResponse queryBabyCheckArticleTypes(MedicineArticleQuery request, Integer userid) {
	94	+ String hospitalId = autoMatchFacade.getHospitalId(userid);
	95	+ request.setHospitalId(hospitalId);
	96	+ request.setYn(YnEnums.YES.getId());
	97	+ request.setNeed(null);
	98	+ List<MedicineArticleModel> resultList=medicineArticleService.queryList(request, Sort.Direction.DESC,new String[]{"created"});
	99	+ BaseObjectResponse br = new BaseObjectResponse();
	100	+ br.setErrorcode(ErrorCodeConstants.SUCCESS);
	101	+ br.setData(resultList);
88	102	br.setErrormsg("成功");
89	103	return br;
90	104	}

...	...	@@ -6427,6 +6427,8 @@
6427	6427	model.setLhEyeCheckId(checkModel.getLhEyeCheckId());
6428	6428	model.setOralCheckId(checkModel.getOralCheckId());
6429	6429	model.setBabyKindergartenCheckId(checkModel.getBabyKindergartenCheckId());
	6430	+ //中医指导类型
	6431	+ model.setArticleTypes(checkModel.getArticleTypes());
6430	6432	return model;
6431	6433
6432	6434	}

...	...	@@ -602,6 +602,19 @@
602	602	//入园体检检查id
603	603	private String babyKindergartenCheckId;
604	604
	605	+ /**
	606	+ * 中医指导类型
	607	+ */
	608	+ private List<Integer> articleTypes;
	609	+
	610	+
	611	+ public List<Integer> getArticleTypes() {
	612	+ return articleTypes;
	613	+ }
	614	+ public void setArticleTypes(List<Integer> articleTypes) {
	615	+ this.articleTypes = articleTypes;
	616	+ }
	617	+
605	618	public String getLhEyeCheckId() {
606	619	return lhEyeCheckId;
607	620	}

...	...	@@ -819,6 +819,19 @@
819	819	//入园体检检查id
820	820	private String babyKindergartenCheckId;
821	821
	822	+ /**
	823	+ * 中医指导类型
	824	+ */
	825	+ private List<Integer> articleTypes;
	826	+
	827	+
	828	+ public List<Integer> getArticleTypes() {
	829	+ return articleTypes;
	830	+ }
	831	+ public void setArticleTypes(List<Integer> articleTypes) {
	832	+ this.articleTypes = articleTypes;
	833	+ }
	834	+
822	835	public String getLhEyeCheckId() {
823	836	return lhEyeCheckId;
824	837	}

...	...	@@ -842,6 +842,19 @@
842	842	//入园体检检查id
843	843	private String babyKindergartenCheckId;
844	844
	845	+ /**
	846	+ * 中医指导类型
	847	+ */
	848	+ private List<Integer> articleTypes;
	849	+
	850	+
	851	+ public List<Integer> getArticleTypes() {
	852	+ return articleTypes;
	853	+ }
	854	+ public void setArticleTypes(List<Integer> articleTypes) {
	855	+ this.articleTypes = articleTypes;
	856	+ }
	857	+
845	858	public String getLhEyeCheckId() {
846	859	return lhEyeCheckId;
847	860	}