diff --git a/src/main/java/com/emr/entity/FinishedDateTime.java b/src/main/java/com/emr/entity/FinishedDateTime.java
index b8b08aaf..a8bf1380 100644
--- a/src/main/java/com/emr/entity/FinishedDateTime.java
+++ b/src/main/java/com/emr/entity/FinishedDateTime.java
@@ -4,12 +4,22 @@ import java.util.Date;
 
 /**
  * oracle,数据交互实体类
- * INP_NO，Long VISIT_ID，这两个属性为预留，现在并没有使用
+ * INP_NO，Long VISIT_ID，这两个属性为预留，并没有使用
+ * 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;
+    }
+
+    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() {
         return INP_NO;
diff --git a/src/main/java/com/emr/entity/OracleDateVo.java b/src/main/java/com/emr/entity/OracleDateVo.java
new file mode 100644
index 00000000..6e0bdc07
--- /dev/null
+++ b/src/main/java/com/emr/entity/OracleDateVo.java
@@ -0,0 +1,28 @@
+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;
+    }
+
+    public void setFinishedDateTime(Date finishedDateTime) {
+        this.finishedDateTime = finishedDateTime;
+    }
+
+    public Date getMrCommitNurseDateTime() {
+        return mrCommitNurseDateTime;
+    }
+
+    public void setMrCommitNurseDateTime(Date mrCommitNurseDateTime) {
+        this.mrCommitNurseDateTime = mrCommitNurseDateTime;
+    }
+}
diff --git a/src/main/java/com/emr/service/FinishedDateTimeService.java b/src/main/java/com/emr/service/FinishedDateTimeService.java
index c3d999f3..93f9ffb7 100644
--- a/src/main/java/com/emr/service/FinishedDateTimeService.java
+++ b/src/main/java/com/emr/service/FinishedDateTimeService.java
@@ -1,8 +1,10 @@
 package com.emr.service;
 
+import com.emr.entity.OracleDateVo;
+
 import java.io.IOException;
 import java.util.Date;
 
 public interface  FinishedDateTimeService {
-     Date findByID(Long INP_NO, Long VISIT_ID) throws IOException;
+     OracleDateVo findByID(Long INP_NO, Long 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 95385651..efa2da9c 100644
--- a/src/main/java/com/emr/service/ipml/FinishedDateTimeServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/FinishedDateTimeServiceImpl.java
@@ -2,11 +2,13 @@ package com.emr.service.ipml;
 
 import com.emr.dao.FinishedDateTimeMapper;
 import com.emr.entity.FinishedDateTime;
+import com.emr.entity.OracleDateVo;
 import com.emr.service.FinishedDateTimeService;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
@@ -20,14 +22,19 @@ import java.util.Date;
 public class FinishedDateTimeServiceImpl implements FinishedDateTimeService {
     /**
      * 实际查询方法
-     *
+     *2021/9/28
      * @param INP_NO   编号
      * @param VISIT_ID 住院次数
-     * @return 最后完成时间
-     * @throws IOException 注意传入两个参数都是Long，返回一条date类型数据或null，可用tostring()转
+     * @return 最后完成时间及护士完成时间
+     * @throws IOException 注意传入两个参数都是Long，项目需求变更，重新修改获取数据及返回数据，
+     * 返回为oracleDateVo对象，使用时请@Autowired注入，然后调用方法获取即可
+     *
      */
+    @Autowired
+    OracleDateVo oracleDateVo;
+
     @Override
-    public Date findByID(Long INP_NO, Long VISIT_ID) throws IOException {
+    public OracleDateVo findByID(Long INP_NO, Long VISIT_ID) throws IOException {
         //加载资源
         String resource = "config/mybatis-config.xml";
         Reader reader = Resources.getResourceAsReader(resource);
@@ -38,8 +45,9 @@ public class FinishedDateTimeServiceImpl implements FinishedDateTimeService {
         FinishedDateTimeMapper mapper = session.getMapper(FinishedDateTimeMapper.class);
         FinishedDateTime result = mapper.findByID(INP_NO, VISIT_ID);
         if (result != null) {
-            Date dateTime = result.getFINISHED_DATE_TIME();
-            return dateTime;
+            oracleDateVo.setFinishedDateTime(result.getFINISHED_DATE_TIME());
+            oracleDateVo.setMrCommitNurseDateTime(result.getMR_COMMIT_NURSE_DATE_TIME());
+            return oracleDateVo;
         }
         return null;
     }
diff --git a/src/main/resources/mapper/FinishedDateTimeMapper.xml b/src/main/resources/mapper/FinishedDateTimeMapper.xml
index 2b28a2a6..9836d097 100644
--- a/src/main/resources/mapper/FinishedDateTimeMapper.xml
+++ b/src/main/resources/mapper/FinishedDateTimeMapper.xml
@@ -6,9 +6,10 @@
         <result column="INP_NO" property="INP_NO" jdbcType="VARCHAR"/>
         <result column="VISIT_ID" property="VISIT_ID" jdbcType="VARCHAR"/>
         <result column="FINISHED_DATE_TIME" property="FINISHED_DATE_TIME" jdbcType="DATE"/>
+        <result column="MR_COMMIT_NURSE_DATE_TIME" property="MR_COMMIT_NURSE_DATE_TIME" jdbcType="DATE"/>
     </resultMap>
 <!--oracleL里没有limit功能，用rownum限制结果数量，只查询一条-->
     <select id="findByID" parameterType="long" resultMap="BaseResultMap">
-select finished_date_time from jhemr.v_doctor_pdf2 where inp_no= #{param1} and visit_id =#{param2} and rownum = 1
+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
     </select>
 </mapper>
\ No newline at end of file