shiyang / regional-platform

Commit 9086d80f9113b80a97faad76ca75b003d46e12db

Authored by jiangjiazhi over 9 years ago

修改新电子病历

Showing 2 changed files with 5 additions and 79 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java

...	...	@@ -350,7 +350,7 @@
350	350	List<Patients> list = patientsService.queryPatient(patientsQuery);
351	351	if (CollectionUtils.isNotEmpty(list))
352	352	{
353		- HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, model.getBirth());
	353	+ HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, model.getBirth(),null);
354	354	List<String> listHighRisk = res.getHighRisk();
355	355
356	356	if (CollectionUtils.isNotEmpty(listHighRisk))

...	...	@@ -18,7 +18,7 @@
18	18	public class SieveDetailResult {
19	19	private String id;
20	20	private String parentId;
21		- //名字
	21	+ /* //名字
22	22	private String name;
23	23	//年龄
24	24	private Integer age;
...	...	@@ -35,7 +35,7 @@
35	35	//备注
36	36	private String remarks;
37	37	//末次月经
38		- private String lastMenses;
	38	+ private String lastMenses;*/
39	39	//产前诊断结果
40	40	private Integer diaresult;
41	41
...	...	@@ -102,15 +102,6 @@
102	102	this.pregnancyOutcomeText = pregnancyOutcomeText;
103	103	}
104	104
105		- public Integer getAge() {
106		- return age;
107		- }
108		-
109		- public void setAge(Integer age) {
110		- this.age = age;
111		- }
112		-
113		-
114	105	public String getDiaTime() {
115	106	return diaTime;
116	107	}
...	...	@@ -127,38 +118,6 @@
127	118	this.diaUnit = diaUnit;
128	119	}
129	120
130		- public String getDueWeek() {
131		- return dueWeek;
132		- }
133		-
134		- public void setDueWeek(String dueWeek) {
135		- this.dueWeek = dueWeek;
136		- }
137		-
138		- public String getLastMenses() {
139		- return lastMenses;
140		- }
141		-
142		- public void setLastMenses(String lastMenses) {
143		- this.lastMenses = lastMenses;
144		- }
145		-
146		- public String getName() {
147		- return name;
148		- }
149		-
150		- public void setName(String name) {
151		- this.name = name;
152		- }
153		-
154		- public String getPhone() {
155		- return phone;
156		- }
157		-
158		- public void setPhone(String phone) {
159		- this.phone = phone;
160		- }
161		-
162	121	public String getPublishName() {
163	122	return publishName;
164	123	}
...	...	@@ -167,31 +126,6 @@
167	126	this.publishName = publishName;
168	127	}
169	128
170		- public String getRemarks() {
171		- return remarks;
172		- }
173		-
174		- public void setRemarks(String remarks) {
175		- this.remarks = remarks;
176		- }
177		-
178		-
179		- public List getRiskFactor() {
180		- return riskFactor;
181		- }
182		-
183		- public void setRiskFactor(List riskFactor) {
184		- this.riskFactor = riskFactor;
185		- }
186		-
187		- public String getRiskScore() {
188		- return riskScore;
189		- }
190		-
191		- public void setRiskScore(String riskScore) {
192		- this.riskScore = riskScore;
193		- }
194		-
195	129	public Integer getStatus() {
196	130	return status;
197	131	}
198	132
...	...	@@ -200,16 +134,8 @@
200	134	this.status = status;
201	135	}
202	136
203		- public String getyChanQi() {
204		- return yChanQi;
205		- }
206		-
207		- public void setyChanQi(String yChanQi) {
208		- this.yChanQi = yChanQi;
209		- }
210		-
211	137	public SieveDetailResult convert(SieveModel sieveModel,Patients patients) {
212		- try {
	138	+ /* try {
213	139	if(null!=patients.getBirth()){
214	140	setAge(DateUtil.getAge(patients.getBirth()));
215	141	}
...	...	@@ -229,7 +155,7 @@
229	155	this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
230	156	if(null!=patients.getLastMenses()){
231	157	setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
232		- }
	158	+ }*/
233	159	/* //产前诊断结果
234	160	private Integer cqResult;
235	161	//妊娠结局