Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r15509 -r15558 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 15509) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 15558) @@ -1497,8 +1497,8 @@ JSONObject jsonObj = invoiceManager.isRoutine(barcode); //判断是否常规发货(cjr) String noBiologicalMonitoringForeignTousse = jsonObj.optString("noBiologicalMonitoringForeignTousses"); String unconventionalForeignTousse = jsonObj.optString("unconventionalForeignTousses"); - if (StringTools.isBlank(noBiologicalMonitoringForeignTousse)) { //此外来器械包做了生物监测(或者不是外来器械包,不用做生物监测的) - vo.setNoBiologicalMonitoring(false); + if (!StringTools.isBlank(noBiologicalMonitoringForeignTousse)) { //此外来器械包没做生物监测 + vo.setNoBiologicalMonitoring(true); } if (!StringTools.isBlank(unconventionalForeignTousse)) { //此外来器械包做了生物监测,但是没结束就要发货了 vo.setIsRoutine(TousseInstance.ROUTINE_NO); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java =================================================================== diff -u -r15509 -r15558 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java (.../InvoiceGoodsVo.java) (revision 15509) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java (.../InvoiceGoodsVo.java) (revision 15558) @@ -57,7 +57,7 @@ public static final boolean VALIDATE_PASS_FALSE = false; private String isRoutine =TousseInstance.ROUTINE_YES; //是否常规发货,默认是常规发货(这里的不常规指的是:正在做"生物监测"时就把这个器械包发货了) - private Boolean noBiologicalMonitoring = true; //没有做生物监测,默认是没做(目前只针对外来器械包) + private Boolean noBiologicalMonitoring = false; //没有做生物监测,默认是做了(目前只针对外来器械包) public Long getId() {