shiyang / regional-platform

Commit 982e0034338571daf12bb9fc4cc6764be1ad796a

Authored by jiangjiazhi almost 9 years ago

Merge remote-tracking branch 'origin/master'

Showing 9 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java
platform-reportData/src/main/resources/reportOrm/StatisticsMapper.xml

...	...	@@ -74,7 +74,7 @@
74	74	return list;
75	75	}
76	76
77		- public static String getNameByPid(int id)
	77	+ public static String getNameById(Integer id)
78	78	{
79	79	for(ServiceStatusEnums s : ServiceStatusEnums.values()) {
80	80	if (s.getId() == id)

...	...	@@ -131,6 +131,27 @@
131	131
132	132	private Integer hospitalId;
133	133
	134	+ private Integer serviceType;
	135	+
	136	+ //诊断
	137	+ private String diagnose;
	138	+
	139	+ public String getDiagnose() {
	140	+ return diagnose;
	141	+ }
	142	+
	143	+ public void setDiagnose(String diagnose) {
	144	+ this.diagnose = diagnose;
	145	+ }
	146	+
	147	+ public Integer getServiceType() {
	148	+ return serviceType;
	149	+ }
	150	+
	151	+ public void setServiceType(Integer serviceType) {
	152	+ this.serviceType = serviceType;
	153	+ }
	154	+
134	155	public Integer getHospitalId() {
135	156	return hospitalId;
136	157	}
...	...	@@ -257,6 +278,9 @@
257	278	if(null!=hospitalId){
258	279	condition=condition.and("hospitalId", hospitalId, MongoOper.IS);
259	280	}
	281	+ if(null!=diagnose){
	282	+ condition=condition.and("diagnose", diagnose, MongoOper.LIKE);
	283	+ }
260	284
261	285
262	286
...	...	@@ -267,6 +291,9 @@
267	291	if(null!=serviceStatus){
268	292	condition=condition.and("serviceStatus", serviceStatus, MongoOper.IS);
269	293	}
	294	+ if(null!=serviceType){
	295	+ condition=condition.and("serviceType", serviceType, MongoOper.IS);
	296	+ }
270	297
271	298	if (null != keyword) {
272	299	if (null != keyword) {
...	...	@@ -294,6 +321,9 @@
294	321
295	322	if (null != highRisk) {
296	323	condition = condition.and("highRisk", highRisk, MongoOper.IS);
	324	+ }
	325	+ if (null != expVip) {
	326	+ condition = condition.and("expVip", expVip, MongoOper.IS);
297	327	}
298	328
299	329

...	...	@@ -155,22 +155,41 @@
155	155	* @param mcardNo 母亲身份证
156	156	* @param page
157	157	* @param limit
158		- * @param serviceStatus 服务状态
	158	+ * @param serviceType 服务状态
159	159	* @param name 儿童姓名
	160	+ * @param highRiskType 0 非高危 1 高危 2/空全部
160	161	* @return
161	162	*/
162	163	@RequestMapping(value = "/queryBabyList", method = RequestMethod.GET)
163	164	@ResponseBody
164	165	public BaseListResponse queryBabyList(@RequestParam(value = "mcardNo", required = false) String mcardNo,
	166	+ @RequestParam(value = "bcardNo", required = false) String bcardNo,
	167	+ @RequestParam(value = "mphone", required = false) String mphone,
	168	+ @RequestParam(value = "monthAge", required = false) Integer startMonthAge,
	169	+ @RequestParam(value = "monthAge", required = false) Integer endMonthAge,
	170	+ @RequestParam(value = "birth", required = false) String birth,
	171	+ @RequestParam(value = "nextDate", required = false) String nextDate,
	172	+ @RequestParam(value = "expVip", required = false) Integer expVip,
	173	+ @RequestParam(value = "serviceType", required = false) Integer serviceType,
	174	+ @RequestParam(value = "name", required = false) String name,
	175	+ @RequestParam(value = "highRiskType", required = false) Integer highRiskType,
	176	+ @RequestParam(value = "diagnose", required = false) String diagnose,
165	177	@RequestParam("page") Integer page,
166		- @RequestParam("limit") Integer limit,
167		- @RequestParam(value = "serviceStatus", required = false) Integer serviceStatus,
168		- @RequestParam(value = "name", required = false) String name){
	178	+ @RequestParam("limit") Integer limit){
169	179
170	180	BabyManageRequest request = new BabyManageRequest();
	181	+ request.setBcardNo(bcardNo);
171	182	request.setMcardNo(mcardNo);
172		- request.setServiceStatus(serviceStatus);
173		- request.setName(request.getName());
	183	+ request.setMphone(mphone);
	184	+ request.setMonthAgeStart(startMonthAge);
	185	+ request.setMonthAgeEnd(endMonthAge);
	186	+ request.setBirth(birth);
	187	+ request.setNextDate(nextDate);
	188	+ request.setExpVip(expVip);
	189	+ request.setHighRiskType(highRiskType);
	190	+ request.setServiceType(serviceType);
	191	+ request.setDiagnose(diagnose);
	192	+ request.setName(name);
174	193	request.setLimit(limit);
175	194	request.setPage(page);
176	195

...	...	@@ -55,10 +55,10 @@
55	55	public void getTotalIndex(HttpServletResponse response, @RequestParam(value = "type")Integer type, @RequestParam(value = "pid", required = false)String pid) {
56	56	Map<String,Object> result= new HashMap<String, Object>();
57	57	Map<String, String> colormap = new HashMap<>();
58		- colormap.put("紫色", "#FCC0F6");
59		- colormap.put("红色", "#FFBDBE");
60		- colormap.put("橙色", "#FFD6BD");
61		- colormap.put("黄色", "#FFFEBD");
	58	+ colormap.put("紫色", "#ff00ff");
	59	+ colormap.put("红色", "#ff0000");
	60	+ colormap.put("橙色", "#ff8800");
	61	+ colormap.put("黄色", "#ffff00");
62	62	colormap.put("其他", "#DEDCE0");
63	63
64	64	Normal normal = new Normal(true, null);
...	...	@@ -154,6 +154,7 @@
154	154	Series groupRiskSeries = new Series();
155	155	groupRiskSeries.setName("高危人数");
156	156	groupRiskSeries.setType("bar");
	157	+ groupRiskSeries.setLabel(label);
157	158	mapsData.clear();
158	159	for (AreaData areaData:currentRiskList) {
159	160	String groupName = areaData.getGroupName().replace("预警", "");
...	...	@@ -199,7 +200,6 @@
199	200	// 4. 按省或市或地区查询区域内近12个自然月每月建档人数
200	201	List<AreaData> patientMonthList = statisticsService.queryMonthPatients(new AreaDataQuery());
201	202	Map<String, Map<String, Integer>> patientMonthMap = new HashMap<>();
202		-
203	203	Map<String, Integer> pmap = new HashMap<>();
204	204	for (AreaData areaData:patientMonthList) {
205	205	String month = buildMonth(areaData.getYear());
...	...	@@ -210,6 +210,21 @@
210	210	}
211	211	}
212	212	patientMonthMap.put("建档人数", pmap);
	213	+ // 6. 按省或市或地区查询区域内近12个自然月每月产检中历史高危人数（按颜色分组）
	214	+ AreaDataQuery query = new AreaDataQuery();
	215	+ query.setDays(12);
	216	+ List<AreaData> riskMonthList = statisticsService.queryHrefYearRisks(query);
	217	+ Map<String, Integer> rmap = new HashMap<>();
	218	+ for (AreaData areaData:riskMonthList) {
	219	+ String month = buildMonth(areaData.getYear());
	220	+ if (rmap.containsKey(month)) {
	221	+ rmap.put(month, rmap.get(month) + areaData.getVal());
	222	+ } else {
	223	+ rmap.put(month, areaData.getVal());
	224	+ }
	225	+ }
	226	+ patientMonthMap.put("高危人数", rmap);
	227	+
213	228
214	229	Option patientMonthOption = buildLineOption("建档&高危人数", null, patientMonthMap, buildDefaultMonth(12));
215	230

...	...	@@ -393,7 +393,7 @@
393	393	String diagnoseStr = model.getDiagnose();
394	394	if (!StringUtils.isEmpty(diagnoseStr))
395	395	{
396		- List diagnoses = JsonUtil.toList(diagnoseStr,List.class);
	396	+ List diagnoses = JsonUtil.toList(diagnoseStr, List.class);
397	397	for (Object obj : diagnoses)
398	398	{
399	399	if (obj != null)
400	400
401	401
402	402
403	403
404	404
405	405
...	...	@@ -701,34 +701,51 @@
701	701
702	702	BabyModelQuery babyQuery = new BabyModelQuery();
703	703	babyQuery.setYn(YnEnums.YES.getId());
	704	+ babyQuery.setNeed("1");
704	705	babyQuery.setMcertNo(request.getMcardNo());
705		- babyQuery.setServiceStatus(request.getServiceStatus());
	706	+ babyQuery.setCardNo(request.getBcardNo());
706	707	babyQuery.setName(request.getName());
707		- babyQuery.setNeed("1");
	708	+ babyQuery.setMphone(request.getMphone());
	709	+ if (request.getMonthAgeStart() != null \|\| request.getMonthAgeEnd() != null)
	710	+ {
	711	+ if (request.getMonthAgeStart() != null)
	712	+ {
	713	+ request.setMonthAgeEnd(request.getMonthAgeStart());
	714	+ }
	715	+ else
	716	+ {
	717	+ request.setMonthAgeStart(request.getMonthAgeEnd());
	718	+ }
	719	+ Date start = DateUtil.addMonth(new Date(),request.getMonthAgeStart());
	720	+ Date end = DateUtil.addMonth(new Date(),request.getMonthAgeEnd());
	721	+ babyQuery.setBirthStart(end);
	722	+ babyQuery.setBirthEnd(start);
	723	+ }
708	724
	725	+ babyQuery.setDiagnose(request.getDiagnose());
	726	+ // babyQuery.setNextDateStart(DateUtil.parseYMD(request.getNextDateStart()));
	727	+// babyQuery.setNextDateEnd(DateUtil.parseYMD(request.getNextDateEnd()));
709	728
	729	+
	730	+// babyQuery.setBirthStart(DateUtil.parseYMD(request.getBirthStart()));
	731	+// babyQuery.setBirthEnd(DateUtil.parseYMD(request.getBirthEnd()));
	732	+
	733	+ if (request.getServiceType() != null && request.getServiceType() != 0)
	734	+ {
	735	+ babyQuery.setServiceType(request.getServiceType());
	736	+ }
	737	+
	738	+ babyQuery.setExpVip(request.getExpVip());
	739	+
710	740	babyQuery.setPage(request.getPage());
711	741	babyQuery.setLimit(request.getLimit());
712	742
713		- babyQuery.setMname(request.getMname());
714	743	//0 非高危 1 高危 2 全部
715	744	if (request.getHighRiskType() != null && request.getHighRiskType() != 2)
716	745	{
717	746	babyQuery.setHighRisk(request.getHighRiskType());
718	747	}
719	748
720		- babyQuery.setMphone(request.getMphone());
721		- babyQuery.setServiceStatus(request.getServiceStatus());
722		- babyQuery.setSex(request.getSex());
723		-
724		- babyQuery.setBirthStart(DateUtil.parseYMD(request.getBirthStart()));
725		- babyQuery.setBirthEnd(DateUtil.parseYMD(request.getBirthEnd()));
726		-
727		- babyQuery.setNextDateStart(DateUtil.parseYMD(request.getNextDateStart()));
728		- babyQuery.setNextDateEnd(DateUtil.parseYMD(request.getNextDateEnd()));
729		-
730		-
731		-
732	749	List<BabyManageListResult> list = new ArrayList<>();
733	750
734	751	List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
735	752
736	753
...	...	@@ -739,16 +756,41 @@
739	756	{
740	757	BabyManageListResult result = new BabyManageListResult();
741	758	result.setId(model.getId());
742		- result.setHighRisk(model.getHighRisk());
743		- result.setSex(model.getSex());
	759	+ if (model.getHighRisk()== null \|\| model.getHighRisk() == 0)
	760	+ {
	761	+ result.setHighRisk("正常");
	762	+ }
	763	+ else
	764	+ {
	765	+ result.setHighRisk("高危");
	766	+ }
	767	+ result.setSex(SexTypeEnums.getTitleById(model.getSex()));
744	768	result.setBabyName(model.getName());
745	769	result.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth()));
746	770	result.setMommyName(model.getMname());
747	771	result.setMommnyPhone(model.getMphone());
748		- result.setServiceStatus(String.valueOf(model.getServiceStatus()));
	772	+ result.setServiceStatus(ServiceStatusEnums.getNameById(model.getServiceStatus()));
749	773	result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate()));
750	774	result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
751	775	result.setPatientId(model.getParentId());
	776	+
	777	+ String diagnose = "正常";
	778	+ if (!StringUtils.isEmpty(model.getDiagnose()))
	779	+ {
	780	+ List diagList = JsonUtil.toList(model.getDiagnose(),List.class);
	781	+ if (CollectionUtils.isNotEmpty(diagList))
	782	+ {
	783	+ for(Object obj : diagList)
	784	+ {
	785	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String)obj);
	786	+ if (basicConfig != null)
	787	+ {
	788	+ diagnose += basicConfig.getName() + " ";
	789	+ }
	790	+ }
	791	+ }
	792	+ }
	793	+ result.setDiagnose(diagnose);
752	794	list.add(result);
753	795	}
754	796	}

...	...	@@ -194,7 +194,7 @@
194	194	result.put("serviceObjName", serviceObjName);
195	195	result.put("serviceTypeName", ServiceTypeEnums.getTitleById(temp.getServiceType()));
196	196
197		- result.put("serviceStatusName", ServiceStatusEnums.getNameByPid(temp.getServiceStatus()));
	197	+ result.put("serviceStatusName", ServiceStatusEnums.getNameById(temp.getServiceStatus()));
198	198	result.put("content", temp.getContent());
199	199
200	200	//发送频次

...	...	@@ -15,6 +15,9 @@
15	15	//服务状态
16	16	private Integer serviceStatus;
17	17
	18	+ //服务类型
	19	+ private Integer serviceType;
	20	+
18	21	//妈咪身份证号
19	22	private String mcardNo;
20	23
21	24
22	25
23	26
...	...	@@ -31,15 +34,12 @@
31	34	private Integer monthAgeEnd;
32	35
33	36	//生日
34		- private String birthStart;
	37	+ private String birth;
35	38
36		- private String birthEnd;
37	39
38	40	//下次预约时间
39		- private String nextDateStart;
	41	+ private String nextDate;
40	42
41		- //下次预约时间
42		- private String nextDateEnd;
43	43
44	44	//母亲联系方式
45	45	private String mphone;
...	...	@@ -53,6 +53,25 @@
53	53	//体检会员 0非体验会员 1体验会员
54	54	private Integer expVip;
55	55
	56	+ //诊断
	57	+ private String diagnose;
	58	+
	59	+ public Integer getServiceType() {
	60	+ return serviceType;
	61	+ }
	62	+
	63	+ public void setServiceType(Integer serviceType) {
	64	+ this.serviceType = serviceType;
	65	+ }
	66	+
	67	+ public String getDiagnose() {
	68	+ return diagnose;
	69	+ }
	70	+
	71	+ public void setDiagnose(String diagnose) {
	72	+ this.diagnose = diagnose;
	73	+ }
	74	+
56	75	public Integer getSex() {
57	76	return sex;
58	77	}
59	78
60	79
61	80
...	...	@@ -125,36 +144,20 @@
125	144	this.monthAgeEnd = monthAgeEnd;
126	145	}
127	146
128		- public String getBirthStart() {
129		- return birthStart;
	147	+ public String getNextDate() {
	148	+ return nextDate;
130	149	}
131	150
132		- public void setBirthStart(String birthStart) {
133		- this.birthStart = birthStart;
	151	+ public void setNextDate(String nextDate) {
	152	+ this.nextDate = nextDate;
134	153	}
135	154
136		- public String getBirthEnd() {
137		- return birthEnd;
	155	+ public String getBirth() {
	156	+ return birth;
138	157	}
139	158
140		- public void setBirthEnd(String birthEnd) {
141		- this.birthEnd = birthEnd;
142		- }
143		-
144		- public String getNextDateStart() {
145		- return nextDateStart;
146		- }
147		-
148		- public void setNextDateStart(String nextDateStart) {
149		- this.nextDateStart = nextDateStart;
150		- }
151		-
152		- public String getNextDateEnd() {
153		- return nextDateEnd;
154		- }
155		-
156		- public void setNextDateEnd(String nextDateEnd) {
157		- this.nextDateEnd = nextDateEnd;
	159	+ public void setBirth(String birth) {
	160	+ this.birth = birth;
158	161	}
159	162
160	163	public String getMphone() {

...	...	@@ -10,7 +10,7 @@
10	10	private String babyName;
11	11
12	12	//性别
13		- private Integer sex;
	13	+ private String sex;
14	14
15	15	//月龄
16	16	private String monthAge;
17	17
...	...	@@ -30,12 +30,23 @@
30	30	//服务状态
31	31	private String serviceStatus;
32	32
33		- //是否高危 0非高危 1高危
34		- private Integer highRisk;
	33	+ //是否高危
	34	+ private String highRisk;
35	35
36	36	//孕妇Id
37	37	private String patientId;
38	38
	39	+ //诊断
	40	+ private String diagnose;
	41	+
	42	+ public String getDiagnose() {
	43	+ return diagnose;
	44	+ }
	45	+
	46	+ public void setDiagnose(String diagnose) {
	47	+ this.diagnose = diagnose;
	48	+ }
	49	+
39	50	public String getPatientId() {
40	51	return patientId;
41	52	}
42	53
...	...	@@ -53,11 +64,11 @@
53	64	}
54	65
55	66
56		- public Integer getSex() {
	67	+ public String getSex() {
57	68	return sex;
58	69	}
59	70
60		- public void setSex(Integer sex) {
	71	+ public void setSex(String sex) {
61	72	this.sex = sex;
62	73	}
63	74
64	75
...	...	@@ -118,11 +129,11 @@
118	129	this.serviceStatus = serviceStatus;
119	130	}
120	131
121		- public Integer getHighRisk() {
	132	+ public String getHighRisk() {
122	133	return highRisk;
123	134	}
124	135
125		- public void setHighRisk(Integer highRisk) {
	136	+ public void setHighRisk(String highRisk) {
126	137	this.highRisk = highRisk;
127	138	}
128	139	}

...	...	@@ -549,7 +549,7 @@
549	549	AND F.HIGH_RISK_GROUP<>'其他'
550	550	AND B.EXAMINE_HISTORY_NUM=1
551	551	AND B.INSERT_DATE<=TRUNC(SYSDATE)
552		- AND B.INSERT_DATE>=TRUNC(ADD_MONTHS(SYSDATE,-6))
	552	+ AND B.INSERT_DATE>=TRUNC(ADD_MONTHS(SYSDATE,-${days}))
553	553	]]>
554	554	<if test="provinceId != null and provinceId != ''">
555	555	AND D.PROVINCE_ID=#{provinceId}