jiangjiazhi / regional-platform

Commit 346b6e788c20aa867cd6e46d52ca964a7de6ed2a

Authored by gengxiaokai over 7 years ago

Exists in master and in 6 other branches

产前诊断

Showing 5 changed files with 492 additions and 9 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java
platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java

...	...	@@ -47,6 +47,10 @@
47	47	private Date modified;//修改时间
48	48	private String status;//数据来源(1,申请过来的；2，自动流转过来)
49	49	private String diaStatus;//数据状态（0，未申请；1，已申请；2，已接收；3，已诊断）
	50	+ private String tireNumber;//胎数
	51	+ private String CsStatus;//产筛状态
	52	+ private String ztfx;//整体风险
	53	+ private String ztfeText;//整体风险中文
50	54
51	55	public String getId() {
52	56	return id;
...	...	@@ -302,6 +306,38 @@
302	306
303	307	public void setApplyWeek(String applyWeek) {
304	308	this.applyWeek = applyWeek;
	309	+ }
	310	+
	311	+ public String getTireNumber() {
	312	+ return tireNumber;
	313	+ }
	314	+
	315	+ public void setTireNumber(String tireNumber) {
	316	+ this.tireNumber = tireNumber;
	317	+ }
	318	+
	319	+ public String getCsStatus() {
	320	+ return CsStatus;
	321	+ }
	322	+
	323	+ public void setCsStatus(String csStatus) {
	324	+ CsStatus = csStatus;
	325	+ }
	326	+
	327	+ public String getZtfx() {
	328	+ return ztfx;
	329	+ }
	330	+
	331	+ public void setZtfx(String ztfx) {
	332	+ this.ztfx = ztfx;
	333	+ }
	334	+
	335	+ public String getZtfeText() {
	336	+ return ztfeText;
	337	+ }
	338	+
	339	+ public void setZtfeText(String ztfeText) {
	340	+ this.ztfeText = ztfeText;
305	341	}
306	342
307	343	public Map<String,String> contomap(){

...	...	@@ -5,6 +5,8 @@
5	5	import com.lyms.platform.common.dao.operator.MongoCondition;
6	6	import com.lyms.platform.common.dao.operator.MongoOper;
7	7	import com.lyms.platform.common.dao.operator.MongoQuery;
	8	+import com.lyms.platform.common.utils.StringUtils;
	9	+import org.springframework.data.mongodb.core.query.Criteria;
8	10
9	11	/**
10	12	* 新增产前诊断申请
11	13
...	...	@@ -21,9 +23,20 @@
21	23	private String hospitalId;//医院ID
22	24	private String cardNo;//身份证
23	25	private String vcCardNo;//就诊卡号
	26	+ private String diaResult;//诊断结果
	27	+ private String applyWeeksStart;//申请开始孕周
	28	+ private String applyWeeksEnd;//申请结束孕周
	29	+ private String nowWeeksStart;//当前开始孕周
	30	+ private String nowWeeksEnd;//当前结束孕周
	31	+ private String rsResult;//妊娠结局
	32	+ private String applyDateStart;//申请开始时间
	33	+ private String applyDateEnd;//申请结束时间
	34	+ private String resultDateStart;//诊断出具开始时间
	35	+ private String resultDateEnd;//诊断出具结束时间
	36	+ private String specimenNo;//标本号
	37	+ private String collectHospitalId;//申请医院
24	38
25	39
26		-
27	40	public String getId() {
28	41	return id;
29	42	}
...	...	@@ -96,6 +109,102 @@
96	109	this.vcCardNo = vccardNo;
97	110	}
98	111
	112	+ public String getDiaResult() {
	113	+ return diaResult;
	114	+ }
	115	+
	116	+ public void setDiaResult(String diaResult) {
	117	+ this.diaResult = diaResult;
	118	+ }
	119	+
	120	+ public String getApplyWeeksStart() {
	121	+ return applyWeeksStart;
	122	+ }
	123	+
	124	+ public void setApplyWeeksStart(String applyWeeksStart) {
	125	+ this.applyWeeksStart = applyWeeksStart;
	126	+ }
	127	+
	128	+ public String getApplyWeeksEnd() {
	129	+ return applyWeeksEnd;
	130	+ }
	131	+
	132	+ public void setApplyWeeksEnd(String applyWeeksEnd) {
	133	+ this.applyWeeksEnd = applyWeeksEnd;
	134	+ }
	135	+
	136	+ public String getNowWeeksStart() {
	137	+ return nowWeeksStart;
	138	+ }
	139	+
	140	+ public void setNowWeeksStart(String nowWeeksStart) {
	141	+ this.nowWeeksStart = nowWeeksStart;
	142	+ }
	143	+
	144	+ public String getNowWeeksEnd() {
	145	+ return nowWeeksEnd;
	146	+ }
	147	+
	148	+ public void setNowWeeksEnd(String nowWeeksEnd) {
	149	+ this.nowWeeksEnd = nowWeeksEnd;
	150	+ }
	151	+
	152	+ public String getRsResult() {
	153	+ return rsResult;
	154	+ }
	155	+
	156	+ public void setRsResult(String rsResult) {
	157	+ this.rsResult = rsResult;
	158	+ }
	159	+
	160	+ public String getApplyDateStart() {
	161	+ return applyDateStart;
	162	+ }
	163	+
	164	+ public void setApplyDateStart(String applyDateStart) {
	165	+ this.applyDateStart = applyDateStart;
	166	+ }
	167	+
	168	+ public String getApplyDateEnd() {
	169	+ return applyDateEnd;
	170	+ }
	171	+
	172	+ public void setApplyDateEnd(String applyDateEnd) {
	173	+ this.applyDateEnd = applyDateEnd;
	174	+ }
	175	+
	176	+ public String getResultDateStart() {
	177	+ return resultDateStart;
	178	+ }
	179	+
	180	+ public void setResultDateStart(String resultDateStart) {
	181	+ this.resultDateStart = resultDateStart;
	182	+ }
	183	+
	184	+ public String getResultDateEnd() {
	185	+ return resultDateEnd;
	186	+ }
	187	+
	188	+ public void setResultDateEnd(String resultDateEnd) {
	189	+ this.resultDateEnd = resultDateEnd;
	190	+ }
	191	+
	192	+ public String getSpecimenNo() {
	193	+ return specimenNo;
	194	+ }
	195	+
	196	+ public void setSpecimenNo(String specimenNo) {
	197	+ this.specimenNo = specimenNo;
	198	+ }
	199	+
	200	+ public String getCollectHospitalId() {
	201	+ return collectHospitalId;
	202	+ }
	203	+
	204	+ public void setCollectHospitalId(String collectHospitalId) {
	205	+ this.collectHospitalId = collectHospitalId;
	206	+ }
	207	+
99	208	public MongoQuery convertToQuery() {
100	209	MongoCondition condition = MongoCondition.newInstance();
101	210	if(null != id){
...	...	@@ -103,6 +212,61 @@
103	212	}
104	213	if(null != diaStatus){
105	214	condition = condition.and("diaStatus", diaStatus, MongoOper.IS);
	215	+ }
	216	+ if(null != diaResult){
	217	+ condition = condition.and("diaResult",diaResult,MongoOper.IS);
	218	+ }
	219	+ if(null != rsResult){
	220	+ condition = condition.and("rsResult", rsResult, MongoOper.IS);
	221	+ }
	222	+ if(null != specimenNo){
	223	+ condition = condition.and("specimenNo", specimenNo, MongoOper.IS);
	224	+ }
	225	+ if(null != collectHospitalId){
	226	+ condition = condition.and("collectHospitalId", collectHospitalId, MongoOper.IS);
	227	+ }
	228	+
	229	+ Criteria c = null;
	230	+ if(null != applyDateStart && null != applyDateEnd){
	231	+ c = Criteria.where("created").gte(applyDateStart).lte(applyDateEnd);
	232	+ }
	233	+ if(null != applyWeeksStart && null != applyWeeksEnd){
	234	+ if(c != null){
	235	+ c = c.where("applyWeek").gte(applyWeeksStart).lte(applyWeeksEnd);
	236	+ }else{
	237	+ c = Criteria.where("applyWeek").gte(applyWeeksStart).lte(applyWeeksEnd);
	238	+ }
	239	+ }
	240	+ if(null != nowWeeksStart && null != nowWeeksEnd){
	241	+ if(c != null){
	242	+ c = c.where("lastMenses").gte(nowWeeksStart).lte(nowWeeksEnd);
	243	+ }else{
	244	+ c = Criteria.where("lastMenses").gte(nowWeeksStart).lte(nowWeeksEnd);
	245	+ }
	246	+ }
	247	+ if (StringUtils.isNotEmpty(queryNo)) {
	248	+ MongoCondition c1 = MongoCondition.newInstance();
	249	+ MongoCondition con1 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE);
	250	+ MongoCondition con2 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS);
	251	+ MongoCondition con3 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
	252	+ //MongoCondition con4 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE);
	253	+ if (c != null) {
	254	+ c1.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria();
	255	+ condition.andCondition(c1);
	256	+ } else {
	257	+ c = c1.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria();
	258	+ }
	259	+ }
	260	+ if(null != resultDateStart && null != resultDateEnd){
	261	+ if(c != null){
	262	+ c = c.where("resultDate").gte(resultDateStart).lte(resultDateEnd);
	263	+ }else{
	264	+ c = Criteria.where("resultDate").gte(resultDateStart).lte(resultDateEnd);
	265	+ }
	266	+ }
	267	+
	268	+ if (c != null) {
	269	+ return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
106	270	}
107	271	return condition.toMongoQuery();
108	272	}

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.platform.common.result.BaseResponse;
4	4	import com.lyms.platform.operate.web.facade.DiagnosisFacaed;
5	5	import com.lyms.platform.operate.web.request.DiagnosisAddRequest;
	6	+import com.lyms.platform.operate.web.result.DiagnosisManagerResult;
6	7	import org.springframework.beans.factory.annotation.Autowired;
7	8	import org.springframework.stereotype.Controller;
8	9	import org.springframework.web.bind.annotation.RequestMapping;
9	10
...	...	@@ -43,9 +44,39 @@
43	44	* @param request
44	45	* @return
45	46	*/
	47	+ @ResponseBody
	48	+ @RequestMapping(value = "/addDiagnosis",method = RequestMethod.GET)
46	49	public BaseResponse addOrUpdateDiagnosis(DiagnosisAddRequest diagnosisAddRequest,HttpServletRequest request){
47	50	//LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
48	51	return diagnosisFacaed.addOrUpdateDiagnosis(diagnosisAddRequest, 1000000185);
	52	+ }
	53	+
	54	+
	55	+ /**
	56	+ * 根据ID获取产前诊断信息
	57	+ * @param id
	58	+ * @return
	59	+ */
	60	+ @ResponseBody
	61	+ @RequestMapping(value = "/getOneDiagnosis",method = RequestMethod.GET)
	62	+ public BaseResponse getDiagnosisById(String id){
	63	+ //LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	64	+ return diagnosisFacaed.queryOneDiaById(id);
	65	+ }
	66	+
	67	+
	68	+ /**
	69	+ * 产前诊断申请列表管理
	70	+ * @param dataresult
	71	+ * @param request
	72	+ * @return
	73	+ */
	74	+ @ResponseBody
	75	+ @RequestMapping(value = "/getDiagnosisList",method = RequestMethod.GET)
	76	+ public DiagnosisManagerResult getDiagnosisList(DiagnosisAddRequest dataresult,HttpServletRequest request){
	77	+ //LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	78	+ dataresult.setHospitalId("1000000185");
	79	+ return diagnosisFacaed.queryDiagnosisList(dataresult);
49	80	}
50	81
51	82	}

...	...	@@ -206,12 +206,11 @@
206	206	/**
207	207	* 根据ID查询产前诊断信息
208	208	* @param id
209		- * @param userId
210	209	* @return
211	210	*/
212		- public BaseResponse queryOneDiaById(String id,Integer userId){
	211	+ public BaseResponse queryOneDiaById(String id){
213	212	BaseObjectResponse br = new BaseObjectResponse();
214		- String hospital = autoMatchFacade.getHospitalId(userId);
	213	+ //String hospital = autoMatchFacade.getHospitalId(userId);
215	214	DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
216	215	diagnosisQuery.setId(id);
217	216	DiagnosisModel dia = new DiagnosisModel();
218	217
...	...	@@ -231,8 +230,43 @@
231	230	public DiagnosisManagerResult queryDiagnosisList(DiagnosisAddRequest dataresult){
232	231	DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult();
233	232	DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
	233	+ if(null != dataresult.getDiaResult()){
	234	+ diagnosisQuery.setDiaResult(dataresult.getDiaResult());
	235	+ }
	236	+ if(null != dataresult.getApplyWeekStart()){
	237	+ diagnosisQuery.setApplyWeeksStart(dataresult.getApplyWeekStart());
	238	+ }
	239	+ if(null != dataresult.getApplyWeekEnd()){
	240	+ diagnosisQuery.setApplyWeeksEnd(dataresult.getApplyWeekEnd());
	241	+ }
	242	+ if(null != dataresult.getNowWeeksStart()){
	243	+ diagnosisQuery.setNowWeeksStart(dataresult.getNowWeeksStart());
	244	+ }
	245	+ if(null != dataresult.getNowWeeksEnd()){
	246	+ diagnosisQuery.setNowWeeksEnd(dataresult.getNowWeeksEnd());
	247	+ }
	248	+ if(null != dataresult.getDiaStatus()){
	249	+ diagnosisQuery.setDiaStatus(dataresult.getDiaStatus());
	250	+ }
	251	+ if(null != dataresult.getRsResult()){
	252	+ diagnosisQuery.setRsResult(dataresult.getRsResult());
	253	+ }
	254	+ if(null != dataresult.getQueryNo()){
	255	+ diagnosisQuery.setQueryNo(dataresult.getQueryNo());
	256	+ }
	257	+ if(null != dataresult.getApplyDateStart()){
	258	+ diagnosisQuery.setApplyDateStart(dataresult.getApplyDateStart());
	259	+ }
	260	+ if(null != dataresult.getApplyDateEnd()){
	261	+ diagnosisQuery.setApplyDateEnd(dataresult.getApplyDateEnd());
	262	+ }
	263	+ if(null != dataresult.getResultDateStart()){
	264	+ diagnosisQuery.setResultDateStart(dataresult.getResultDateStart());
	265	+ }
	266	+ if(null != dataresult.getResultDateEnd()){
	267	+ diagnosisQuery.setResultDateEnd(dataresult.getResultDateEnd());
	268	+ }
234	269
235		-
236	270	diagnosisQuery.setPage(dataresult.getPage());
237	271	diagnosisQuery.setLimit(dataresult.getLimit());
238	272	diagnosisQuery.setNeed("need");
239	273
240	274
...	...	@@ -246,13 +280,117 @@
246	280	diagnosisManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
247	281	return diagnosisManagerResult;
248	282	}
	283	+ for(DiagnosisModel diagnosisModel : diaList){
	284	+ SieveQuery sieveQuery = new SieveQuery();
	285	+ sieveQuery.setParentId(diagnosisModel.getParentId());
	286	+ //查询产筛list
	287	+ List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
	288	+ if(list != null && list.size() > 0){
	289	+ SieveModel sieveModel = list.get(0);
	290	+ diagnosisModel.setRsResult(sieveModel.getRenShenResult().toString());
	291	+ diagnosisModel.setTireNumber(sieveModel.getTireNumber().toString());
	292	+ diagnosisModel.setCsStatus(sieveModel.getStatus().toString());
	293	+ if("0".equals(sieveModel.getZtfx())){
	294	+ diagnosisModel.setZtfx("0");
	295	+ diagnosisModel.setZtfeText("低风险");
	296	+ }
	297	+ if("1".equals(sieveModel.getZtfx())){
	298	+ diagnosisModel.setZtfx("1");
	299	+ diagnosisModel.setZtfeText("临界值");
	300	+ }
	301	+ if("2".equals(sieveModel.getZtfx())){
	302	+ diagnosisModel.setZtfx("2");
	303	+ diagnosisModel.setZtfeText("高风险");
	304	+ }
	305	+ }
	306	+ }
	307	+ diagnosisManagerResult.setData(diaList);
	308	+ diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo());
	309	+ diagnosisManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
	310	+ diagnosisManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
	311	+ return diagnosisManagerResult;
	312	+ }
249	313
	314	+
	315	+ /**
	316	+ * 产筛实验室（产前诊断管理）
	317	+ * @param dataresult
	318	+ * @return
	319	+ */
	320	+ public DiagnosisManagerResult queryDiagnosisLab(DiagnosisAddRequest dataresult){
	321	+ DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult();
	322	+ DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
	323	+ if(null != dataresult.getApplyDateStart()){
	324	+ diagnosisQuery.setApplyDateStart(dataresult.getApplyDateStart());
	325	+ }
	326	+ if(null != dataresult.getApplyDateEnd()){
	327	+ diagnosisQuery.setApplyDateEnd(dataresult.getApplyDateEnd());
	328	+ }
	329	+ if(null != dataresult.getCollectHospitalId()){
	330	+ diagnosisQuery.setCollectHospitalId(dataresult.getCollectHospitalId());
	331	+ }
	332	+ if(null != dataresult.getSpecimenNo()){
	333	+ diagnosisQuery.setSpecimenNo(dataresult.getSpecimenNo());
	334	+ }
	335	+ if(null != dataresult.getDiaStatus()){
	336	+ diagnosisQuery.setDiaStatus(dataresult.getDiaStatus());
	337	+ }
	338	+ if(null != dataresult.getResultDateStart()){
	339	+ diagnosisQuery.setResultDateStart(dataresult.getResultDateStart());
	340	+ }
	341	+ if(null != dataresult.getResultDateEnd()){
	342	+ diagnosisQuery.setResultDateEnd(dataresult.getResultDateEnd());
	343	+ }
	344	+ if(null != dataresult.getQueryNo()){
	345	+ diagnosisQuery.setQueryNo(dataresult.getQueryNo());
	346	+ }
	347	+ //只查询状态为已申请和已接收的
	348	+
	349	+
	350	+ diagnosisQuery.setPage(dataresult.getPage());
	351	+ diagnosisQuery.setLimit(dataresult.getLimit());
	352	+ diagnosisQuery.setNeed("need");
	353	+ diagnosisQuery.setOrder("created");
	354	+ //babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(babySieveAddRequest.getOperatorId()));
	355	+ diagnosisQuery.setHospitalId("216");
	356	+ List<DiagnosisModel> diaList = diagnosisService.queryDiagnosis(diagnosisQuery);
	357	+ if(CollectionUtils.isEmpty(diaList)){
	358	+ diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo());
	359	+ diagnosisManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
	360	+ diagnosisManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
	361	+ return diagnosisManagerResult;
	362	+ }
	363	+ for(DiagnosisModel diagnosisModel : diaList){
	364	+ SieveQuery sieveQuery = new SieveQuery();
	365	+ sieveQuery.setParentId(diagnosisModel.getParentId());
	366	+ //查询产筛list
	367	+ List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
	368	+ if(list != null && list.size() > 0){
	369	+ SieveModel sieveModel = list.get(0);
	370	+ diagnosisModel.setRsResult(sieveModel.getRenShenResult().toString());
	371	+ diagnosisModel.setTireNumber(sieveModel.getTireNumber().toString());
	372	+ diagnosisModel.setCsStatus(sieveModel.getStatus().toString());
	373	+ if("0".equals(sieveModel.getZtfx())){
	374	+ diagnosisModel.setZtfx("0");
	375	+ diagnosisModel.setZtfeText("低风险");
	376	+ }
	377	+ if("1".equals(sieveModel.getZtfx())){
	378	+ diagnosisModel.setZtfx("1");
	379	+ diagnosisModel.setZtfeText("临界值");
	380	+ }
	381	+ if("2".equals(sieveModel.getZtfx())){
	382	+ diagnosisModel.setZtfx("2");
	383	+ diagnosisModel.setZtfeText("高风险");
	384	+ }
	385	+ }
	386	+ }
250	387	diagnosisManagerResult.setData(diaList);
251	388	diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo());
252	389	diagnosisManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
253	390	diagnosisManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
254	391	return diagnosisManagerResult;
255	392	}
	393	+
