diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java
index 2c8dea5..2dfbb28 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java
@@ -15,8 +15,6 @@ public class BabyPatientExtendEar extends AbstracUuidEntity {
private Date createDate;
- private String createUserId;
-
private String createHospitalId;
private Date lastUpdateDate;
@@ -26,24 +24,31 @@ public class BabyPatientExtendEar extends AbstracUuidEntity {
private String lastUpdateHospitalId;
/**
- * 听力高危因素 存字典表所对应的字段 多个用逗号分割
- */
- private String highRiskCause;
-
- /**
* 状态 1=正常 -1=禁用
*/
private Integer status;
private String babyPatientId;
- public String getBabyPatientId() {
- return babyPatientId;
- }
+ /**
+ * 高危及诊断
+ */
+ //母亲孕期高危因素
+ private String mHighRiskFactorId;
+ //住院号
+ private String admissNo;
+ //新生儿出院诊断
+ private String dischargeDiagnosis;
+ //听力高危因素
+ private String highRiskCause;
- public void setBabyPatientId(String babyPatientId) {
- this.babyPatientId = babyPatientId;
- }
+ /**
+ * 院内信息
+ */
+ //建档医生
+ private String createUserId;
+ //条码
+ private String barCode;
public String getPersonId() {
return personId;
@@ -52,6 +57,7 @@ public class BabyPatientExtendEar extends AbstracUuidEntity {
public void setPersonId(String personId) {
this.personId = personId;
}
+
public Date getCreateDate() {
return createDate;
}
@@ -59,6 +65,43 @@ public class BabyPatientExtendEar extends AbstracUuidEntity {
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
+
+ public String getCreateHospitalId() {
+ return createHospitalId;
+ }
+
+ public String getBabyPatientId() {
+ return babyPatientId;
+ }
+
+ public void setBabyPatientId(String babyPatientId) {
+ this.babyPatientId = babyPatientId;
+ }
+
+ public String getmHighRiskFactorId() {
+ return mHighRiskFactorId;
+ }
+
+ public void setmHighRiskFactorId(String mHighRiskFactorId) {
+ this.mHighRiskFactorId = mHighRiskFactorId;
+ }
+
+ public String getAdmissNo() {
+ return admissNo;
+ }
+
+ public void setAdmissNo(String admissNo) {
+ this.admissNo = admissNo;
+ }
+
+ public String getDischargeDiagnosis() {
+ return dischargeDiagnosis;
+ }
+
+ public void setDischargeDiagnosis(String dischargeDiagnosis) {
+ this.dischargeDiagnosis = dischargeDiagnosis;
+ }
+
public String getCreateUserId() {
return createUserId;
}
@@ -66,8 +109,14 @@ public class BabyPatientExtendEar extends AbstracUuidEntity {
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
- public String getCreateHospitalId() {
- return createHospitalId;
+
+
+ public String getBarCode() {
+ return barCode;
+ }
+
+ public void setBarCode(String barCode) {
+ this.barCode = barCode;
}
public void setCreateHospitalId(String createHospitalId) {
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java
index 88f48e5..ff3e86d 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java
@@ -9,16 +9,83 @@ import java.util.Date;
public class BabyPatientExtendEarQuery extends BaseQuery
{
private String id;
+
+ /**
+ * 儿童id
+ */
private String personId;
+
private Date createDate;
- private String createUserId;
+
private String createHospitalId;
+
private Date lastUpdateDate;
+
private String lastUpdateUserId;
+
private String lastUpdateHospitalId;
- private String highRiskCause;
+
+ /**
+ * 状态 1=正常 -1=禁用
+ */
private Integer status;
+
private String babyPatientId;
+ /**
+ * 高危及诊断
+ */
+ //母亲孕期高危因素
+ private String mHighRiskFactorId;
+ //住院号
+ private String admissNo;
+ //新生儿出院诊断
+ private String dischargeDiagnosis;
+ //听力高危因素
+ private String highRiskCause;
+
+ /**
+ * 院内信息
+ */
+ //建档医生
+ private String createUserId;
+ //条码
+ private String barCode;
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getmHighRiskFactorId() {
+ return mHighRiskFactorId;
+ }
+
+ public void setmHighRiskFactorId(String mHighRiskFactorId) {
+ this.mHighRiskFactorId = mHighRiskFactorId;
+ }
+
+ public String getDischargeDiagnosis() {
+ return dischargeDiagnosis;
+ }
+
+ public void setDischargeDiagnosis(String dischargeDiagnosis) {
+ this.dischargeDiagnosis = dischargeDiagnosis;
+ }
+
+ public String getBarCode() {
+ return barCode;
+ }
+
+ public void setBarCode(String barCode) {
+ this.barCode = barCode;
+ }
+
+ public String getAdmissNo() {
+ return admissNo;
+ }
+
+ public void setAdmissNo(String admissNo) {
+ this.admissNo = admissNo;
+ }
public String getId()
{
@@ -33,12 +100,6 @@ public class BabyPatientExtendEarQuery extends BaseQuery
this.babyPatientId = babyPatientId;
}
- public void setId(String id)
- {
- this.id = id;
-
- }
-
public String getPersonId()
{
return personId;
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml
index ca1e680..6aafa37 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml
@@ -14,11 +14,15 @@
+
+
+
+
-insert into baby_patient_extend_ear (id,person_id,create_date,create_user_id,create_hospital_id,last_update_date,last_update_user_id,last_update_hospital_id,high_risk_cause,status,baby_patient_id) values (#{id},#{personId},#{createDate},#{createUserId},#{createHospitalId},#{lastUpdateDate},#{lastUpdateUserId},#{lastUpdateHospitalId},#{highRiskCause},#{status},#{babyPatientId})
+insert into baby_patient_extend_ear (id,person_id,create_date,create_user_id,create_hospital_id,last_update_date,last_update_user_id,last_update_hospital_id,high_risk_cause,status,baby_patient_id,admiss_no,discharge_diagnosis,bar_code,mhigh_risk_factor_id) values (#{id},#{personId},#{createDate},#{createUserId},#{createHospitalId},#{lastUpdateDate},#{lastUpdateUserId},#{lastUpdateHospitalId},#{highRiskCause},#{status},#{babyPatientId},#{admissNo},#{dischargeDiagnosis},#{barCode},#{mHighRiskFactorId})
@@ -49,11 +53,23 @@ insert into baby_patient_extend_ear (id,person_id,create_date,create_user_id,cre
high_risk_cause = #{highRiskCause,jdbcType=VARCHAR},
+
+ status = #{status,jdbcType=INTEGER},
+
baby_patient_id = #{babyPatientId,jdbcType=VARCHAR},
-
- status = #{status,jdbcType=INTEGER},
+
+ admiss_no = #{admissNo,jdbcType=VARCHAR},
+
+
+ discharge_diagnosis = #{dischargeDiagnosis,jdbcType=VARCHAR},
+
+
+ bar_code = #{barCode,jdbcType=VARCHAR},
+
+
+ mhigh_risk_factor_id = #{mHighRiskFactorId,jdbcType=VARCHAR},
where id = #{id,jdbcType=VARCHAR}
@@ -66,8 +82,8 @@ delete from baby_patient_extend_ear where id = #{id,jdbcType=VARCHAR}
@@ -117,6 +133,18 @@ select id,person_id,create_date,create_user_id,create_hospital_id,last_update_da
and baby_patient_id = #{babyPatientId,jdbcType=VARCHAR}
+
+ and admiss_no = #{admissNo,jdbcType=VARCHAR}
+
+
+ and discharge_diagnosis = #{dischargeDiagnosis,jdbcType=VARCHAR}
+
+
+ and bar_code = #{barCode,jdbcType=VARCHAR}
+
+
+ and mhigh_risk_factor_id = #{mHighRiskFactorId,jdbcType=VARCHAR}
+
@@ -124,7 +152,8 @@ select id,person_id,create_date,create_user_id,create_hospital_id,last_update_da
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 77cce73..d21fe3d 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
@@ -20,6 +20,7 @@ import com.lyms.platform.operate.web.result.*;
import com.lyms.platform.operate.web.utils.CommonsHelper;
import com.lyms.platform.operate.web.utils.InitDataUtils;
import com.lyms.platform.operate.web.utils.MongoUtil;
+import com.lyms.platform.operate.web.utils.ResolveUtils;
import com.lyms.platform.permission.model.*;
import com.lyms.platform.permission.service.*;
import com.lyms.platform.pojo.BabyModel;
@@ -138,7 +139,8 @@ public class BabyEarFacade {
return childrenPerson;
}
- private void addMysqlBabyRecord(BabyModel baby) {
+ private void addMysqlBabyRecord(BabyEarBase babyarBaseb) {
+ BabyModel baby = babyarBaseb.convertToDataModel();
ChildrenPerson childrenPerson = fillChildren(baby);
//同时写mysql表
childrenPersonService.addChildrenPerson(childrenPerson);
@@ -177,8 +179,10 @@ public class BabyEarFacade {
* @return 操作是否成功
*/
public BaseResponse addOrUpdateBabyEar(BabyEarAddRequest babyEarAddRequest, Integer userId) {
+ BabyEarBase babyEarBase = babyEarAddRequest.getBase();
//获取儿童信息
- IBasicRequestConvert convert = babyEarAddRequest.getBase();
+ IBasicRequestConvert convert =babyEarBase;
+
//儿童基本信息
BabyModel baby = convert.convertToDataModel();
//儿童出生信息
@@ -187,6 +191,7 @@ public class BabyEarFacade {
BabyPatientExtendEarFamily babyPatientExtendEarFamily = babyEarAddRequest.getPatientExtendEarFamily();
//母亲信息
BabyPatientExtendEarMotherRequest babyPatientExtendEarMotherRequest = babyEarAddRequest.getPatientExtendEarMother();
+
BabyPatientExtendEarMother babyPatientExtendEarMother=null;
if(null!=babyPatientExtendEarMotherRequest){
babyPatientExtendEarMother= babyPatientExtendEarMotherRequest.convertToDataModel();
@@ -204,9 +209,15 @@ public class BabyEarFacade {
baby.setYn(1);
baby.setCreated(new Date());
babyPatientId = babyService.addOneBaby(baby).getId();
- addMysqlBabyRecord(baby);
+ addMysqlBabyRecord(babyEarAddRequest.getBase());
}
BabyPatientExtendEar babyPatientExtendEar = new BabyPatientExtendEar();
+ babyPatientExtendEar.setmHighRiskFactorId(babyEarBase.getmHighRiskFactorId());
+ babyPatientExtendEar.setAdmissNo(babyEarBase.getAdmissNo());
+ babyPatientExtendEar.setDischargeDiagnosis(babyEarBase.getDischargeDiagnosis());
+ babyPatientExtendEar.setHighRiskCause(babyEarBase.getHighRiskCause());
+ babyPatientExtendEar.setHighRiskCause(babyEarBase.getHighRiskCause());
+
if (StringUtils.isEmpty(id)) {
babyPatientExtendEar.setCreateDate(new Date());
babyPatientExtendEar.setCreateHospitalId(hId);
@@ -278,8 +289,38 @@ public class BabyEarFacade {
babyPatientExtendEarQuery.setBabyPatientId(babyModel.getId());
List babyPatientExtendEars = babyPatientExtendEarService.queryBabyPatientExtendEar(babyPatientExtendEarQuery);
if (CollectionUtils.isNotEmpty(babyPatientExtendEars)) {
- babyEarBase.setId(babyPatientExtendEars.get(0).getId());
+ BabyPatientExtendEar babyPatientExtendEar = babyPatientExtendEars.get(0);
+ babyEarBase.setId(babyPatientExtendEar.getId());
+ babyEarBase.setAdmissNo(babyPatientExtendEar.getAdmissNo());
+ babyEarBase.setBarCode(babyPatientExtendEar.getBarCode());
+ babyEarBase.setCreateUserId(babyPatientExtendEar.getCreateUserId());
+ //母亲孕期高危因素
+ if(babyPatientExtendEar.getmHighRiskFactorId()!=null){
+
+ String[] highFactors = babyPatientExtendEar.getmHighRiskFactorId().split(",");
+ List ids = Arrays.asList(highFactors);
+
+ HighScoreResult highScoreResult = ResolveUtils.queryRisk(ids, true, basicConfigService);
+ List> checkList = ResolveUtils.queryHighRisk(highScoreResult);
+ babyEarBase.setmHighRiskFactorList(checkList);
+ }
+ //听力高危因素
+ if(babyPatientExtendEar.getHighRiskCause()!=null){
+ List highArr = new ArrayList();
+ String[] highFactors = babyPatientExtendEar.getHighRiskCause().split(",");
+ for (String hf : highFactors) {
+ if (StringUtils.isNotEmpty(hf)) {
+ String name = HighRiskEnum.getTitle(Integer.parseInt(hf));
+ JSONObject confiJo = new JSONObject();
+ confiJo.put("id",hf);
+ confiJo.put("name",name);
+ highArr.add(confiJo);
+ }
+ }
+ babyEarBase.setHighRiskCauseList(highArr);
+ }
}
+ babyEarResult.setBase(babyEarBase);
//查詢母親的信息
BabyPatientExtendEarMotherQuery babyPatientExtendEarMotherQuery = new BabyPatientExtendEarMotherQuery();
@@ -305,7 +346,6 @@ public class BabyEarFacade {
if (CollectionUtils.isNotEmpty(babyPatientExtendEarBirths)) {
babyEarResult.setBabyBirth(babyPatientExtendEarBirths.get(0));
}
- babyEarResult.setBase(babyEarBase);
objectResponse.setData(babyEarResult);
objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
} else {
@@ -327,41 +367,83 @@ public class BabyEarFacade {
BabyEarBase babyEarBase = new BabyEarBase(babyModel);
//儿童基础信息
BabyEarBaseView babyEarBaseView = convertToBabyEarBase(babyEarBase);
- babyEarResult.setBase(babyEarBaseView);
- //查詢母親的信息
- BabyPatientExtendEarMotherQuery babyPatientExtendEarMotherQuery = new BabyPatientExtendEarMotherQuery();
- babyPatientExtendEarMotherQuery.setBabyPatientId(babyId);
- List babyPatientExtendEarMothers = babyPatientExtendEarMotherService.queryBabyPatientExtendEarMother(babyPatientExtendEarMotherQuery);
+ BabyPatientExtendEarQuery babyPatientExtendEarQuery = new BabyPatientExtendEarQuery();
+ babyPatientExtendEarQuery.setBabyPatientId(babyModel.getId());
+ List babyPatientExtendEars = babyPatientExtendEarService.queryBabyPatientExtendEar(babyPatientExtendEarQuery);
+ if (CollectionUtils.isNotEmpty(babyPatientExtendEars)) {
+ BabyPatientExtendEar babyPatientExtendEar = babyPatientExtendEars.get(0);
+ babyEarBaseView.setAdmissNo(babyPatientExtendEar.getAdmissNo());
+ babyEarBaseView.setDischargeDiagnosis(babyPatientExtendEar.getDischargeDiagnosis());
+
+ babyEarBaseView.setBarCode(babyPatientExtendEar.getBarCode());
+ //听力高危因素
+ if (babyPatientExtendEar.getHighRiskCause() != null) {
+ String[] highFactors = babyPatientExtendEar.getHighRiskCause().split(",");
+ StringBuffer hfBuff = new StringBuffer();
+
+ for (String hf : highFactors) {
+ if (StringUtils.isNotEmpty(hf)) {
+ String name = HighRiskEnum.getTitle(Integer.parseInt(hf));
+ hfBuff.append(name + "、");
+ }
+ }
+ babyEarBaseView.setHighRiskCause(hfBuff.toString());
+ }
+ //母亲孕期高危因素
+ if (babyPatientExtendEar.getmHighRiskFactorId() != null) {
+ String[] highFactors = babyPatientExtendEar.getmHighRiskFactorId().split(",");
+ List ids = Arrays.asList(highFactors);
+
+ HighScoreResult highScoreResult = ResolveUtils.queryRisk(ids, true, basicConfigService);
+ Integer score = 0;
+ if (highScoreResult != null && highScoreResult.getScore() != null) {
+ score = highScoreResult.getScore();
+ }
+ List> checkList = ResolveUtils.queryHighRisk(highScoreResult);
+ List> list = new ArrayList<>();
+ if (CollectionUtils.isNotEmpty(checkList)) {
+ list.addAll(checkList);
+ }
+ babyEarBaseView.setmHighRiskFactorList(list);
+ }
- if (CollectionUtils.isNotEmpty(babyPatientExtendEarMothers)) {
- BabyEarMotherView babyEarMotherView = convertToBabyEarMotherView(babyPatientExtendEarMothers.get(0));
- babyEarResult.setPatientExtendEarMother(babyEarMotherView);
- }
+ babyEarResult.setBase(babyEarBaseView);
- BabyPatientExtendEarFamilyQuery babyPatientExtendEarFamilyQuery = new BabyPatientExtendEarFamilyQuery();
- babyPatientExtendEarFamilyQuery.setBabyPatientId(babyId);
+ //查詢母親的信息
+ BabyPatientExtendEarMotherQuery babyPatientExtendEarMotherQuery = new BabyPatientExtendEarMotherQuery();
+ babyPatientExtendEarMotherQuery.setBabyPatientId(babyId);
+ List babyPatientExtendEarMothers = babyPatientExtendEarMotherService.queryBabyPatientExtendEarMother(babyPatientExtendEarMotherQuery);
- //查詢家庭信息
- List babyPatientExtendEarFamilies = babyPatientExtendEarFamilyService.queryBabyPatientExtendEarFamily(babyPatientExtendEarFamilyQuery);
- if (CollectionUtils.isNotEmpty(babyPatientExtendEarFamilies)) {
- BabyEarFamilyView babyEarFamilyView = convertToBabyEarFamilyView(babyPatientExtendEarFamilies.get(0));
- babyEarResult.setPatientExtendEarFamily(babyEarFamilyView);
- }
+ if (CollectionUtils.isNotEmpty(babyPatientExtendEarMothers)) {
+ BabyEarMotherView babyEarMotherView = convertToBabyEarMotherView(babyPatientExtendEarMothers.get(0));
+ babyEarResult.setPatientExtendEarMother(babyEarMotherView);
+ }
- BabyPatientExtendEarBirthQuery babyPatientExtendEarBirthQuery = new BabyPatientExtendEarBirthQuery();
- babyPatientExtendEarBirthQuery.setBabyPatientId(babyId);
- //出生信息
- List babyPatientExtendEarBirths = babyPatientExtendEarBirthService.queryBabyPatientExtendEarBirth(babyPatientExtendEarBirthQuery);
+ BabyPatientExtendEarFamilyQuery babyPatientExtendEarFamilyQuery = new BabyPatientExtendEarFamilyQuery();
+ babyPatientExtendEarFamilyQuery.setBabyPatientId(babyId);
- if (CollectionUtils.isNotEmpty(babyPatientExtendEarBirths)) {
- BabyEarBirthView babyEarBirthView = convertToBabyEarBirthView(babyPatientExtendEarBirths.get(0));
- babyEarResult.setBabyBirth(babyEarBirthView);
+ //查詢家庭信息
+ List babyPatientExtendEarFamilies = babyPatientExtendEarFamilyService.queryBabyPatientExtendEarFamily(babyPatientExtendEarFamilyQuery);
+ if (CollectionUtils.isNotEmpty(babyPatientExtendEarFamilies)) {
+ BabyEarFamilyView babyEarFamilyView = convertToBabyEarFamilyView(babyPatientExtendEarFamilies.get(0));
+ babyEarResult.setPatientExtendEarFamily(babyEarFamilyView);
+ }
+
+ BabyPatientExtendEarBirthQuery babyPatientExtendEarBirthQuery = new BabyPatientExtendEarBirthQuery();
+ babyPatientExtendEarBirthQuery.setBabyPatientId(babyId);
+ //出生信息
+ List babyPatientExtendEarBirths = babyPatientExtendEarBirthService.queryBabyPatientExtendEarBirth(babyPatientExtendEarBirthQuery);
+
+ if (CollectionUtils.isNotEmpty(babyPatientExtendEarBirths)) {
+ BabyEarBirthView babyEarBirthView = convertToBabyEarBirthView(babyPatientExtendEarBirths.get(0));
+ babyEarResult.setBabyBirth(babyEarBirthView);
+ }
+ objectResponse.setData(babyEarResult);
+ objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+ } else {
+ objectResponse.setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("没有对应的儿童");
}
- objectResponse.setData(babyEarResult);
- objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
- } else {
- objectResponse.setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("没有对应的儿童");
}
return objectResponse;
}
@@ -454,13 +536,15 @@ public class BabyEarFacade {
fetuStr = "有";
}
}
+ babyEarBirthView.setFetuEmbarras(fetuStr);
String apgarScore = babyPatientExtendEarBirth.getApgarScoreOne()+"-"+babyPatientExtendEarBirth.getApgarScoreFive()+"-"+babyPatientExtendEarBirth.getApgarScoreTen();
if(babyPatientExtendEarBirth.getFetuEmbarras()!=null&&babyPatientExtendEarBirth.getFetuEmbarras()==1){
apgarScore+="不详";
}
+ babyEarBirthView.setApgarScore(apgarScore);
+
- babyEarBirthView.setFetuEmbarras(fetuStr);
String deformity = "无";
if(babyPatientExtendEarBirth.getDeformityType()!=null&&babyPatientExtendEarBirth.getDeformityType()==1){
deformity = "有";
@@ -523,6 +607,8 @@ public class BabyEarFacade {
outsideResponse = "迟钝";
}
}
+
+
babyEarBirthView.setOutsideResponse(outsideResponse);
return babyEarBirthView;
}
@@ -563,14 +649,9 @@ public class BabyEarFacade {
babyEarBaseView.setfLevel(getBasicConfig(babyEarBase.getfLevelId()));
babyEarBaseView.setFproType(getBasicConfig(babyEarBase.getFproTypeId()));
babyEarBaseView.setFphone(babyEarBase.getFphone());
- babyEarBaseView.setmHighRiskFactor(babyEarBase.getmHighRiskFactorId());
- babyEarBaseView.setAdmissNo(babyEarBase.getAdmissNo());
- babyEarBaseView.setDischargeDiagnosis(babyEarBase.getDischargeDiagnosis());
- babyEarBaseView.setHighRiskCause(babyEarBase.getHighRiskCause());
babyEarBaseView.setCreateUser(babyEarBase.getCreateUserId());
babyEarBaseView.setCreateTime(babyEarBase.getCreateTime());
babyEarBaseView.setVcCardNo(babyEarBase.getVcCardNo());
- babyEarBaseView.setBarCode(babyEarBase.getBarCode());
babyEarBaseView.setServiceType(ServiceStatusEnums.getNameById(babyEarBase.getServiceType()));
babyEarBaseView.setMonthAge(babyEarBase.getMonthAge());
return babyEarBaseView;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
index d5130da..2301e17 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
@@ -5,6 +5,7 @@ import com.lyms.platform.common.utils.DateUtil;
import com.lyms.platform.pojo.BabyModel;
import java.util.Date;
+import java.util.List;
/**
* 邮政编码和高危因素没有存储在mongodb
@@ -89,12 +90,16 @@ public class BabyEarBase implements IBasicRequestConvert {
*/
//母亲孕期高危因素
private String mHighRiskFactorId;
+ //母亲孕期高危因素集合
+ private List mHighRiskFactorList;
//住院号
private String admissNo;
//新生儿出院诊断
private String dischargeDiagnosis;
//听力高危因素
private String highRiskCause;
+ //听力高危因素
+ private List highRiskCauseList;
/**
* 院内信息
@@ -128,6 +133,10 @@ public class BabyEarBase implements IBasicRequestConvert {
setAreaId(babyModel.getAreaId());
setStreetId(babyModel.getStreetId());
setAddress(babyModel.getAddress());
+ setVcCardNo(babyModel.getVcCardNo());
+ setServiceType(babyModel.getServiceType());
+ setServiceStatus(babyModel.getServiceStatus());
+ setRemark(babyModel.getMremark());
setMname(babyModel.getMname());
setMphone(babyModel.getMphone());
setFcertNo(babyModel.getFcertNo());
@@ -161,6 +170,10 @@ public class BabyEarBase implements IBasicRequestConvert {
babyModel.setMcertTypeId(mcertTypeId);
babyModel.setmLevelId(mLevelId);
babyModel.setId(babyId);
+ babyModel.setMremark(remark);
+ babyModel.setVcCardNo(vcCardNo);
+ babyModel.setServiceType(serviceType);
+ babyModel.setServiceStatus(serviceStatus);
babyModel.setBuildDoctor(createUserId);
babyModel.setBuildDate(new Date());
babyModel.setBirth(DateUtil.parseYMD(birth));
@@ -463,6 +476,21 @@ public class BabyEarBase implements IBasicRequestConvert {
this.postCode = postCode;
}
+ public List getmHighRiskFactorList() {
+ return mHighRiskFactorList;
+ }
+
+ public void setmHighRiskFactorList(List mHighRiskFactorList) {
+ this.mHighRiskFactorList = mHighRiskFactorList;
+ }
+ public List getHighRiskCauseList() {
+ return highRiskCauseList;
+ }
+
+ public void setHighRiskCauseList(List highRiskCauseList) {
+ this.highRiskCauseList = highRiskCauseList;
+ }
+
public Integer getSex() {
return sex;
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPatientExtendEarMotherRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPatientExtendEarMotherRequest.java
index 107ca89..60b1ec4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPatientExtendEarMotherRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPatientExtendEarMotherRequest.java
@@ -4,6 +4,7 @@ import com.lyms.platform.common.base.IBasicRequestConvert;
import com.lyms.platform.common.utils.JsonUtil;
import com.lyms.platform.permission.model.BabyPatientExtendEarMother;
+import java.util.List;
import java.util.Map;
/**
@@ -59,6 +60,8 @@ public class BabyPatientExtendEarMotherRequest implements IBasicRequestConvert