jiangjiazhi / regional-platform

Download as
Browse Code »

Commit aec879578f0deba675fbe1405eece5b4bb36e238

Authored by jesse.wang
1 parent d674a24a45
Exists in master and in 4 other branches autism, dev, fengning2023-06-06, luanping

孤独症初筛复筛接口

Showing 4 changed files with 162 additions and 188 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyAutismPrimaryScreeningMapper.java View file @ aec8795
... ... @@ -29,7 +29,7 @@
29 29 * @param pageable 分页对象
30 30 * @return 对象列表
31 31 */
32   - List<BabyAutismPrimaryScreening> queryAllByLimit(BabyAutismPrimaryScreening babyAutismPrimaryScreening, @Param("pageable") BaseQuery pageable);
  32 + List<BabyAutismPrimaryScreening> queryAllByLimit(@Param("babyAutismPrimaryScreening")BabyAutismPrimaryScreening babyAutismPrimaryScreening, @Param("pageable") BaseQuery pageable);
33 33  
34 34 /**
35 35 * 统计总行数
... ... @@ -37,7 +37,7 @@
37 37 * @param babyAutismPrimaryScreening 查询条件
38 38 * @return 总行数
39 39 */
40   - long count(BabyAutismPrimaryScreening babyAutismPrimaryScreening);
  40 + long count(@Param("babyAutismPrimaryScreening") BabyAutismPrimaryScreening babyAutismPrimaryScreening);
41 41  
42 42 /**
43 43 * 新增数据
... ... @@ -82,7 +82,7 @@
82 82  
83 83 /**
84 84 * 根据儿童ID查询初筛记录
85   - * @param babyId
  85 + * @param id
86 86 * @return
87 87 */
88 88 List<BabyAutismPrimaryScreening> queryListByBabyId(String id);
platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml View file @ aec8795
... ... @@ -73,7 +73,7 @@
73 73 </select>
74 74  
75 75 <!--查询指定行数据-->
76   - <select id="queryAllByLimit" resultMap="BabyAutismPrimaryScreeningMap">
  76 + <select id="queryAllByLimit" resultMap="BabyAutismPrimaryScreeningMap" parameterType="com.lyms.platform.pojo.BabyAutismPrimaryScreening">
77 77 select
78 78 id, created, modified, yn, operater_id, hospital_id, baby_id, baby_build_date, baby_name, baby_sex, baby_m_name,
79 79 baby_f_name, baby_m_phone, baby_f_phone, baby_m_cert_no, baby_f_cert_no, pid, check_month_age, check_month_id,
80 80  
81 81  
82 82  
83 83  
84 84  
85 85  
86 86  
87 87  
88 88  
89 89  
90 90  
91 91  
92 92  
93 93  
94 94  
95 95  
96 96  
97 97  
98 98  
99 99  
100 100  
101 101  
102 102  
103 103  
104 104  
105 105  
106 106  
107 107  
108 108  
109 109  
110 110  
111 111  
112 112  
113 113  
114 114  
115 115  
116 116  
117 117  
118 118  
119 119  
120 120  
121 121  
122 122  
123 123  
124 124  
125 125  
126 126  
127 127  
128 128  
129 129  
130 130  
131 131  
132 132  
133 133  
134 134  
135 135  
136 136  
137 137  
138 138  
139 139  
140 140  
... ... @@ -81,194 +81,194 @@
81 81 warning_signs, language_social, preliminary_screening_results
82 82 from baby_autism_primary_screening
83 83 <where>
84   - <if test="id != null and id != ''">
  84 + <if test="babyAutismPrimaryScreening.id != null and babyAutismPrimaryScreening.id != ''">
85 85 and id = #{id}
86 86 </if>
87   - <if test="created != null and created != ''">
88   - and created = #{created}
  87 + <if test="babyAutismPrimaryScreening.created != null ">
  88 + and created = #{babyAutismPrimaryScreening.created}
