jiangjiazhi / regional-platform

Commit 9096c8015c3dd4e2a1fafda256a7f3089b4e8670

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

追访

Showing 8 changed files with 126 additions and 22 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.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/RiskReportFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.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/request/RiskBabysQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyHiskCountTask.java

...	...	@@ -111,7 +111,6 @@
111	111
112	112	//下次产检时间
113	113	private Date nextDateEnd;
114		-
115	114	//服务状态
116	115	private Integer serviceStatus;
117	116

...	...	@@ -280,6 +280,7 @@
280	280	@RequestParam(value = "startMonthAge", required = false) Integer startMonthAge,
281	281	@RequestParam(value = "endMonthAge", required = false) Integer endMonthAge,
282	282	@RequestParam(value = "birth", required = false) String birth,
	283	+ @RequestParam(value = "buildTime", required = false) String buildTime,
283	284	@RequestParam(value = "nextDate", required = false) String nextDate,
284	285	@RequestParam(value = "expVip", required = false) Integer expVip,
285	286	@RequestParam(value = "serviceType", required = false) Integer serviceType,
...	...	@@ -319,7 +320,7 @@
319	320	request.setPage(page);
320	321	request.setServiceStatus(serviceStatus);
321	322	request.setDateRange(dateRange);
322		-
	323	+ request.setBuildDate(buildTime);
323	324	// 省
324	325	request.setProvinceId(provinceId);
325	326	// 市

...	...	@@ -2197,6 +2197,11 @@
2197	2197	}
2198	2198	}
2199	2199
	2200	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(request.getBuildDate())) {
	2201	+ babyQuery.setBuildDateStart(DateUtil.getSNDate(request.getBuildDate())[0]);
	2202	+ babyQuery.setBuildDateEnd(DateUtil.getSNDate(request.getBuildDate())[1]);
	2203	+ }
	2204	+
2200	2205	if(StringUtils.isNotEmpty(request.getBirth()) && request.getMonthAgeStart() != null && request.getMonthAgeEnd() != null)
2201	2206	{
2202	2207

...	...	@@ -107,6 +107,23 @@
107	107	}
108	108	}
109	109
	110	+ if (StringUtils.isNotEmpty(riskBabysQueryRequest.getBirth()))
	111	+ {
	112	+ String birthStr = riskBabysQueryRequest.getBirth();
	113	+ String[] dates = birthStr.split(" - ");
	114	+ babyModelQuery.setBirthStart(DateUtil.parseYMD(dates[0]));
	115	+ babyModelQuery.setBirthEnd(new Date(DateUtil.parseYMD(dates[1]).getTime()+246060*1000 -1 ));
	116	+ }
	117	+
	118	+ Date currentDate = DateUtil.formatDate(new Date());if (riskBabysQueryRequest.getMonthAgeStart() != null && riskBabysQueryRequest.getMonthAgeEnd() != null)
	119	+ {
	120	+ Date start = DateUtil.addMonth(currentDate, -riskBabysQueryRequest.getMonthAgeStart());
	121	+ babyModelQuery.setBirthEnd(start);
	122	+
	123	+ Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -riskBabysQueryRequest.getMonthAgeEnd() - 1), 1);
	124	+ babyModelQuery.setBirthStart(end);
	125	+ }
	126	+
110	127	BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
111	128	BabyModelQuery query = new BabyModelQuery();
112	129	query.setYn(YnEnums.YES.getId());

...	...	@@ -2996,22 +2996,59 @@
2996	2996	}
2997	2997	antExChu.add(DateUtil.getyyyy_MM_dd(an.getCheckDate()));
2998	2998	antExChu.add(ResolveUtils.getPregnancyWeek(patients.getLastMenses(), an.getCheckDate()));
2999		- String hightRiskStr = basicConfigService.getScreenResult(JsonUtil.jkstr2Obj(an.getRiskFactor(), List.class));
3000		- antExChu.add(hightRiskStr);
	2999	+ // String hightRiskStr = basicConfigService.getScreenResult(JsonUtil.jkstr2Obj(an.getRiskFactor(), List.class));
	3000	+ // antExChu.add(hightRiskStr);
3001	3001
3002		- List list2 = JsonUtil.toList(an.getRiskFactor(), List.class);
3003		- HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(list2, true);
3004		- List<Map<String, Object>> checkList = ResolveUtils.queryHighRisk(highScoreResult);
	3002	+ // List list2 = JsonUtil.toList(an.getRiskFactor(), List.class);
	3003	+ // HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(list2, true);
	3004	+ // List<Map<String, Object>> checkList = ResolveUtils.queryHighRisk(highScoreResult);
	3005	+ // Set sbLev = new HashSet();
	3006	+ // for (int i = 0;i<highScoreResult.getLevel().size();i++) {
	3007	+ // Map<String, Object> mp = (Map<String, Object>) highScoreResult.getLevel().get(i);
	3008	+ // sbLev.add(mp.get("name"));
	3009	+ // }
	3010	+ // if(CollectionUtils.isNotEmpty(sbLev)){
	3011	+ // antExChu.add(sbLev.toString());
	3012	+ // }else{
	3013	+ // antExChu.add("健康");
	3014	+ // }
	3015	+
