From 6be73a8a794b74ecff37093f801ef29d16dba25a Mon Sep 17 00:00:00 2001 From: fangcheng Date: Mon, 8 May 2017 10:01:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=AB=E6=AC=A1=E8=AF=8A?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/base/common/dao/conf/DiagnoseMapsMapper.xml | 11 +++++------ .../lyms/base/common/dao/conf/HighriskMapsMapper.xml | 11 +++++------ .../com/lyms/base/common/entity/conf/DiagnoseMaps.java | 17 +++++++++-------- .../com/lyms/base/common/entity/conf/HighriskMaps.java | 16 ++++++++-------- .../lyms/hospital/dao/diagnose/DiagnoseInfoMapper.java | 3 +++ .../lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml | 15 +++++++++++++-- .../hospital/service/diagnose/DiagnoseInfoService.java | 12 ++++++++++++ .../service/diagnose/impl/DiagnoseInfoServiceImpl.java | 6 ++++++ .../java/test/hospital/diagnose/DiagnoseMapsTest.java | 2 +- .../java/test/hospital/highrisk/HighriskMapsTest.java | 2 +- 10 files changed, 63 insertions(+), 32 deletions(-) diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseMapsMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseMapsMapper.xml index bca5932..0e47738 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseMapsMapper.xml +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseMapsMapper.xml @@ -6,14 +6,14 @@ - + - + @@ -22,19 +22,18 @@ - ID AS id, DIAGNOSE_ID AS diagnoseId, SOURCE_ID AS sourceId + ID AS id, DIAGNOSE_ID AS diagnoseId, CONF_ID AS confId - m.ID AS id, m.DIAGNOSE_ID AS diagnoseId, m.SOURCE_ID AS sourceId, + m.ID AS id, m.DIAGNOSE_ID AS diagnoseId, m.CONF_ID AS confId, NAME AS name, GROUPNAME AS groupname, GROUPORDER AS grouporder, ITEMORDER AS itemorder - diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskMapsMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskMapsMapper.xml index dc8c211..d862fcc 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskMapsMapper.xml +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskMapsMapper.xml @@ -6,14 +6,14 @@ - + - + @@ -24,20 +24,19 @@ - ID AS id, DIAGNOSE_ID AS diagnoseId, SOURCE_ID AS sourceId + ID AS id, DIAGNOSE_ID AS diagnoseId, CONF_ID AS confId - m.ID AS id, m.DIAGNOSE_ID AS diagnoseId, m.SOURCE_ID AS sourceId, + m.ID AS id, m.DIAGNOSE_ID AS diagnoseId, m.CONF_ID AS confId, NAME AS name, COLORCODE AS colorcode, COLORTEXT AS colortext, GROUPORDER AS grouporder, ITEMORDER AS itemorder, GRADE AS grade - diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseMaps.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseMaps.java index 6a560fa..33d6784 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseMaps.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseMaps.java @@ -31,8 +31,8 @@ public class DiagnoseMaps implements Serializable { /** * 诊断项资源ID */ - @TableField(value="SOURCE_ID") - private String sourceId; + @TableField(value="CONF_ID") + private String confId; public String getId() { @@ -51,12 +51,13 @@ public class DiagnoseMaps implements Serializable { this.diagnoseId = diagnoseId; } - public String getSourceId() { - return sourceId; - } + public String getConfId() { + return confId; + } + + public void setConfId(String confId) { + this.confId = confId; + } - public void setSourceId(String sourceId) { - this.sourceId = sourceId; - } } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskMaps.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskMaps.java index 5458113..c7a0c3b 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskMaps.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskMaps.java @@ -31,8 +31,8 @@ public class HighriskMaps implements Serializable { /** * 高危项定义资源表ID */ - @TableField(value="SOURCE_ID") - private String sourceId; + @TableField(value="CONF_ID") + private String confId; @TableField(value = "NAME") private String name; @@ -79,13 +79,13 @@ public class HighriskMaps implements Serializable { this.diagnoseId = diagnoseId; } - public String getSourceId() { - return sourceId; - } + public String getConfId() { + return confId; + } - public void setSourceId(String sourceId) { - this.sourceId = sourceId; - } + public void setConfId(String confId) { + this.confId = confId; + } public String getName() { return name; diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.java index f8b7afe..b80a3f1 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.java @@ -1,5 +1,6 @@ package com.lyms.hospital.dao.diagnose; +import com.lyms.base.common.entity.conf.DiagnoseConf; import com.lyms.base.common.entity.conf.HighriskConf; import com.lyms.hospital.entity.diagnose.DiagnoseInfo; import com.baomidou.mybatisplus.mapper.BaseMapper; @@ -20,5 +21,7 @@ public interface DiagnoseInfoMapper extends BaseMapper { public Integer deleteLogicById(Serializable id); public List getLastHighrisk(Serializable personId); + + public List getLastDiagnose(Serializable personId); } \ No newline at end of file diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml index f69c0e2..3aada17 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml @@ -94,15 +94,26 @@ + + diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java index c262c25..4462bfd 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java @@ -3,6 +3,7 @@ package com.lyms.hospital.service.diagnose; import java.io.Serializable; import java.util.List; +import com.lyms.base.common.entity.conf.DiagnoseConf; import com.lyms.base.common.entity.conf.HighriskConf; import com.lyms.hospital.entity.assist.DiagnoseAssit; import com.lyms.hospital.entity.diagnose.DiagnoseInfo; @@ -50,5 +51,16 @@ public interface DiagnoseInfoService extends BaseService { *
  • 修改时间： */ public List getLastHighrisk(Serializable personId); + + /** + *
  • @Description:根据居民ID获取末次诊断 + *
  • @param personId + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年5月8日 + *
  • 修改人： + *
  • 修改时间： + */ + public List getLastDiagnose(Serializable personId); } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java index 4b021d7..d191c61 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.base.common.entity.conf.DiagnoseConf; import com.lyms.base.common.entity.conf.HighriskConf; import com.lyms.hospital.dao.diagnose.DiagnoseInfoMapper; import com.lyms.hospital.entity.assist.DiagnoseAssit; @@ -152,4 +153,9 @@ public class DiagnoseInfoServiceImpl extends ServiceImpl getLastHighrisk(Serializable personId) { return baseMapper.getLastHighrisk(personId); } + + @Override + public List getLastDiagnose(Serializable personId) { + return baseMapper.getLastDiagnose(personId); + } } \ No newline at end of file diff --git a/parent/hospital.web/src/test/java/test/hospital/diagnose/DiagnoseMapsTest.java b/parent/hospital.web/src/test/java/test/hospital/diagnose/DiagnoseMapsTest.java index 5b743dd..16c97e1 100644 --- a/parent/hospital.web/src/test/java/test/hospital/diagnose/DiagnoseMapsTest.java +++ b/parent/hospital.web/src/test/java/test/hospital/diagnose/DiagnoseMapsTest.java @@ -36,7 +36,7 @@ public class DiagnoseMapsTest extends BaseServiceTest{ DiagnoseMaps entity = new DiagnoseMaps(); entity.setId(StrUtils.uuid()); entity.setDiagnoseId("1"); - entity.setSourceId("123"); + entity.setConfId("123"); diagnoseMapsService.insert(entity); } 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 558e0ed..a3a949e 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 @@ -31,7 +31,7 @@ public class HighriskMapsTest extends BaseServiceTest{ HighriskMaps entity = new HighriskMaps(); entity.setId(StrUtils.uuid()); entity.setDiagnoseId("1"); - entity.setSourceId("123"); + entity.setConfId("123"); highriskMapsService.insert(entity); } } -- 1.8.3.1