89 89 </if>
90   - <if test="modified != null and modified != ''">
91   - and modified = #{modified}
  90 + <if test="babyAutismPrimaryScreening.modified != null ">
  91 + and modified = #{babyAutismPrimaryScreening.modified}
92 92 </if>
93   - <if test="yn != null">
94   - and yn = #{yn}
  93 + <if test="babyAutismPrimaryScreening.yn != null">
  94 + and yn = #{babyAutismPrimaryScreening.yn}
95 95 </if>
96   - <if test="operaterId != null and operaterId != ''">
97   - and operater_id = #{operaterId}
  96 + <if test="babyAutismPrimaryScreening.operaterId != null and babyAutismPrimaryScreening.operaterId != ''">
  97 + and operater_id = #{babyAutismPrimaryScreening.operaterId}
98 98 </if>
99   - <if test="hospitalId != null and hospitalId != ''">
100   - and hospital_id = #{hospitalId}
  99 + <if test="babyAutismPrimaryScreening.hospitalId != null and babyAutismPrimaryScreening.hospitalId != ''">
  100 + and hospital_id = #{babyAutismPrimaryScreening.hospitalId}
101 101 </if>
102   - <if test="babyId != null and babyId != ''">
103   - and baby_id = #{babyId}
  102 + <if test="babyAutismPrimaryScreening.babyId != null and babyAutismPrimaryScreening.babyId != ''">
  103 + and baby_id = #{babyAutismPrimaryScreening.babyId}
104 104 </if>
105   - <if test="babyBuildDate != null and babyBuildDate != ''">
106   - and baby_build_date = #{babyBuildDate}
  105 + <if test="babyAutismPrimaryScreening.babyBuildDate != null and babyAutismPrimaryScreening.babyBuildDate != ''">
  106 + and baby_build_date = #{babyAutismPrimaryScreening.babyBuildDate}
107 107 </if>
108   - <if test="babyName != null and babyName != ''">
109   - and baby_name = #{babyName}
  108 + <if test="babyAutismPrimaryScreening.babyName != null and babyAutismPrimaryScreening.babyName != ''">
  109 + and baby_name = #{babyAutismPrimaryScreening.babyName}
110 110 </if>
111   - <if test="babySex != null">
112   - and baby_sex = #{babySex}
  111 + <if test="babyAutismPrimaryScreening.babySex != null">
  112 + and baby_sex = #{babyAutismPrimaryScreening.babySex}
113 113 </if>
114   - <if test="babyMName != null and babyMName != ''">
115   - and baby_m_name = #{babyMName}
  114 + <if test="babyAutismPrimaryScreening.babyMName != null and babyAutismPrimaryScreening.babyMName != ''">
  115 + and baby_m_name = #{babyAutismPrimaryScreening.babyMName}
116 116 </if>
117   - <if test="babyFName != null and babyFName != ''">
118   - and baby_f_name = #{babyFName}
  117 + <if test="babyAutismPrimaryScreening.babyFName != null and babyAutismPrimaryScreening.babyFName != ''">
  118 + and baby_f_name = #{babyAutismPrimaryScreening.babyFName}
119 119 </if>
120   - <if test="babyMPhone != null and babyMPhone != ''">
121   - and baby_m_phone = #{babyMPhone}
  120 + <if test="babyAutismPrimaryScreening.babyMPhone != null and babyAutismPrimaryScreening.babyMPhone != ''">
  121 + and baby_m_phone = #{babyAutismPrimaryScreening.babyMPhone}
122 122 </if>
123   - <if test="babyFPhone != null and babyFPhone != ''">
124   - and baby_f_phone = #{babyFPhone}
  123 + <if test="babyAutismPrimaryScreening.babyFPhone != null and babyAutismPrimaryScreening.babyFPhone != ''">
  124 + and baby_f_phone = #{babyAutismPrimaryScreening.babyFPhone}
