jiangjiazhi / regional-platform

Commit d4311b5b0ee673a64301ab3d74ec9d2812bb8158

Authored by liquanyu almost 3 years ago

Exists in master and in 6 other branches

两癌

Showing 5 changed files with 349 additions and 31 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabySieveHandleTask.java

...	...	@@ -35,7 +35,7 @@
35	35	private String levelTypeId;
36	36	//手机号
37	37	private String phone;
38		- //居住地
	38	+ //居住地省
39	39	private String provinceId;
40	40	//市
41	41	private String cityId;
42	42
43	43
44	44
...	...	@@ -47,23 +47,36 @@
47	47	private String address;
48	48	//个案编号
49	49	private String number;
	50	+
	51	+ //上报年份
	52	+ private Integer year;
	53	+ //季度
	54	+ private Integer quarter;
	55	+
50	56	//(一）病史情况
51	57	//月经情况
52	58	//月经初潮年龄(岁)
53	59	private String bsYjage;
54	60	//最近一次末次月经
55	61	private String bsZjyj;
	62	+
56	63	//绝经(1.否2.是3.不确定)
57	64	private String bsJj;
58	65	//绝经年龄(岁)
59	66	private String bsJjage;
60	67	//孕产史
	68	+
	69	+ //是否生产过 1 否 2是
	70	+ private String sfsc;
	71	+
61	72	//孕次(次)
62	73	private String ycYc;
63	74	//产次(次)
64	75	private String ycCc;
65	76	//初产年龄(岁)
66	77	private String ycAge;
	78	+ //是否哺乳 1 否 2是
	79	+ private String sfbr;
67	80	//哺乳史
68	81	private String ycFrs;
69	82	//是否接受过乳腺癌检査
...	...	@@ -78,6 +91,7 @@
78	91	private Map<String,Object> jzsRxa;
79	92	//卵巢癌
80	93	private Map<String,Object> jzsLca;
	94	+
81	95	//遵化新增，宫颈癌字，值和上面卵巢相同
82	96	private Map<String,Object> jzsGja;
83	97	//(二）乳腺临床检査，全部遵化新增其它 qt
...	...	@@ -122,6 +136,61 @@
122	136	//活动度右
123	137	private Map<String,Object> rxlHddy;
124	138
	139	+ //乳腺触诊
	140	+ //乳腺触诊左乳
	141	+ private Map<String,Object> rxczLeft;
	142	+ //乳腺触诊右乳
	143	+ private Map<String,Object> rxczRight;
	144	+ //乳腺触诊临床检查结果
	145	+ private Map<String,Object> rxczLcjcResult;
	146	+ //乳腺触诊检查机构
	147	+ private String rxczHospitalId;
	148	+ //乳腺触诊检查人员
	149	+ private String rxczUserId;
	150	+ //乳腺触诊检查日期
	151	+ private String rxczCheckDate;
	152	+
	153	+ //乳腺彩色超声检查左乳
	154	+ private Map<String,Object> rxcsLeft;
	155	+ //乳腺彩色超声检查右乳
	156	+ private Map<String,Object> rxcsRight;
	157	+ //乳腺彩色超声检查左乳分级 0 1 2 3 4 5
	158	+ private String rxcsLeftLevel;
	159	+ //乳腺彩色超声检查右乳分级 0 1 2 3 4 5
	160	+ private String rxcsRightLevel;
	161	+ //乳腺彩色超声检查建议
	162	+ private String rxcsSuggest;
	163	+ //乳腺彩色超声检查检查机构
	164	+ private String rxcsHospitalId;
	165	+ //乳腺彩色超声检查检查人员
	166	+ private String rxcsUserId;
	167	+ //乳腺彩色超声检查检查日期
	168	+ private String rxcsCheckDate;
	169	+
	170	+ //乳腺X检查
	171	+ //乳腺X检查左乳分级 0 1 2 3 4 5
	172	+ private String rxxLeftLevel;
	173	+ //乳腺X检查右乳分级 0 1 2 3 4 5
	174	+ private String rxxRightLevel;
	175	+ //乳腺X检查左乳肿块
	176	+ private Map<String,Object> rxxLeftBlock;
	177	+ //乳腺X检查右乳肿块
	178	+ private Map<String,Object> rxxRightBlock;
	179	+ //乳腺X检查左乳其他
	180	+ private String rxxLeftOther;
	181	+ //乳腺X检查右乳其他
	182	+ private String rxxRightOther;
	183	+ //乳腺X检查建议
	184	+ private String rxxSuggest;
	185	+ //乳腺X检查检查机构
	186	+ private String rxxHospitalId;
	187	+ //乳腺X检查检查人员
	188	+ private String rxxUserId;
	189	+ //乳腺X检查检查日期
	190	+ private String rxxCheckDate;
	191	+
	192	+
	193	+
