diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java
index 25b39f5..3c91f8b 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java
@@ -18,6 +18,7 @@ public class LisReportModel {
private String type;
// 就诊卡号
private String vcCardNo;
+ private String cardNo;
// 患者姓名
private String name;
// 住院号
@@ -60,6 +61,14 @@ public class LisReportModel {
//医院名称
private String hospitalName;
+ public String getCardNo() {
+ return cardNo;
+ }
+
+ public void setCardNo(String cardNo) {
+ this.cardNo = cardNo;
+ }
+
public String getHospitalName() {
return hospitalName;
}
@@ -246,13 +255,31 @@ public class LisReportModel {
@Override
public String toString() {
- return "LisReportModel [id=" + id + ", lisId=" + lisId + ", title="
- + title + ", type=" + type + ", vcCardNo=" + vcCardNo
- + ", name=" + name + ", bhnum=" + bhnum + ", age=" + age
- + ", sex=" + sex + ", applyTime=" + applyTime + ", checkTime="
- + checkTime + ", publishTime=" + publishTime + ", applyDoctor="
- + applyDoctor + ", applyDept=" + applyDept + ", checker="
- + checker + ", modified=" + modified + ", created=" + created
- + ", hospitalId=" + hospitalId + "]";
+ return "LisReportModel{" +
+ "id=" + id +
+ ", lisId='" + lisId + '\'' +
+ ", title='" + title + '\'' +
+ ", type='" + type + '\'' +
+ ", vcCardNo='" + vcCardNo + '\'' +
+ ", cardNo='" + cardNo + '\'' +
+ ", name='" + name + '\'' +
+ ", bhnum='" + bhnum + '\'' +
+ ", age='" + age + '\'' +
+ ", sex='" + sex + '\'' +
+ ", applyTime=" + applyTime +
+ ", checkTime=" + checkTime +
+ ", publishTime=" + publishTime +
+ ", applyDoctor='" + applyDoctor + '\'' +
+ ", applyDept='" + applyDept + '\'' +
+ ", checker='" + checker + '\'' +
+ ", modified=" + modified +
+ ", created=" + created +
+ ", hospitalId='" + hospitalId + '\'' +
+ ", phone='" + phone + '\'' +
+ ", items=" + items +
+ ", status=" + status +
+ ", itemJson='" + itemJson + '\'' +
+ ", hospitalName='" + hospitalName + '\'' +
+ '}';
}
}
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java
index ff7c429..8240436 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java
@@ -24,6 +24,8 @@ public class LisReportQuery extends BaseQuery {
private String type;
// 就诊卡号
private String vcCardNo;
+ //身份证
+ private String cardNo;
//儿童社保卡
private String sINCard;
@@ -75,6 +77,14 @@ public class LisReportQuery extends BaseQuery {
//检验明细json
private String itemJson;
+ public String getCardNo() {
+ return cardNo;
+ }
+
+ public void setCardNo(String cardNo) {
+ this.cardNo = cardNo;
+ }
+
public String getsINCard() {
return sINCard;
}
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
index bfcc2fd..27560ce 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
@@ -8,6 +8,7 @@
TITLE,
TYPE,
VCCARDNO,
+ CARDNO,
NAME,
BHNUM,
AGE,
@@ -29,6 +30,7 @@
#{title},
#{type},
#{vcCardNo},
+ #{cardNo},
#{name},
#{bhnum},
#{age},
@@ -91,6 +93,7 @@
TITLE AS title,
TYPE AS type,
VCCARDNO AS vcCardNo,
+ CARDNO AS cardNo,
NAME AS name,
BHNUM AS bhnum,
AGE AS age,
@@ -114,6 +117,9 @@
AND VCCARDNO = #{vcCardNo} or VCCARDNO = #{sINCard}
+
+ AND CARDNO = #{cardNo}
+
AND name = #{name}
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 07b207e..b12a4f7 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
@@ -18,13 +18,25 @@ import java.util.Map;
public class BabyModel extends BaseModel {
private static final long serialVersionUID = SerialIdEnum.BabyModel.getCid();
+ //月龄下拉框
+ private String ylSelect;
/*滦平 start */
- //耳声发射（1通过/2未通过）
+ //耳声发射（1通过/2未通过）不用了
private Integer esfs;
+
+ // 听力是否筛查（20210122 张洁滦平需求，出院小结听力是否筛查 就是 baby耳声发射）
+ private Integer isUNHS;
+ /**
+ * 听筛结果 1-双耳通过，2-右侧未通过，3-左侧为通过，4-双侧未通过
+ */
+ private Integer hearScrResult;
+
+
//听性脑干（1通过/2未通过）
private Integer txng;
// 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
+ // "txngState":1 （20210122 张洁滦平需求 新增 1-双耳通过，2-右侧未通过，3-左侧为通过，4-双侧未通过）
private Map txngNew;
//耳聋基因（1通过/2未通过）
private Integer eljy;
@@ -1154,6 +1166,14 @@ public class BabyModel extends BaseModel {
this.jxBz = jxBz;
}
+ public String getYlSelect() {
+ return ylSelect;
+ }
+
+ public void setYlSelect(String ylSelect) {
+ this.ylSelect = ylSelect;
+ }
+
public Map getJxBzSele() {
return jxBzSele;
}
@@ -1346,6 +1366,14 @@ public class BabyModel extends BaseModel {
return buildType;
}
+ public Integer getIsUNHS() {
+ return isUNHS;
+ }
+
+ public void setIsUNHS(Integer isUNHS) {
+ this.isUNHS = isUNHS;
+ }
+
public void setBuildType(Integer buildType) {
this.buildType = buildType;
}
@@ -2637,6 +2665,14 @@ public class BabyModel extends BaseModel {
this.bCGAndHBVVaccinationDosage = bCGAndHBVVaccinationDosage;
}
+ public Integer getHearScrResult() {
+ return hearScrResult;
+ }
+
+ public void setHearScrResult(Integer hearScrResult) {
+ this.hearScrResult = hearScrResult;
+ }
+
public String getHbvInjectUserName() {
return hbvInjectUserName;
}
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java
index 32af36b..c7b69f4 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java
@@ -143,7 +143,7 @@ public class DischargeAbstractBabyModel extends BaseModel {
/**
* @auther HuJiaqi
* @createTime 2016年12月05日 18时25分
- * @discription 听力是否筛查
+ * @discription 听力是否筛查（20210122 张洁滦平需求，听力是否筛查 就是 耳声发射，后台不用动前端该名称即可。）
*/
private Integer isUNHS;
@@ -159,6 +159,7 @@ public class DischargeAbstractBabyModel extends BaseModel {
//听性脑干（1通过/2未通过）
private Integer txng;
// 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
+ // "txngState":1 （20210122 张洁滦平需求 新增 1-双耳通过，2-右侧未通过，3-左侧为通过，4-双侧未通过）
private Map txngNew;
//耳聋基因（1通过/2未通过）
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
index 4c2b1c2..58e79c5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
@@ -90,6 +90,7 @@ public class LisController extends BaseController {
model.setName(lisRequest.getName());
model.setBhnum(lisRequest.getBhnum());
model.setPhone(lisRequest.getPhone());
+ model.setCardNo(lisRequest.getCardNo());
model.setSex(lisRequest.getSex());
model.setTitle(lisRequest.getTitle());
model.setType(lisRequest.getType());
@@ -131,7 +132,7 @@ public class LisController extends BaseController {
* @param sortType 排序类型(1,根据日期分类;2,根据检查项目分类)
* @param phone 手机号码
* @param cardNo 身份证号码
- * @param perType 2-儿童
+ * @param perType 1默认孕妇 、2-儿童、3以前指定了意见医院 、4 20210121新增婚检使用
* @param sINCard 儿童社保卡
* @return
*/
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index bcaf83b..dca50c3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -1290,6 +1290,8 @@ public class BabyBookbuildingFacade {
private BabyModel getBabyModel(BabyBookbuildingAddRequest b, boolean isAdd, Integer userId, String hospitalId) {
// hujiaqi添加了一个字段，判断是插入还是更新，如果是更新，就不更新birth字段
BabyModel bm = new BabyModel();
+ bm.setNextDate(DateUtil.parseYMD(b.getNextDate()));
+ bm.setYlSelect(b.getYlSelect());
//遵化定制 路北辖区状态
bm.setZhlbxqState(b.getZhlbxqState());
bm.setKouqNew(b.getKouqNew());
@@ -1652,6 +1654,9 @@ public class BabyBookbuildingFacade {
if (models != null && models.size() > 0) {
BabyModel model = models.get(0);
result = getBabyBuildResult(model);
+ result.setYlSelect(model.getYlSelect());
+ result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate()));
+
result.setZhlbxqState(model.getZhlbxqState());
result.setKouqNew(model.getKouqNew());
result.setTxngNew(model.getTxngNew());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
index 31d5bdc..69c545f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
@@ -190,8 +190,8 @@ public class DischargeAbstractFacade extends BaseServiceImpl {
List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
for (BabyModel b: babyModels) {//如果出院小结前有多个儿童档案都更新，后就无法控制了
BabyModel babyModel = setBabyModel(dabm, b);
- babyModel.setTxngNew(dabm.getTxngNew());
- babyModel.setKouqNew(dabm.getKouqNew());
+// babyModel.setTxngNew(dabm.getTxngNew());
+// babyModel.setKouqNew(dabm.getKouqNew());
if(babyModel !=null && StringUtils.isNotBlank(babyModel.getId())){
babyBookbuildingService.updateBabyBuild(babyModel,babyModel.getId());
}
@@ -208,14 +208,22 @@ public class DischargeAbstractFacade extends BaseServiceImpl {
private BabyModel setBabyModel(DischargeAbstractBabyModel dabm, BabyModel babyModel) {
- if(babyModel.getEsfs() == null && dabm.getEsfs()!=null){//耳声发射（1通过/2未通过）
+ /* if(babyModel.getEsfs() == null && dabm.getEsfs()!=null){//耳声发射（1通过/2未通过）
babyModel.setEsfs(dabm.getEsfs());
+ }*/
+ if(babyModel.getIsUNHS() == null && dabm.getIsUNHS()!=null){//听力是否筛查== 耳声发射,以前的耳声发射不要了
+ babyModel.setIsUNHS(dabm.getIsUNHS());
}
+ if(babyModel.getHearScrResult() == null && dabm.getHearScrResult()!=null){//听筛结果
+ babyModel.setHearScrResult(dabm.getHearScrResult());
+ }
+
if(babyModel.getTxng() == null && dabm.getTxng()!=null){//听性脑干（1通过/2未通过）
babyModel.setTxng(dabm.getTxng());
}
-
- if(babyModel.getTxngNew() == null && dabm.getTxngNew()!=null){// 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
+ // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)不在使用
+ // "txngState":1 （20210122 张洁滦平需求 新增 1-双耳通过，2-右侧未通过，3-左侧为通过，4-双侧未通过）
+ if(babyModel.getTxngNew() == null && dabm.getTxngNew()!=null){
babyModel.setTxngNew(dabm.getTxngNew());
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
index 692fca6..ff1b08c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
@@ -85,7 +85,7 @@ public class LisFacade {
*
* @param vcCardNo 就诊卡号
* @param sortType 排序类型(1,根据日期分类;2,根据检查项目分类)
- * @param perType 2-儿童，其他是孕妇
+ * @param perType 1默认孕妇 、2-儿童、3以前指定了意见医院 、4 20210121新增婚检使用
* @return
*/
public BaseResponse getLisAndRisData(String vcCardNo,String sINCard, String phone, String cardNo, Integer sortType, int perType,String userName, Integer userId) {
@@ -229,7 +229,7 @@ public class LisFacade {
* @param phone 手机号码
* @param hospitalId 用户ID
* @param cardNo 身份证号码
- * @param perType 2-儿童
+ * @param perType 1默认孕妇 、2-儿童、3以前指定了意见医院 、4 20210121新增婚检使用
* @return
*/
public List queryLisCheckList(String vcCardNo,String sINCard, String phone, String hospitalId, String cardNo, int perType,String userName) {
@@ -261,6 +261,10 @@ public class LisFacade {
else if (perType == 3)
{
lises = queryLisWhfyData(vcCardNo, cardNo,model);
+ }else if (perType == 4)//婚检查询方式
+ {
+ model.setHospitalId(hospitalId);
+ lises = queryLisHJData(vcCardNo, cardNo,model);
}
else {
@@ -517,6 +521,38 @@ public class LisFacade {
}
+ /**
+ * 婚检查询lis检查数据，条件是身份证、就诊卡
+ * @param vcCardNo
+ * @param cardNo
+ * @param model
+ * @return
+ */
+ private List queryLisHJData(String vcCardNo, String cardNo,LisReportQuery model) {
+ List reportModelList = new ArrayList<>();
+ //通过就诊卡号和医院id查询到医院下面的lis记录
+ if (StringUtils.isNotEmpty(vcCardNo) || StringUtils.isNotEmpty(cardNo)) {
+ if (StringUtils.isNotEmpty(cardNo)) {
+ model.setCardNo(cardNo);
+ }
+ List lises = lisService.queryLisDataByModel(model);
+ if (CollectionUtils.isNotEmpty(lises)) {
+ reportModelList.addAll(lises);
+ } else{
+ if (StringUtils.isNotEmpty(vcCardNo))
+ {
+ model.setVcCardNo(vcCardNo);
+ }
+ lises = lisService.queryLisDataByModel(model);
+ if (CollectionUtils.isNotEmpty(lises)) {
+ reportModelList.addAll(lises);
+ }
+ }
+ }
+ return reportModelList;
+
+ }
+
/**
* 诸城就诊卡号处理
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 2d3a93d..07fd327 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -5234,6 +5234,8 @@ public class ViewFacade {
result.setPatientSerResults(patientSerResults);
result = result.convertToResult(model);
+ result.setYlSelect(model.getYlSelect());
+ result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate()));
result.setBnationId(model.getBnationId() == null ? "" : getBasicConfig(model.getBnationId()));//民族
result.setEncoded(model.getEncoded());
result.setmHighRiskReason(mongoUtil.findNames(model.getmHighRiskReason()));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
index fdc99e6..a9f798b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
@@ -12,6 +12,12 @@ import java.util.Map;
*/
@Form
public class BabyBookbuildingAddRequest {
+
+ //月龄下拉框
+ private String ylSelect;
+ //下次预约
+ private String nextDate;
+
/***********母亲基本信息***********/
// 儿童高危因素标记
private List babyHighRiskReason;
@@ -436,6 +442,22 @@ public class BabyBookbuildingAddRequest {
return yn;
}
+ public String getYlSelect() {
+ return ylSelect;
+ }
+
+ public void setYlSelect(String ylSelect) {
+ this.ylSelect = ylSelect;
+ }
+
+ public String getNextDate() {
+ return nextDate;
+ }
+
+ public void setNextDate(String nextDate) {
+ this.nextDate = nextDate;
+ }
+
public void setYn(Integer yn) {
this.yn = yn;
}
@@ -1340,10 +1362,10 @@ public class BabyBookbuildingAddRequest {
this.highRisk = highRisk;
}
+
public String getVipEndTime() {
return vipEndTime;
}
-
public String getZhlbxqState() {
return zhlbxqState;
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java
index 6f41f4b..62b7b9c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java
@@ -206,7 +206,7 @@ public class DischargeAbstractSaveRequest {
/**
* @auther HuJiaqi
* @createTime 2016年12月05日 18时25分
- * @discription 听力是否筛查
+ * @discription 听力是否筛查（20210122 张洁滦平需求，听力是否筛查 就是 耳声发射，后台不用动前端该名称即可。）
*/
private Integer isUNHS;
/**
@@ -220,7 +220,9 @@ public class DischargeAbstractSaveRequest {
//听性脑干（1通过/2未通过）
private Integer txng;
// 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
+ // "txngState":1 （20210122 张洁滦平需求 新增 1-双耳通过，2-右侧未通过，3-左侧为通过，4-双侧未通过）
private Map txngNew;
+
//耳聋基因（1通过/2未通过）
private Integer eljy;
//口腔（1通过/2未通过）
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/LisReportModelRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/LisReportModelRequest.java
index 53b8e17..6a203e8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/LisReportModelRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/LisReportModelRequest.java
@@ -18,6 +18,7 @@ public class LisReportModelRequest {
private String type;
// 就诊卡号
private String vcCardNo;
+ private String cardNo;
// 患者姓名
private String name;
// 住院号
@@ -53,6 +54,14 @@ public class LisReportModelRequest {
//检验项集合
private List items;
+ public String getCardNo() {
+ return cardNo;
+ }
+
+ public void setCardNo(String cardNo) {
+ this.cardNo = cardNo;
+ }
+
public Integer getStatus() {
return status;
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
index 9499826..b455463 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
@@ -8,6 +8,12 @@ import java.util.Map;
* Created by lqy on 2016/6/17.
*/
public class BabyBuildResult {
+ //月龄下拉框
+ private String ylSelect;
+ //下次预约
+ private String nextDate;
+
+
// 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
private Map txngNew;
//修改口腔检查：yesOrNo yes○正常 no○异常：下拉项：cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____
@@ -474,6 +480,21 @@ public class BabyBuildResult {
this.mHighRiskReason = mHighRiskReason;
}
+ public String getYlSelect() {
+ return ylSelect;
+ }
+
+ public void setYlSelect(String ylSelect) {
+ this.ylSelect = ylSelect;
+ }
+
+ public String getNextDate() {
+ return nextDate;
+ }
+
+ public void setNextDate(String nextDate) {
+ this.nextDate = nextDate;
+ }
public String getFileCode() {
return fileCode;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
index 37d7a28..fa517cb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
@@ -22,6 +22,12 @@ import java.util.Map;
* Created by lqy on 2016/6/17.
*/
public class BabyPageResult implements IBasicResultConvert {
+ //月龄下拉框
+ private String ylSelect;
+ //下次预约
+ private String nextDate;
+
+
// 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
private Map txngNew;
//修改口腔检查：yesOrNo yes○正常 no○异常：下拉项：cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____
@@ -403,6 +409,22 @@ public class BabyPageResult implements IBasicResultConvert