256	394
257	395	}

...	...	@@ -32,7 +32,7 @@
32	32	private String phone;
33	33	//年龄
34	34	private String age;
35		- //申请孕周
	35	+ //孕周
36	36	private String dueWeek;
37	37	//预产期
38	38	private String yChanQi;
39	39
...	...	@@ -68,10 +68,28 @@
68	68	private String hospitalId;
69	69	//查询号
70	70	private String queryNo;
71		- //诊断结果
	71	+ //诊断结果（0，阴性；1，阳性）
72	72	private String diaResult;
73		- //申请孕周
74		- private String applyWeek;
	73	+ //申请孕周开始
	74	+ private String applyWeekStart;
	75	+ //申请孕周结束
	76	+ private String applyWeekEnd;
	77	+ //当前孕周开始
	78	+ private String nowWeeksStart;
	79	+ //当前孕周结束
	80	+ private String nowWeeksEnd;
	81	+ //产前诊断申请开始时间
	82	+ private String applyDateStart;
	83	+ //产前诊断申请结束时间
	84	+ private String applyDateEnd;
	85	+ //诊断出具开始时间
	86	+ private String resultDateStart;
	87	+ //诊断出具结束时间
	88	+ private String resultDateEnd;
	89	+ //数据状态
	90	+ private String diaStatus;
	91	+ //妊娠结局
	92	+ private String rsResult;
