jiangjiazhi / regional-platform

Commit c4b60f88b272fb10700aa1855081ba9a69f88c99

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

两癌筛查数据bug修改

Showing 7 changed files with 1046 additions and 149 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CancerScreeningService.java
platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.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/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java

...	...	@@ -6,6 +6,8 @@
6	6	import com.lyms.platform.common.dao.operator.MongoQuery;
7	7	import com.lyms.platform.common.enums.YnEnums;
8	8	import com.lyms.platform.pojo.CancerScreeningModel;
	9	+import com.lyms.platform.query.CancerScreeningQuery;
	10	+import org.apache.commons.lang.StringUtils;
9	11	import org.springframework.beans.factory.annotation.Autowired;
10	12	import org.springframework.data.domain.Sort;
11	13	import org.springframework.stereotype.Service;
...	...	@@ -28,7 +30,7 @@
28	30	* @param residentId
29	31	* @return
30	32	*/
31		- public List<CancerScreeningModel> findAllByResidentId(String residentId) {
	33	+ public List<CancerScreeningModel> findResIdCancerScreenList(String residentId) {
32	34	Assert.notNull(residentId, "findAllByParentId residentId must not be null.");
33	35	MongoCondition condition = MongoCondition.newInstance("residentId", residentId, MongoOper.IS).and("yn", YnEnums.YES.getId(), MongoOper.IS);
34	36	return iCancerScreeningDao.query(condition.toMongoQuery().addOrder(Sort.Direction.DESC, "created"));
...	...	@@ -82,5 +84,18 @@
82	84	iCancerScreeningDao.updateOneCanScr(cancerScreenModel, id);
83	85	}
84	86
	87	+ /**
	88	+ * 分页查询列表
	89	+ * @param canQuery
	90	+ * @return
	91	+ */
	92	+ public List<CancerScreeningModel> queryCancerScreList(CancerScreeningQuery canQuery) {
	93	+ MongoQuery query = canQuery.convertToQuery();
	94	+ if (StringUtils.isNotEmpty(canQuery.getNeed())) {
	95	+ canQuery.mysqlBuild(iCancerScreeningDao.count(canQuery.convertToQuery()));
	96	+ query.start(canQuery.getOffset()).end(canQuery.getLimit());
	97	+ }
	98	+ return iCancerScreeningDao.query(query.addOrder(Sort.Direction.DESC, "modified"));
	99	+ }
85	100	}

