jiangjiazhi / regional-platform

Commit 05109f1905e5cb9b9cb96d933c700c170534353e

Authored by zhangchao over 1 year ago

Exists in dev

#fix:优化大同RIS和分娩数据同步接口

Showing 2 changed files with 25 additions and 22 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/RisReportModel.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RisServiceImpl.java

1	1	package com.lyms.platform.permission.model;
2	2
3	3
	4	+import com.google.common.base.Strings;
	5	+
4	6	public class RisReportModel {
5	7	private Integer id;
6	8	private String r_id;
...	...	@@ -49,7 +51,7 @@
49	51	}
50	52
51	53	public void setTitle(String title) {
52		- this.title = title;
	54	+ this.title = Strings.isNullOrEmpty(title)?" ":title;
53	55	}
54	56
55	57	public String getType() {
...	...	@@ -57,7 +59,7 @@
57	59	}
58	60
59	61	public void setType(String type) {
60		- this.type = type;
	62	+ this.type = Strings.isNullOrEmpty(type)?" ":type;
61	63	}
62	64
63	65	public String getVccardno() {
...	...	@@ -65,7 +67,7 @@
65	67	}
66	68
67	69	public void setVccardno(String vccardno) {
68		- this.vccardno = vccardno;
	70	+ this.vccardno = Strings.isNullOrEmpty(vccardno)?" ":vccardno;
69	71	}
70	72
71	73	public String getName() {
...	...	@@ -73,7 +75,7 @@
73	75	}
74	76
75	77	public void setName(String name) {
76		- this.name = name;
	78	+ this.name = Strings.isNullOrEmpty(name)?" ":name;
77	79	}
78	80
79	81	public String getPhone() {
...	...	@@ -81,7 +83,7 @@
81	83	}
82	84
83	85	public void setPhone(String phone) {
84		- this.phone = phone;
	86	+ this.phone = Strings.isNullOrEmpty(phone)?" ":phone;
85	87	}
86	88
87	89	public String getBhnum() {
...	...	@@ -89,7 +91,7 @@
89	91	}
90	92
91	93	public void setBhnum(String bhnum) {
92		- this.bhnum = bhnum;
	94	+ this.bhnum = Strings.isNullOrEmpty(bhnum)?" ":bhnum;
93	95	}
94	96
95	97	public String getAge() {
...	...	@@ -97,7 +99,7 @@
97	99	}
98	100
99	101	public void setAge(String age) {
100		- this.age = age;
	102	+ this.age = Strings.isNullOrEmpty(age)?" ":age;
101	103	}
102	104
103	105	public String getSex() {
...	...	@@ -105,7 +107,7 @@
105	107	}
106	108
107	109	public void setSex(String sex) {
108		- this.sex = sex;
	110	+ this.sex = Strings.isNullOrEmpty(sex)?" ":sex;
109	111	}
110	112
111	113	public String getImgs() {
...	...	@@ -113,7 +115,7 @@
113	115	}
114	116
115	117	public void setImgs(String imgs) {
116		- this.imgs = imgs;
	118	+ this.imgs = Strings.isNullOrEmpty(imgs)?" ":imgs;
117	119	}
118	120
119	121	public String getItem_finding() {
...	...	@@ -121,7 +123,7 @@
121	123	}
122	124
123	125	public void setItem_finding(String item_finding) {
124		- this.item_finding = item_finding;
	126	+ this.item_finding = Strings.isNullOrEmpty(item_finding)?" ":item_finding;
125	127	}
126	128
127	129	public String getItem_diagnosis() {
...	...	@@ -129,7 +131,7 @@
129	131	}
130	132
131	133	public void setItem_diagnosis(String item_diagnosis) {
132		- this.item_diagnosis = item_diagnosis;
	134	+ this.item_diagnosis =Strings.isNullOrEmpty(item_diagnosis)?" ":item_diagnosis;
133	135	}
134	136
135	137	public String getItem_result() {
...	...	@@ -137,7 +139,7 @@
137	139	}
138	140
139	141	public void setItem_result(String item_result) {
140		- this.item_result = item_result;
	142	+ this.item_result = Strings.isNullOrEmpty(item_result)?" ":item_result;
141	143	}
142	144
143	145	public String getApply_time() {
...	...	@@ -145,7 +147,7 @@
145	147	}
146	148
147	149	public void setApply_time(String apply_time) {
148		- this.apply_time = apply_time;
	150	+ this.apply_time = Strings.isNullOrEmpty(apply_time)?" ":apply_time;
149	151	}
150	152
151	153	public String getCheck_time() {
...	...	@@ -153,7 +155,7 @@
153	155	}
154	156
155	157	public void setCheck_time(String check_time) {
156		- this.check_time = check_time;
	158	+ this.check_time = Strings.isNullOrEmpty(check_time)?" ":check_time;
157	159	}
158	160
159	161	public String getPublish_time() {
...	...	@@ -161,7 +163,7 @@
161	163	}
162	164
163	165	public void setPublish_time(String publish_time) {
164		- this.publish_time = publish_time;
	166	+ this.publish_time =Strings.isNullOrEmpty(publish_time)?" ":publish_time;
165	167	}
166	168
167	169	public String getApply_doctor() {
...	...	@@ -169,7 +171,7 @@
169	171	}
170	172
171	173	public void setApply_doctor(String apply_doctor) {
172		- this.apply_doctor = apply_doctor;
	174	+ this.apply_doctor =Strings.isNullOrEmpty(apply_doctor)?" ":apply_doctor;
173	175	}
174	176
175	177	public String getApply_dept() {
...	...	@@ -177,7 +179,7 @@
177	179	}
178	180
179	181	public void setApply_dept(String apply_dept) {
180		- this.apply_dept = apply_dept;
	182	+ this.apply_dept = Strings.isNullOrEmpty(apply_dept)?" ":apply_dept;
181	183	}
182	184
183	185	public String getChecker() {
...	...	@@ -185,7 +187,7 @@
185	187	}
186	188
187	189	public void setChecker(String checker) {
188		- this.checker = checker;
	190	+ this.checker = Strings.isNullOrEmpty(checker)?" ":checker;
189	191	}
190	192
191	193	public String getModified() {
...	...	@@ -193,7 +195,7 @@
193	195	}
194	196
195	197	public void setModified(String modified) {
196		- this.modified = modified;
	198	+ this.modified = Strings.isNullOrEmpty(modified)?" ":modified;
197	199	}
198	200
199	201	public String getCreated() {
...	...	@@ -201,7 +203,7 @@
201	203	}
202	204
203	205	public void setCreated(String created) {
204		- this.created = created;
	206	+ this.created = Strings.isNullOrEmpty(created)?" ":created;
205	207	}
206	208
207	209	public String getHospital_id() {
...	...	@@ -209,7 +211,7 @@
209	211	}
210	212
211	213	public void setHospital_id(String hospital_id) {
212		- this.hospital_id = hospital_id;
	214	+ this.hospital_id =Strings.isNullOrEmpty(hospital_id)?" ":hospital_id;
213	215	}
214	216
215	217	public String getItem_json() {
...	...	@@ -217,7 +219,7 @@
217	219	}
218	220
219	221	public void setItem_json(String item_json) {
220		- this.item_json = item_json;
	222	+ this.item_json = Strings.isNullOrEmpty(item_json)?" ":item_json;
221	223	}
222	224
223	225	@Override

...	...	@@ -79,6 +79,7 @@
79	79	model.setAge(model.getAge().trim());
80	80	model.setItem_finding(model.getItem_finding().trim());
81	81	model.setItem_diagnosis(model.getItem_diagnosis().trim());
	82	+ model.setItem_json(JsonUtil.array2JsonString(model.getItem_json()));
82	83	System.out.println("resivce = " + model.toString());
83	84	// masterRisMapper.deleteRisData(model);
84	85	masterRisMapper.saveRisData(model);