diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index 0cf0f5a..1e33ca3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -87,8 +87,6 @@
         resMap.put("binName",pgDevice == null ? coorName:coorName.substring(coorName.indexOf("号分区")+3,coorName.indexOf("K")));
 
         resultMap.put("msg","success");
-//        resultMap.put("result",pgTagPosition);
-//        resultMap.put("result",new PGPositionDto(pgTagPosition));
         resultMap.put("result",resMap);
         return resultMap;
     }
@@ -109,13 +107,9 @@
 
         Map<Object,Object> mapPosition = new HashMap<>();
         if(pgInPgStatus.getOutTime() == null)
-            mapPosition = pgTagPositionManager.getHisByHostIdView(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId());
+            mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId());
         else
             mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId());
-//        if(pgInPgStatus.getOutTime() == null)
-//            mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId());
-//        else
-//            mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId());
 
         JSONObject jsonObject = JSONObject.fromObject(pgTagMac);
         jsonObject.remove("id");

diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index 0cf0f5a..1e33ca3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -87,8 +87,6 @@
         resMap.put("binName",pgDevice == null ? coorName:coorName.substring(coorName.indexOf("号分区")+3,coorName.indexOf("K")));
 
         resultMap.put("msg","success");
-//        resultMap.put("result",pgTagPosition);
-//        resultMap.put("result",new PGPositionDto(pgTagPosition));
         resultMap.put("result",resMap);
         return resultMap;
     }
@@ -109,13 +107,9 @@
 
         Map<Object,Object> mapPosition = new HashMap<>();
         if(pgInPgStatus.getOutTime() == null)
-            mapPosition = pgTagPositionManager.getHisByHostIdView(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId());
+            mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId());
         else
             mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId());
-//        if(pgInPgStatus.getOutTime() == null)
-//            mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId());
-//        else
-//            mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId());
 
         JSONObject jsonObject = JSONObject.fromObject(pgTagMac);
         jsonObject.remove("id");
diff --git "a/\345\205\245\345\273\212\345\234\250\345\273\212\344\272\272\345\221\230\345\256\232\344\275\21520190916.docx" "b/\345\205\245\345\273\212\345\234\250\345\273\212\344\272\272\345\221\230\345\256\232\344\275\21520190916.docx"
new file mode 100644
index 0000000..c024fdb
--- /dev/null
+++ "b/\345\205\245\345\273\212\345\234\250\345\273\212\344\272\272\345\221\230\345\256\232\344\275\21520190916.docx"
Binary files differ