jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 97239b2b3966f5cf4c78fd209d2785ae383ebc1b

Authored by yangfei
1 parent 09969b2a80
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

听力诊断模块

Showing 9 changed files with 245 additions and 97 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java View file @ 97239b2
... ... @@ -182,6 +182,10 @@
182 182 */
183 183 private String respiratorContinuedDate;
184 184 /**
  185 + * 呼吸机使用的持续时间单位
  186 + */
  187 + private String respiratorContinuedDateUnit;
  188 + /**
185 189 * 对外界声音和其他感官刺激的反应 1=灵敏 2=迟钝
186 190 */
187 191 private Integer outsideResponse;
... ... @@ -194,6 +198,14 @@
194 198 * 儿童听力建档ID
195 199 */
196 200 private String babyEarId;
  201 +
  202 + public String getRespiratorContinuedDateUnit() {
  203 + return respiratorContinuedDateUnit;
  204 + }
  205 +
  206 + public void setRespiratorContinuedDateUnit(String respiratorContinuedDateUnit) {
  207 + this.respiratorContinuedDateUnit = respiratorContinuedDateUnit;
  208 + }
197 209  
198 210 public String getBabyEarId() {
199 211 return babyEarId;
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirthQuery.java View file @ 97239b2
... ... @@ -183,6 +183,10 @@
183 183 */
184 184 private String respiratorContinuedDate;
185 185 /**
  186 + * 呼吸机使用的持续时间单位
  187 + */
  188 + private String respiratorContinuedDateUnit;
  189 + /**
186 190 * 对外界声音和其他感官刺激的反应 1=灵敏 2=迟钝
187 191 */
188 192 private Integer outsideResponse;
... ... @@ -310,6 +314,14 @@
310 314  
311 315 public Integer getBirthInjuryType() {
312 316 return birthInjuryType;
  317 + }
  318 +
  319 + public String getRespiratorContinuedDateUnit() {
  320 + return respiratorContinuedDateUnit;
  321 + }
  322 +
  323 + public void setRespiratorContinuedDateUnit(String respiratorContinuedDateUnit) {
  324 + this.respiratorContinuedDateUnit = respiratorContinuedDateUnit;
313 325 }
314 326  
315 327 public void setBirthInjuryType(Integer birthInjuryType) {
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBirth.xml View file @ 97239b2
... ... @@ -39,6 +39,7 @@
39 39 <result column="nicu_continued_date" property="nicuContinuedDate" jdbcType="VARCHAR"/>
40 40 <result column="respirator_type" property="respiratorType" jdbcType="INTEGER"/>
41 41 <result column="respirator_continued_date" property="respiratorContinuedDate" jdbcType="VARCHAR"/>
  42 + <result column="respirator_continued_date_unit" property="respiratorContinuedDateUnit" jdbcType="VARCHAR"/>
42 43 <result column="outside_response" property="outsideResponse" jdbcType="INTEGER"/>
43 44 <result column="baby_patient_id" property="babyPatientId" jdbcType="VARCHAR"/>
44 45 <result column="baby_ear_id" property="babyEarId" jdbcType="VARCHAR" />
... ... @@ -47,7 +48,7 @@
47 48  
48 49 <insert id="addBabyPatientExtendEarBirth"
49 50 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarBirth">
50   -insert into baby_patient_extend_ear_birth (id,fetu_number,product_number,birth_weight,parturition_type,birth_defect_type,birth_defect_desc,fetu_embarras_type,apgar_score_one,apgar_score_five,apgar_score_ten,birth_injury_type,birth_injury_position,amniotic_fluid_type,abnormal_parturition_type,abnormal_parturition_position,deformity_type,deformity_position,birth_infection_type,birth_infection_cause,birth_course_disease,birth_ill_type,birth_ill_cause,birth_ill_disease,head_trauma_history,head_trauma_desc,ear_poison_type,ear_poison_map,tympanitis_type,tympanitis_desc,nicu_type,nicu_cause,nicu_continued_date,respirator_type,respirator_continued_date,outside_response,baby_patient_id,baby_ear_id) values (#{id},#{fetuNumber},#{productNumber},#{birthWeight},#{parturitionType},#{birthDefectType},#{birthDefectDesc},#{fetuEmbarrasType},#{apgarScoreOne},#{apgarScoreFive},#{apgarScoreTen},#{birthInjuryType},#{birthInjuryPosition},#{amnioticFluidType},#{abnormalParturitionType},#{abnormalParturitionPosition},#{deformityType},#{deformityPosition},#{birthInfectionType},#{birthInfectionCause},#{birthCourseDisease},#{birthIllType},#{birthIllCause},#{birthIllDisease},#{headTraumaHistory},#{headTraumaDesc},#{earPoisonType},#{earPoisonMap},#{tympanitisType},#{tympanitisDesc},#{nicuType},#{nicuCause},#{nicuContinuedDate},#{respiratorType},#{respiratorContinuedDate},#{outsideResponse},#{babyPatientId},#{babyEarId})
  51 +insert into baby_patient_extend_ear_birth (id,fetu_number,product_number,birth_weight,parturition_type,birth_defect_type,birth_defect_desc,fetu_embarras_type,apgar_score_one,apgar_score_five,apgar_score_ten,birth_injury_type,birth_injury_position,amniotic_fluid_type,abnormal_parturition_type,abnormal_parturition_position,deformity_type,deformity_position,birth_infection_type,birth_infection_cause,birth_course_disease,birth_ill_type,birth_ill_cause,birth_ill_disease,head_trauma_history,head_trauma_desc,ear_poison_type,ear_poison_map,tympanitis_type,tympanitis_desc,nicu_type,nicu_cause,nicu_continued_date,respirator_type,respirator_continued_date,respirator_continued_date_unit,outside_response,baby_patient_id,baby_ear_id) values (#{id},#{fetuNumber},#{productNumber},#{birthWeight},#{parturitionType},#{birthDefectType},#{birthDefectDesc},#{fetuEmbarrasType},#{apgarScoreOne},#{apgarScoreFive},#{apgarScoreTen},#{birthInjuryType},#{birthInjuryPosition},#{amnioticFluidType},#{abnormalParturitionType},#{abnormalParturitionPosition},#{deformityType},#{deformityPosition},#{birthInfectionType},#{birthInfectionCause},#{birthCourseDisease},#{birthIllType},#{birthIllCause},#{birthIllDisease},#{headTraumaHistory},#{headTraumaDesc},#{earPoisonType},#{earPoisonMap},#{tympanitisType},#{tympanitisDesc},#{nicuType},#{nicuCause},#{nicuContinuedDate},#{respiratorType},#{respiratorContinuedDate},#{respiratorContinuedDateUnit},#{outsideResponse},#{babyPatientId},#{babyEarId})
51 52 </insert>
52 53  
53 54  
54 55  
55 56  
... ... @@ -130,19 +131,19 @@
130 131 <if test="headTraumaDesc != null and headTraumaDesc != ''">
131 132 head_trauma_desc = #{headTraumaDesc,jdbcType=VARCHAR},
132 133 </if>
133   - <if test="earPoisonType != null and earPoisonType >= 0">
  134 + <if test="earPoisonType != null">
134 135 ear_poison_type = #{earPoisonType,jdbcType=INTEGER},
135 136 </if>
136 137 <if test="earPoisonMap != null and earPoisonMap != ''">
137 138 ear_poison_map = #{earPoisonMap,jdbcType=VARCHAR},
138 139 </if>
139   - <if test="tympanitisType != null and tympanitisType >= 0">
  140 + <if test="tympanitisType != null">
140 141 tympanitis_type = #{tympanitisType,jdbcType=INTEGER},
141 142 </if>
142 143 <if test="tympanitisDesc != null and tympanitisDesc != ''">
143 144 tympanitis_desc = #{tympanitisDesc,jdbcType=VARCHAR},
144 145 </if>
145   - <if test="nicuType != null and nicuType >= 0">
  146 + <if test="nicuType != null">
146 147 nicu_type = #{nicuType,jdbcType=INTEGER},
147 148 </if>
148 149 <if test="nicuCause != null and nicuCause != ''">
149 150  
... ... @@ -151,13 +152,16 @@
151 152 <if test="nicuContinuedDate != null and nicuContinuedDate != ''">
152 153 nicu_continued_date = #{nicuContinuedDate,jdbcType=VARCHAR},
153 154 </if>
154   - <if test="respiratorType != null and respiratorType >= 0">
  155 + <if test="respiratorType != null">
155 156 respirator_type = #{respiratorType,jdbcType=INTEGER},
156 157 </if>
157 158 <if test="respiratorContinuedDate != null and respiratorContinuedDate != ''">
158 159 respirator_continued_date = #{respiratorContinuedDate,jdbcType=VARCHAR},
159 160 </if>
160   - <if test="outsideResponse != null and outsideResponse >= 0">
  161 + <if test="respiratorContinuedDateUnit != null and respiratorContinuedDateUnit != ''">
  162 + respirator_continued_date_unit = #{respiratorContinuedDateUnit,jdbcType=VARCHAR},
  163 + </if>
  164 + <if test="outsideResponse != null">
161 165 outside_response = #{outsideResponse,jdbcType=INTEGER},
162 166 </if>
163 167 <if test="babyPatientId != null and babyPatientId != ''">
... ... @@ -178,7 +182,7 @@
178 182  
179 183 <select id="getBabyPatientExtendEarBirth" resultMap="BabyPatientExtendEarBirthResultMap"
180 184 parameterType="java.lang.String">
181   -select id,fetu_number,product_number,birth_weight,parturition_type,birth_defect_type,birth_defect_desc,fetu_embarras_type,apgar_score_one,apgar_score_five,apgar_score_ten,birth_injury_type,birth_injury_position,amniotic_fluid_type,abnormal_parturition_type,abnormal_parturition_position,deformity_type,deformity_position,birth_infection_type,birth_infection_cause,birth_course_disease,birth_ill_type,birth_ill_cause,birth_ill_disease,head_trauma_history,head_trauma_desc,ear_poison_type,ear_poison_map,tympanitis_type,tympanitis_desc,nicu_type,nicu_cause,nicu_continued_date,respirator_type,respirator_continued_date,outside_response,baby_patient_id,baby_ear_id
  185 +select id,fetu_number,product_number,birth_weight,parturition_type,birth_defect_type,birth_defect_desc,fetu_embarras_type,apgar_score_one,apgar_score_five,apgar_score_ten,birth_injury_type,birth_injury_position,amniotic_fluid_type,abnormal_parturition_type,abnormal_parturition_position,deformity_type,deformity_position,birth_infection_type,birth_infection_cause,birth_course_disease,birth_ill_type,birth_ill_cause,birth_ill_disease,head_trauma_history,head_trauma_desc,ear_poison_type,ear_poison_map,tympanitis_type,tympanitis_desc,nicu_type,nicu_cause,nicu_continued_date,respirator_type,respirator_continued_date,respirator_continued_date_unit,outside_response,baby_patient_id,baby_ear_id
182 186 from baby_patient_extend_ear_birth where id = #{id,jdbcType=VARCHAR}
183 187 </select>
184 188  
185 189  
186 190  
... ... @@ -274,19 +278,19 @@
274 278 <if test="headTraumaDesc != null and headTraumaDesc != ''">
275 279 and head_trauma_desc = #{headTraumaDesc,jdbcType=VARCHAR}
276 280 </if>
277   - <if test="earPoisonType != null and earPoisonType >= 0">
  281 + <if test="earPoisonType != null">
278 282 and ear_poison_type = #{earPoisonType,jdbcType=INTEGER}
279 283 </if>
280 284 <if test="earPoisonMap != null and earPoisonMap != ''">
281 285 and ear_poison_map = #{earPoisonMap,jdbcType=VARCHAR}
282 286 </if>
283   - <if test="tympanitisType != null and tympanitisType >= 0">
  287 + <if test="tympanitisType != null">
284 288 and tympanitis_type = #{tympanitisType,jdbcType=INTEGER}
285 289 </if>
286 290 <if test="tympanitisDesc != null and tympanitisDesc != ''">
287 291 and tympanitis_desc = #{tympanitisDesc,jdbcType=VARCHAR}
288 292 </if>
289   - <if test="nicuType != null and nicuType >= 0">
  293 + <if test="nicuType != null">
290 294 and nicu_type = #{nicuType,jdbcType=INTEGER}
291 295 </if>
292 296 <if test="nicuCause != null and nicuCause != ''">
293 297  
... ... @@ -295,13 +299,16 @@
295 299 <if test="nicuContinuedDate != null and nicuContinuedDate != ''">
296 300 and nicu_continued_date = #{nicuContinuedDate,jdbcType=VARCHAR}
297 301 </if>
298   - <if test="respiratorType != null and respiratorType >= 0">
  302 + <if test="respiratorType != null">
299 303 and respirator_type = #{respiratorType,jdbcType=INTEGER}
300 304 </if>
301 305 <if test="respiratorContinuedDate != null and respiratorContinuedDate != ''">
302 306 and respirator_continued_date = #{respiratorContinuedDate,jdbcType=VARCHAR}
303 307 </if>
304   - <if test="outsideResponse != null and outsideResponse >= 0">
  308 + <if test="respiratorContinuedDateUnit != null and respiratorContinuedDateUnit != ''">
  309 + and respirator_continued_date_unit = #{respiratorContinuedDateUnit,jdbcType=VARCHAR}
  310 + </if>
  311 + <if test="outsideResponse != null">
305 312 and outside_response = #{outsideResponse,jdbcType=INTEGER}
306 313 </if>
307 314 <if test="babyPatientId != null and babyPatientId != ''">
... ... @@ -317,7 +324,7 @@
317 324 <select id="queryBabyPatientExtendEarBirth" resultMap="BabyPatientExtendEarBirthResultMap"
318 325 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarBirthQuery">
319 326 select
320   - id,fetu_number,product_number,birth_weight,parturition_type,birth_defect_type,birth_defect_desc,fetu_embarras_type,apgar_score_one,apgar_score_five,apgar_score_ten,birth_injury_type,birth_injury_position,amniotic_fluid_type,abnormal_parturition_type,abnormal_parturition_position,deformity_type,deformity_position,birth_infection_type,birth_infection_cause,birth_course_disease,birth_ill_type,birth_ill_cause,birth_ill_disease,head_trauma_history,head_trauma_desc,ear_poison_type,ear_poison_map,tympanitis_type,tympanitis_desc,nicu_type,nicu_cause,nicu_continued_date,respirator_type,respirator_continued_date,outside_response,baby_patient_id,baby_ear_id
  327 + id,fetu_number,product_number,birth_weight,parturition_type,birth_defect_type,birth_defect_desc,fetu_embarras_type,apgar_score_one,apgar_score_five,apgar_score_ten,birth_injury_type,birth_injury_position,amniotic_fluid_type,abnormal_parturition_type,abnormal_parturition_position,deformity_type,deformity_position,birth_infection_type,birth_infection_cause,birth_course_disease,birth_ill_type,birth_ill_cause,birth_ill_disease,head_trauma_history,head_trauma_desc,ear_poison_type,ear_poison_map,tympanitis_type,tympanitis_desc,nicu_type,nicu_cause,nicu_continued_date,respirator_type,respirator_continued_date,respirator_continued_date_unit,outside_response,baby_patient_id,baby_ear_id
321 328 from baby_patient_extend_ear_birth
322 329 <include refid="BabyPatientExtendEarBirthCondition"/>
323 330 <include refid="orderAndLimit"/>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java View file @ 97239b2
... ... @@ -83,9 +83,11 @@
83 83  
84 84 for (BabyPatientExtendEarFollowUp fp : followUpList) {
85 85 //如果有一条记录是已结案，进入提示，不能建立随访记录
86   - if (fp.getIfclose() == 1) {
87   - Ifclose = true;
88   - break;
  86 + if (fp.getIfclose() != null) {
  87 + if (fp.getIfclose() == 1) {
  88 + Ifclose = true;
  89 + break;
  90 + }
89 91 }
90 92 }
91 93 if (Ifclose) {//已经结案
92 94  
... ... @@ -167,11 +169,11 @@
167 169  
168 170 List<BabyPatientExtendEar> babyPatientExtendEars = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery);
169 171 //是否听力建档
170   - if(CollectionUtils.isEmpty(babyPatientExtendEars)){
  172 + if (CollectionUtils.isEmpty(babyPatientExtendEars)) {
171 173 return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童还未完善听力建档");
172 174 }
173 175  
174   - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
  176 + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
175 177 }
176 178  
177 179 /**
... ... @@ -229,8 +231,8 @@
229 231 hdQuery.setBabyId(babyId);
230 232 hdQuery.setSort("diagnose_time");
231 233 List<BabyPatientExtendEarHearingDiagnose> hdList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(hdQuery);
232   - if(CollectionUtils.isNotEmpty(hdList)){
233   - BabyPatientExtendEarHearingDiagnose ehd = hdList.get(hdList.size()-1);
  234 + if (CollectionUtils.isNotEmpty(hdList)) {
  235 + BabyPatientExtendEarHearingDiagnose ehd = hdList.get(hdList.size() - 1);
234 236 initHearingDiagnose.setDiagnoseTime(DateUtil.getyyyy_MM_dd(ehd.getDiagnoseTime()));
235 237 }
236 238 return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
... ... @@ -299,7 +301,7 @@
299 301 }
300 302 }
301 303 if (!isResu) {
302   - return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("听诊诊断失败，儿童听筛已通过");
  304 + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童听筛已通过，不能进行听力诊断");
303 305 }
304 306 }
305 307  
... ... @@ -313,6 +315,7 @@
313 315  
314 316 return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
315 317 }
  318 +
316 319 /**
317 320 * 随访模块列表管理初始化数据
318 321 *
... ... @@ -333,6 +336,7 @@
333 336 initFollowUpListData.setTreatment(EnumUtil.toJson(TreatmentEnums.class));
334 337 return initFollowUpListData.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
335 338 }
  339 +
336 340 /**
337 341 * 进入新增听力转诊页面前，验证及初始化数据
338 342 *
339 343  
340 344  
341 345  
... ... @@ -368,16 +372,16 @@
368 372 //取第一条初筛记录结果
369 373 BabyPatientExtendEarScreen firstScreen = screenList.get(0);
370 374  
371   - if(firstScreen.getOaeLeft() == null){
  375 + if (firstScreen.getOaeLeft() == null) {
372 376 firstScreen.setOaeLeft(1);
373 377 }
374   - if(firstScreen.getOaeRight()==null){
  378 + if (firstScreen.getOaeRight() == null) {
375 379 firstScreen.setOaeRight(1);
376 380 }
377   - if(firstScreen.getAabrLeft()==null){
  381 + if (firstScreen.getAabrLeft() == null) {
378 382 firstScreen.setAabrLeft(1);
379 383 }
380   - if(firstScreen.getAabrRight()==null){
  384 + if (firstScreen.getAabrRight() == null) {
381 385 firstScreen.setAabrRight(1);
382 386 }
383 387 //初筛未通过
... ... @@ -392,7 +396,7 @@
392 396 } else if (firstScreen.getOaeRight() == -1 || firstScreen.getAabrRight() == -1) {//aabr未通过
393 397 firstResu.append("右耳");
394 398 }
395   - if(StringUtils.isNotEmpty(firstResu.toString())){
  399 + if (StringUtils.isNotEmpty(firstResu.toString())) {
396 400 firstResu.append(")");
397 401 }
398 402  
399 403  
400 404  
401 405  
402 406  
403 407  
404 408  
405 409  
406 410  
... ... @@ -412,33 +416,33 @@
412 416 BabyPatientExtendEarScreen endScreen = screenList.get(screenList.size() - 1);
413 417 //初筛未通过
414 418 StringBuffer endResu = new StringBuffer();
415   - if ((endScreen.getOaeLeft()!=null&&endScreen.getOaeLeft() == -1) || (endScreen.getOaeRight() !=null && endScreen.getOaeRight() == -1) || (endScreen.getAabrLeft()!=null && endScreen.getAabrLeft() == -1) || (endScreen.getAabrRight()!=null&&endScreen.getAabrRight() == -1)) {//oae未通过
  419 + if ((endScreen.getOaeLeft() != null && endScreen.getOaeLeft() == -1) || (endScreen.getOaeRight() != null && endScreen.getOaeRight() == -1) || (endScreen.getAabrLeft() != null && endScreen.getAabrLeft() == -1) || (endScreen.getAabrRight() != null && endScreen.getAabrRight() == -1)) {//oae未通过
416 420 endResu.append("未通过(");
417 421 }
418   - if (((endScreen.getOaeLeft()!=null&&endScreen.getOaeLeft() == -1) || (endScreen.getAabrLeft()!=null&&endScreen.getAabrLeft() == -1)) &&( (endScreen.getOaeRight() !=null&&endScreen.getOaeRight() == -1) || (endScreen.getAabrRight()!=null&&endScreen.getAabrRight() == -1))) {//oae未通过
  422 + if (((endScreen.getOaeLeft() != null && endScreen.getOaeLeft() == -1) || (endScreen.getAabrLeft() != null && endScreen.getAabrLeft() == -1)) && ((endScreen.getOaeRight() != null && endScreen.getOaeRight() == -1) || (endScreen.getAabrRight() != null && endScreen.getAabrRight() == -1))) {//oae未通过
419 423 endResu.append("双耳");
420 424  
421   - } else if ((endScreen.getOaeLeft()!=null&&endScreen.getOaeLeft() == -1) || (endScreen.getAabrLeft()!=null&&endScreen.getAabrLeft() == -1)) {//oae未通过
  425 + } else if ((endScreen.getOaeLeft() != null && endScreen.getOaeLeft() == -1) || (endScreen.getAabrLeft() != null && endScreen.getAabrLeft() == -1)) {//oae未通过
422 426 endResu.append("左耳");
423   - } else if ((endScreen.getOaeRight()!=null&&endScreen.getOaeRight() == -1) || (endScreen.getAabrRight()!=null&&endScreen.getAabrRight() == -1)) {//aabr未通过
  427 + } else if ((endScreen.getOaeRight() != null && endScreen.getOaeRight() == -1) || (endScreen.getAabrRight() != null && endScreen.getAabrRight() == -1)) {//aabr未通过
424 428 endResu.append("右耳");
425 429 }
426   - if(StringUtils.isNotEmpty(endResu.toString())){
  430 + if (StringUtils.isNotEmpty(endResu.toString())) {
427 431 endResu.append(")");
428 432 }
429 433  
430 434 map.put("endResu", endResu.toString());
431 435  
432   - if(endScreen.getOaeLeft() == null){
  436 + if (endScreen.getOaeLeft() == null) {
433 437 endScreen.setOaeLeft(1);
434 438 }
435   - if(endScreen.getOaeRight()==null){
  439 + if (endScreen.getOaeRight() == null) {
436 440 endScreen.setOaeRight(1);
437 441 }
438   - if(endScreen.getAabrLeft()==null){
  442 + if (endScreen.getAabrLeft() == null) {
439 443 endScreen.setAabrLeft(1);
440 444 }
441   - if(endScreen.getAabrRight()==null){
  445 + if (endScreen.getAabrRight() == null) {
442 446 endScreen.setAabrRight(1);
443 447 }
444 448  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java View file @ 97239b2
... ... @@ -81,6 +81,15 @@
81 81 //当前登录人医院Id
82 82 String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
83 83  
  84 + //根据医院查询区域
  85 +
  86 + //根据babyid查询pid
  87 +
  88 + //根据pid查询babyId
  89 +
  90 +
  91 +
  92 +
84 93 //儿童听筛记录
85 94 BabyPatientExtendEarScreenQuery earScreenQuery = new BabyPatientExtendEarScreenQuery();
86 95 earScreenQuery.setBabyId(babyId);
87 96  
... ... @@ -391,11 +400,16 @@
391 400 String title = HighRiskEnum.getTitle(Integer.parseInt(hf[b]));
392 401 map.put(Integer.parseInt(hf[b]), title);
393 402 // highRiskEnums.add(map);
394   - hrSb.append(title + ",");
  403 + hrSb.append(title + "、");
395 404 }
396 405 }
397   - // hea.setHighRiskEnums(highRiskEnums);
398   - hea.setHighRiskEnums(hrSb.toString());
  406 + String hfString = null;
  407 + if (hrSb.toString().endsWith("、")) {
  408 + hfString = hrSb.substring(0, hrSb.length() - 1);
  409 + } else {
  410 + hfString = hrSb.toString();
  411 + }
  412 + hea.setHighRiskEnums(hfString);
399 413 }
400 414 //确诊结果
401 415 if (hd.getConfirmResult() != null) {
402 416  
... ... @@ -407,11 +421,16 @@
407 421 String title = ConfirmedEnums.getTitle(Integer.parseInt(cr[b]));
408 422 map.put(Integer.parseInt(cr[b]), title);
409 423 // hdEnums.add(map);
410   - hdSb.append(title + "，");
  424 + hdSb.append(title + "、");
411 425 }
412 426 }
413   - // hea.setDiagnResult(hdEnums);
414   - hea.setDiagnResult(hdSb.toString());
  427 + String hfString = null;
  428 + if (hdSb.toString().endsWith("、")) {
  429 + hfString = hdSb.substring(0, hdSb.length() - 1);
  430 + } else {
  431 + hfString = hdSb.toString();
  432 + }
  433 + hea.setDiagnResult(hfString);
415 434 }
416 435 hdList.add(hea);
417 436 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java View file @ 97239b2
... ... @@ -92,7 +92,14 @@
92 92 hfBuff.append(name + "、");
93 93 }
94 94 }
95   - result.put("confirmResultStr", hfBuff.toString());
  95 + String hfString = null;
  96 + if (hfBuff.toString().endsWith("、")) {
  97 + hfString = hfBuff.substring(0, hfBuff.length() - 1);
  98 + } else {
  99 + hfString = hfBuff.toString();
  100 + }
  101 +
  102 + result.put("confirmResultStr", hfString);
96 103 result.put("confirmResult", extendEarHearingDiagnose.getConfirmResult());
97 104 }
98 105 response.setObject(result);
99 106  
... ... @@ -165,8 +172,15 @@
165 172 highArr.add(confiJo);
166 173 }
167 174 }
  175 + String hfString = null;
  176 + if (hfBuff.toString().endsWith("、")) {
  177 + hfString = hfBuff.substring(0, hfBuff.length() - 1);
  178 + } else {
  179 + hfString = hfBuff.toString();
  180 + }
  181 +
168 182 behd.setHighFactors(highArr);
169   - behd.setHighFactorStr(hfBuff.toString());
  183 + behd.setHighFactorStr(hfString);
170 184 }
171 185  
172 186 if (behd.getDiagnoseTime() != null) {
173 187  
... ... @@ -197,8 +211,14 @@
197 211 hfBuff.append(name + "、");
198 212 }
199 213 }
  214 + String hfString = null;
  215 + if (hfBuff.toString().endsWith("、")) {
  216 + hfString = hfBuff.substring(0, hfBuff.length() - 1);
  217 + } else {
  218 + hfString = hfBuff.toString();
  219 + }
200 220 behd.setConfirmResults(confiArr);
201   - behd.setConfirmResultStr(hfBuff.toString());
  221 + behd.setConfirmResultStr(hfString);
202 222 } else {
203 223 behd.setConfirmResults(new ArrayList());
204 224 }
... ... @@ -218,7 +238,13 @@
218 238 hfBuff.append(name + "、");
219 239 }
220 240 }
221   - behd.setDiagnResultStr(hfBuff.toString());
  241 + String hfString = null;
  242 + if (hfBuff.toString().endsWith("、")) {
  243 + hfString = hfBuff.substring(0, hfBuff.length() - 1);
  244 + } else {
  245 + hfString = hfBuff.toString();
  246 + }
  247 + behd.setDiagnResultStr(hfString);
222 248 behd.setDiagnResults(diagnArr);
223 249 } else {
224 250 behd.setConfirmResults(new ArrayList());
225 251  
... ... @@ -511,10 +537,16 @@
511 537 Map<Integer, String> map = new HashMap<>();
512 538 String title = HighRiskEnum.getTitle(Integer.parseInt(hf[b]));
513 539 map.put(Integer.parseInt(hf[b]), title);
514   - hrSb.append(title + ",");
  540 + hrSb.append(title + "、");
515 541 }
516 542 }
517   - hea.setHighRiskEnums(hrSb.toString());
  543 + String hfString = null;
  544 + if (hrSb.toString().endsWith("、")) {
  545 + hfString = hrSb.substring(0, hrSb.length() - 1);
  546 + } else {
  547 + hfString = hrSb.toString();
  548 + }
  549 + hea.setHighRiskEnums(hfString);
518 550 }
519 551 //确诊结果
520 552 if (hd.getConfirmResult() != null) {
521 553  
... ... @@ -525,10 +557,16 @@
525 557 Map<Integer, String> map = new HashMap<>();
526 558 String title = ConfirmedEnums.getTitle(Integer.parseInt(cr[b]));
527 559 map.put(Integer.parseInt(cr[b]), title);
528   - hdSb.append(title + "，");
  560 + hdSb.append(title + "、");
529 561 }
530 562 }
531   - hea.setConfirmResult(hdSb.toString());
  563 + String hfString = null;
  564 + if (hdSb.toString().endsWith("、")) {
  565 + hfString = hdSb.substring(0, hdSb.length() - 1);
  566 + } else {
  567 + hfString = hdSb.toString();
  568 + }
  569 + hea.setConfirmResult(hfString);
532 570 }
533 571  
534 572 //诊断结果
535 573  
... ... @@ -540,10 +578,16 @@
540 578 Map<Integer, String> map = new HashMap<>();
541 579 String title = HearingDiagnosisEnums.getTitle(Integer.parseInt(cr[b]));
542 580 map.put(Integer.parseInt(cr[b]), title);
543   - hdSb.append(title + "，");
  581 + hdSb.append(title + "、");
544 582 }
545 583 }
546   - hea.setDiagnResult(hdSb.toString());
  584 + String hfString = null;
  585 + if (hdSb.toString().endsWith("、")) {
  586 + hfString = hdSb.substring(0, hdSb.length() - 1);
  587 + } else {
  588 + hfString = hdSb.toString();
  589 + }
  590 + hea.setDiagnResult(hfString);
547 591 }
548 592 //已诊断
549 593 confiList.add(hea);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 97239b2
... ... @@ -2405,6 +2405,14 @@
2405 2405 result.setServiceType(String.valueOf(babyModel.getServiceType()));
2406 2406 result.setHospitalId(babyModel.getHospitalId());
2407 2407  
  2408 + result.setFetusCount(babyModel.getFetusCount());
  2409 + result.setDueCount(babyModel.getDueCount());
  2410 + result.setBabyWeight(babyModel.getBabyWeight());
  2411 + result.setDueType(babyModel.getDueType());
  2412 + result.setMalformation(babyModel.getMalformation());
  2413 + result.setApgarScore(JsonUtil.str2Obj(babyModel.getApgarScore(), Map.class));
  2414 + result.setmHighRiskReason(babyModel.getmHighRiskReason());
  2415 +
2408 2416  
2409 2417 result.setFatherProfessionTypeId(babyModel.getFproTypeId());
2410 2418 } else {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ 97239b2
... ... @@ -638,6 +638,7 @@
638 638 }
639 639 }
640 640 }
  641 +
641 642 babyEarBaseView.setDischargeDiagnosis(diagnosis);
642 643  
643 644 //听力高危因素
... ... @@ -651,7 +652,13 @@
651 652 hfBuff.append(name + "、");
652 653 }
653 654 }
654   - babyEarBaseView.setHighRiskCause(hfBuff.toString());
  655 + String hfString = null;
  656 + if (hfBuff.toString().endsWith("、")) {
  657 + hfString = hfBuff.substring(0, hfBuff.length() - 1);
  658 + } else {
  659 + hfString = hfBuff.toString();
  660 + }
  661 + babyEarBaseView.setHighRiskCause(hfString);
655 662 }
656 663 //母亲孕期高危因素
657 664 if (babyPatientExtendEar.getmHighRiskFactorId() != null) {
... ... @@ -791,7 +798,7 @@
791 798 historyStr.append("风疹");
792 799 if (historyJson.containsKey("fzSelected")) {
793 800 int fzSelected = historyJson.getIntValue("fzSelected");
794   - historyStr.append("(孕" + fzSelected + "周)、");
  801 + historyStr.append("(孕" + fzSelected + "周),");
795 802 }
796 803 }
797 804 }
... ... @@ -801,7 +808,7 @@
801 808 historyStr.append("弓形虫");
802 809 if (historyJson.containsKey("gxcSelected")) {
803 810 int gxcSelected = historyJson.getIntValue("gxcSelected");
804   - historyStr.append("(孕" + gxcSelected + "周)、");
  811 + historyStr.append("(孕" + gxcSelected + "周),");
805 812 }
806 813 }
807 814 }
... ... @@ -812,7 +819,7 @@
812 819 historyStr.append("巨细胞病毒");
813 820 if (historyJson.containsKey("jxbbdSelected")) {
814 821 int jxbbdSelected = historyJson.getIntValue("jxbbdSelected");
815   - historyStr.append("(孕" + jxbbdSelected + "周)、");
  822 + historyStr.append("(孕" + jxbbdSelected + "周),");
816 823 }
817 824 }
818 825 }
... ... @@ -822,7 +829,7 @@
822 829 historyStr.append("疱疹");
823 830 if (historyJson.containsKey("pzSelected")) {
824 831 int pzSelected = historyJson.getIntValue("pzSelected");
825   - historyStr.append("(孕" + pzSelected + "周)、");
  832 + historyStr.append("(孕" + pzSelected + "周),");
826 833 }
827 834 }
828 835 }
829 836  
... ... @@ -832,11 +839,17 @@
832 839 historyStr.append("其他");
833 840 if (historyJson.containsKey("qtSelected")) {
834 841 String qtSelected = historyJson.getString("qtSelected");
835   - historyStr.append("(" + qtSelected + ")、");
  842 + historyStr.append("(" + qtSelected + ")");
836 843 }
837 844 }
838 845 }
839   - babyEarMotherView.setViralInfectionHistoryType(historyStr.toString());
  846 + String hfString = null;
  847 + if (historyStr.toString().endsWith(",")) {
  848 + hfString = historyStr.substring(0, historyStr.length() - 1);
  849 + } else {
  850 + hfString = historyStr.toString();
  851 + }
  852 + babyEarMotherView.setViralInfectionHistoryType(hfString);
840 853 }
841 854  
842 855  
... ... @@ -849,7 +862,7 @@
849 862 historyStr.append("淋病");
850 863 if (historyJson.containsKey("lbSelected")) {
851 864 int lbSelected = historyJson.getIntValue("lbSelected");
852   - historyStr.append("(孕" + lbSelected + "周)、");
  865 + historyStr.append("(孕" + lbSelected + "周),");
853 866 }
854 867 }
855 868 }
... ... @@ -859,7 +872,7 @@
859 872 historyStr.append("弓形虫");
860 873 if (historyJson.containsKey("gxcSelected")) {
861 874 int gxcSelected = historyJson.getIntValue("gxcSelected");
862   - historyStr.append("(孕" + gxcSelected + "周)、");
  875 + historyStr.append("(孕" + gxcSelected + "周),");
863 876 }
864 877 }
865 878 }
... ... @@ -870,7 +883,7 @@
870 883 historyStr.append("梅毒");
871 884 if (historyJson.containsKey("mdSelected")) {
872 885 int mdSelected = historyJson.getIntValue("mdSelected");
873   - historyStr.append("(孕" + mdSelected + "周)、");
  886 + historyStr.append("(孕" + mdSelected + "周),");
874 887 }
875 888 }
876 889 }
... ... @@ -880,7 +893,7 @@
880 893 historyStr.append("尖锐湿疹");
881 894 if (historyJson.containsKey("jrszSelected")) {
882 895 int jrszSelected = historyJson.getIntValue("jrszSelected");
883   - historyStr.append("(孕" + jrszSelected + "周)、");
  896 + historyStr.append("(孕" + jrszSelected + "周),");
884 897 }
885 898 }
886 899 }
887 900  
... ... @@ -891,11 +904,17 @@
891 904 historyStr.append("其他");
892 905 if (historyJson.containsKey("qtSelected")) {
893 906 String qtSelected = historyJson.getString("qtSelected");
894   - historyStr.append("(" + qtSelected + ")、");
  907 + historyStr.append("(" + qtSelected + ")");
895 908 }
896 909 }
897 910 }
898   - babyEarMotherView.setGenitalInfectionHistoryType(historyStr.toString());
  911 + String hfString = null;
  912 + if (historyStr.toString().endsWith(",")) {
  913 + hfString = historyStr.substring(0, historyStr.length() - 1);
  914 + } else {
  915 + hfString = historyStr.toString();
  916 + }
  917 + babyEarMotherView.setGenitalInfectionHistoryType(hfString);
899 918 }
900 919  
901 920  
902 921  
... ... @@ -905,10 +924,10 @@
905 924 if (historyJson.containsKey("yesOrNo")) {
906 925 int yesOrNo = historyJson.getIntValue("yesOrNo");
907 926 if (yesOrNo == 1) {
908   - historyStr.append("有、");
  927 + historyStr.append("有,");
909 928 if (historyJson.containsKey("other")) {
910 929 int other = historyJson.getIntValue("other");
911   - historyStr.append("(孕" + other + "周)、");
  930 + historyStr.append("(孕" + other + "周)");
912 931 }
913 932 } else {
914 933 historyStr.append("无");
... ... @@ -1004,7 +1023,7 @@
1004 1023 if (historyJson.containsKey("yesOrNo")) {
1005 1024 int yesOrNo = historyJson.getIntValue("yesOrNo");
1006 1025 if (1 == yesOrNo) {
1007   - historyStr.append("有、");
  1026 + historyStr.append("有,");
1008 1027 } else {
1009 1028 historyStr.append("无");
1010 1029 }
1011 1030  
1012 1031  
1013 1032  
... ... @@ -1013,25 +1032,25 @@
1013 1032 if (historyJson.containsKey("tnb")) {
1014 1033 boolean sy = historyJson.getBooleanValue("tnb");
1015 1034 if (sy) {
1016   - historyStr.append("糖尿病、");
  1035 + historyStr.append("糖尿病,");
1017 1036 }
1018 1037 }
1019 1038 if (historyJson.containsKey("sy")) {
1020 1039 boolean sy = historyJson.getBooleanValue("sy");
1021 1040 if (sy) {
1022   - historyStr.append("肾炎、");
  1041 + historyStr.append("肾炎,");
1023 1042 }
1024 1043 }
1025 1044 if (historyJson.containsKey("jzxgnjt")) {
1026 1045 boolean jzxgnjt = historyJson.getBooleanValue("jzxgnjt");
1027 1046 if (jzxgnjt) {
1028   - historyStr.append("甲状腺功能减退、");
  1047 + historyStr.append("甲状腺功能减退,");
1029 1048 }
1030 1049 }
1031 1050 if (historyJson.containsKey("bxz")) {
1032 1051 boolean bxz = historyJson.getBooleanValue("bxz");
1033 1052 if (bxz) {
1034   - historyStr.append("败血症、");
  1053 + historyStr.append("败血症,");
1035 1054 }
1036 1055 }
1037 1056 if (historyJson.containsKey("qt")) {
... ... @@ -1043,7 +1062,14 @@
1043 1062 if (historyJson.containsKey("qtText")) {
1044 1063 historyStr.append(historyJson.getString("qtText"));
1045 1064 }
1046   - babyEarMotherView.setMedicalHistoryType(historyStr.toString());
  1065 + String hfString = null;
  1066 + if (historyStr.toString().endsWith(",")) {
  1067 + hfString = historyStr.substring(0, historyStr.length() - 1);
  1068 + } else {
  1069 + hfString = historyStr.toString();
  1070 + }
  1071 +
  1072 + babyEarMotherView.setMedicalHistoryType(hfString);
1047 1073 }
1048 1074  
1049 1075 if (StringUtils.isNotEmpty(babyPatientExtendEarMother.getBnormalPregnancyHistoryType())) {
... ... @@ -1053,7 +1079,7 @@
1053 1079 if (historyJson.containsKey("yesOrNo")) {
1054 1080 int yesOrNo = historyJson.getIntValue("yesOrNo");
1055 1081 if (1 == yesOrNo) {
1056   - historyStr.append("有");
  1082 + historyStr.append("有,");
1057 1083 } else {
1058 1084 historyStr.append("无");
1059 1085 }
1060 1086  
1061 1087  
... ... @@ -1062,19 +1088,19 @@
1062 1088 if (historyJson.containsKey("rgz")) {
1063 1089 boolean rgz = historyJson.getBooleanValue("rgz");
1064 1090 if (rgz) {
1065   - historyStr.append("妊高症");
  1091 + historyStr.append("妊高症,");
1066 1092 }
1067 1093 }
1068 1094 if (historyJson.containsKey("myxxbh")) {
1069 1095 boolean myxxbh = historyJson.getBooleanValue("myxxbh");
1070 1096 if (myxxbh) {
1071   - historyStr.append("母音血型不和");
  1097 + historyStr.append("母音血型不和,");
1072 1098 }
1073 1099 }
1074 1100 if (historyJson.containsKey("tegnfych")) {
1075 1101 boolean tegnfych = historyJson.getBooleanValue("tegnfych");
1076 1102 if (tegnfych) {
1077   - historyStr.append("胎儿宫内发育迟缓");
  1103 + historyStr.append("胎儿宫内发育迟缓,");
1078 1104 }
1079 1105 }
1080 1106 if (historyJson.containsKey("qt")) {
... ... @@ -1086,7 +1112,14 @@
1086 1112 if (historyJson.containsKey("qtText")) {
1087 1113 historyStr.append(historyJson.getString("qtText"));
1088 1114 }
1089   - babyEarMotherView.setBnormalPregnancyHistoryType(historyStr.toString());
  1115 + String hfString = null;
  1116 + if (historyStr.toString().endsWith(",")) {
  1117 + hfString = historyStr.substring(0, historyStr.length() - 1);
  1118 + } else {
  1119 + hfString = historyStr.toString();
  1120 + }
  1121 +
  1122 + babyEarMotherView.setBnormalPregnancyHistoryType(hfString);
1090 1123 }
1091 1124 return babyEarMotherView;
1092 1125 }
... ... @@ -1112,7 +1145,7 @@
1112 1145 babyEarBirthView.setAmnioticFluid("I度");
1113 1146 } else if (babyPatientExtendEarBirth.getAmnioticFluidType() == 2) { //1= I度 2=II度 3=III度
1114 1147 babyEarBirthView.setAmnioticFluid("II度");
1115   - } else if (babyPatientExtendEarBirth.getAmnioticFluidType() == 2) { //1= I度 2=II度 3=III度
  1148 + } else if (babyPatientExtendEarBirth.getAmnioticFluidType() == 3) { //1= I度 2=II度 3=III度
1116 1149 babyEarBirthView.setAmnioticFluid("III度");
1117 1150 }
1118 1151 }
1119 1152  
1120 1153  
1121 1154  
1122 1155  
... ... @@ -1122,32 +1155,27 @@
1122 1155 String parturitType = "无";
1123 1156 if (babyPatientExtendEarBirth.getAbnormalParturitionType() != null) {
1124 1157 if (babyPatientExtendEarBirth.getAbnormalParturitionType() == 1) {//有
1125   - parturitType = "有(";
  1158 + parturitType = "有,";
1126 1159 if (StringUtils.isNotEmpty(babyPatientExtendEarBirth.getAbnormalParturitionPosition())) {//异常分娩部位 1=臀部 2=脐带绕颈 3=胎膜早破
1127 1160 JSONObject positionJo = JSONObject.parseObject(babyPatientExtendEarBirth.getAbnormalParturitionPosition());
1128 1161 if (positionJo.containsKey("tw")) {
1129 1162 if (positionJo.getBoolean("tw")) {
1130   - parturitType += "臀部、";
  1163 + parturitType += "臀部,";
1131 1164 }
1132 1165 }
1133 1166 if (positionJo.containsKey("qdrj")) {
1134 1167 if (positionJo.getBoolean("qdrj")) {
1135   - parturitType += "脐带绕颈、";
  1168 + parturitType += "脐带绕颈,";
1136 1169 }
1137 1170 }
1138 1171 if (positionJo.containsKey("tmzp")) {
1139 1172 if (positionJo.getBoolean("tmzp")) {
1140   - parturitType += "胎膜早破、";
  1173 + parturitType += "胎膜早破,";
1141 1174 }
1142 1175 }
1143   - parturitType += ")";
1144   - // if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 1) {
1145   - // parturitType = "有(臀部)";
1146   - // } else if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 2) {
1147   - // parturitType = "有(脐带绕颈)";
1148   - // } else if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 3) {
1149   - // parturitType = "有(胎膜早破)";
1150   - // }
  1176 + if (parturitType.endsWith(",")) {
  1177 + parturitType = parturitType.substring(0, parturitType.length() - 1);
  1178 + }
1151 1179 }
1152 1180 }
1153 1181 }
... ... @@ -1172,7 +1200,7 @@
1172 1200 if (babyPatientExtendEarBirth.getDeformityType() != null && babyPatientExtendEarBirth.getDeformityType() == 1) {
1173 1201 deformity = "有";
1174 1202 if (babyPatientExtendEarBirth.getDeformityPosition() != null) {
1175   - deformity = "有(" + babyPatientExtendEarBirth.getDeformityPosition() + ")";
  1203 + deformity = "有," + babyPatientExtendEarBirth.getDeformityPosition();
1176 1204 }
1177 1205 }
1178 1206  
... ... @@ -1181,7 +1209,7 @@
1181 1209 if (babyPatientExtendEarBirth.getHeadTraumaHistory() != null && babyPatientExtendEarBirth.getHeadTraumaHistory() == 1) {
1182 1210 headTraumaHistory = "有";
1183 1211 if (babyPatientExtendEarBirth.getHeadTraumaDesc() != null) {
1184   - headTraumaHistory = "有(" + babyPatientExtendEarBirth.getHeadTraumaDesc() + ")";
  1212 + headTraumaHistory = "有," + babyPatientExtendEarBirth.getHeadTraumaDesc();
1185 1213 }
1186 1214 }
1187 1215 babyEarBirthView.setHeadTraumaDesc(headTraumaHistory);
1188 1216  
... ... @@ -1209,10 +1237,10 @@
1209 1237 babyEarBirthView.setEarPoison(babyPatientExtendEarBirth.getEarPoisonMap());
1210 1238  
1211 1239 String tympanitisType = "无";
1212   - if (babyPatientExtendEarBirth.getNicuType() != null && babyPatientExtendEarBirth.getNicuType() == 1) {
  1240 + if (babyPatientExtendEarBirth.getTympanitisType() != null && babyPatientExtendEarBirth.getTympanitisType() == 1) {
1213 1241 tympanitisType = "有";
1214 1242 if (babyPatientExtendEarBirth.getTympanitisDesc() != null) {
1215   - tympanitisType = "有" + babyPatientExtendEarBirth.getTympanitisDesc();
  1243 + tympanitisType = "有," + babyPatientExtendEarBirth.getTympanitisDesc();
1216 1244 }
1217 1245 }
1218 1246  
... ... @@ -1463,7 +1491,14 @@
1463 1491 highArr.add(confiJo);
1464 1492 }
1465 1493 }
1466   - data.put("highRiskCauseStr", hfBuff.toString());
  1494 +
  1495 + String hfString = null;
  1496 + if (hfBuff.toString().endsWith("、")) {
  1497 + hfString = hfBuff.substring(0, hfBuff.length() - 1);
  1498 + } else {
  1499 + hfString = hfBuff.toString();
  1500 + }
  1501 + data.put("highRiskCauseStr", hfString);
1467 1502 data.put("highRiskCause", highArr);
1468 1503 }
1469 1504 data.put("oaeLeft", babyPatientExtendEarScreen.getOaeLeft() == null ? "" : babyPatientExtendEarScreen.getOaeLeft());
... ... @@ -1684,7 +1719,13 @@
1684 1719 hfBuff.append(name + "、");
1685 1720 }
1686 1721 }
1687   - screenResult.setHighRiskCause(hfBuff.toString());
  1722 + String hfString = null;
  1723 + if (hfBuff.toString().endsWith("、")) {
  1724 + hfString = hfBuff.substring(0, hfBuff.length() - 1);
  1725 + } else {
  1726 + hfString = hfBuff.toString();
  1727 + }
  1728 + screenResult.setHighRiskCause(hfString);
1688 1729 }
1689 1730 String srcResult = "通过";
1690 1731 if ((earScreen.getAabrLeft() != null && earScreen.getAabrLeft() == -1) || (earScreen.getOaeLeft() != null && earScreen.getOaeLeft() == -1)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java View file @ 97239b2
... ... @@ -4,6 +4,7 @@
4 4 import com.lyms.platform.common.utils.DateUtil;
5 5 import com.lyms.platform.pojo.BabyModel;
6 6  
  7 +import java.util.Date;
7 8 import java.util.List;
8 9  
9 10 /**
... ... @@ -129,7 +130,7 @@
129 130 setName(babyModel.getName());
130 131 setCardNo(babyModel.getCardNo());
131 132 setBirth(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
132   - setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), babyModel.getBuildDate()));
  133 + setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
133 134 setProvinceId(babyModel.getProvinceId());
134 135 setCityId(babyModel.getCityId());
135 136 setAreaId(babyModel.getAreaId());