Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseApplicationReportHelper.java =================================================================== diff -u -r37400 -r37419 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseApplicationReportHelper.java (.../ForeignTousseApplicationReportHelper.java) (revision 37400) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseApplicationReportHelper.java (.../ForeignTousseApplicationReportHelper.java) (revision 37419) @@ -494,9 +494,6 @@ vo.setReturnTimeStr(dateFormatYMDHM.format(returnTime)); } } - if(queryIsUrgent){ - vo.setIsUrgent(StringTools.defaultIfBlank(rs.getString("isUrgent"),"")); - } if(queryDoctorAccountDepart){ vo.setDoctorAccountDepart(StringTools.defaultIfBlank(rs.getString("doctorAccountDepart"),"")); } @@ -584,6 +581,9 @@ if(queryWeight){ tousseItemVO.setWeight(rs.getDouble("weight")); } + if(queryIsUrgent){ + tousseItemVO.setIsUrgent(StringTools.defaultIfBlank(rs.getString("isUrgent"),"")); + } tousseItemVO.setInvoiceSendTimeStr(invoiceSendTimeStr); String tiDoctorName = rs.getString("tiDoctorName"); if(StringUtils.isBlank(tiDoctorName) && StringUtils.isNotBlank(vo.getDoctor())){ Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js =================================================================== diff -u -r37399 -r37419 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js (.../foreignTousseApplicationReport.js) (revision 37399) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js (.../foreignTousseApplicationReport.js) (revision 37419) @@ -262,6 +262,7 @@ var receiveTimeStr = (data[i].receiveTimeStr == null) ? '' : data[i].receiveTimeStr; var recyclingTimeStr = (data[i].recyclingTimeStr == null) ? '' : data[i].recyclingTimeStr; var tiDoctorName = tousseItems[j].tiDoctorName || ''; + var tiIsUrgent = tousseItems[j].isUrgent || ''; if (j == 0) { html += ''; html += getBodyTd(data[i].applicationTimeStr, tousseItems.length, 1); @@ -284,7 +285,7 @@ html += getBodyTd(data[i].bedNumber, tousseItems.length, 1); html += getBodyTd(itemName, 1, 1, '#EAFFFF'); if (queryIsUrgent) { - html += getBodyTd(data[i].isUrgent, 1, 1, '#EAFFFF'); + html += getBodyTd(tiIsUrgent, 1, 1, '#EAFFFF'); } if (sstsConfig.enableShowForeignTousseApplicationReportMaterials) { html += getBodyTd(materialDetails, 1, 1, '#EAFFFF'); @@ -330,7 +331,7 @@ html += ''; html += getBodyTd(itemName, 1, 1, '#EAFFFF'); if (queryIsUrgent) { - html += getBodyTd(data[i].isUrgent, 1, 1, '#EAFFFF'); + html += getBodyTd(tiIsUrgent, 1, 1, '#EAFFFF'); } if (sstsConfig.enableShowForeignTousseApplicationReportMaterials) { html += getBodyTd(materialDetails, 1, 1, '#EAFFFF'); @@ -415,8 +416,9 @@ html += getBodyTd(data[i].patient, 1, 1); html += getBodyTd(data[i].bedNumber, 1, 1); html += getBodyTd(itemName, 1, 1, '#EAFFFF'); + var tiIsUrgent = tousseItems[0].isUrgent || ''; if (queryIsUrgent) { - html += getBodyTd(data[i].isUrgent, 1, 1, '#EAFFFF'); + html += getBodyTd(tiIsUrgent, 1, 1, '#EAFFFF'); } if (sstsConfig.enableShowForeignTousseApplicationReportMaterials) { html += getBodyTd(materialDetails, 1, 1, '#EAFFFF');