jiangjiazhi / regional-platform

Commit 56f98d33fc0d2351b98e8cda19b000b0d16ee7d5

Authored by jesse.wang over 2 years ago

Exists in master and in 4 other branches

孤独症初筛名字

Showing 2 changed files with 27 additions and 35 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismPrimaryScreening.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PrimaryScreeningController.java

...	...	@@ -147,7 +147,17 @@
147	147	*/
148	148	private String warningSignstring;
149	149
	150	+ /**
	151	+ * 语言功能和社会交往能力询问
	152	+ */
	153	+ private String languageSocialName;
150	154
	155	+ /**
	156	+ * 预警征象筛查
	157	+ */
	158	+ private String warningSignstringName;
	159	+
	160	+
151	161	private String checkHospital;
152	162
153	163	public String getCheckHospital() {
...	...	@@ -211,41 +221,20 @@
211	221	*/
212	222	private String global;
213	223
214		- @Override
215		- public String toString() {
216		- return "BabyAutismPrimaryScreening{" +
217		- "id='" + id + '\'' +
218		- ", created=" + created +
219		- ", modified=" + modified +
220		- ", yn=" + yn +
221		- ", operaterId='" + operaterId + '\'' +
222		- ", hospitalId='" + hospitalId + '\'' +
223		- ", babyId='" + babyId + '\'' +
224		- ", babyBuildDate=" + babyBuildDate +
225		- ", babyName='" + babyName + '\'' +
226		- ", babySex=" + babySex +
227		- ", babyMName='" + babyMName + '\'' +
228		- ", babyFName='" + babyFName + '\'' +
229		- ", babyMPhone='" + babyMPhone + '\'' +
230		- ", babyFPhone='" + babyFPhone + '\'' +
231		- ", babyMCertNo='" + babyMCertNo + '\'' +
232		- ", babyFCertNo='" + babyFCertNo + '\'' +
233		- ", pid='" + pid + '\'' +
234		- ", checkMonthAge='" + checkMonthAge + '\'' +
235		- ", checkMonthId='" + checkMonthId + '\'' +
236		- ", birth=" + birth +
237		- ", checkTime=" + checkTime +
238		- ", nextCheckTime=" + nextCheckTime +
239		- ", checkDoctor='" + checkDoctor + '\'' +
240		- ", doctorSign='" + doctorSign + '\'' +
241		- ", patientSign='" + patientSign + '\'' +
242		- ", guidanceOpinions='" + guidanceOpinions + '\'' +
243		- ", handleOpinions='" + handleOpinions + '\'' +
244		- ", warningSigns=" + warningSigns +
245		- ", languageSocial=" + languageSocial +
246		- ", preliminaryScreeningResults='" + preliminaryScreeningResults + '\'' +
247		- ", global='" + global + '\'' +
248		- '}';
	224	+ public String getLanguageSocialName() {
	225	+ return languageSocialName;
	226	+ }
	227	+
	228	+ public void setLanguageSocialName(String languageSocialName) {
	229	+ this.languageSocialName = languageSocialName;
	230	+ }
	231	+
	232	+ public String getWarningSignstringName() {
	233	+ return warningSignstringName;
	234	+ }
	235	+
	236	+ public void setWarningSignstringName(String warningSignstringName) {
	237	+ this.warningSignstringName = warningSignstringName;
249	238	}
250	239
251	240	public String getGlobal() {

...	...	@@ -10,6 +10,7 @@
10	10	import com.lyms.platform.operate.web.facade.PrimaryScreeningFacade;
11	11	import com.lyms.platform.operate.web.inteceptor.InitDataConfig;
12	12	import com.lyms.platform.pojo.BabyAutismPrimaryScreening;
	13	+import org.apache.commons.lang.StringUtils;
13	14	import org.slf4j.Logger;
14	15	import org.slf4j.LoggerFactory;
15	16	import org.springframework.beans.factory.annotation.Autowired;
16	17
...	...	@@ -138,7 +139,9 @@
138	139	}
139	140	}
140	141	primaryScreening.setWarningSigns(warningSigns);
	142	+ primaryScreening.setWarningSignstringName(StringUtils.join(warningSigns,","));
141	143	primaryScreening.setLanguageSocial(languageSocial);
	144	+ primaryScreening.setLanguageSocialName(StringUtils.join(languageSocial,","));
142	145	BaseObjectResponse br = new BaseObjectResponse();
143	146	br.setErrorcode(ErrorCodeConstants.SUCCESS);
144	147	br.setData(primaryScreening);