125 125 </if>
126   - <if test="babyMCertNo != null and babyMCertNo != ''">
127   - and baby_m_cert_no = #{babyMCertNo}
  126 + <if test="babyAutismPrimaryScreening.babyMCertNo != null and babyAutismPrimaryScreening.babyMCertNo != ''">
  127 + and baby_m_cert_no = #{babyAutismPrimaryScreening.babyMCertNo}
128 128 </if>
129   - <if test="babyFCertNo != null and babyFCertNo != ''">
130   - and baby_f_cert_no = #{babyFCertNo}
  129 + <if test="babyAutismPrimaryScreening.babyFCertNo != null and babyAutismPrimaryScreening.babyFCertNo != ''">
  130 + and baby_f_cert_no = #{babyAutismPrimaryScreening.babyFCertNo}
131 131 </if>
132   - <if test="pid != null and pid != ''">
133   - and pid = #{pid}
  132 + <if test="babyAutismPrimaryScreening.pid != null and babyAutismPrimaryScreening.pid != ''">
  133 + and pid = #{babyAutismPrimaryScreening.pid}
134 134 </if>
135   - <if test="checkMonthAge != null and checkMonthAge != ''">
136   - and check_month_age = #{checkMonthAge}
  135 + <if test="babyAutismPrimaryScreening.checkMonthAge != null and babyAutismPrimaryScreening.checkMonthAge != ''">
  136 + and check_month_age = #{babyAutismPrimaryScreening.checkMonthAge}
137 137 </if>
138   - <if test="checkMonthId != null and checkMonthId != ''">
139   - and check_month_id = #{checkMonthId}
  138 + <if test="babyAutismPrimaryScreening.checkMonthId != null and babyAutismPrimaryScreening.checkMonthId != ''">
  139 + and check_month_id = #{babyAutismPrimaryScreening.checkMonthId}
140 140 </if>
141   - <if test="birth != null and birth != ''">
142   - and birth = #{birth}
  141 + <if test="babyAutismPrimaryScreening.birth != null ">
  142 + and birth = #{babyAutismPrimaryScreening.birth}
143 143 </if>
144   - <if test="checkTime != null and checkTime != ''">
145   - and check_time = #{checkTime}
  144 + <if test="babyAutismPrimaryScreening.checkTime != null ">
  145 + and check_time = #{babyAutismPrimaryScreening.checkTime}
146 146 </if>
147   - <if test="nextCheckTime != null and nextCheckTime != ''">
148   - and next_check_time = #{nextCheckTime}
  147 + <if test="babyAutismPrimaryScreening.nextCheckTime != null ">
  148 + and next_check_time = #{babyAutismPrimaryScreening.nextCheckTime}
149 149 </if>
150   - <if test="doctor != null and doctor != ''">
151   - and check_doctor = #{doctor}
  150 + <if test="babyAutismPrimaryScreening.doctor != null and babyAutismPrimaryScreening.doctor != ''">
  151 + and check_doctor = #{babyAutismPrimaryScreening.doctor}
152 152 </if>
153   - <if test="doctorSign != null and doctorSign != ''">
154   - and doctor_sign = #{doctorSign}
  153 + <if test="babyAutismPrimaryScreening.doctorSign != null and babyAutismPrimaryScreening.doctorSign != ''">
  154 + and doctor_sign = #{babyAutismPrimaryScreening.doctorSign}
155 155 </if>
156   - <if test="patientSign != null and patientSign != ''">
157   - and patient_sign = #{patientSign}
  156 + <if test="babyAutismPrimaryScreening.patientSign != null and babyAutismPrimaryScreening.patientSign != ''">
  157 + and patient_sign = #{babyAutismPrimaryScreening.patientSign}
158 158 </if>
159   - <if test="guidanceOpinions != null and guidanceOpinions != ''">
160   - and guidance_opinions = #{guidanceOpinions}
  159 + <if test="babyAutismPrimaryScreening.guidanceOpinions != null and babyAutismPrimaryScreening.guidanceOpinions != ''">
  160 + and guidance_opinions = #{babyAutismPrimaryScreening.guidanceOpinions}