125	194	//副乳1.无2.有
126	195	private String rxlFr;
127	196	// 遵化新增，副乳其它
128	197
...	...	@@ -170,9 +239,9 @@
170	239	//建议遵化新增，手术4 , 其它qt
171	240	private Map<String,Object> rxJy;
172	241	//(五〉最终随访结果
173		- //随访情况
	242	+ //随访情况 1 已随访 2 失访
174	243	private String sfQk;
175		- //病理检査
	244	+ //病理检査 1 已做 2 未做 3不详
176	245	private String sfBljc;
177	246	//病理检査机构
178	247	private String sfBljg;
179	248
...	...	@@ -280,10 +349,11 @@
280	349	*/
281	350	//失访情况 1，是；2。否
282	351	private String newSfQk;
	352	+
283	353	//病理结果内容字段：t;n;m;qibie;
284	354	private Map<String,Object> blJg;
285	355	//诊断机构
286		- private String bLzdJg;
	356	+ private String bLzdJg;
287	357	//诊断人员
288	358	private String bLzdRy;
289	359	//诊断时间
...	...	@@ -296,6 +366,230 @@
296	366	private String zHzdRy;
297	367	//诊断时间
298	368	private Date zHzdSj;
	369	+
	370	+ public Integer getYear() {
	371	+ return year;
	372	+ }
	373	+
	374	+ public void setYear(Integer year) {
	375	+ this.year = year;
	376	+ }
	377	+
	378	+ public Integer getQuarter() {
	379	+ return quarter;
	380	+ }
	381	+
	382	+ public void setQuarter(Integer quarter) {
	383	+ this.quarter = quarter;
	384	+ }
	385	+
	386	+ public String getSfsc() {
	387	+ return sfsc;
	388	+ }
	389	+
	390	+ public void setSfsc(String sfsc) {
	391	+ this.sfsc = sfsc;
	392	+ }
	393	+
	394	+ public String getSfbr() {
	395	+ return sfbr;
	396	+ }
	397	+
	398	+ public void setSfbr(String sfbr) {
	399	+ this.sfbr = sfbr;
	400	+ }
	401	+
	402	+ public Map<String, Object> getRxczLeft() {
	403	+ return rxczLeft;
	404	+ }
	405	+
	406	+ public void setRxczLeft(Map<String, Object> rxczLeft) {
	407	+ this.rxczLeft = rxczLeft;
	408	+ }
	409	+
	410	+ public Map<String, Object> getRxczRight() {
	411	+ return rxczRight;
	412	+ }
	413	+
	414	+ public void setRxczRight(Map<String, Object> rxczRight) {
	415	+ this.rxczRight = rxczRight;
	416	+ }
	417	+
	418	+ public Map<String, Object> getRxczLcjcResult() {
	419	+ return rxczLcjcResult;
	420	+ }
	421	+
	422	+ public void setRxczLcjcResult(Map<String, Object> rxczLcjcResult) {
	423	+ this.rxczLcjcResult = rxczLcjcResult;
	424	+ }
	425	+
	426	+ public String getRxczHospitalId() {
	427	+ return rxczHospitalId;
	428	+ }
	429	+
	430	+ public void setRxczHospitalId(String rxczHospitalId) {
	431	+ this.rxczHospitalId = rxczHospitalId;
	432	+ }
	433	+
	434	+ public String getRxczUserId() {
	435	+ return rxczUserId;
	436	+ }
	437	+
	438	+ public void setRxczUserId(String rxczUserId) {
	439	+ this.rxczUserId = rxczUserId;
	440	+ }
	441	+
	442	+ public String getRxczCheckDate() {
	443	+ return rxczCheckDate;
	444	+ }
	445	+
	446	+ public void setRxczCheckDate(String rxczCheckDate) {
	447	+ this.rxczCheckDate = rxczCheckDate;
	448	+ }
	449	+
	450	+ public Map<String, Object> getRxcsLeft() {
	451	+ return rxcsLeft;
	452	+ }
	453	+
	454	+ public void setRxcsLeft(Map<String, Object> rxcsLeft) {
	455	+ this.rxcsLeft = rxcsLeft;
	456	+ }
	457	+
	458	+ public Map<String, Object> getRxcsRight() {
	459	+ return rxcsRight;
	460	+ }
	461	+
	462	+ public void setRxcsRight(Map<String, Object> rxcsRight) {
	463	+ this.rxcsRight = rxcsRight;
	464	+ }
	465	+
	466	+ public String getRxcsLeftLevel() {
	467	+ return rxcsLeftLevel;
	468	+ }
	469	+
	470	+ public void setRxcsLeftLevel(String rxcsLeftLevel) {
	471	+ this.rxcsLeftLevel = rxcsLeftLevel;
	472	+ }
	473	+
	474	+ public String getRxcsRightLevel() {
	475	+ return rxcsRightLevel;
	476	+ }
	477	+
	478	+ public void setRxcsRightLevel(String rxcsRightLevel) {
	479	+ this.rxcsRightLevel = rxcsRightLevel;
	480	+ }
	481	+
	482	+ public String getRxcsSuggest() {
	483	+ return rxcsSuggest;
	484	+ }
	485	+
	486	+ public void setRxcsSuggest(String rxcsSuggest) {
	487	+ this.rxcsSuggest = rxcsSuggest;
	488	+ }
	489	+
	490	+ public String getRxcsHospitalId() {
	491	+ return rxcsHospitalId;
	492	+ }
	493	+
	494	+ public void setRxcsHospitalId(String rxcsHospitalId) {
	495	+ this.rxcsHospitalId = rxcsHospitalId;
	496	+ }
	497	+
	498	+ public String getRxcsUserId() {
	499	+ return rxcsUserId;
	500	+ }
	501	+
	502	+ public void setRxcsUserId(String rxcsUserId) {
	503	+ this.rxcsUserId = rxcsUserId;
	504	+ }
	505	+
	506	+ public String getRxcsCheckDate() {
	507	+ return rxcsCheckDate;
	508	+ }
	509	+
	510	+ public void setRxcsCheckDate(String rxcsCheckDate) {
	511	+ this.rxcsCheckDate = rxcsCheckDate;
	512	+ }
	513	+
	514	+ public String getRxxLeftLevel() {
	515	+ return rxxLeftLevel;
	516	+ }
	517	+
	518	+ public void setRxxLeftLevel(String rxxLeftLevel) {
	519	+ this.rxxLeftLevel = rxxLeftLevel;
	520	+ }
	521	+
	522	+ public String getRxxRightLevel() {
	523	+ return rxxRightLevel;
	524	+ }
	525	+
	526	+ public void setRxxRightLevel(String rxxRightLevel) {
	527	+ this.rxxRightLevel = rxxRightLevel;
	528	+ }
	529	+
	530	+ public Map<String, Object> getRxxLeftBlock() {
	531	+ return rxxLeftBlock;
	532	+ }
	533	+
	534	+ public void setRxxLeftBlock(Map<String, Object> rxxLeftBlock) {
	535	+ this.rxxLeftBlock = rxxLeftBlock;
	536	+ }
	537	+
	538	+ public Map<String, Object> getRxxRightBlock() {
	539	+ return rxxRightBlock;
	540	+ }
	541	+
	542	+ public void setRxxRightBlock(Map<String, Object> rxxRightBlock) {
	543	+ this.rxxRightBlock = rxxRightBlock;
	544	+ }
	545	+
	546	+ public String getRxxLeftOther() {
	547	+ return rxxLeftOther;
	548	+ }
	549	+
	550	+ public void setRxxLeftOther(String rxxLeftOther) {
	551	+ this.rxxLeftOther = rxxLeftOther;
	552	+ }
	553	+
	554	+ public String getRxxRightOther() {
	555	+ return rxxRightOther;
	556	+ }
	557	+
	558	+ public void setRxxRightOther(String rxxRightOther) {
	559	+ this.rxxRightOther = rxxRightOther;
	560	+ }
	561	+
	562	+ public String getRxxSuggest() {
	563	+ return rxxSuggest;
	564	+ }
	565	+
	566	+ public void setRxxSuggest(String rxxSuggest) {
	567	+ this.rxxSuggest = rxxSuggest;
	568	+ }
	569	+
	570	+ public String getRxxHospitalId() {
	571	+ return rxxHospitalId;
	572	+ }
	573	+
	574	+ public void setRxxHospitalId(String rxxHospitalId) {
	575	+ this.rxxHospitalId = rxxHospitalId;
	576	+ }
	577	+
	578	+ public String getRxxUserId() {
	579	+ return rxxUserId;
	580	+ }
	581	+
	582	+ public void setRxxUserId(String rxxUserId) {
	583	+ this.rxxUserId = rxxUserId;
	584	+ }
	585	+
	586	+ public String getRxxCheckDate() {
	587	+ return rxxCheckDate;
	588	+ }
	589	+
	590	+ public void setRxxCheckDate(String rxxCheckDate) {
	591	+ this.rxxCheckDate = rxxCheckDate;
	592	+ }
