Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslgzxyy/TousseInstancePushDaoImpl.java =================================================================== diff -u -r37763 -r37781 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslgzxyy/TousseInstancePushDaoImpl.java (.../TousseInstancePushDaoImpl.java) (revision 37763) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslgzxyy/TousseInstancePushDaoImpl.java (.../TousseInstancePushDaoImpl.java) (revision 37781) @@ -364,11 +364,11 @@ } String sterilizationOperatorName = sterilizationRecord.getSterilizationUser(); String sterilizationOperatorCode = searchUserCode(sterilizationOperatorName, orgUnitCode); - String sterilizationBeginTimeStr = ForgonDateUtils.safelyFormatDate(sterilizationRecord.getStartDate(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, ""); + //String sterilizationBeginTimeStr = ForgonDateUtils.safelyFormatDate(sterilizationRecord.getStartDate(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, ""); String sterilizationEndTimeStr = ForgonDateUtils.safelyFormatDate(sterilizationRecord.getEndDate(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, ""); //灭菌开始 - Long bussId = sterilizationRecord.getId(); + /*Long bussId = sterilizationRecord.getId(); String pointCode = "disinsupply_begin"; String execId = buildTousseInstanceExecIdByPointCode(ti, pointCode , bussId); String orgCode = ti.getOrgUnitCoding(); @@ -402,6 +402,25 @@ pointCode, pointName, execUserCode, execUserName, execDeptCode, execDeptName, execTime); + tiDisinSupplyStatus.add(disinSupplyStatus);*/ + + //灭菌 + Long bussId = sterilizationRecord.getId(); + String pointCode = "disinsupply_disinfect"; + String execId = buildTousseInstanceExecIdByPointCode(ti, pointCode , bussId); + String orgCode = ti.getOrgUnitCoding(); + Long cycleIndexId = ti.getId(); + String pointName = pointCodePointNameMap.get(pointCode); + String execUserCode = sterilizationOperatorCode; + String execUserName = sterilizationOperatorName; + String execDeptCode = orgUnitCode; + String execDeptName = orgUnitName; + String execTime = sterilizationEndTimeStr; + String disinSupplyStatus = buildDisinSupplyStatus(execId, orgCode, + ti.getId(), cycleIndexId, + pointCode, pointName, + execUserCode, execUserName, + execDeptCode, execDeptName, execTime); tiDisinSupplyStatus.add(disinSupplyStatus); //生物监测