diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java
index 864ca46..e238a65 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java
@@ -63,9 +63,9 @@ public class BabyPatientExtendEarBirth {
*/
private BigDecimal apgarScoreTen;
/**
- * 胎儿窘迫 不详（单选） 1-选中
+ * apgar评分 不详（单选） 1-选中
*/
- private Integer fetuEmbarras;
+ private Integer apgarUnknown;
/**
* 产伤类型： 1=有 -1=无
@@ -379,12 +379,12 @@ public class BabyPatientExtendEarBirth {
this.tireNumber = tireNumber;
}
- public Integer getFetuEmbarras() {
- return fetuEmbarras;
+ public Integer getApgarUnknown() {
+ return apgarUnknown;
}
- public void setFetuEmbarras(Integer fetuEmbarras) {
- this.fetuEmbarras = fetuEmbarras;
+ public void setApgarUnknown(Integer apgarUnknown) {
+ this.apgarUnknown = apgarUnknown;
}
public String getEarPoisonMap() {
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirthQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirthQuery.java
index 714caaf..b1ba3b3 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirthQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirthQuery.java
@@ -64,9 +64,9 @@ public class BabyPatientExtendEarBirthQuery extends BaseQuery
*/
private BigDecimal apgarScoreTen;
/**
- * 胎儿窘迫 不详（单选） 1-选中
+ * apgar 不详（单选） 1-选中
*/
- private Integer fetuEmbarras;
+ private Integer apgarUnknown;
/**
* 产伤类型： 1=有 -1=无
@@ -232,6 +232,14 @@ public class BabyPatientExtendEarBirthQuery extends BaseQuery
this.productNumber = productNumber;
}
+ public Integer getApgarUnknown() {
+ return apgarUnknown;
+ }
+
+ public void setApgarUnknown(Integer apgarUnknown) {
+ this.apgarUnknown = apgarUnknown;
+ }
+
public BigDecimal getBirthWeight() {
return birthWeight;
}
@@ -304,13 +312,6 @@ public class BabyPatientExtendEarBirthQuery extends BaseQuery
this.apgarScoreTen = apgarScoreTen;
}
- public Integer getFetuEmbarras() {
- return fetuEmbarras;
- }
-
- public void setFetuEmbarras(Integer fetuEmbarras) {
- this.fetuEmbarras = fetuEmbarras;
- }
public Integer getBirthInjuryType() {
return birthInjuryType;
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospitalQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospitalQuery.java
index 61672cf..a6051d4 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospitalQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospitalQuery.java
@@ -132,6 +132,14 @@ public class PatientMarkHospitalQuery extends BaseQuery {
*/
private Date hospitDate;
/**
+ * 住院开始时间
+ */
+ private Date hospitStartDate;
+ /**
+ * 住院结束时间
+ */
+ private Date hospitEndDate;
+ /**
* 住院类型(1-分娩住院、2-其他住院)
*/
private Integer hospitType;
@@ -140,6 +148,22 @@ public class PatientMarkHospitalQuery extends BaseQuery {
*/
private String sql;
+ public Date getHospitStartDate() {
+ return hospitStartDate;
+ }
+
+ public void setHospitStartDate(Date hospitStartDate) {
+ this.hospitStartDate = hospitStartDate;
+ }
+
+ public Date getHospitEndDate() {
+ return hospitEndDate;
+ }
+
+ public void setHospitEndDate(Date hospitEndDate) {
+ this.hospitEndDate = hospitEndDate;
+ }
+
public String getSql() {
return sql;
}
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBirth.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBirth.xml
index 17f6385..e14f148 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBirth.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBirth.xml
@@ -44,12 +44,13 @@
+
-insert into baby_patient_extend_ear_birth (id,fetu_number,product_number,birth_weight,tire_number,parturition_type,birth_defect_type,birth_defect_desc,fetu_embarras_type,apgar_score_one,apgar_score_five,apgar_score_ten,birth_injury_type,birth_injury_position,amniotic_fluid_type,abnormal_parturition_type,abnormal_parturition_position,deformity_type,deformity_position,birth_infection_type,birth_infection_cause,birth_course_disease,birth_ill_type,birth_ill_cause,birth_ill_disease,head_trauma_history,head_trauma_desc,ear_poison_type,ear_poison_map,tympanitis_type,tympanitis_desc,nicu_type,nicu_cause,nicu_continued_date,respirator_type,respirator_continued_date,respirator_continued_date_unit,outside_response,baby_patient_id,baby_ear_id) values (#{id},#{fetuNumber},#{productNumber},#{birthWeight},#{tireNumber},#{parturitionType},#{birthDefectType},#{birthDefectDesc},#{fetuEmbarrasType},#{apgarScoreOne},#{apgarScoreFive},#{apgarScoreTen},#{birthInjuryType},#{birthInjuryPosition},#{amnioticFluidType},#{abnormalParturitionType},#{abnormalParturitionPosition},#{deformityType},#{deformityPosition},#{birthInfectionType},#{birthInfectionCause},#{birthCourseDisease},#{birthIllType},#{birthIllCause},#{birthIllDisease},#{headTraumaHistory},#{headTraumaDesc},#{earPoisonType},#{earPoisonMap},#{tympanitisType},#{tympanitisDesc},#{nicuType},#{nicuCause},#{nicuContinuedDate},#{respiratorType},#{respiratorContinuedDate},#{respiratorContinuedDateUnit},#{outsideResponse},#{babyPatientId},#{babyEarId})
+insert into baby_patient_extend_ear_birth (id,fetu_number,product_number,birth_weight,tire_number,parturition_type,birth_defect_type,birth_defect_desc,fetu_embarras_type,apgar_score_one,apgar_score_five,apgar_score_ten,birth_injury_type,birth_injury_position,amniotic_fluid_type,abnormal_parturition_type,abnormal_parturition_position,deformity_type,deformity_position,birth_infection_type,birth_infection_cause,birth_course_disease,birth_ill_type,birth_ill_cause,birth_ill_disease,head_trauma_history,head_trauma_desc,ear_poison_type,ear_poison_map,tympanitis_type,tympanitis_desc,nicu_type,nicu_cause,nicu_continued_date,respirator_type,respirator_continued_date,respirator_continued_date_unit,outside_response,baby_patient_id,baby_ear_id,apgar_unknown) values (#{id},#{fetuNumber},#{productNumber},#{birthWeight},#{tireNumber},#{parturitionType},#{birthDefectType},#{birthDefectDesc},#{fetuEmbarrasType},#{apgarScoreOne},#{apgarScoreFive},#{apgarScoreTen},#{birthInjuryType},#{birthInjuryPosition},#{amnioticFluidType},#{abnormalParturitionType},#{abnormalParturitionPosition},#{deformityType},#{deformityPosition},#{birthInfectionType},#{birthInfectionCause},#{birthCourseDisease},#{birthIllType},#{birthIllCause},#{birthIllDisease},#{headTraumaHistory},#{headTraumaDesc},#{earPoisonType},#{earPoisonMap},#{tympanitisType},#{tympanitisDesc},#{nicuType},#{nicuCause},#{nicuContinuedDate},#{respiratorType},#{respiratorContinuedDate},#{respiratorContinuedDateUnit},#{outsideResponse},#{babyPatientId},#{babyEarId},#{apgarUnknown})
@@ -174,6 +175,9 @@ insert into baby_patient_extend_ear_birth (id,fetu_number,product_number,birth_w
baby_ear_id = #{babyEarId,jdbcType=VARCHAR},
+
+ apgar_unknown = #{apgarUnknown,jdbcType=INTEGER},
+
where id = #{id,jdbcType=VARCHAR}
@@ -186,7 +190,7 @@ delete from baby_patient_extend_ear_birth where id = #{id,jdbcType=VARCHAR}
@@ -331,7 +335,7 @@ select id,fetu_number,product_number,birth_weight,tire_number,parturition_type,b