299	593
300	594	public String getNewSfQk() {
301	595	return newSfQk;

...	...	@@ -41,13 +41,20 @@
41	41	* 建档id
42	42	*/
43	43	private String parentId;
44		-
	44	+// //民族Id
	45	+// --private String nationId;
45	46	private String name;
46	47
47	48	private Integer age;
48	49
49	50	private String phone;
50		-
	51	+// //文化程度
	52	+// --private String levelTypeId;
	53	+//
	54	+// //上报年份
	55	+// --private Integer year;
	56	+// //季度
	57	+// --private Integer quarter;
51	58	//编号
52	59	private String code;
53	60
54	61
...	...	@@ -102,7 +109,19 @@
102	109
103	110	// 宫颈癌筛查:1 宫颈+B超检查:2
104	111	private Integer checkPackage;
	112	+ private Date created;
	113	+ private Date modified;
105	114
	115	+ private String hospitalId;
	116	+
	117	+ public Date getModified() {
	118	+ return modified;
	119	+ }
	120	+
	121	+ public void setModified(Date modified) {
	122	+ this.modified = modified;
	123	+ }
	124	+
106	125	public Integer getCheckPackage() {
107	126	return checkPackage;
108	127	}
109	128
...	...	@@ -167,9 +186,7 @@
167	186	this.tctjcContent = tctjcContent;
168	187	}
169	188
170		- private Date created;
171	189
172		- private String hospitalId;
173	190
174	191	public String getCode() {
175	192	return code;

...	...	@@ -107,6 +107,7 @@
107	107	}
108	108
109	109	/**
	110	+ * 1
110	111	* 秦皇岛增加或更新一条新生儿筛查
111	112	* @Author: 武涛涛
112	113	* @Date: 2020/11/16 14:23
...	...	@@ -136,6 +137,7 @@
136	137
137	138
138	139	/**
	140	+ * 1
139	141	* 秦皇岛新生儿筛查管理
140	142	* @param babySieveAddQhdRequest
141	143	* @return
...	...	@@ -159,6 +161,7 @@
159	161	}
160	162
161	163	/**
	164	+ * 1
162	165	* 根据ID查看新生儿筛查申请秦皇岛版
163	166	* @param id
164	167	* @return

...	...	@@ -411,28 +411,32 @@
411	411	ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.getResident(cancerScr.getResidentId());
412	412	//冗余妇女建档数据
413	413	if (residentsArchiveModel != null) {
414		- //姓名
415		- cancerScr.setUsername(residentsArchiveModel.getUsername());
416		- //出生日期
417		- cancerScr.setBirthday(residentsArchiveModel.getBirthday());
418		- //民族Id
419		- cancerScr.setNationId(residentsArchiveModel.getNationId());
420		- //身份证件号
421		- cancerScr.setCertificateNum(residentsArchiveModel.getCertificateNum());
422		- //文化程度
423		- cancerScr.setLevelTypeId(residentsArchiveModel.getLevelTypeId());
424		- //手机号
425		- cancerScr.setPhone(residentsArchiveModel.getPhone());
426		- //居住地
427		- cancerScr.setProvinceId(residentsArchiveModel.getProvinceId());
428		- //市
429		- cancerScr.setCityId(residentsArchiveModel.getCityId());
430		- //区
431		- cancerScr.setAreaId(residentsArchiveModel.getAreaId());
432		- //街道
433		- cancerScr.setStreetId(residentsArchiveModel.getStreetId());
434		- //详细
435		- cancerScr.setAddress(residentsArchiveModel.getAddress());
	414	+ if(StringUtils.isEmpty(cancerScr.getUsername()))
	415	+ {
	416	+ //姓名
	417	+ cancerScr.setUsername(residentsArchiveModel.getUsername());
	418	+ //出生日期
	419	+ cancerScr.setBirthday(residentsArchiveModel.getBirthday());
	420	+ //民族Id
	421	+ cancerScr.setNationId(residentsArchiveModel.getNationId());
	422	+ //身份证件号
	423	+ cancerScr.setCertificateNum(residentsArchiveModel.getCertificateNum());
	424	+ //文化程度
	425	+ cancerScr.setLevelTypeId(residentsArchiveModel.getLevelTypeId());
	426	+ //手机号
	427	+ cancerScr.setPhone(residentsArchiveModel.getPhone());
	428	+ //居住地
	429	+ cancerScr.setProvinceId(residentsArchiveModel.getProvinceId());
	430	+ //市
	431	+ cancerScr.setCityId(residentsArchiveModel.getCityId());
	432	+ //区
	433	+ cancerScr.setAreaId(residentsArchiveModel.getAreaId());
	434	+ //街道
	435	+ cancerScr.setStreetId(residentsArchiveModel.getStreetId());
	436	+ //详细
	437	+ cancerScr.setAddress(residentsArchiveModel.getAddress());
	438	+ }
	439	+
436	440	//根据用户id获取医院ID
437	441	String hospitalId = autoMatchFacade.getHospitalId(id);
438	442	//医院id

...	...	@@ -201,7 +201,7 @@
201	201	if ("2".equals(dueType)) {
202	202	babySieveManager.setDueType("剖宫产");
203	203	}*/
204		- babySieveManager.setSieveStatus(StringUtils.isEmpty(babyModel.getSieveStatus()) ? "0" : babyModel.getSieveStatus());
	204	+ babySieveManager.setSieveStatus(StringUtils.isEmpty(babyModel.getSieveStatuseNw()) ? "0" : babyModel.getSieveStatuseNw());
205	205	babySieveManager.setmName(babyModel.getMname());
206	206
207	207	babySieveManagerLiat.add(babySieveManager);