Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r17981 -r17991 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 17981) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 17991) @@ -3015,11 +3015,13 @@ if(StringUtils.isNotBlank(patientInfo.getWashHandNurse())){ useRecord.setWashHandNurse(patientInfo.getWashHandNurse()); } - + //病区 + if(StringUtils.isNotBlank(patientInfo.getPatientArea())){ + useRecord.setPatientArea(patientInfo.getPatientArea()); + } /*以下三个属性useRecord中没有对应字段设置*/ /*String ascriptionDepartment = patientInfo.getAscriptionDepartment(); - String operationTime = patientInfo.getOperationTime(); - String patientArea = patientInfo.getPatientArea();*/ + String operationTime = patientInfo.getOperationTime();*/ } /** Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r17981 -r17991 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 17981) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 17991) @@ -1415,6 +1415,7 @@ editUseRecord.setOperationRoom(newUseRecord.getOperationRoom()); editUseRecord.setWashHandNurse(newUseRecord.getWashHandNurse()); editUseRecord.setCircuitNurse(newUseRecord.getCircuitNurse()); + editUseRecord.setPatientArea(newUseRecord.getPatientArea()); } } Map actualUsedMap = new HashMap(); Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordToJson.java =================================================================== diff -u -r17972 -r17991 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordToJson.java (.../UseRecordToJson.java) (revision 17972) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordToJson.java (.../UseRecordToJson.java) (revision 17991) @@ -1,6 +1,5 @@ package com.forgon.disinfectsystem.useRecord.service; -import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -47,7 +46,7 @@ public boolean apply(Object source, String name, Object value) { List inCludesList = Arrays.asList(new String[] { "id", "treatmentNum", "hospitalNum", "patientName", "patientIDCard", - "patientAge", "doctorName", "operation", "editable","operationRoom","circuitNurse","washHandNurse"}); + "patientAge", "doctorName", "operation", "editable","operationRoom","circuitNurse","washHandNurse","patientArea"}); if (inCludesList.contains(name)) { return false; }