...	...	@@ -18,9 +18,34 @@
18	18	public class CancerScreeningModel extends BaseModel {
19	19	//主键id
20	20	private String id;
21		-
22		- //妇女id
	21	+ //妇女档案id
23	22	private String residentId;
	23	+ //医院ID
	24	+ private String hospitalId;
	25	+ //姓名
	26	+ private String username;
	27	+ //出生日期
	28	+ private Date birthday;
	29	+ //民族Id
	30	+ private String nationId;
	31	+ //身份证件号
	32	+ private String certificateNum;
	33	+ //文化程度
	34	+ private String levelTypeId;
	35	+ //手机号
	36	+ private String phone;
	37	+ //居住地
	38	+ private String provinceId;
	39	+ //市
	40	+ private String cityId;
	41	+ //区
	42	+ private String areaId;
	43	+ //街道
	44	+ private String streetId;
	45	+ //详细
	46	+ private String address;
	47	+ //个案编号
	48	+ private String number;
24	49	//(一）病史情况
25	50	//月经情况
26	51	//月经初潮年龄(岁)
...	...	@@ -162,6 +187,118 @@
162	187	* 是否有效
163	188	*/
164	189	private Integer yn;
	190	+
	191	+ public String getHospitalId() {
	192	+ return hospitalId;
	193	+ }
	194	+
	195	+ public void setHospitalId(String hospitalId) {
	196	+ this.hospitalId = hospitalId;
	197	+ }
	198	+
	199	+ public String getUsername() {
	200	+ return username;
	201	+ }
	202	+
	203	+ public void setUsername(String username) {
	204	+ this.username = username;
	205	+ }
	206	+
	207	+ public Date getBirthday() {
	208	+ return birthday;
	209	+ }
	210	+
	211	+ public void setBirthday(Date birthday) {
	212	+ this.birthday = birthday;
	213	+ }
	214	+
	215	+ public String getNationId() {
	216	+ return nationId;
	217	+ }
	218	+
	219	+ public void setNationId(String nationId) {
	220	+ this.nationId = nationId;
	221	+ }
	222	+
	223	+ public String getCertificateNum() {
	224	+ return certificateNum;
	225	+ }
	226	+
	227	+ public void setCertificateNum(String certificateNum) {
	228	+ this.certificateNum = certificateNum;
	229	+ }
	230	+
	231	+ public String getLevelTypeId() {
	232	+ return levelTypeId;
	233	+ }
	234	+
	235	+ public void setLevelTypeId(String levelTypeId) {
	236	+ this.levelTypeId = levelTypeId;
	237	+ }
	238	+
	239	+ public String getPhone() {
	240	+ return phone;
	241	+ }
	242	+
	243	+ public void setPhone(String phone) {
	244	+ this.phone = phone;
	245	+ }
	246	+
	247	+ public String getProvinceId() {
	248	+ return provinceId;
	249	+ }
	250	+
	251	+ public void setProvinceId(String provinceId) {
	252	+ this.provinceId = provinceId;
	253	+ }
	254	+
	255	+ public String getCityId() {
	256	+ return cityId;
	257	+ }
	258	+
	259	+ public void setCityId(String cityId) {
	260	+ this.cityId = cityId;
	261	+ }
	262	+
	263	+ public String getAreaId() {
	264	+ return areaId;
	265	+ }
	266	+
	267	+ public void setAreaId(String areaId) {
	268	+ this.areaId = areaId;
	269	+ }
	270	+
	271	+ public String getStreetId() {
	272	+ return streetId;
	273	+ }
	274	+
	275	+ public void setStreetId(String streetId) {
	276	+ this.streetId = streetId;
	277	+ }
	278	+
	279	+ public String getAddress() {
	280	+ return address;
	281	+ }
	282	+
	283	+ public void setAddress(String address) {
	284	+ this.address = address;
	285	+ }
	286	+
	287	+ public String getNumber() {
	288	+ return number;
	289	+ }
	290	+
	291	+ public void setNumber(String number) {
	292	+ this.number = number;
	293	+ }
	294	+
	295	+ public Integer getYn() {
	296	+ return yn;
	297	+ }
	298	+
	299	+ public void setYn(Integer yn) {
	300	+ this.yn = yn;
	301	+ }
165	302
166	303	public String getId() {
167	304	return id;

...	...	@@ -11,152 +11,842 @@
11	11	import com.lyms.platform.common.dao.operator.MongoCondition;
12	12	import com.lyms.platform.common.dao.operator.MongoQuery;
13	13
	14	+import java.util.Date;
	15	+
14	16	/**
15	17	* 两癌筛查
16	18	*/
17	19	public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQuery {
	20	+ //妇女档案id
	21	+ private String residentId;
	22	+ //姓名
	23	+ private String uname;
	24	+ //出生日期
	25	+ private Date birthday;
	26	+ //民族Id
	27	+ private String nationId;
	28	+ //身份证件号
	29	+ private String certificateNum;
	30	+ //文化程度
	31	+ private String levelTypeId;
	32	+ //手机号
	33	+ private String phone;
	34	+ //居住地
	35	+ private String provinceId;
	36	+ //市
	37	+ private String cityId;
	38	+ //区
	39	+ private String areaId;
	40	+ //街道
	41	+ private String streetId;
	42	+ //详细
	43	+ private String address;
	44	+ //个案编号
	45	+ private String number;
	46	+ //查询号
	47	+ private String queryNo;
18	48	//(一）病史情况
19	49	//月经情况
20	50	//月经初潮年龄(岁)
21		- public String bsYjage;
	51	+ private String bsYjage;
22	52	//最近一次末次月经
23		- public String bsZjyj;
	53	+ private String bsZjyj;
24	54	//绝经(1.否2.是3.不确定)
25		- public String bsJj;
	55	+ private String bsJj;
26	56	//绝经年龄(岁)
27		- public String bsJjage;
	57	+ private String bsJjage;
28	58	//孕产史
29	59	//孕次(次)
30		- public String ycYc;
	60	+ private String ycYc;
31	61	//产次(次)
32		- public String ycCc;
	62	+ private String ycCc;
33	63	//初产年龄(岁)
34		- public String ycAge;
	64	+ private String ycAge;
35	65	//哺乳史
36		- public String ycFrs;
	66	+ private String ycFrs;
37	67	//是否接受过乳腺癌检査
38		- public String ycRxajc;
	68	+ private String ycRxajc;
39	69	//既往史
40	70	//乳腺手术或活检史
41		- public String jwsRxss;
	71	+ private String jwsRxss;
42	72	//激素替代治疗史
43		- public String jwsJstd;
	73	+ private String jwsJstd;
44	74	//家族史病史
45	75	//乳腺癌
46		- public String jzsRxa;
	76	+ private String jzsRxa;
47	77	//卵巢癌
48		- public String jzsLca;
	78	+ private String jzsLca;
49	79	//(二）乳腺临床检査
50	80	//皮肤左
51		- public String rxlPfz;
	81	+ private String rxlPfz;
52	82	//皮肤右
53		- public String rxlPfy;
	83	+ private String rxlPfy;
54	84	//乳头左
55		- public String rxlRtz;
	85	+ private String rxlRtz;
56	86	//乳头右
57		- public String rxlRty;
	87	+ private String rxlRty;
58	88	//溢液左
59		- public String rxlYyz;
	89	+ private String rxlYyz;
60	90	//溢液右
61		- public String rxlYyy;
	91	+ private String rxlYyy;
62	92	//肿块左
63		- public String rxlZkz;
	93	+ private String rxlZkz;
64	94	//肿块右
65		- public String rxlZky;
	95	+ private String rxlZky;
66	96	//大小左
67		- public String rxlDxz;
	97	+ private String rxlDxz;
68	98	//大小右
69		- public String rxlDxy;
	99	+ private String rxlDxy;
70	100	//形状左
71		- public String rxlXzz;
	101	+ private String rxlXzz;
72	102	//形状右
73		- public String rxlXzy;
	103	+ private String rxlXzy;
74	104	//硬度左
75		- public String rxlYdz;
	105	+ private String rxlYdz;
76	106	//硬度右
77		- public String rxlYdy;
	107	+ private String rxlYdy;
78	108	//边缘左
79		- public String rxlByz;
	109	+ private String rxlByz;
80	110	//边缘右
81		- public String rxlByy;
	111	+ private String rxlByy;
82	112	//表面左
83		- public String rxlBmz;
	113	+ private String rxlBmz;
84	114	//表面右
85		- public String rxlBmy;
	115	+ private String rxlBmy;
86	116	//活动度左
87		- public String rxlHddz;
	117	+ private String rxlHddz;
88	118	//活动度右
89		- public String rxlHddy;
	119	+ private String rxlHddy;
90	120	//副乳1.无2.有
91		- public String rxlFr;
	121	+ private String rxlFr;
92	122	//腋淋巴结左
93		- public String rxlYlbz;
	123	+ private String rxlYlbz;
94	124	//腋淋巴结右
95		- public String rxlYlby;
	125	+ private String rxlYlby;
96	126	//锁骨上淋巴结左
97		- public String rxlSglbz;
	127	+ private String rxlSglbz;
98	128	//锁骨上淋巴结右
99		- public String rxlSglby;
	129	+ private String rxlSglby;
100	130	//临床检査结果
101		- public String rxlJcjg;
	131	+ private String rxlJcjg;
102	132	//(三）乳腺彩色超声检査
103	133	//超声所见
104		- public String rxCssj;
	134	+ private String rxCssj;
105	135	//分类左
106		- public String rxFlz;
	136	+ private String rxFlz;
107	137	//分类右
108		- public String rxlFly;
	138	+ private String rxlFly;
109	139	//建议
110		- public String rxlJy;
	140	+ private String rxlJy;
111	141	//检查机构
112		- public String rxlJcdw;
	142	+ private String rxlJcdw;
113	143	//检査人员
114		- public String rxlJcry;
	144	+ private String rxlJcry;
115	145	//检査日期
116		- public String rxlJcrq;
	146	+ private String rxlJcrq;
117	147	//(四〉乳腺X线检査（未作X线检査不填写此项）
118	148	//乳腺X线评估左
119		- public String rxPgz;
	149	+ private String rxPgz;
120	150	//乳腺X线评估右
121		- public String rxlPgy;
	151	+ private String rxlPgy;
122	152	//建议
123		- public String rxJy;
	153	+ private String rxJy;
124	154	//(五〉最终随访结果
125	155	//随访情况
126		- public String sfQk;
	156	+ private String sfQk;
127	157	//病理检査
128		- public String sfBljc;
	158	+ private String sfBljc;
129	159	//病理检査机构
130		- public String sfBljg;
	160	+ private String sfBljg;
131	161	//病理诊断者
132		- public String sfBlzd;
	162	+ private String sfBlzd;
133	163	//病理检査日期
134		- public String sfJcrq;
	164	+ private String sfJcrq;
135	165	//最后诊断
136		- public String sfZhzd;
	166	+ private String sfZhzd;
137	167	//TNM分期
138		- public String sfTnm;
	168	+ private String sfTnm;
139	169	//诊治机构
140		- public String sfZzjg;
	170	+ private String sfZzjg;
141	171	//诊治日期
142		- public String sfZlrq;
	172	+ private String sfZlrq;
143	173	//接受治疗情况
144		- public String sfJszl;
	174	+ private String sfJszl;
145	175	//检査机构
146		- public String sfJcjg;
	176	+ private String sfJcjg;
147	177	//检查人员
148		- public String sfJcry;
	178	+ private String sfJcry;
149	179	//检査日期
150		- public String sfJcsj;
	180	+ private String sfJcsj;
	181	+ /**
	182	+ * 是否有效
	183	+ */
	184	+ private Integer yn;
	185	+ private Date modified;
	186	+ private Date created;
	187	+ //操作人
	188	+ private Integer operator;
	189	+ //医院ID
	190	+ private String hospitalId;
151	191
152	192	/**
153	193	* @return
154	194	*/
155	195	@Override
156	196	public MongoQuery convertToQuery() {
	197	+
157	198	MongoCondition condition = MongoCondition.newInstance();
158	199
159	200	return condition.toMongoQuery();
160	201	}
	202	+
	203	+ public String getHospitalId() {
	204	+ return hospitalId;
	205	+ }
	206	+
	207	+ public void setHospitalId(String hospitalId) {
	208	+ this.hospitalId = hospitalId;
	209	+ }
	210	+
	211	+ public String getQueryNo() {
	212	+ return queryNo;
	213	+ }
	214	+
	215	+ public void setQueryNo(String queryNo) {
	216	+ this.queryNo = queryNo;
	217	+ }
	218	+
	219	+ public Integer getYn() {
	220	+ return yn;
	221	+ }
	222	+
	223	+ public void setYn(Integer yn) {
	224	+ this.yn = yn;
	225	+ }
	226	+
	227	+ public Date getModified() {
	228	+ return modified;
	229	+ }
	230	+
	231	+ public void setModified(Date modified) {
	232	+ this.modified = modified;
	233	+ }
	234	+
	235	+ public Date getCreated() {
	236	+ return created;
	237	+ }
	238	+
	239	+ public void setCreated(Date created) {
	240	+ this.created = created;
	241	+ }
	242	+
	243	+ public Integer getOperator() {
	244	+ return operator;
	245	+ }
	246	+
	247	+ public void setOperator(Integer operator) {
	248	+ this.operator = operator;
	249	+ }
	250	+
	251	+ public String getResidentId() {
	252	+ return residentId;
	253	+ }
	254	+
	255	+ public void setResidentId(String residentId) {
	256	+ this.residentId = residentId;
	257	+ }
	258	+
	259	+ public String getUname() {
	260	+ return uname;
	261	+ }
	262	+
	263	+ public void setUname(String uname) {
	264	+ this.uname = uname;
	265	+ }
	266	+
	267	+ public Date getBirthday() {
	268	+ return birthday;
	269	+ }
	270	+
	271	+ public void setBirthday(Date birthday) {
	272	+ this.birthday = birthday;
	273	+ }
	274	+
	275	+ public String getNationId() {
	276	+ return nationId;
	277	+ }
	278	+
	279	+ public void setNationId(String nationId) {
	280	+ this.nationId = nationId;
	281	+ }
	282	+
	283	+ public String getCertificateNum() {
	284	+ return certificateNum;
	285	+ }
	286	+
	287	+ public void setCertificateNum(String certificateNum) {
	288	+ this.certificateNum = certificateNum;
	289	+ }
	290	+
	291	+ public String getLevelTypeId() {
	292	+ return levelTypeId;
	293	+ }
	294	+
	295	+ public void setLevelTypeId(String levelTypeId) {
	296	+ this.levelTypeId = levelTypeId;
	297	+ }
	298	+
	299	+ public String getPhone() {
	300	+ return phone;
	301	+ }
	302	+
	303	+ public void setPhone(String phone) {
	304	+ this.phone = phone;
	305	+ }
	306	+
	307	+ public String getProvinceId() {
	308	+ return provinceId;
	309	+ }
	310	+
	311	+ public void setProvinceId(String provinceId) {
	312	+ this.provinceId = provinceId;
	313	+ }
	314	+
	315	+ public String getCityId() {
	316	+ return cityId;
	317	+ }
	318	+
	319	+ public void setCityId(String cityId) {
	320	+ this.cityId = cityId;
	321	+ }
	322	+
	323	+ public String getAreaId() {
	324	+ return areaId;
	325	+ }
	326	+
	327	+ public void setAreaId(String areaId) {
	328	+ this.areaId = areaId;
	329	+ }
	330	+
	331	+ public String getStreetId() {
	332	+ return streetId;
	333	+ }
	334	+
	335	+ public void setStreetId(String streetId) {
	336	+ this.streetId = streetId;
	337	+ }
	338	+
	339	+ public String getAddress() {
	340	+ return address;
	341	+ }
	342	+
	343	+ public void setAddress(String address) {
	344	+ this.address = address;
	345	+ }
	346	+
	347	+ public String getNumber() {
	348	+ return number;
	349	+ }
	350	+
	351	+ public void setNumber(String number) {
	352	+ this.number = number;
	353	+ }
	354	+
	355	+ public String getBsYjage() {
	356	+ return bsYjage;
	357	+ }
	358	+
	359	+ public void setBsYjage(String bsYjage) {
	360	+ this.bsYjage = bsYjage;
	361	+ }
	362	+
	363	+ public String getBsZjyj() {
	364	+ return bsZjyj;
	365	+ }
	366	+
	367	+ public void setBsZjyj(String bsZjyj) {
	368	+ this.bsZjyj = bsZjyj;
	369	+ }
	370	+
	371	+ public String getBsJj() {
	372	+ return bsJj;
	373	+ }
	374	+
	375	+ public void setBsJj(String bsJj) {
	376	+ this.bsJj = bsJj;
	377	+ }
	378	+
	379	+ public String getBsJjage() {
	380	+ return bsJjage;
	381	+ }
	382	+
	383	+ public void setBsJjage(String bsJjage) {
	384	+ this.bsJjage = bsJjage;
	385	+ }
	386	+
	387	+ public String getYcYc() {
	388	+ return ycYc;
	389	+ }
	390	+
	391	+ public void setYcYc(String ycYc) {
	392	+ this.ycYc = ycYc;
	393	+ }
	394	+
	395	+ public String getYcCc() {
	396	+ return ycCc;
	397	+ }
	398	+
	399	+ public void setYcCc(String ycCc) {
	400	+ this.ycCc = ycCc;
	401	+ }
	402	+
	403	+ public String getYcAge() {
	404	+ return ycAge;
	405	+ }
	406	+
	407	+ public void setYcAge(String ycAge) {
	408	+ this.ycAge = ycAge;
	409	+ }
	410	+
	411	+ public String getYcFrs() {
	412	+ return ycFrs;
	413	+ }
	414	+
	415	+ public void setYcFrs(String ycFrs) {
	416	+ this.ycFrs = ycFrs;
	417	+ }
	418	+
	419	+ public String getYcRxajc() {
	420	+ return ycRxajc;
	421	+ }
	422	+
	423	+ public void setYcRxajc(String ycRxajc) {
	424	+ this.ycRxajc = ycRxajc;
	425	+ }
	426	+
	427	+ public String getJwsRxss() {
	428	+ return jwsRxss;
	429	+ }
	430	+
	431	+ public void setJwsRxss(String jwsRxss) {
	432	+ this.jwsRxss = jwsRxss;
	433	+ }
	434	+
	435	+ public String getJwsJstd() {
	436	+ return jwsJstd;
	437	+ }
	438	+
	439	+ public void setJwsJstd(String jwsJstd) {
	440	+ this.jwsJstd = jwsJstd;
	441	+ }
	442	+
	443	+ public String getJzsRxa() {
	444	+ return jzsRxa;
	445	+ }
	446	+
	447	+ public void setJzsRxa(String jzsRxa) {
	448	+ this.jzsRxa = jzsRxa;
	449	+ }
	450	+
	451	+ public String getJzsLca() {
	452	+ return jzsLca;
	453	+ }
	454	+
	455	+ public void setJzsLca(String jzsLca) {
	456	+ this.jzsLca = jzsLca;
	457	+ }
	458	+
	459	+ public String getRxlPfz() {
	460	+ return rxlPfz;
	461	+ }
	462	+
	463	+ public void setRxlPfz(String rxlPfz) {
	464	+ this.rxlPfz = rxlPfz;
	465	+ }
	466	+
	467	+ public String getRxlPfy() {
	468	+ return rxlPfy;
	469	+ }
	470	+
	471	+ public void setRxlPfy(String rxlPfy) {
	472	+ this.rxlPfy = rxlPfy;
	473	+ }
	474	+
	475	+ public String getRxlRtz() {
	476	+ return rxlRtz;
	477	+ }
	478	+
	479	+ public void setRxlRtz(String rxlRtz) {
	480	+ this.rxlRtz = rxlRtz;
	481	+ }
	482	+
	483	+ public String getRxlRty() {
	484	+ return rxlRty;
	485	+ }
	486	+
	487	+ public void setRxlRty(String rxlRty) {
	488	+ this.rxlRty = rxlRty;
	489	+ }
	490	+
	491	+ public String getRxlYyz() {
	492	+ return rxlYyz;
	493	+ }
	494	+
	495	+ public void setRxlYyz(String rxlYyz) {
	496	+ this.rxlYyz = rxlYyz;
	497	+ }
	498	+
	499	+ public String getRxlYyy() {
	500	+ return rxlYyy;
	501	+ }
	502	+
	503	+ public void setRxlYyy(String rxlYyy) {
	504	+ this.rxlYyy = rxlYyy;
	505	+ }
	506	+
	507	+ public String getRxlZkz() {
	508	+ return rxlZkz;
	509	+ }
	510	+
	511	+ public void setRxlZkz(String rxlZkz) {
	512	+ this.rxlZkz = rxlZkz;
	513	+ }
	514	+
	515	+ public String getRxlZky() {
	516	+ return rxlZky;
	517	+ }
	518	+
	519	+ public void setRxlZky(String rxlZky) {
	520	+ this.rxlZky = rxlZky;
	521	+ }
	522	+
	523	+ public String getRxlDxz() {
	524	+ return rxlDxz;
	525	+ }
	526	+
	527	+ public void setRxlDxz(String rxlDxz) {
	528	+ this.rxlDxz = rxlDxz;
	529	+ }
	530	+
	531	+ public String getRxlDxy() {
	532	+ return rxlDxy;
	533	+ }
	534	+
	535	+ public void setRxlDxy(String rxlDxy) {
	536	+ this.rxlDxy = rxlDxy;
	537	+ }
	538	+
	539	+ public String getRxlXzz() {
	540	+ return rxlXzz;
	541	+ }
	542	+
	543	+ public void setRxlXzz(String rxlXzz) {
	544	+ this.rxlXzz = rxlXzz;
	545	+ }
	546	+
	547	+ public String getRxlXzy() {
	548	+ return rxlXzy;
	549	+ }
	550	+
	551	+ public void setRxlXzy(String rxlXzy) {
	552	+ this.rxlXzy = rxlXzy;
	553	+ }
	554	+
	555	+ public String getRxlYdz() {
	556	+ return rxlYdz;
	557	+ }
	558	+
	559	+ public void setRxlYdz(String rxlYdz) {
	560	+ this.rxlYdz = rxlYdz;
	561	+ }
	562	+
	563	+ public String getRxlYdy() {
	564	+ return rxlYdy;
	565	+ }
	566	+
	567	+ public void setRxlYdy(String rxlYdy) {
	568	+ this.rxlYdy = rxlYdy;
	569	+ }
	570	+
	571	+ public String getRxlByz() {
	572	+ return rxlByz;
	573	+ }
	574	+
	575	+ public void setRxlByz(String rxlByz) {
	576	+ this.rxlByz = rxlByz;
	577	+ }
	578	+
	579	+ public String getRxlByy() {
	580	+ return rxlByy;
	581	+ }
	582	+
	583	+ public void setRxlByy(String rxlByy) {
	584	+ this.rxlByy = rxlByy;
	585	+ }
	586	+
	587	+ public String getRxlBmz() {
	588	+ return rxlBmz;
	589	+ }
	590	+
	591	+ public void setRxlBmz(String rxlBmz) {
	592	+ this.rxlBmz = rxlBmz;
	593	+ }
	594	+
	595	+ public String getRxlBmy() {
	596	+ return rxlBmy;
	597	+ }
	598	+
	599	+ public void setRxlBmy(String rxlBmy) {
	600	+ this.rxlBmy = rxlBmy;
	601	+ }
	602	+
	603	+ public String getRxlHddz() {
	604	+ return rxlHddz;
	605	+ }
	606	+
	607	+ public void setRxlHddz(String rxlHddz) {
	608	+ this.rxlHddz = rxlHddz;
	609	+ }
	610	+
	611	+ public String getRxlHddy() {
	612	+ return rxlHddy;
	613	+ }
	614	+
	615	+ public void setRxlHddy(String rxlHddy) {
	616	+ this.rxlHddy = rxlHddy;
	617	+ }
	618	+
	619	+ public String getRxlFr() {
	620	+ return rxlFr;
	621	+ }
	622	+
	623	+ public void setRxlFr(String rxlFr) {
	624	+ this.rxlFr = rxlFr;
	625	+ }
	626	+
	627	+ public String getRxlYlbz() {
	628	+ return rxlYlbz;
	629	+ }
	630	+
	631	+ public void setRxlYlbz(String rxlYlbz) {
	632	+ this.rxlYlbz = rxlYlbz;
	633	+ }
	634	+
	635	+ public String getRxlYlby() {
	636	+ return rxlYlby;
	637	+ }
	638	+
	639	+ public void setRxlYlby(String rxlYlby) {
	640	+ this.rxlYlby = rxlYlby;
	641	+ }
	642	+
	643	+ public String getRxlSglbz() {
	644	+ return rxlSglbz;
	645	+ }
	646	+
	647	+ public void setRxlSglbz(String rxlSglbz) {
	648	+ this.rxlSglbz = rxlSglbz;
	649	+ }
	650	+
	651	+ public String getRxlSglby() {
	652	+ return rxlSglby;
	653	+ }
	654	+
	655	+ public void setRxlSglby(String rxlSglby) {
	656	+ this.rxlSglby = rxlSglby;
	657	+ }
	658	+
	659	+ public String getRxlJcjg() {
	660	+ return rxlJcjg;
	661	+ }
	662	+
	663	+ public void setRxlJcjg(String rxlJcjg) {
	664	+ this.rxlJcjg = rxlJcjg;
	665	+ }
	666	+
	667	+ public String getRxCssj() {
	668	+ return rxCssj;
	669	+ }
	670	+
	671	+ public void setRxCssj(String rxCssj) {
	672	+ this.rxCssj = rxCssj;
	673	+ }
	674	+
	675	+ public String getRxFlz() {
	676	+ return rxFlz;
	677	+ }
	678	+
	679	+ public void setRxFlz(String rxFlz) {
	680	+ this.rxFlz = rxFlz;
	681	+ }
	682	+
	683	+ public String getRxlFly() {
	684	+ return rxlFly;
	685	+ }
	686	+
	687	+ public void setRxlFly(String rxlFly) {
	688	+ this.rxlFly = rxlFly;
	689	+ }
	690	+
	691	+ public String getRxlJy() {
	692	+ return rxlJy;
	693	+ }
	694	+
	695	+ public void setRxlJy(String rxlJy) {
	696	+ this.rxlJy = rxlJy;
	697	+ }
	698	+
	699	+ public String getRxlJcdw() {
	700	+ return rxlJcdw;
	701	+ }
	702	+
	703	+ public void setRxlJcdw(String rxlJcdw) {
	704	+ this.rxlJcdw = rxlJcdw;
	705	+ }
	706	+
	707	+ public String getRxlJcry() {
	708	+ return rxlJcry;
	709	+ }
	710	+
	711	+ public void setRxlJcry(String rxlJcry) {
	712	+ this.rxlJcry = rxlJcry;
	713	+ }
	714	+
	715	+ public String getRxlJcrq() {
	716	+ return rxlJcrq;
	717	+ }
	718	+
	719	+ public void setRxlJcrq(String rxlJcrq) {
	720	+ this.rxlJcrq = rxlJcrq;
	721	+ }
	722	+
	723	+ public String getRxPgz() {
	724	+ return rxPgz;
	725	+ }
	726	+
	727	+ public void setRxPgz(String rxPgz) {
	728	+ this.rxPgz = rxPgz;
	729	+ }
	730	+
	731	+ public String getRxlPgy() {
	732	+ return rxlPgy;
	733	+ }
	734	+
	735	+ public void setRxlPgy(String rxlPgy) {
	736	+ this.rxlPgy = rxlPgy;
	737	+ }
	738	+
	739	+ public String getRxJy() {
	740	+ return rxJy;
	741	+ }
	742	+
	743	+ public void setRxJy(String rxJy) {
	744	+ this.rxJy = rxJy;
	745	+ }
	746	+
	747	+ public String getSfQk() {
	748	+ return sfQk;
	749	+ }
	750	+
	751	+ public void setSfQk(String sfQk) {
	752	+ this.sfQk = sfQk;
	753	+ }
	754	+
	755	+ public String getSfBljc() {
	756	+ return sfBljc;
	757	+ }
	758	+
	759	+ public void setSfBljc(String sfBljc) {
	760	+ this.sfBljc = sfBljc;
	761	+ }
	762	+
	763	+ public String getSfBljg() {
	764	+ return sfBljg;
	765	+ }
	766	+
	767	+ public void setSfBljg(String sfBljg) {
	768	+ this.sfBljg = sfBljg;
	769	+ }
	770	+
	771	+ public String getSfBlzd() {
	772	+ return sfBlzd;
	773	+ }
	774	+
	775	+ public void setSfBlzd(String sfBlzd) {
	776	+ this.sfBlzd = sfBlzd;
	777	+ }
	778	+
	779	+ public String getSfJcrq() {
	780	+ return sfJcrq;
	781	+ }
	782	+
	783	+ public void setSfJcrq(String sfJcrq) {
	784	+ this.sfJcrq = sfJcrq;
	785	+ }
	786	+
	787	+ public String getSfZhzd() {
	788	+ return sfZhzd;
	789	+ }
	790	+
	791	+ public void setSfZhzd(String sfZhzd) {
	792	+ this.sfZhzd = sfZhzd;
	793	+ }
	794	+
	795	+ public String getSfTnm() {
	796	+ return sfTnm;
	797	+ }
	798	+
	799	+ public void setSfTnm(String sfTnm) {
	800	+ this.sfTnm = sfTnm;
	801	+ }
	802	+
	803	+ public String getSfZzjg() {
	804	+ return sfZzjg;
	805	+ }
	806	+
	807	+ public void setSfZzjg(String sfZzjg) {
	808	+ this.sfZzjg = sfZzjg;
	809	+ }
	810	+
	811	+ public String getSfZlrq() {
	812	+ return sfZlrq;
	813	+ }
	814	+
	815	+ public void setSfZlrq(String sfZlrq) {
	816	+ this.sfZlrq = sfZlrq;
	817	+ }
	818	+
	819	+ public String getSfJszl() {
	820	+ return sfJszl;
	821	+ }
	822	+
	823	+ public void setSfJszl(String sfJszl) {
	824	+ this.sfJszl = sfJszl;
	825	+ }
	826	+
	827	+ public String getSfJcjg() {
	828	+ return sfJcjg;
	829	+ }
	830	+
	831	+ public void setSfJcjg(String sfJcjg) {
	832	+ this.sfJcjg = sfJcjg;
	833	+ }
	834	+
	835	+ public String getSfJcry() {
	836	+ return sfJcry;
	837	+ }
	838	+
	839	+ public void setSfJcry(String sfJcry) {
	840	+ this.sfJcry = sfJcry;
	841	+ }
	842	+
	843	+ public String getSfJcsj() {
	844	+ return sfJcsj;
	845	+ }
	846	+
	847	+ public void setSfJcsj(String sfJcsj) {
	848	+ this.sfJcsj = sfJcsj;
	849	+ }
	850	+
161	851	}

...	...	@@ -46,6 +46,18 @@
46	46	}
47	47
48	48	/**
	49	+ * 获取妇女所有两癌筛查列表
	50	+ * @param residentId
	51	+ * @return
	52	+ */
	53	+ @ResponseBody
	54	+ @RequestMapping(value="/resCanScrList/{id}",method = RequestMethod.GET)
	55	+ @TokenRequired
	56	+ public BaseResponse getResIdCancerScreenList(@PathVariable String residentId) {
	57	+ return cancerScreenService.getResIdCancerScreenList(residentId);
	58	+ }
	59	+
	60	+ /**
49	61	* 查询两癌筛查列表
50	62	* @param cancerScreeningRequest
51	63	* @param request
...	...	@@ -60,7 +72,7 @@
60	72	}
61	73
62	74	/**
63		- * 根据两癌删除查询详情
	75	+ * 根据两癌Id查询详情
64	76	* @param id
65	77	* @return
66	78	*/

1	1	package com.lyms.platform.operate.web.facade;
2	2
	3	+import com.lyms.platform.biz.service.BasicConfigService;
3	4	import com.lyms.platform.biz.service.CancerScreeningService;
	5	+import com.lyms.platform.common.enums.YnEnums;
4	6	import com.lyms.platform.common.result.BaseResponse;
	7	+import com.lyms.platform.common.utils.DateUtil;
5	8	import com.lyms.platform.operate.web.request.CancerScreeningRequest;
	9	+import com.lyms.platform.operate.web.utils.CommonsHelper;
	10	+import com.lyms.platform.operate.web.utils.FunvCommonUtil;
	11	+import com.lyms.platform.permission.model.Users;
	12	+import com.lyms.platform.permission.service.UsersService;
6	13	import com.lyms.platform.pojo.CancerScreeningModel;
	14	+import com.lyms.platform.query.CancerScreeningQuery;
	15	+import org.apache.commons.collections.CollectionUtils;
	16	+import org.apache.commons.collections.map.HashedMap;
7	17	import org.springframework.beans.factory.annotation.Autowired;
8	18	import org.springframework.stereotype.Component;
9	19
	20	+import java.util.ArrayList;
	21	+import java.util.HashMap;
	22	+import java.util.List;
	23	+import java.util.Map;
	24	+
10	25	/**
11	26	* @auther yangfei
12	27	* @createTime 2018年05月02日 10时45分
13	28
14	29
15	30
16	31
17	32
...	...	@@ -18,15 +33,80 @@
18	33	private CancerScreeningService cancerScreenService;
19	34	@Autowired
20	35	private AutoMatchFacade autoMatchFacade;
	36	+ @Autowired
	37	+ private UsersService usersService;
	38	+ @Autowired
	39	+ private BasicConfigService basicConfigService;
21	40
	41	+ /**
	42	+ * 获取当前医院或院组内的两癌检查列表
	43	+ * @param queryRequest
	44	+ * @param id
	45	+ * @return
	46	+ */
	47	+ public BaseResponse list(CancerScreeningRequest queryRequest,Integer id) {
22	48
23		- public BaseResponse list(CancerScreeningRequest cancerScreeningRequest,Integer id) {
24	49	//根据用户id获取医院ID
25	50	String hospitalId = autoMatchFacade.getHospitalId(id);
	51	+ //查询条件
	52	+ CancerScreeningQuery query = new CancerScreeningQuery();
	53	+ query.setLimit(queryRequest.getLimit());
	54	+ query.setPage(queryRequest.getPage());
	55	+ query.setNeed("need");
	56	+ query.setYn(YnEnums.YES.getId());
	57	+ query.setQueryNo(queryRequest.getQueryNo());
	58	+ if (hospitalId!=null){
	59	+ query.setHospitalId(hospitalId);
	60	+ }
	61	+ query.setProvinceId(queryRequest.getProvinceId());
	62	+ query.setCityId(queryRequest.getCityId());
	63	+ query.setAreaId(queryRequest.getAreaId());
26	64
	65	+ List<CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
	66	+ if (CollectionUtils.isNotEmpty(modelList)){
	67	+ for (CancerScreeningModel model : modelList){
	68	+ Map<String,Object> map = new HashMap<>();
	69	+ map.put("id",model.getId());
	70	+ map.put("name",model.getUsername());
	71	+ map.put("cardNum", FunvCommonUtil.getId(model.getCertificateNum()));
	72	+ map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone()));
	73	+ map.put("age",DateUtil.getAge(model.getBirthday()));
	74	+ map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));
	75	+ }
	76	+ }
