Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/spring/his.xml
===================================================================
diff -u -r39172 -r39182
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/spring/his.xml (.../his.xml) (revision 39172)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/spring/his.xml (.../his.xml) (revision 39182)
@@ -132,23 +132,13 @@
-
-
-
-
-
-
-
-
@@ -168,14 +158,10 @@
-
-
-
-
-
+
Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
===================================================================
diff -u -r39122 -r39182
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java (.../UseRecordManager.java) (revision 39122)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java (.../UseRecordManager.java) (revision 39182)
@@ -12,6 +12,7 @@
import net.sf.json.JSONObject;
import com.forgon.directory.model.OrgUnit;
+import com.forgon.disinfectsystem.datasynchronization.model.OperationInfoVo;
import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
import com.forgon.disinfectsystem.entity.useRecord.UseDiposableGoodsItem;
@@ -502,4 +503,11 @@
* @param removeCause 移除原因
*/
public void removeUseRecordTousseInstance(Long tousseInstanceId, boolean deleteEmptyUseRecord, String removeCause);
+
+ /**
+ * “病人出室通知”ZSYY-395
+ * @param minuteInterval
+ * @return
+ */
+ public List patientDischargeNotification(Long minuteInterval);
}
Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/FindPatientSurgicalStatusDao.java
===================================================================
diff -u -r39122 -r39182
--- ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/FindPatientSurgicalStatusDao.java (.../FindPatientSurgicalStatusDao.java) (revision 39122)
+++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/FindPatientSurgicalStatusDao.java (.../FindPatientSurgicalStatusDao.java) (revision 39182)
@@ -1,5 +1,6 @@
package com.forgon.disinfectsystem.datasynchronization.dao;
+import java.util.Date;
import java.util.List;
import org.apache.ibatis.annotations.Param;
@@ -27,5 +28,15 @@
public default List findPatientOperationInfoByHospitalNumber(@Param("hospitalNumber") String hospitalNumber){
return null;
}
+
+ /**
+ * 按时间,查找"病人出室信息"
+ * @param startDate
+ * @param endDate
+ * @return
+ */
+ public default List findPatientOperationInfoByTimes(@Param("startDate") Date startDate, @Param("endDate") Date endDate){
+ return null;
+ }
}
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/interfaces/mybatis/FindPatientSurgicalStatusMapper.xml
===================================================================
diff -u -r39172 -r39182
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/interfaces/mybatis/FindPatientSurgicalStatusMapper.xml (.../FindPatientSurgicalStatusMapper.xml) (revision 39172)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/interfaces/mybatis/FindPatientSurgicalStatusMapper.xml (.../FindPatientSurgicalStatusMapper.xml) (revision 39182)
@@ -23,7 +23,7 @@