jiangjiazhi / regional-platform

Commit 1bf3df2ca2cc294ba392542198d5984324eca59e

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

update

Showing 7 changed files with 88 additions and 14 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java
platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java

...	...	@@ -429,6 +429,71 @@
429	429
430	430	/****************************************/
431	431
	432	+ /**
	433	+ * 秦皇岛
	434	+ * 儿童眼保健检查-新增页面检查套餐上面加“来源”这四类可以多选。
	435	+ * 第1类:健康查体又分为，散居手动输入，整体选择幼儿园机构（院方提供商的幼儿园数据）
	436	+ * 第2类:幼儿园转诊选择幼儿园机构（院方提供幼儿园数据）
	437	+ * 第3类:基层转诊选择基层机构（院方提供基层数据）
	438	+ * 第4类:本院
	439	+ */
	440	+ private String source; //来源多选 1：健康查体 2：幼儿园转诊 3:基层转诊 4：本院
	441	+ private Integer healthCheckType;//1：健康查体: 1：散居、2:整体
	442	+ private String healthCheckTypeScattered; //1:散居（手输）
	443	+ private String healthCheckTypeWhole; //2:整体（直接存选中的名字）
	444	+ private String kindergarten;//2：幼儿园转诊--幼儿园机构（直接存选中的名字）
	445	+ private String basicOrganization;//3:基层转诊--基层机构（直接存选中的名字）
	446	+
	447	+ public String getSource() {
	448	+ return source;
	449	+ }
	450	+
	451	+ public void setSource(String source) {
	452	+ this.source = source;
	453	+ }
	454	+
	455	+ public Integer getHealthCheckType() {
	456	+ return healthCheckType;
	457	+ }
	458	+
	459	+ public void setHealthCheckType(Integer healthCheckType) {
	460	+ this.healthCheckType = healthCheckType;
	461	+ }
	462	+
	463	+ public String getHealthCheckTypeScattered() {
	464	+ return healthCheckTypeScattered;
	465	+ }
	466	+
	467	+ public void setHealthCheckTypeScattered(String healthCheckTypeScattered) {
	468	+ this.healthCheckTypeScattered = healthCheckTypeScattered;
	469	+ }
	470	+
	471	+ public String getHealthCheckTypeWhole() {
	472	+ return healthCheckTypeWhole;
	473	+ }
	474	+
	475	+ public void setHealthCheckTypeWhole(String healthCheckTypeWhole) {
	476	+ this.healthCheckTypeWhole = healthCheckTypeWhole;
	477	+ }
	478	+
	479	+ public String getKindergarten() {
	480	+ return kindergarten;
	481	+ }
	482	+
	483	+ public void setKindergarten(String kindergarten) {
	484	+ this.kindergarten = kindergarten;
	485	+ }
	486	+
	487	+ public String getBasicOrganization() {
	488	+ return basicOrganization;
	489	+ }
	490	+
	491	+ public void setBasicOrganization(String basicOrganization) {
	492	+ this.basicOrganization = basicOrganization;
	493	+ }
	494	+
	495	+ /****************************************/
	496	+
432	497	public List<Map> getHandleOpinionsIdList() {
433	498	return handleOpinionsIdList;
434	499	}

...	...	@@ -357,7 +357,7 @@
357	357	}
358	358
359	359	/**抛宫产次数类型
360		- * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产
	360	+ * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产 5：三次分娩首次抛宫产
361	361	*/
362	362	private Integer cesareanTimeType;
363	363

...	...	@@ -181,10 +181,10 @@
181	181	@TokenRequired
182	182	@RequestMapping(method = RequestMethod.GET)
183	183	public BaseResponse list(Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, HttpServletRequest request,
184		- Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,String noPassIds) {
	184	+ Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,String noPassIds,Integer classify) {
185	185	return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key,yeymcId,
186	186	currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit,
187		- bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, noPassIds);
	187	+ bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, noPassIds,classify);
188	188	}
189	189
190	190	/**
...	...	@@ -205,8 +205,8 @@
205	205	@ResponseBody
206	206	@TokenRequired
207	207	@RequestMapping(value = "/export", method = RequestMethod.GET)
208		- public void export(Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletRequest request, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin) {
209		- babyEyeCheckService.export(getUserId(request), startDate, endDate, doctor, key, yeymcId,currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, response, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin);
	208	+ public void export(Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletRequest request, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin, Integer classify) {
	209	+ babyEyeCheckService.export(getUserId(request), startDate, endDate, doctor, key, yeymcId,currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, response, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, classify);
210	210	}
211	211
212	212	@ResponseBody

...	...	@@ -539,7 +539,7 @@
539	539	}
540	540
541	541	/**抛宫产次数类型
542		- * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产
	542	+ * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产 5：三次分娩首次抛宫产
543	543	*/
544	544	private Integer cesareanTimeType;
545	545

...	...	@@ -437,7 +437,7 @@
437	437	private String fmHospital;
438	438
439	439	/**抛宫产次数类型
440		- * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产
	440	+ * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产 5：三次分娩首次抛宫产
441	441	*/
442	442	private Integer cesareanTimeType;
443	443