27	77	return new BaseResponse();
28	78	}
29	79
	80	+ /**
	81	+ * 获取妇女两癌筛查列表
	82	+ * @param residentId
	83	+ * @return
	84	+ */
	85	+ public BaseResponse getResIdCancerScreenList(String residentId) {
	86	+ BaseResponse baseResponse = new BaseResponse();
	87	+ List<CancerScreeningModel> cancerScreeningModels = cancerScreenService.findResIdCancerScreenList(residentId);
	88	+ List<Map<String,String>> hisCancerScrList = new ArrayList<>();
	89	+ for(CancerScreeningModel cs:cancerScreeningModels){
	90	+ Map<String,String> map = new HashedMap();
	91	+ map.put("id",cs.getId());
	92	+ map.put("createTime", DateUtil.getyyyy_MM_dd(cs.getCreated()));
	93	+ //根据用户id获取医院ID
	94	+ Users users = usersService.getUsers(cs.getOperator());
	95	+ if(users!=null){
	96	+ map.put("operUser",users.getName());
	97	+ }
	98	+ hisCancerScrList.add(map);
	99	+ }
	100	+ baseResponse.setObject(hisCancerScrList);
	101	+
	102	+ return baseResponse;
	103	+ }
	104	+
	105	+ /**
	106	+ * 获取两癌筛查详情
	107	+ * @param id
	108	+ * @return
	109	+ */