3005	3016	Set sbLev = new HashSet();
3006		- for (int i = 0;i<highScoreResult.getLevel().size();i++) {
3007		- Map<String, Object> mp = (Map<String, Object>) highScoreResult.getLevel().get(i);
3008		- sbLev.add(mp.get("name"));
	3017	+ Set riskName = new HashSet();
	3018	+
	3019	+ Map<String, Object> riskMap = new HashMap<>();
	3020	+ //处理高危因素
	3021	+ getRisk(an.getRiskFactor(), an.getOtherRisk(), riskMap);
	3022	+
	3023	+ if(riskMap.get("highRisk")!=null){
	3024	+ List<Map<String, Object>> riksList = (List<Map<String, Object>>) riskMap.get("highRisk");
	3025	+ for(Map<String,Object> risk:riksList){
	3026	+ if(String.valueOf(risk.get("color")).contains("yellow")){
	3027	+ sbLev.add("黄色");
	3028	+ }else if(String.valueOf(risk.get("color")).contains("orange")){
	3029	+ sbLev.add("橙色");
	3030	+ }else if(String.valueOf(risk.get("color")).contains("red")){
	3031	+ sbLev.add("红色");
	3032	+ }else if(String.valueOf(risk.get("color")).contains("purple")){
	3033	+ sbLev.add("紫色");
	3034	+ }
	3035	+ riskName.add(risk.get("name"));
	3036	+ }
3009	3037	}
	3038	+
3010	3039	if(CollectionUtils.isNotEmpty(sbLev)){
	3040	+ antExChu.add(riskName.toString());
	3041	+ }else{
	3042	+ antExChu.add("-");
	3043	+ }
	3044	+
	3045	+ if(CollectionUtils.isNotEmpty(sbLev)){
3011	3046	antExChu.add(sbLev.toString());
3012	3047	}else{
3013	3048	antExChu.add("健康");
3014	3049	}
	3050	+
	3051	+
3015	3052	antExChu.add(an.getTreatmentOpinion()==null?" ":an.getTreatmentOpinion());
3016	3053	antExChu.add(organization.getName());
3017	3054	String checkDoctor = "";

...	...	@@ -52,9 +52,14 @@
52	52	private String provinceId;
53	53	private String cityId;
54	54	private String areaId;
55		-
	55	+ //建档时间
	56	+ private String bTime;
56	57	private String streetId;
57	58
	59	+ //建档时间
	60	+ private String buildDate;
	61	+
	62	+
58	63	private String hospitalProvinceId;
59	64
60	65	private String hospitalCityId;
...	...	@@ -75,6 +80,23 @@
75	80
76	81	//1-需要隐藏姓名、电话、地址
77	82	private int showDetail;
	83	+
	84	+
	85	+ public String getbTime() {
	86	+ return bTime;
	87	+ }
	88	+
	89	+ public void setbTime(String bTime) {
	90	+ this.bTime = bTime;
	91	+ }
	92	+
	93	+ public String getBuildDate() {
	94	+ return buildDate;
	95	+ }
	96	+
	97	+ public void setBuildDate(String buildDate) {
	98	+ this.buildDate = buildDate;
	99	+ }
78	100
79	101	public List getHighRiskInfos() {
80	102	return highRiskInfos;

...	...	@@ -65,14 +65,18 @@
65	65	private String cprovinceId;
66	66	private String ccityId;
67	67	private String careaId;
	68	+ //生日
	69	+ private String birth;
	70	+ //月龄
	71	+ private Integer monthAgeStart;
	72	+ //月龄
	73	+ private Integer monthAgeEnd;
68	74
69		-
70	75	// 医院id
71	76	private String hId;
72	77
73	78	//建档时间
74	79	private String buildTime;
75		-
76	80	//下次预约时间
77	81	private String nextCheckTime;
78	82
...	...	@@ -191,6 +195,30 @@
191	195	}
192	196	}
193	197	return OrderEnum.valueOfOrder(order);
	198	+ }
	199	+
	200	+ public String getBirth() {
	201	+ return birth;
	202	+ }
	203	+
	204	+ public void setBirth(String birth) {
	205	+ this.birth = birth;
	206	+ }
	207	+
	208	+ public Integer getMonthAgeStart() {
	209	+ return monthAgeStart;
	210	+ }
	211	+
	212	+ public void setMonthAgeStart(Integer monthAgeStart) {
	213	+ this.monthAgeStart = monthAgeStart;
	214	+ }
	215	+
	216	+ public Integer getMonthAgeEnd() {
	217	+ return monthAgeEnd;
	218	+ }
	219	+
	220	+ public void setMonthAgeEnd(Integer monthAgeEnd) {
	221	+ this.monthAgeEnd = monthAgeEnd;
194	222	}
195	223
196	224	public int getShowDetail() {

...	...	@@ -72,18 +72,13 @@
72	72	List<RiskReportResult> datas = new ArrayList<>();
73	73
74	74	for (BasicConfig config : configs) {
75		- BabyModelQuery query = new BabyModelQuery();
76		- query.setYn(YnEnums.YES.getId());
77		- query.setBuildTypeList(babyModelQuery.getBuildTypeList());
78		- query.setHospitalId(babyModelQuery.getHospitalId());
79		- //建档医生
80		- query.setBuildDoctor(babyModelQuery.getBuildDoctor());
	75	+ babyModelQuery.setYn(YnEnums.YES.getId());
81	76	if(type == 1){
82		- query.setHighRiskInfo(config.getId());
	77	+ babyModelQuery.setHighRiskInfo(config.getId());
83	78	}else if(type == 2){
84		- query.setWeakSonInfo(config.getId());
	79	+ babyModelQuery.setWeakSonInfo(config.getId());
85	80	}
86		- int riskPatientCount = babyService.queryBabyCount(query);
	81	+ int riskPatientCount = babyService.queryBabyCount(babyModelQuery);
87	82	// System.out.println("name:"+config.getName()+",riskPatientCount:"+riskPatientCount);
88	83	RiskReportResult risk = new RiskReportResult();
89	84	risk.setHighRiskId(config.getId());