161 161 </if>
162   - <if test="handleOpinions != null and handleOpinions != ''">
163   - and handle_opinions = #{handleOpinions}
  162 + <if test="babyAutismPrimaryScreening.handleOpinions != null and babyAutismPrimaryScreening.handleOpinions != ''">
  163 + and handle_opinions = #{babyAutismPrimaryScreening.handleOpinions}
164 164 </if>
165   - <if test="warningSignstring != null and warningSignstring != ''">
166   - and warning_signs = #{warningSignstring}
  165 + <if test="babyAutismPrimaryScreening.warningSignstring != null and babyAutismPrimaryScreening.warningSignstring != ''">
  166 + and warning_signs = #{babyAutismPrimaryScreening.warningSignstring}
167 167 </if>
168   - <if test="languageSocialstirng != null and languageSocialstirng != ''">
169   - and language_social = #{languageSocialstirng}
  168 + <if test="babyAutismPrimaryScreening.languageSocialstirng != null and babyAutismPrimaryScreening.languageSocialstirng != ''">
  169 + and language_social = #{babyAutismPrimaryScreening.languageSocialstirng}
170 170 </if>
171   - <if test="global != null and global != ''">
172   - and preliminary_screening_results = #{global}
  171 + <if test="babyAutismPrimaryScreening.global != null and babyAutismPrimaryScreening.global != ''">
  172 + and preliminary_screening_results = #{babyAutismPrimaryScreening.global}
173 173 </if>
174 174 </where>
175   - limit #{pageable.offset}, #{pageable.pageSize}
  175 + limit #{pageable.offset}, #{pageable.limit}
176 176 </select>
177 177  
178 178 <!--统计总行数-->
179   - <select id="count" resultType="java.lang.Long">
  179 + <select id="count" resultType="java.lang.Long" parameterType="com.lyms.platform.pojo.BabyAutismPrimaryScreening">
180 180 select count(1)
181 181 from baby_autism_primary_screening
182 182 <where>
183   - <if test="id != null and id != ''">
  183 + <if test="babyAutismPrimaryScreening.id != null and babyAutismPrimaryScreening.id != ''">
184 184 and id = #{id}
185 185 </if>
186   - <if test="created != null and created != ''">
187   - and created = #{created}
  186 + <if test="babyAutismPrimaryScreening.created != null ">
  187 + and created = #{babyAutismPrimaryScreening.created}
188 188 </if>
189   - <if test="modified != null and modified != ''">
190   - and modified = #{modified}
  189 + <if test="babyAutismPrimaryScreening.modified != null ">
  190 + and modified = #{babyAutismPrimaryScreening.modified}
191 191 </if>
192   - <if test="yn != null">
193   - and yn = #{yn}
  192 + <if test="babyAutismPrimaryScreening.yn != null">
  193 + and yn = #{babyAutismPrimaryScreening.yn}
194 194 </if>
195   - <if test="operaterId != null and operaterId != ''">
196   - and operater_id = #{operaterId}
  195 + <if test="babyAutismPrimaryScreening.operaterId != null and babyAutismPrimaryScreening.operaterId != ''">
  196 + and operater_id = #{babyAutismPrimaryScreening.operaterId}
197 197 </if>
198   - <if test="hospitalId != null and hospitalId != ''">
199   - and hospital_id = #{hospitalId}
  198 + <if test="babyAutismPrimaryScreening.hospitalId != null and babyAutismPrimaryScreening.hospitalId != ''">
  199 + and hospital_id = #{babyAutismPrimaryScreening.hospitalId}
200 200 </if>
201   - <if test="babyId != null and babyId != ''">
202   - and baby_id = #{babyId}
  201 + <if test="babyAutismPrimaryScreening.babyId != null and babyAutismPrimaryScreening.babyId != ''">
  202 + and baby_id = #{babyAutismPrimaryScreening.babyId}