30	110	public BaseResponse getCancerScreenInfo(String id) {
31	111	CancerScreeningModel cancerScreeningModel = cancerScreenService.findOneById(id);
32	112	return new BaseResponse();

...	...	@@ -363,7 +363,10 @@
363	363	// HuJiaqi添加开始，这里冗余了分娩分娩医院，分娩年龄，分娩孕周，分娩方式，并将状态更改为产妇
364	364	patients1.setType(3);
365	365	patients1.setIsAutoFm(YnEnums.NO.getId());
366		- patients1.setFmHospital(hospitalId);
	366	+
	367	+ if (deliverAddRequest.getPatient() == null) {
	368	+ patients1.setFmHospital(hospitalId);
	369	+ }
367	370	patients1.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode()) ? null : deliverAddRequest.getDeliveryMode().toString());
368	371	if (null != patients.getBuildType() && patients.getBuildType() == 2) {
369	372	patients1.setBuildType(0);

1	1	package com.lyms.platform.operate.web.request;
2	2
3		-import java.util.Date;
4		-
5	3	/**
6	4	* @auther yangfei
7	5	* @createTime 2017年09月15日 09时49分
8		- * @discription
	6	+ * @discription 两癌筛查查询条件
9	7	*/
10	8	public class CancerScreeningRequest extends BasePageQueryRequest {
11	9
12	10	/**
13		- * 1-预约住院、2-回院提醒、3-住院提醒
14		- */
15		- private Integer type;
16		- /**
17	11	* 孕周开始日期
18	12	*/
19		- private Integer cDueWeekStart;
	13	+ private Integer checkDateStart;
20	14	/**
21	15	* 孕周结束日期
22	16	*/
23		- private Integer cDueWeekEnd;
	17	+ private Integer checkDateEnd;
24	18	/**
25		- * 提醒状态 1-待提醒、2-已提醒
26		- */
27		- private Integer status;
28		- /**
29		- * 提醒结果 1-成功、2-失败
30		- */
31		- private Integer result;
32		- /**
33		- * 失败原因 1-电话无人接听、2-他院已办理住院、3-暂时未确定、4-其他）
34		- */
35		- private Integer failure;
36		- /**
37		- * 预约记录创建开始时间
38		- */
39		- private Date makeStartDate;
40		- /**
41		- * 预约记录创建结束时间
42		- */
43		- private Date makeEndDate;
44		- /**
45	19	* 查询号
46	20	*/
47	21	private String queryNo;
48		- /**
49		- * 是否实际住院 1-是，2-否
50		- */
51		- private Integer isReality;
	22	+ //居住地
	23	+ private String provinceId;
	24	+ private String cityId;
	25	+ private String areaId;
	26	+ private String streetId;
	27	+ private String address;
52	28
53		- public Integer getIsReality() {
54		- return isReality;
	29	+ public String getProvinceId() {
	30	+ return provinceId;
55	31	}
56	32
57		- public void setIsReality(Integer isReality) {
58		- this.isReality = isReality;
	33	+ public void setProvinceId(String provinceId) {
	34	+ this.provinceId = provinceId;
59	35	}
60	36
61		- public String getQueryNo() {
62		- return queryNo;
	37	+ public String getCityId() {
	38	+ return cityId;
63	39	}
64	40
65		- public void setQueryNo(String queryNo) {
66		- this.queryNo = queryNo;
	41	+ public void setCityId(String cityId) {
	42	+ this.cityId = cityId;
67	43	}
68	44
69		- public Integer getType() {
70		- return type;
	45	+ public String getAreaId() {
	46	+ return areaId;
71	47	}
72	48
73		- public void setType(Integer type) {
74		- this.type = type;
	49	+ public void setAreaId(String areaId) {
	50	+ this.areaId = areaId;
75	51	}
76	52
77		- public Integer getcDueWeekStart() {
78		- return cDueWeekStart;
	53	+ public String getStreetId() {
	54	+ return streetId;
79	55	}
80	56
81		- public void setcDueWeekStart(Integer cDueWeekStart) {
82		- this.cDueWeekStart = cDueWeekStart;
	57	+ public void setStreetId(String streetId) {
	58	+ this.streetId = streetId;
83	59	}
84	60
85		- public Integer getcDueWeekEnd() {
86		- return cDueWeekEnd;
	61	+ public String getAddress() {
	62	+ return address;
87	63	}
88	64
89		- public void setcDueWeekEnd(Integer cDueWeekEnd) {
90		- this.cDueWeekEnd = cDueWeekEnd;
	65	+ public void setAddress(String address) {
	66	+ this.address = address;
91	67	}
92	68
93		- public Integer getStatus() {
94		- return status;
	69	+ public Integer getCheckDateStart() {
	70	+ return checkDateStart;
95	71	}
96	72
97		- public void setStatus(Integer status) {
98		- this.status = status;
	73	+ public void setCheckDateStart(Integer checkDateStart) {
	74	+ this.checkDateStart = checkDateStart;
99	75	}
100	76
101		- public Integer getResult() {
102		- return result;
	77	+ public Integer getCheckDateEnd() {
	78	+ return checkDateEnd;
103	79	}
104	80
105		- public void setResult(Integer result) {
106		- this.result = result;
	81	+ public void setCheckDateEnd(Integer checkDateEnd) {
	82	+ this.checkDateEnd = checkDateEnd;
107	83	}
108	84
109		- public Integer getFailure() {
110		- return failure;
	85	+ public String getQueryNo() {
	86	+ return queryNo;
111	87	}
112	88
113		- public void setFailure(Integer failure) {
114		- this.failure = failure;
115		- }
116		-
117		- public Date getMakeStartDate() {
118		- return makeStartDate;
119		- }
120		-
121		- public void setMakeStartDate(Date makeStartDate) {
122		- this.makeStartDate = makeStartDate;
123		- }
124		-
125		- public Date getMakeEndDate() {
126		- return makeEndDate;
127		- }
128		-
129		- public void setMakeEndDate(Date makeEndDate) {
130		- this.makeEndDate = makeEndDate;
	89	+ public void setQueryNo(String queryNo) {
	90	+ this.queryNo = queryNo;
131	91	}
132	92	}