jiangjiazhi / regional-platform

Authored by liquanyu almost 8 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 13 additions and 12 deletions

...	...	@@ -108,7 +108,6 @@
108	108	sieveModel.setId(list.get(0).getId());
109	109	sieveModel.setHospitalId(hospitalId);
110	110	sieveModel.setZtfx(sieveAddRequest.getMax());
111		- sieveModel.setDiagnosisTime(sieveResultModel.getDiagnosisTime());
112	111	sieveModel.setResultTime(sieveResultModel.getResultTime());
113	112
114	113	sieveService.updateOneChanQianDiaSieve(sieveModel);
...	...	@@ -226,6 +225,7 @@
226	225	sieveModel.setRenShenResult(chanQianDiaAddRequest.getPregnancyOutcome());
227	226	sieveModel.setStatus(4);
228	227	sieveModel.setCqStatus(1);
	228	+ sieveModel.setDiagnosisTime(chanQianDiaAddRequest.getDiagnosisTime() == null ? null : DateUtil.parseYMD(chanQianDiaAddRequest.getDiagnosisTime()));
229	229	sieveService.updateOneChanQianDiaSieve(sieveModel);
230	230	operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), sieveModel, OptActionEnums.ADD.getId(), "产前诊断");
231	231

...	...	@@ -23,6 +23,17 @@
23	23	@FormParam
24	24	private String publishName;// 录入人员;
25	25
	26	+ //诊断结果时间
	27	+ private String diagnosisTime;
	28	+
	29	+ public String getDiagnosisTime() {
	30	+ return diagnosisTime;
	31	+ }
	32	+
	33	+ public void setDiagnosisTime(String diagnosisTime) {
	34	+ this.diagnosisTime = diagnosisTime;
	35	+ }
	36	+
26	37	public String getParentId() {
27	38	return parentId;
28	39	}

...	...	@@ -31,9 +31,8 @@
31	31
32	32	//结果录入时间
33	33	private String resultTime;
34		- //诊断结果时间
35		- private String diagnosisTime;
36	34
	35	+
37	36	public String getResultTime() {
38	37	return resultTime;
39	38	}
...	...	@@ -42,14 +41,6 @@
42	41	this.resultTime = resultTime;
43	42	}
44	43
45		- public String getDiagnosisTime() {
46		- return diagnosisTime;
47		- }
48		-
49		- public void setDiagnosisTime(String diagnosisTime) {
50		- this.diagnosisTime = diagnosisTime;
51		- }
52		-
53	44	public String getCspj() {
54	45	return cspj;
55	46	}
...	...	@@ -141,7 +132,6 @@
141	132	sieveModel.setCspj(cspj);
142	133	sieveModel.setStzhz13(stzhz13);
143	134	sieveModel.setPublishName(publishName);
144		- sieveModel.setDiagnosisTime(DateUtil.parseYMD(diagnosisTime));
145	135	sieveModel.setResultTime(DateUtil.parseYMD(resultTime));
146	136	return sieveModel;
147	137	}