diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java index 108d748..225e2ab 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java @@ -52,6 +52,11 @@ public class BabyHighRiskBabyModelQuery extends BaseQuery implements IConvertToN //结案 转归 1痊愈□ 2好转□ 3转院□ 4失访□ private String cCOutcome; + + //1是 2否 结案 + private String caseClosed; + + //高危因素 private List highRiskDiagnose; @@ -284,6 +289,11 @@ public class BabyHighRiskBabyModelQuery extends BaseQuery implements IConvertToN if (null != cCOutcome) { condition = condition.and("cCOutcome", cCOutcome, MongoOper.IS); } + + if (null != caseClosed) { + condition = condition.and("caseClosed", caseClosed, MongoOper.IS); + } + if (highRiskDiagnose !=null) { condition = condition.and("highRiskDiagnose", highRiskDiagnose, MongoOper.IN); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 08ab9b1..c91c6ec 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -1280,6 +1280,8 @@ public class BabyCheckFacade extends BaseServiceImpl { base.setBabyCardNo(model.getCardNo()); base.setBnationId(model.getBnationId() == null ? "" : getBasicConfig(model.getBnationId())); /*end*/ + base.setBlNo(model.getBlNo());//住院号 + base.setYn(model.getYn()); base.setDataStatus(model.getDataStatus()); base.setmHighRiskReason(mongoUtil.findColor(model.getmHighRiskReason())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java index fede64d..c827cc7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java @@ -22,6 +22,9 @@ public class BabyBasicResult { //社保卡 private String sINCard; + //病历号(住院号) + private String blNo; + //新生儿民族Id private String bnationId; //儿童身份证 @@ -95,6 +98,14 @@ public class BabyBasicResult { private String babyWeight; + public String getBlNo() { + return blNo; + } + + public void setBlNo(String blNo) { + this.blNo = blNo; + } + public String getBabyHeight() { return babyHeight; }