203 203 </if>
204   - <if test="babyBuildDate != null and babyBuildDate != ''">
205   - and baby_build_date = #{babyBuildDate}
  204 + <if test="babyAutismPrimaryScreening.babyBuildDate != null and babyAutismPrimaryScreening.babyBuildDate != ''">
  205 + and baby_build_date = #{babyAutismPrimaryScreening.babyBuildDate}
206 206 </if>
207   - <if test="babyName != null and babyName != ''">
208   - and baby_name = #{babyName}
  207 + <if test="babyAutismPrimaryScreening.babyName != null and babyAutismPrimaryScreening.babyName != ''">
  208 + and baby_name = #{babyAutismPrimaryScreening.babyName}
209 209 </if>
210   - <if test="babySex != null">
211   - and baby_sex = #{babySex}
  210 + <if test="babyAutismPrimaryScreening.babySex != null">
  211 + and baby_sex = #{babyAutismPrimaryScreening.babySex}
212 212 </if>
213   - <if test="babyMName != null and babyMName != ''">
214   - and baby_m_name = #{babyMName}
  213 + <if test="babyAutismPrimaryScreening.babyMName != null and babyAutismPrimaryScreening.babyMName != ''">
  214 + and baby_m_name = #{babyAutismPrimaryScreening.babyMName}
215 215 </if>
216   - <if test="babyFName != null and babyFName != ''">
217   - and baby_f_name = #{babyFName}
  216 + <if test="babyAutismPrimaryScreening.babyFName != null and babyAutismPrimaryScreening.babyFName != ''">
  217 + and baby_f_name = #{babyAutismPrimaryScreening.babyFName}
218 218 </if>
219   - <if test="babyMPhone != null and babyMPhone != ''">
220   - and baby_m_phone = #{babyMPhone}
  219 + <if test="babyAutismPrimaryScreening.babyMPhone != null and babyAutismPrimaryScreening.babyMPhone != ''">
  220 + and baby_m_phone = #{babyAutismPrimaryScreening.babyMPhone}
221 221 </if>
222   - <if test="babyFPhone != null and babyFPhone != ''">
223   - and baby_f_phone = #{babyFPhone}
  222 + <if test="babyAutismPrimaryScreening.babyFPhone != null and babyAutismPrimaryScreening.babyFPhone != ''">
  223 + and baby_f_phone = #{babyAutismPrimaryScreening.babyFPhone}
224 224 </if>
225   - <if test="babyMCertNo != null and babyMCertNo != ''">
226   - and baby_m_cert_no = #{babyMCertNo}
  225 + <if test="babyAutismPrimaryScreening.babyMCertNo != null and babyAutismPrimaryScreening.babyMCertNo != ''">
  226 + and baby_m_cert_no = #{babyAutismPrimaryScreening.babyMCertNo}
227 227 </if>
228   - <if test="babyFCertNo != null and babyFCertNo != ''">
229   - and baby_f_cert_no = #{babyFCertNo}
  228 + <if test="babyAutismPrimaryScreening.babyFCertNo != null and babyAutismPrimaryScreening.babyFCertNo != ''">
  229 + and baby_f_cert_no = #{babyAutismPrimaryScreening.babyFCertNo}
230 230 </if>
231   - <if test="pid != null and pid != ''">
232   - and pid = #{pid}
  231 + <if test="babyAutismPrimaryScreening.pid != null and babyAutismPrimaryScreening.pid != ''">
  232 + and pid = #{babyAutismPrimaryScreening.pid}
233 233 </if>
234   - <if test="checkMonthAge != null and checkMonthAge != ''">
235   - and check_month_age = #{checkMonthAge}
  234 + <if test="babyAutismPrimaryScreening.checkMonthAge != null and babyAutismPrimaryScreening.checkMonthAge != ''">
  235 + and check_month_age = #{babyAutismPrimaryScreening.checkMonthAge}