...	...	@@ -30,7 +30,7 @@
30	30	BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId,
31	31	Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive,
32	32	String positiveIds, Integer page, Integer limit, Date bookStartDate, Date bookEndDate, String apparatusPositive,
33		- String doctorPositive, String yin,String noPassIds);
	33	+ String doctorPositive, String yin, String noPassIds, Integer classify);
34	34
35	35	BaseResponse childrenFilingList(Integer userId, Date startBuildDate, Date endBuildDate,Date startDate, Date endDate, String doctor, String key,
36	36	Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive,
...	...	@@ -45,7 +45,7 @@
45	45
46	46	BaseResponse listInit(Integer userId);
47	47
48		- void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin);
	48	+ void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,Integer classify);
49	49
50	50	BaseResponse getBabyEyeCheckInfo(String hospitalId, String babyId);
51	51	public String getExcItems(BabyNerveMovementModel movementModel);

...	...	@@ -26,13 +26,11 @@
26	26	import com.lyms.platform.query.BabyModelQuery;
27	27	import org.apache.commons.collections.map.HashedMap;
28	28	import org.springframework.beans.factory.annotation.Autowired;
29		-import org.springframework.beans.factory.annotation.Qualifier;
30	29	import org.springframework.data.domain.Sort;
31	30	import org.springframework.data.mongodb.core.MongoTemplate;
32	31	import org.springframework.data.mongodb.core.query.Criteria;
33	32	import org.springframework.data.mongodb.core.query.Query;
34	33	import org.springframework.data.mongodb.core.query.Update;
35		-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
36	34	import org.springframework.stereotype.Service;
37	35
38	36	import javax.servlet.http.HttpServletResponse;
...	...	@@ -955,7 +953,7 @@
955	953	public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId, Integer currentMonthStart,
956	954	Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds,
957	955	Integer page, Integer limit, Date bookStartDate, Date bookEndDate,
958		- String apparatusPositive, String doctorPositive, String yin, String noPassIds) {
	956	+ String apparatusPositive, String doctorPositive, String yin, String noPassIds, Integer classify) {
959	957	boolean b = true;
960	958	String hospitalId = autoMatchFacade.getHospitalId(userId);
961	959	Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId);
...	...	@@ -998,6 +996,11 @@
998	996	if (StringUtils.isNotEmpty(yin)) {
999	997	criteria.and("apparatus").nin("2").and("doctorJudgement").nin("2");
1000	998	}
	999	+ //分类-1.近视高危、2.弱视高危、3.异常高危。（筛选查询）
	1000	+ if (null!=classify) {
	1001	+ criteria.and("classify").is(classify);
	1002	+ }
	1003	+
1001	1004	if (org.apache.commons.lang.StringUtils.isNotBlank(key) \|\| org.apache.commons.lang.StringUtils.isNotBlank(yeymcId)) {
1002	1005	Criteria c = new Criteria();
1003	1006	if (org.apache.commons.lang.StringUtils.isNotBlank(key)) {
...	...	@@ -1328,6 +1331,8 @@
1328	1331	temp.put("doctor", couponMapper.getUserName(babyEyeCheck.getDoctor()));
1329	1332	temp.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime()));
1330	1333	temp.put("nextCheckTime", DateUtil.getYyyyMmDd(babyEyeCheck.getNextCheckTime()));
	1334	+ //分类-1.近视高危、2.弱视高危、3.异常高危
	1335	+ temp.put("classify", babyEyeCheck.getClassify());
1331	1336	CollectionUtils.removeNullValue(temp);
1332	1337	restMap.add(temp);
1333	1338	}
...	...	@@ -2168,8 +2173,8 @@
2168	2173	}
2169	2174
2170	2175	@Override
2171		- public void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin) {
2172		- BaseResponse rest = list(userId, startDate, endDate, doctor, key, yeymcId, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, null);
	2176	+ public void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin, Integer classify) {
	2177	+ BaseResponse rest = list(userId, startDate, endDate, doctor, key, yeymcId, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, null, classify);
2173	2178	PageResult pageResult = (PageResult) rest.getObject();
2174	2179	List<Map<String, Object>> datas = (List<Map<String, Object>>) pageResult.getGrid();
2175	2180	Map<String, String> cnames = new LinkedHashMap<>();
...	...	@@ -2182,6 +2187,8 @@
2182	2187	cnames.put("positive", "阳性项目");
2183	2188	cnames.put("doctor", "检查医生");
2184	2189	cnames.put("checkTime", "检查日期");
	2190	+ //秦皇岛儿保-眼科检查-分类
	2191	+ cnames.put("classify", "分类");
2185	2192
2186	2193	List<Map<String, Object>> results = new ArrayList<>();
2187	2194	if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) {
...	...	@@ -2197,6 +2204,8 @@
2197	2204	result.put("positive", data.get("positive"));
2198	2205	result.put("doctor", data.get("doctor"));
2199	2206	result.put("checkTime", data.get("checkTime"));
	2207	+ //秦皇岛儿保-眼科检查-分类
	2208	+ result.put("classify", data.get("classify"));
2200	2209	results.add(result);
2201	2210	}
2202	2211	}