Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslgzxyy/TousseInstancePushDaoImpl.java =================================================================== diff -u -r37725 -r37763 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslgzxyy/TousseInstancePushDaoImpl.java (.../TousseInstancePushDaoImpl.java) (revision 37725) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslgzxyy/TousseInstancePushDaoImpl.java (.../TousseInstancePushDaoImpl.java) (revision 37763) @@ -264,7 +264,7 @@ String execDeptName = departName; String execTime = signDate; String disinSupplyStatus = buildDisinSupplyStatus(execId, orgCode, - bussId, cycleIndexId, + ti.getId(), cycleIndexId, pointCode, pointName, execUserCode, execUserName, execDeptCode, execDeptName, execTime); @@ -305,7 +305,7 @@ String execDeptName = ti.getOrgUnitName(); String execTime = delivertDateTime; String disinSupplyStatus = buildDisinSupplyStatus(execId, orgCode, - bussId, cycleIndexId, + ti.getId(), cycleIndexId, pointCode, pointName, execUserCode, execUserName, execDeptCode, execDeptName, execTime); @@ -334,7 +334,7 @@ String execDeptName = ti.getOrgUnitName(); String execTime = delivertDateTime; String disinSupplyStatus = buildDisinSupplyStatus(execId, orgCode, - bussId, cycleIndexId, + ti.getId(), cycleIndexId, pointCode, pointName, execUserCode, execUserName, execDeptCode, execDeptName, execTime); @@ -380,7 +380,7 @@ String execDeptName = orgUnitName; String execTime = sterilizationBeginTimeStr; String disinSupplyStatus = buildDisinSupplyStatus(execId, orgCode, - bussId, cycleIndexId, + ti.getId(), cycleIndexId, pointCode, pointName, execUserCode, execUserName, execDeptCode, execDeptName, execTime); @@ -398,7 +398,7 @@ execDeptName = orgUnitName; execTime = sterilizationEndTimeStr; disinSupplyStatus = buildDisinSupplyStatus(execId, orgCode, - bussId, cycleIndexId, + ti.getId(), cycleIndexId, pointCode, pointName, execUserCode, execUserName, execDeptCode, execDeptName, execTime); @@ -422,7 +422,7 @@ execTime = sterilizationEndTimeStr; String execStatus = returnExecStatus(biologyResult); disinSupplyStatus = buildDisinSupplyStatus(execId, orgCode, - bussId, cycleIndexId, + ti.getId(), cycleIndexId, pointCode, pointName, execUserCode, execUserName, execDeptCode, execDeptName, execTime, execStatus); @@ -446,7 +446,7 @@ execTime = sterilizationEndTimeStr; String execStatus = returnExecStatus(physicsResult); disinSupplyStatus = buildDisinSupplyStatus(execId, orgCode, - bussId, cycleIndexId, + ti.getId(), cycleIndexId, pointCode, pointName, execUserCode, execUserName, execDeptCode, execDeptName, execTime, execStatus); @@ -464,7 +464,7 @@ execDeptName = orgUnitName; execTime = sterilizationEndTimeStr; disinSupplyStatus = buildDisinSupplyStatus(execId, orgCode, - bussId, cycleIndexId, + ti.getId(), cycleIndexId, pointCode, pointName, execUserCode, execUserName, execDeptCode, execDeptName, execTime, execStatus); @@ -488,7 +488,7 @@ execTime = sterilizationEndTimeStr; String execStatus = returnExecStatus(chemistryResult); disinSupplyStatus = buildDisinSupplyStatus(execId, orgCode, - bussId, cycleIndexId, + ti.getId(), cycleIndexId, pointCode, pointName, execUserCode, execUserName, execDeptCode, execDeptName, execTime, execStatus); @@ -529,7 +529,7 @@ String execDeptName = ti.getOrgUnitName(); String execTime = ForgonDateUtils.safelyFormatDate(ti.getReviewTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, ""); String disinSupplyStatus = buildDisinSupplyStatus(execId, orgCode, - bussId, cycleIndexId, + ti.getId(), cycleIndexId, pointCode, pointName, execUserCode, execUserName, execDeptCode, execDeptName, execTime); @@ -559,7 +559,7 @@ String execDeptName = ti.getOrgUnitName(); String execTime = ForgonDateUtils.safelyFormatDate(ti.getOperationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, ""); String disinSupplyStatus = buildDisinSupplyStatus(execId, orgCode, - bussId, cycleIndexId, + ti.getId(), cycleIndexId, pointCode, pointName, execUserCode, execUserName, execDeptCode, execDeptName, execTime); @@ -608,7 +608,7 @@ String execDeptName = ti.getOrgUnitName(); String execTime = washAndDisinfectRecord.getEndDateStr(); String disinSupplyStatus = buildDisinSupplyStatus(execId, orgCode, - bussId, cycleIndexId, + ti.getId(), cycleIndexId, pointCode, pointName, execUserCode, execUserName, execDeptCode, execDeptName, execTime); @@ -637,7 +637,7 @@ Long bussId = ti.getRecyclingRecordId(); String execId = buildTousseInstanceExecIdByPointCode(ti, pointCode, bussId); String disinSupplyStatus = buildDisinSupplyStatus(execId, ti.getOrgUnitCoding(), - ti.getRecyclingRecordId(), ti.getId(), + ti.getId(), ti.getId(), pointCode, pointCodePointNameMap.get(pointCode), recycleOperatorCode, recycleOperatorName, ti.getOrgUnitCoding(), ti.getOrgUnitName(),