From 6a3593453905955850fc8f9364e21e80ba6de5d5 Mon Sep 17 00:00:00 2001 From: xm Date: Fri, 29 Oct 2021 10:06:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E7=9A=84bug?= =?UTF-8?q?=EF=BC=8C10/29?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/emr/dao/FinishedDateTimeMapper.java | 2 +- .../java/com/emr/entity/FinishedDateTime.java | 33 ++++++++++--------- .../java/com/emr/entity/OracleDateVo.java | 9 ++--- .../emr/service/FinishedDateTimeService.java | 2 +- .../ipml/FinishedDateTimeServiceImpl.java | 8 ++--- .../mapper/FinishedDateTimeMapperTest.xml | 2 +- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/emr/dao/FinishedDateTimeMapper.java b/src/main/java/com/emr/dao/FinishedDateTimeMapper.java index 1255462b..68436ba7 100644 --- a/src/main/java/com/emr/dao/FinishedDateTimeMapper.java +++ b/src/main/java/com/emr/dao/FinishedDateTimeMapper.java @@ -4,5 +4,5 @@ import com.emr.entity.FinishedDateTime; public interface FinishedDateTimeMapper { - FinishedDateTime findByID(Long INP_NO, Long VISIT_ID); + FinishedDateTime findByID(String INP_NO, String VISIT_ID); } diff --git a/src/main/java/com/emr/entity/FinishedDateTime.java b/src/main/java/com/emr/entity/FinishedDateTime.java index a8bf1380..3bb07af5 100644 --- a/src/main/java/com/emr/entity/FinishedDateTime.java +++ b/src/main/java/com/emr/entity/FinishedDateTime.java @@ -8,35 +8,36 @@ import java.util.Date; * 2021/9/28 加入护士完成时间 */ public class FinishedDateTime { - private Long INP_NO; - private Long VISIT_ID; - private Date FINISHED_DATE_TIME; - private Date MR_COMMIT_NURSE_DATE_TIME; - - public Date getMR_COMMIT_NURSE_DATE_TIME() { - return MR_COMMIT_NURSE_DATE_TIME; - } + private String INP_NO; - public void setMR_COMMIT_NURSE_DATE_TIME(Date MR_COMMIT_NURSE_DATE_TIME) { - this.MR_COMMIT_NURSE_DATE_TIME = MR_COMMIT_NURSE_DATE_TIME; - } - - public Long getINP_NO() { + public String getINP_NO() { return INP_NO; } - public void setINP_NO(Long INP_NO) { + public void setINP_NO(String INP_NO) { this.INP_NO = INP_NO; } - public Long getVISIT_ID() { + public String getVISIT_ID() { return VISIT_ID; } - public void setVISIT_ID(Long VISIT_ID) { + public void setVISIT_ID(String VISIT_ID) { this.VISIT_ID = VISIT_ID; } + private String VISIT_ID; + private Date FINISHED_DATE_TIME; + private Date MR_COMMIT_NURSE_DATE_TIME; + + public Date getMR_COMMIT_NURSE_DATE_TIME() { + return MR_COMMIT_NURSE_DATE_TIME; + } + + public void setMR_COMMIT_NURSE_DATE_TIME(Date MR_COMMIT_NURSE_DATE_TIME) { + this.MR_COMMIT_NURSE_DATE_TIME = MR_COMMIT_NURSE_DATE_TIME; + } + public Date getFINISHED_DATE_TIME() { return FINISHED_DATE_TIME; } diff --git a/src/main/java/com/emr/entity/OracleDateVo.java b/src/main/java/com/emr/entity/OracleDateVo.java index 6e0bdc07..1db13f51 100644 --- a/src/main/java/com/emr/entity/OracleDateVo.java +++ b/src/main/java/com/emr/entity/OracleDateVo.java @@ -1,15 +1,11 @@ package com.emr.entity; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; import java.util.Date; @Component public class OracleDateVo { - private Date finishedDateTime; - private Date mrCommitNurseDateTime; public Date getFinishedDateTime() { return finishedDateTime; } @@ -25,4 +21,9 @@ public class OracleDateVo { public void setMrCommitNurseDateTime(Date mrCommitNurseDateTime) { this.mrCommitNurseDateTime = mrCommitNurseDateTime; } + + + private Date finishedDateTime; + private Date mrCommitNurseDateTime; + } diff --git a/src/main/java/com/emr/service/FinishedDateTimeService.java b/src/main/java/com/emr/service/FinishedDateTimeService.java index 93f9ffb7..b8e6f088 100644 --- a/src/main/java/com/emr/service/FinishedDateTimeService.java +++ b/src/main/java/com/emr/service/FinishedDateTimeService.java @@ -6,5 +6,5 @@ import java.io.IOException; import java.util.Date; public interface FinishedDateTimeService { - OracleDateVo findByID(Long INP_NO, Long VISIT_ID) throws IOException; + OracleDateVo findByID(String INP_NO, String VISIT_ID) throws IOException; } diff --git a/src/main/java/com/emr/service/ipml/FinishedDateTimeServiceImpl.java b/src/main/java/com/emr/service/ipml/FinishedDateTimeServiceImpl.java index efa2da9c..215a2aac 100644 --- a/src/main/java/com/emr/service/ipml/FinishedDateTimeServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/FinishedDateTimeServiceImpl.java @@ -1,5 +1,6 @@ package com.emr.service.ipml; + import com.emr.dao.FinishedDateTimeMapper; import com.emr.entity.FinishedDateTime; import com.emr.entity.OracleDateVo; @@ -13,7 +14,6 @@ import org.springframework.stereotype.Service; import java.io.IOException; import java.io.Reader; -import java.util.Date; /** * oracle数据获取 @@ -30,11 +30,8 @@ public class FinishedDateTimeServiceImpl implements FinishedDateTimeService { * 返回为oracleDateVo对象，使用时请@Autowired注入，然后调用方法获取即可 * */ - @Autowired - OracleDateVo oracleDateVo; - @Override - public OracleDateVo findByID(Long INP_NO, Long VISIT_ID) throws IOException { + public OracleDateVo findByID(String INP_NO, String VISIT_ID) throws IOException { //加载资源 String resource = "config/mybatis-config.xml"; Reader reader = Resources.getResourceAsReader(resource); @@ -45,6 +42,7 @@ public class FinishedDateTimeServiceImpl implements FinishedDateTimeService { FinishedDateTimeMapper mapper = session.getMapper(FinishedDateTimeMapper.class); FinishedDateTime result = mapper.findByID(INP_NO, VISIT_ID); if (result != null) { + OracleDateVo oracleDateVo = new OracleDateVo(); oracleDateVo.setFinishedDateTime(result.getFINISHED_DATE_TIME()); oracleDateVo.setMrCommitNurseDateTime(result.getMR_COMMIT_NURSE_DATE_TIME()); return oracleDateVo; diff --git a/src/main/resources/mapper/FinishedDateTimeMapperTest.xml b/src/main/resources/mapper/FinishedDateTimeMapperTest.xml index 9836d097..cc59a0be 100644 --- a/src/main/resources/mapper/FinishedDateTimeMapperTest.xml +++ b/src/main/resources/mapper/FinishedDateTimeMapperTest.xml @@ -9,7 +9,7 @@ - select finished_date_time,mr_commit_nurse_date_time from jhemr.v_doctor_pdf2 where inp_no= #{param1} and visit_id =#{param2} and rownum = 1 \ No newline at end of file