jiangjiazhi / regional-platform

Commit 08d3ed422bee6bba3ff40e48a7a3ac27c7b6ce06

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

列表显示筛查结果数据

Showing 9 changed files with 103 additions and 16 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java

...	...	@@ -4,7 +4,6 @@
4	4	import com.lyms.platform.biz.dal.IAntExRecordMDao;
5	5	import com.lyms.platform.common.dao.operator.MongoQuery;
6	6	import com.lyms.platform.common.enums.YnEnums;
7		-import com.lyms.platform.common.utils.BeanUtils;
8	7	import com.lyms.platform.common.utils.DateUtil;
9	8	import com.lyms.platform.common.utils.JsonUtil;
10	9	import com.lyms.platform.pojo.*;
...	...	@@ -19,7 +18,6 @@
19	18	import org.springframework.data.domain.Sort;
20	19	import org.springframework.stereotype.Service;
21	20
22		-import java.util.ArrayList;
23	21	import java.util.Date;
24	22	import java.util.List;
25	23	import java.util.Map;
...	...	@@ -114,6 +112,7 @@
114	112	for (AntenatalExaminationModel antEx : list) {
115	113	AntExRecordModel record = convert(antEx);
116	114	if (null != record) {
	115	+ //冗余到产检表
117	116	handRecord(record);
118	117	}
119	118	}
...	...	@@ -188,6 +187,7 @@
188	187
189	188	public AntExRecordModel convert(AntenatalExaminationModel antEx) {
190	189	AntExRecordModel antExRecordModel = new AntExRecordModel();
	190	+ antExRecordModel.setScreenResult(antEx.getScreenResult());
191	191	antExRecordModel.setParentId(antEx.getParentId());
192	192	antExRecordModel.setfId(antEx.getId());
193	193	antExRecordModel.setType(1);
...	...	@@ -253,6 +253,7 @@
253	253
254	254	public AntExRecordModel convert(AntExChuModel antExChuModel) {
255	255	AntExRecordModel antExRecordModel = new AntExRecordModel();
	256	+ antExRecordModel.setScreenResult(antExChuModel.getScreenResult());
256	257	antExRecordModel.setCheckDoctor(antExChuModel.getProdDoctor());
257	258	antExRecordModel.setHospitalId(antExChuModel.getHospitalId());
258	259	antExRecordModel.setParentId(antExChuModel.getParentId());

1	1	package com.lyms.platform.pojo;
2	2
3	3	import com.lyms.platform.beans.SerialIdEnum;
4		-import com.lyms.platform.common.enums.YnEnums;
5	4	import com.lyms.platform.common.result.BaseModel;
6	5	import org.springframework.data.mongodb.core.mapping.Document;
7	6
8		-import java.io.Serializable;
9	7	import java.util.Date;
10	8	import java.util.List;
11	9
...	...	@@ -54,6 +52,8 @@
54	52	private List hLevel;
55	53	//风险因素
56	54	private List hRisk;
	55	+ //风险因素
	56	+ private List screenResult ;
57	57	private String pid;
58	58	//建档时间
59	59	private Date buildTime;
...	...	@@ -86,6 +86,14 @@
86	86
87	87
88	88	private Integer first; // 1否 2 是，是否当前医院第一次初诊德州需求
	89	+
	90	+ public List getScreenResult() {
	91	+ return screenResult;
	92	+ }
	93	+
	94	+ public void setScreenResult(List screenResult) {
	95	+ this.screenResult = screenResult;
	96	+ }
89	97
90	98	public Integer getFirst() {
91	99	return first;

...	...	@@ -518,7 +518,7 @@
518	518	updateLastRhTime(patients.getId(), hospitalId);
519	519
520	520	setLashCTimes(excAddRequest.getParentId());
521		-
	521	+ //冗余到产检表
522	522	antenatalExaminationService.updateAntExRecord(excAddRequest.getId(), 1);
523	523
524	524	//修改数据

1	1	package com.lyms.platform.operate.web.result;
2	2
3		-import com.lyms.platform.common.base.IBasicResultConvert;
4	3	import com.lyms.platform.common.utils.DateUtil;
5	4	import com.lyms.platform.common.utils.StringUtils;
6		-import com.lyms.platform.pojo.*;
	5	+import com.lyms.platform.pojo.AntExRecordModel;
7	6
8	7	import java.util.List;
9	8	import java.util.Map;
...	...	@@ -36,7 +35,8 @@
36	35	private String riskScore;
37	36	//本院产检次数
38	37	private int chTimes;
39		-
	38	+ //风险因素
	39	+ private String screenResult;
40	40	//总产检次数
41	41	private int tTimes;
42	42	//预约产检日期
...	...	@@ -55,6 +55,14 @@
55	55	private String addr;
56	56	//产次
57	57	private int cTimes=1;
	58	+
	59	+ public String getScreenResult() {
	60	+ return screenResult;
	61	+ }
	62	+
	63	+ public void setScreenResult(String screenResult) {
	64	+ this.screenResult = screenResult;
	65	+ }
58	66
59	67	public String getPid() {
60	68	return pid;

...	...	@@ -4,7 +4,6 @@
4	4	import com.lyms.platform.common.enums.ServiceStatusEnums;
5	5	import com.lyms.platform.common.enums.ServiceTypeEnums;
6	6	import com.lyms.platform.common.utils.DateUtil;
7		-import com.lyms.platform.common.utils.JsonUtil;
8	7	import com.lyms.platform.common.utils.StringUtils;
9	8	import com.lyms.platform.pojo.Patients;
10	9	import org.codehaus.jackson.annotate.JsonIgnore;
11	10
...	...	@@ -55,8 +54,8 @@
55	54	private String serviceStatus;
56	55
57	56	private String pid;
	57	+ private String screenResult;
58	58
59		-
60	59	//操纵者
61	60	private String operator;
62	61
...	...	@@ -160,6 +159,14 @@
160	159
161	160	public String getRealPhone() {
162	161	return realPhone;
	162	+ }
	163	+
	164	+ public String getScreenResult() {
	165	+ return screenResult;
	166	+ }
	167	+
	168	+ public void setScreenResult(String screenResult) {
	169	+ this.screenResult = screenResult;
163	170	}
164	171
165	172	public void setRealPhone(String realPhone) {

1	1	package com.lyms.platform.operate.web.result;
2	2
3	3	import com.lyms.platform.common.base.IBasicResultConvert;
4		-import com.lyms.platform.common.core.annotation.form.Form;
5		-import com.lyms.platform.common.core.annotation.form.FormParam;
6	4	import com.lyms.platform.common.enums.ServiceStatusEnums;
7	5	import com.lyms.platform.common.enums.ServiceTypeEnums;
8	6	import com.lyms.platform.common.utils.DateUtil;
9		-import com.lyms.platform.common.utils.JsonUtil;
10	7	import com.lyms.platform.common.utils.StringUtils;
11		-import com.lyms.platform.operate.web.request.BasePageQueryRequest;
12	8	import com.lyms.platform.pojo.Patients;
13		-import com.lyms.platform.pojo.PuerperaModel;
14	9	import org.codehaus.jackson.annotate.JsonIgnore;
15	10
16	11	import java.util.Date;
...	...	@@ -37,6 +32,8 @@
37	32	private List<Map> rLevel;
38	33	//风险因素
39	34	private String rFactor;
	35	+ //筛查结果
	36	+ private String screenResult;
40	37	//高危评分
41	38	private Integer hScore;
42	39	//产检次数
...	...	@@ -83,6 +80,17 @@
83	80	private String bTime;
84	81	//建档号
85	82	private String fileCode;
	83	+
	84	+ public String getScreenResult() {
	85	+ if(org.apache.commons.lang.StringUtils.isEmpty(screenResult)){
	86	+ return SPIT;
	87	+ }
	88	+ return screenResult;
	89	+ }
	90	+
	91	+ public void setScreenResult(String screenResult) {
	92	+ this.screenResult = screenResult;
	93	+ }
86	94
87	95	public String getFileCode() {
88	96	if(null==fileCode){

...	...	@@ -15,6 +15,7 @@
15	15	import com.lyms.platform.pojo.AntExChuModel;
16	16	import com.lyms.platform.pojo.AntExRecordModel;
17	17	import com.lyms.platform.pojo.AntenatalExaminationModel;
	18	+import com.lyms.platform.pojo.BasicConfig;
18	19	import com.lyms.platform.query.AntExRecordQuery;
19	20	import org.apache.commons.collections.CollectionUtils;
20	21	import org.apache.commons.lang.math.NumberUtils;
...	...	@@ -194,6 +195,25 @@
194	195	ri += ",";
195	196	}
196	197	ri += name.substring(0, name.length() - 1);
	198	+ }
	199	+
	200	+ //筛查结果
	201	+ List<String> screen = e.getScreenResult();
	202	+ if (CollectionUtils.isNotEmpty(screen)) {
	203	+ StringBuilder sb = new StringBuilder(56);
	204	+ for (String srt : screen) {
	205	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(srt)) {
	206	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt);
	207	+ if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) {
	208	+ sb.append(basicConfig.getName()).append(',');
	209	+ }
	210	+ }
	211	+ }
	212	+ if (sb.toString().endsWith(",")) {
	213	+ antExManagerResult.setScreenResult(sb.substring(0, sb.length() - 1));
	214	+ } else {
	215	+ antExManagerResult.setScreenResult(sb.toString());
	216	+ }
197	217	}
198	218
199	219	antExManagerResult.setRiskFactor(ri);

...	...	@@ -13,7 +13,6 @@
13	13	import com.lyms.platform.operate.web.result.HighScoreResult;
14	14	import com.lyms.platform.operate.web.result.QuanPatientsResult;
15	15	import com.lyms.platform.operate.web.utils.CommonsHelper;
16		-import com.lyms.platform.operate.web.utils.ResolveUtils;
17	16	import com.lyms.platform.permission.model.Organization;
18	17	import com.lyms.platform.permission.model.Users;
19	18	import com.lyms.platform.permission.service.OrganizationService;
...	...	@@ -90,6 +89,24 @@
90	89	}
91	90	} else {
92	91	quanPatientsResult.setlName(patients.getBookbuildingDoctor());
	92	+ }
	93	+ }
	94	+ //筛查结果
	95	+ List<String> screen = patients.getScreenResult();
	96	+ if (CollectionUtils.isNotEmpty(screen)) {
	97	+ StringBuilder sb = new StringBuilder(56);
	98	+ for (String srt : screen) {
	99	+ if (StringUtils.isNotEmpty(srt)) {
	100	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt);
	101	+ if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) {
	102	+ sb.append(basicConfig.getName()).append(',');
	103	+ }
	104	+ }
	105	+ }
	106	+ if (sb.toString().endsWith(",")) {
	107	+ quanPatientsResult.setScreenResult(sb.substring(0, sb.length() - 1));
	108	+ } else {
	109	+ quanPatientsResult.setScreenResult(sb.toString());
93	110	}
94	111	}
95	112	quanPatientsResult.setbTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));

...	...	@@ -176,6 +176,24 @@
176	176	riskPatientsResult.setServiceStatus(ServiceStatusEnums.getNameById(patients.getServiceStatus()));
177	177	riskPatientsResult.setcTime(nextCheckTime);
178	178	stopWatch.start("query findLastRisk");
	179	+ //筛查结果
	180	+ List<String> screen = patients.getScreenResult();
	181	+ if (CollectionUtils.isNotEmpty(screen)) {
	182	+ StringBuilder sb = new StringBuilder(56);
	183	+ for (String srt : screen) {
	184	+ if (StringUtils.isNotEmpty(srt)) {
	185	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt);
	186	+ if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) {
	187	+ sb.append(basicConfig.getName()).append(',');
	188	+ }
	189	+ }
	190	+ }
	191	+ if (sb.toString().endsWith(",")) {
	192	+ riskPatientsResult.setScreenResult(sb.substring(0, sb.length() - 1));
	193	+ } else {
	194	+ riskPatientsResult.setScreenResult(sb.toString());
	195	+ }
	196	+ }
179	197
180	198	//高危因素
181	199	List<String> factor = patients.getRiskFactorId();