From 6838caacbdb196901fe2c2baeeb783a565d2e473 Mon Sep 17 00:00:00 2001 From: fangcheng Date: Fri, 31 Mar 2017 17:56:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/hospital/entity/woman/WomanFetationRecord.java | 12 ++++++------ .../test/java/test/hospital/highrisk/HighriskMapsTest.java | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFetationRecord.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFetationRecord.java index 8c8b19b..2677006 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFetationRecord.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFetationRecord.java @@ -168,12 +168,12 @@ public class WomanFetationRecord implements Serializable { * 末次月经 */ @TableField(value="HOSPITAL_LAST_MENSTRUATION") - private String hospitalLastMenstruation; + private Date hospitalLastMenstruation; /** * 纠正末次月经 */ @TableField(value="HOSPITAL_CORRECT_LAST_MENSTRUATION") - private String hospitalCorrectLastMenstruation; + private Date hospitalCorrectLastMenstruation; /** * 预产期 */ @@ -508,19 +508,19 @@ public class WomanFetationRecord implements Serializable { this.contactPostpartumDetail = contactPostpartumDetail; } - public String getHospitalLastMenstruation() { + public Date getHospitalLastMenstruation() { return hospitalLastMenstruation; } - public void setHospitalLastMenstruation(String hospitalLastMenstruation) { + public void setHospitalLastMenstruation(Date hospitalLastMenstruation) { this.hospitalLastMenstruation = hospitalLastMenstruation; } - public String getHospitalCorrectLastMenstruation() { + public Date getHospitalCorrectLastMenstruation() { return hospitalCorrectLastMenstruation; } - public void setHospitalCorrectLastMenstruation(String hospitalCorrectLastMenstruation) { + public void setHospitalCorrectLastMenstruation(Date hospitalCorrectLastMenstruation) { this.hospitalCorrectLastMenstruation = hospitalCorrectLastMenstruation; } diff --git a/parent/hospital.web/src/test/java/test/hospital/highrisk/HighriskMapsTest.java b/parent/hospital.web/src/test/java/test/hospital/highrisk/HighriskMapsTest.java index 9d133ac..558e0ed 100644 --- a/parent/hospital.web/src/test/java/test/hospital/highrisk/HighriskMapsTest.java +++ b/parent/hospital.web/src/test/java/test/hospital/highrisk/HighriskMapsTest.java @@ -6,8 +6,6 @@ import org.springframework.beans.factory.annotation.Autowired; import com.lyms.base.common.entity.conf.HighriskMaps; import com.lyms.base.common.service.conf.HighriskMapsService; import com.lyms.util.StrUtils; - -import antlr.StringUtils; import test.hospital.BaseServiceTest; public class HighriskMapsTest extends BaseServiceTest{ -- 1.8.3.1