236 236 </if>
237   - <if test="checkMonthId != null and checkMonthId != ''">
238   - and check_month_id = #{checkMonthId}
  237 + <if test="babyAutismPrimaryScreening.checkMonthId != null and babyAutismPrimaryScreening.checkMonthId != ''">
  238 + and check_month_id = #{babyAutismPrimaryScreening.checkMonthId}
239 239 </if>
240   - <if test="birth != null and birth != ''">
241   - and birth = #{birth}
  240 + <if test="babyAutismPrimaryScreening.birth != null ">
  241 + and birth = #{babyAutismPrimaryScreening.birth}
242 242 </if>
243   - <if test="checkTime != null and checkTime != ''">
244   - and check_time = #{checkTime}
  243 + <if test="babyAutismPrimaryScreening.checkTime != null ">
  244 + and check_time = #{babyAutismPrimaryScreening.checkTime}
245 245 </if>
246   - <if test="nextCheckTime != null and nextCheckTime != ''">
247   - and next_check_time = #{nextCheckTime}
  246 + <if test="babyAutismPrimaryScreening.nextCheckTime != null ">
  247 + and next_check_time = #{babyAutismPrimaryScreening.nextCheckTime}
248 248 </if>
249   - <if test="doctor != null and doctor != ''">
250   - and check_doctor = #{doctor}
  249 + <if test="babyAutismPrimaryScreening.doctor != null and babyAutismPrimaryScreening.doctor != ''">
  250 + and check_doctor = #{babyAutismPrimaryScreening.doctor}
251 251 </if>
252   - <if test="doctorSign != null and doctorSign != ''">
253   - and doctor_sign = #{doctorSign}
  252 + <if test="babyAutismPrimaryScreening.doctorSign != null and babyAutismPrimaryScreening.doctorSign != ''">
  253 + and doctor_sign = #{babyAutismPrimaryScreening.doctorSign}
254 254 </if>
255   - <if test="patientSign != null and patientSign != ''">
256   - and patient_sign = #{patientSign}
  255 + <if test="babyAutismPrimaryScreening.patientSign != null and babyAutismPrimaryScreening.patientSign != ''">
  256 + and patient_sign = #{babyAutismPrimaryScreening.patientSign}
257 257 </if>
258   - <if test="guidanceOpinions != null and guidanceOpinions != ''">
259   - and guidance_opinions = #{guidanceOpinions}
  258 + <if test="babyAutismPrimaryScreening.guidanceOpinions != null and babyAutismPrimaryScreening.guidanceOpinions != ''">
  259 + and guidance_opinions = #{babyAutismPrimaryScreening.guidanceOpinions}
260 260 </if>
261   - <if test="handleOpinions != null and handleOpinions != ''">
262   - and handle_opinions = #{handleOpinions}
  261 + <if test="babyAutismPrimaryScreening.handleOpinions != null and babyAutismPrimaryScreening.handleOpinions != ''">
  262 + and handle_opinions = #{babyAutismPrimaryScreening.handleOpinions}
263 263 </if>
264   - <if test="warningSignstring != null and warningSignstring != ''">
265   - and warning_signs = #{warningSignstring}
  264 + <if test="babyAutismPrimaryScreening.warningSignstring != null and babyAutismPrimaryScreening.warningSignstring != ''">
  265 + and warning_signs = #{babyAutismPrimaryScreening.warningSignstring}
266 266 </if>
267   - <if test="languageSocialstirng != null and languageSocialstirng != ''">
268   - and language_social = #{languageSocialstirng}
  267 + <if test="babyAutismPrimaryScreening.languageSocialstirng != null and babyAutismPrimaryScreening.languageSocialstirng != ''">
  268 + and language_social = #{babyAutismPrimaryScreening.languageSocialstirng}
269 269 </if>
270   - <if test="global != null and global != ''">
271   - and preliminary_screening_results = #{global}
  270 + <if test="babyAutismPrimaryScreening.global != null and babyAutismPrimaryScreening.global != ''">
  271 + and preliminary_screening_results = #{babyAutismPrimaryScreening.global}
