diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml index ee04ab9..814b219 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml @@ -351,21 +351,8 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ ) - - and ( - oae_left !=-1 - and oae_right !=-1 - and aabr_left !=-1 - and aabr_right !=-1 - ) - - - and( - oae_left =-1 - or oae_right = -1 - or aabr_left = -1 - or aabr_right = -1 - ) + + and scr_ispass = #{scrIspass,jdbcType=INTEGER} @@ -585,7 +572,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ and status = #{status,jdbcType=INTEGER} - and scrIspass = #{scr_ispass,jdbcType=INTEGER} + and scr_ispass = #{scrIspass,jdbcType=INTEGER} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index 8152e43..cba5538 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -196,7 +196,7 @@ public class BabyModel extends BaseModel { //分娩孕周 private Integer dueWeek; - //0-转诊待接收 1-转诊已接收 2-孕妇或儿童区域下隐藏建档, 默认是母档案为0 + //0-转诊待接收 0-转诊待接收 1-转诊已接收 2-孕妇或儿童区域下隐藏建档, 默认是母档案为null private String enable; //操作人 private Integer operator; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index 0383438..91b789b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -531,7 +531,7 @@ public class HearingDiagnoseController extends BaseController { hea.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMname())); hea.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMphone())); hea.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone())); - hea.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date())); + hea.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), hd.getDiagnoseTime())); hea.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth()))); hea.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex()))); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index 6914ba1..eea71e6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -1825,7 +1825,7 @@ public class BabyEarFacade { if (CollectionUtils.isNotEmpty(models)) { List babyIds = new ArrayList<>(); for (BabyPatientExtendEarBaby babyModel : models) { - babyIds.add(babyModel.getId()); + babyIds.add(babyModel.getBabyPatientId()); } screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()])); } else {