Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslgzxyy/TousseInstancePushDaoImpl.java =================================================================== diff -u -r37723 -r37725 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslgzxyy/TousseInstancePushDaoImpl.java (.../TousseInstancePushDaoImpl.java) (revision 37723) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslgzxyy/TousseInstancePushDaoImpl.java (.../TousseInstancePushDaoImpl.java) (revision 37725) @@ -404,28 +404,10 @@ execDeptCode, execDeptName, execTime); tiDisinSupplyStatus.add(disinSupplyStatus); - //效果监测 - pointCode = "disinsupply_check"; - execId = buildTousseInstanceExecIdByPointCode(ti, pointCode , bussId); - orgCode = ti.getOrgUnitCoding(); - cycleIndexId = ti.getId(); - pointName = pointCodePointNameMap.get(pointCode); - execUserCode = sterilizationOperatorCode; - execUserName = sterilizationOperatorName; - execDeptCode = orgUnitCode; - execDeptName = orgUnitName; - execTime = sterilizationEndTimeStr; - disinSupplyStatus = buildDisinSupplyStatus(execId, orgCode, - bussId, cycleIndexId, - pointCode, pointName, - execUserCode, execUserName, - execDeptCode, execDeptName, execTime); - tiDisinSupplyStatus.add(disinSupplyStatus); - //生物监测 - String biologicalMonitoringStatus = sterilizationRecord.getBiologicalMonitoringStatus(); - if(StringUtils.equals(biologicalMonitoringStatus, SterilizationRecord.MONITOR_RESULT_QUALIFIED) - || StringUtils.equals(biologicalMonitoringStatus, SterilizationRecord.MONITOR_RESULT_UNQUALIFIED)){ + String biologyResult = sterilizationRecord.getBiologyResult(); + if(StringUtils.equals(biologyResult, SterilizationRecord.MONITOR_RESULT_QUALIFIED) + || StringUtils.equals(biologyResult, SterilizationRecord.MONITOR_RESULT_UNQUALIFIED)){ String monitorUserName = sterilizationRecord.getMonitorUser(); String monitorUserCode = searchUserCode(monitorUserName, orgUnitCode); pointCode = "disinsupply_biomonitoring"; @@ -438,7 +420,7 @@ execDeptCode = orgUnitCode; execDeptName = orgUnitName; execTime = sterilizationEndTimeStr; - String execStatus = returnExecStatus(biologicalMonitoringStatus); + String execStatus = returnExecStatus(biologyResult); disinSupplyStatus = buildDisinSupplyStatus(execId, orgCode, bussId, cycleIndexId, pointCode, pointName, @@ -469,6 +451,24 @@ execUserCode, execUserName, execDeptCode, execDeptName, execTime, execStatus); tiDisinSupplyStatus.add(disinSupplyStatus); + + //效果监测 + pointCode = "disinsupply_check"; + execId = buildTousseInstanceExecIdByPointCode(ti, pointCode , bussId); + orgCode = ti.getOrgUnitCoding(); + cycleIndexId = ti.getId(); + pointName = pointCodePointNameMap.get(pointCode); + execUserCode = sterilizationOperatorCode; + execUserName = sterilizationOperatorName; + execDeptCode = orgUnitCode; + execDeptName = orgUnitName; + execTime = sterilizationEndTimeStr; + disinSupplyStatus = buildDisinSupplyStatus(execId, orgCode, + bussId, cycleIndexId, + pointCode, pointName, + execUserCode, execUserName, + execDeptCode, execDeptName, execTime, execStatus); + tiDisinSupplyStatus.add(disinSupplyStatus); }