jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 14d004529fd70080abdeb037b164414e587f7703

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

听力诊断模块

Showing 4 changed files with 6 additions and 19 deletions

platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml View file @ 14d0045
... ... @@ -351,22 +351,9 @@
351 351 )
352 352 </if>
353 353  
354   - <if test="scrIspass != null and scrIspass ==1 and srcSkill==null and leftRight == null">
355   - and (
356   - oae_left !=-1
357   - and oae_right !=-1
358   - and aabr_left !=-1
359   - and aabr_right !=-1
360   - )
  354 + <if test="scrIspass != null and srcSkill==null and leftRight == null">
  355 + and scr_ispass = #{scrIspass,jdbcType=INTEGER}
361 356 </if>
362   - <if test="scrIspass != null and scrIspass ==2 and srcSkill==null and leftRight == null">
363   - and(
364   - oae_left =-1
365   - or oae_right = -1
366   - or aabr_left = -1
367   - or aabr_right = -1
368   - )
369   - </if>
370 357 <if test="srcSkill != null and srcSkill == 1">
371 358 <if test="scrIspass != null and scrIspass ==1">
372 359 and(
... ... @@ -585,7 +572,7 @@
585 572 and status = #{status,jdbcType=INTEGER}
586 573 </if>
587 574 <if test="scrIspass != null and scrIspass >= 0">
588   - and scrIspass = #{scr_ispass,jdbcType=INTEGER}
  575 + and scr_ispass = #{scrIspass,jdbcType=INTEGER}
589 576 </if>
590 577 </where>
591 578 <include refid="orderAndLimit"/>
platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java View file @ 14d0045
... ... @@ -196,7 +196,7 @@
196 196  
197 197 //分娩孕周
198 198 private Integer dueWeek;
199   - //0-转诊待接收 1-转诊已接收 2-孕妇或儿童区域下隐藏建档， 默认是母档案为0
  199 + //0-转诊待接收 0-转诊待接收 1-转诊已接收 2-孕妇或儿童区域下隐藏建档， 默认是母档案为null
200 200 private String enable;
201 201 //操作人
202 202 private Integer operator;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java View file @ 14d0045
... ... @@ -531,7 +531,7 @@
531 531 hea.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMname()));
532 532 hea.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMphone()));
533 533 hea.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone()));
534   - hea.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
  534 + hea.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), hd.getDiagnoseTime()));
535 535 hea.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth())));
536 536 hea.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex())));
537 537 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ 14d0045
... ... @@ -1825,7 +1825,7 @@
1825 1825 if (CollectionUtils.isNotEmpty(models)) {
1826 1826 List<String> babyIds = new ArrayList<>();
1827 1827 for (BabyPatientExtendEarBaby babyModel : models) {
1828   - babyIds.add(babyModel.getId());
  1828 + babyIds.add(babyModel.getBabyPatientId());
1829 1829 }
1830 1830 screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
1831 1831 } else {