272 272 </if>
273 273 </where>
274 274 </select>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PrimaryScreeningController.java View file @ aec8795
... ... @@ -11,7 +11,6 @@
11 11 import com.lyms.platform.operate.web.facade.PrimaryScreeningFacade;
12 12 import com.lyms.platform.operate.web.inteceptor.InitDataConfig;
13 13 import com.lyms.platform.pojo.BabyAutismPrimaryScreening;
14   -import org.apache.commons.lang.StringUtils;
15 14 import org.slf4j.Logger;
16 15 import org.slf4j.LoggerFactory;
17 16 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -19,7 +18,6 @@
19 18 import org.springframework.web.bind.annotation.*;
20 19  
21 20 import javax.servlet.http.HttpServletRequest;
22   -import java.util.ArrayList;
23 21 import java.util.HashMap;
24 22 import java.util.List;
25 23  
... ... @@ -111,35 +109,6 @@
111 109 @RequestMapping(value = "/queryUpDate", method = RequestMethod.GET)
112 110 public BaseResponse queryUpDate(String id) {
113 111 BabyAutismPrimaryScreening primaryScreening = primaryScreeningFacade.queryUpDate(id);
114   - String checkMonthId = primaryScreening.getCheckMonthId();
115   - HashMap<String, List<BaseMap>> monthageInfo = InitDataConfig.MONTHAGEINFO.get(Integer.valueOf(checkMonthId));
116   - String[] warningSignsId = primaryScreening.getWarningSignstring().split(",");
117   - //预警征象筛查
118   - List<BaseMap> warningSignsInfo = monthageInfo.get("warningSigns");
119   - List<String> warningSigns = new ArrayList<>();
120   - for (BaseMap baseMap : warningSignsInfo) {
121   - for (String s : warningSignsId) {
122   - if (s.equals(baseMap.getId())) {
123   - warningSigns.add(baseMap.getName());
124   - }
125   - }
126   - }
127   - //语言功能和社会交往能力询问
128   - List<BaseMap> languageSocialInfo = monthageInfo.get("languageSocial");
129   - String[] languageSocialstirngId = primaryScreening.getLanguageSocialstirng().split(",");
130   - /**
131   - * 语言功能和社会交往能力询问
132   - */
133   - List<String> languageSocial = new ArrayList<>();
134   - for (BaseMap baseMap : languageSocialInfo) {
135   - for (String s : languageSocialstirngId) {
136   - if (s.equals(baseMap.getId())) {
137   - languageSocial.add(baseMap.getName());
138   - }
139   - }
140   - }
141   - primaryScreening.setWarningSignstringName(StringUtils.join(warningSigns,","));
142   - primaryScreening.setLanguageSocialName(StringUtils.join(languageSocial,","));
143 112 BaseObjectResponse br = new BaseObjectResponse();
144 113 br.setErrorcode(ErrorCodeConstants.SUCCESS);
145 114 br.setData(primaryScreening);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java View file @ aec8795
... ... @@ -153,7 +153,7 @@
153 153  
154 154 public BabyAutismPrimaryScreening queryUpDate(String id) {
155 155 BabyAutismPrimaryScreening primaryScreening = babyAutismPrimaryScreeningService.queryById(id);
156   -
  156 + nameChange(primaryScreening);
157 157 return primaryScreening;
158 158 }
159 159  
160 160  
... ... @@ -161,39 +161,9 @@
161 161 pageRequest.mysqlBuild(babyAutismPrimaryScreeningService.count(babyAutismPrimaryScreening, pageRequest).intValue());
162 162 List<BabyAutismPrimaryScreening> primaryScreeningPage = babyAutismPrimaryScreeningService.queryByPage(babyAutismPrimaryScreening, pageRequest);
163 163 for (BabyAutismPrimaryScreening primaryScreening : primaryScreeningPage) {
164   - //查询医院
165   - Organization org = organizationService.getOrganization(Integer.valueOf(primaryScreening.getHospitalId()));
166   - primaryScreening.setCheckHospital(org.getName());
167   - String checkMonthId = primaryScreening.getCheckMonthId();
168   - HashMap<String, List<BaseMap>> monthageInfo = InitDataConfig.MONTHAGEINFO.get(Integer.valueOf(checkMonthId));
169   - String[] warningSignsId = primaryScreening.getWarningSignstring().split(",");
170   - //预警征象筛查
171   - List<BaseMap> warningSignsInfo = monthageInfo.get("warningSigns");
172   - List<String> warningSigns = new ArrayList<>();
173   - for (BaseMap baseMap : warningSignsInfo) {
174   - for (String s : warningSignsId) {
175   - if (s.equals(baseMap.getId())) {
176   - warningSigns.add(baseMap.getName());
177   - }
178   - }
179   - }
180   - //语言功能和社会交往能力询问
181   - List<BaseMap> languageSocialInfo = monthageInfo.get("languageSocial");
182   - String[] languageSocialstirngId = primaryScreening.getLanguageSocialstirng().split(",");
183   - /**
184   - * 语言功能和社会交往能力询问
185   - */
186   - List<String> languageSocial = new ArrayList<>();
187   - for (BaseMap baseMap : languageSocialInfo) {
188   - for (String s : languageSocialstirngId) {
189   - if (s.equals(baseMap.getId())) {
190   - languageSocial.add(baseMap.getName());
191   - }
192   - }
193   - }
194   - primaryScreening.setWarningSignstringName(StringUtils.join(warningSigns,","));
195   - primaryScreening.setLanguageSocialName(StringUtils.join(languageSocial,","));
196 164  
  165 + nameChange(primaryScreening);
  166 +
197 167 }
198 168 BaseObjectResponse br = new BaseObjectResponse();
199 169 br.setErrorcode(ErrorCodeConstants.SUCCESS);
... ... @@ -210,6 +180,41 @@
210 180 br.setErrorcode(ErrorCodeConstants.SUCCESS);
211 181 br.setErrormsg("成功");
212 182 return br;
  183 + }
  184 +
  185 + public void nameChange(BabyAutismPrimaryScreening primaryScreening) {
  186 + //查询医院
  187 + Organization org = organizationService.getOrganization(Integer.valueOf(primaryScreening.getHospitalId()));
  188 + primaryScreening.setCheckHospital(org.getName());
  189 + String checkMonthId = primaryScreening.getCheckMonthId();
  190 + HashMap<String, List<BaseMap>> monthageInfo = InitDataConfig.MONTHAGEINFO.get(Integer.valueOf(checkMonthId));
  191 + String[] warningSignsId = primaryScreening.getWarningSignstring().split(",");
  192 + //预警征象筛查
  193 + List<BaseMap> warningSignsInfo = monthageInfo.get("warningSigns");
  194 + List<String> warningSigns = new ArrayList<>();
  195 + for (BaseMap baseMap : warningSignsInfo) {
  196 + for (String s : warningSignsId) {
  197 + if (s.equals(baseMap.getId())) {
  198 + warningSigns.add(baseMap.getName());
  199 + }
  200 + }
  201 + }
  202 + //语言功能和社会交往能力询问
  203 + List<BaseMap> languageSocialInfo = monthageInfo.get("languageSocial");
  204 + String[] languageSocialstirngId = primaryScreening.getLanguageSocialstirng().split(",");
  205 + /**
  206 + * 语言功能和社会交往能力询问
  207 + */
  208 + List<String> languageSocial = new ArrayList<>();
  209 + for (BaseMap baseMap : languageSocialInfo) {
  210 + for (String s : languageSocialstirngId) {
  211 + if (s.equals(baseMap.getId())) {
  212 + languageSocial.add(baseMap.getName());
  213 + }
  214 + }
  215 + }
  216 + primaryScreening.setWarningSignstringName(StringUtils.join(warningSigns,","));
  217 + primaryScreening.setLanguageSocialName(StringUtils.join(languageSocial,","));
213 218 }
214 219 }