75	93
76	94
77	95
...	...	@@ -289,6 +307,102 @@
289	307
290	308	public void setHospitalId(String hospitalId) {
291	309	this.hospitalId = hospitalId;
	310	+ }
	311	+
	312	+ public String getQueryNo() {
	313	+ return queryNo;
	314	+ }
	315	+
	316	+ public void setQueryNo(String queryNo) {
	317	+ this.queryNo = queryNo;
	318	+ }
	319	+
	320	+ public String getDiaResult() {
	321	+ return diaResult;
	322	+ }
	323	+
	324	+ public void setDiaResult(String diaResult) {
	325	+ this.diaResult = diaResult;
	326	+ }
	327	+
	328	+ public String getApplyWeekStart() {
	329	+ return applyWeekStart;
	330	+ }
	331	+
	332	+ public void setApplyWeekStart(String applyWeekStart) {
	333	+ this.applyWeekStart = applyWeekStart;
	334	+ }
	335	+
	336	+ public String getApplyWeekEnd() {
	337	+ return applyWeekEnd;
	338	+ }
	339	+
	340	+ public void setApplyWeekEnd(String applyWeekEnd) {
	341	+ this.applyWeekEnd = applyWeekEnd;
	342	+ }
	343	+
	344	+ public String getNowWeeksStart() {
	345	+ return nowWeeksStart;
	346	+ }
	347	+
	348	+ public void setNowWeeksStart(String nowWeeksStart) {
	349	+ this.nowWeeksStart = nowWeeksStart;
	350	+ }
	351	+
	352	+ public String getNowWeeksEnd() {
	353	+ return nowWeeksEnd;
	354	+ }
	355	+
	356	+ public void setNowWeeksEnd(String nowWeeksEnd) {
	357	+ this.nowWeeksEnd = nowWeeksEnd;
	358	+ }
	359	+
	360	+ public String getApplyDateStart() {
	361	+ return applyDateStart;
	362	+ }
	363	+
	364	+ public void setApplyDateStart(String applyDateStart) {
	365	+ this.applyDateStart = applyDateStart;
	366	+ }
	367	+
	368	+ public String getApplyDateEnd() {
	369	+ return applyDateEnd;
	370	+ }
	371	+
	372	+ public void setApplyDateEnd(String applyDateEnd) {
	373	+ this.applyDateEnd = applyDateEnd;
	374	+ }
	375	+
	376	+ public String getResultDateStart() {
	377	+ return resultDateStart;
	378	+ }
	379	+
	380	+ public void setResultDateStart(String resultDateStart) {
	381	+ this.resultDateStart = resultDateStart;
	382	+ }
	383	+
	384	+ public String getResultDateEnd() {
	385	+ return resultDateEnd;
	386	+ }
	387	+
	388	+ public void setResultDateEnd(String resultDateEnd) {
	389	+ this.resultDateEnd = resultDateEnd;
	390	+ }
	391	+
	392	+ public String getDiaStatus() {
	393	+ return diaStatus;
	394	+ }
	395	+
	396	+ public void setDiaStatus(String diaStatus) {
	397	+ this.diaStatus = diaStatus;
	398	+ }
	399	+
	400	+ public String getRsResult() {
	401	+ return rsResult;
	402	+ }
	403	+
	404	+ public void setRsResult(String rsResult) {
	405	+ this.rsResult = rsResult;
292	406	}
293	407
294	408	@Override