Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r26128 -r26285 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 26128) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 26285) @@ -9950,11 +9950,11 @@ JsonObject obj = new JsonObject(); - obj.addProperty("name", tousseName); + obj.addProperty("name", Objects.toString(tousseName, "")); obj.addProperty("barcode", barcode); obj.addProperty("biologicalMonitoringEndDate", Objects.toString(biologicalMonitoringEndDate, "")); obj.addProperty("endDate", Objects.toString(endDate, "")); - obj.addProperty("biologyResult", biologyResult); + obj.addProperty("biologyResult", Objects.toString(biologyResult, "")); obj.addProperty("biologicalMonitoringTime", Objects.toString(biologicalMonitoringTime, "")); obj.addProperty("lagTime", Objects.toString(lagTime, "")); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/BiologicalMonitoringSituationTest.java =================================================================== diff -u -r26085 -r26285 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/BiologicalMonitoringSituationTest.java (.../BiologicalMonitoringSituationTest.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/BiologicalMonitoringSituationTest.java (.../BiologicalMonitoringSituationTest.java) (revision 26285) @@ -160,7 +160,7 @@ resultObj = toussesArray.get(0).getAsJsonObject(); assertTrue(resultObj.has("errorMsg")); - assertEquals("[Test开胸包]生物监测结果为不合格,不能发货", resultObj.get("errorMsg").getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开胸包]生物监测结果为不合格,不能发货", resultObj.get("errorMsg").getAsString()); sr1.setBiologicalMonitoringEndDate(ForgonDateUtils.safelyParseDate("3017-01-01 00:00:00")); @@ -169,7 +169,7 @@ invoiceManager.updateBiologicalMonitoringInfo(toussesArray); assertTrue(resultObj.has("errorMsg")); - assertEquals("[Test开胸包]生物监测结果为不合格,不能发货", resultObj.get("errorMsg").getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开胸包]生物监测结果为不合格,不能发货", resultObj.get("errorMsg").getAsString()); @@ -204,7 +204,7 @@ JsonArray asJsonArray = resultObj.get("confirmMsgs").getAsJsonArray(); assertEquals(1, asJsonArray.size()); - assertEquals("[Test开胸包]正在做生物监测,需要紧急发货吗?", asJsonArray.get(0).getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开胸包]正在做生物监测,需要紧急发货吗?", asJsonArray.get(0).getAsString()); /** @@ -222,7 +222,7 @@ asJsonArray = resultObj.get("confirmMsgs").getAsJsonArray(); assertEquals(1, asJsonArray.size()); - assertEquals("[Test开胸包]生物监测结果为无,确定要发货吗?", asJsonArray.get(0).getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开胸包]生物监测结果为无,确定要发货吗?", asJsonArray.get(0).getAsString()); /** * Test开胸包(包含植入物) && 生物监测结果为“无” && 填了生物监测结束时间 && 发货时间小于生物监测结束时间(即:紧急发货 ) * 返回值:{"条码":{"noBiologicalMonitoring":"","biologicalMonitoringNoResult":"条码","biologicalMonitoringFail":"","urgentDelivery":"条码"}} @@ -239,7 +239,7 @@ asJsonArray = resultObj.get("confirmMsgs").getAsJsonArray(); assertEquals(1, asJsonArray.size()); - assertEquals("[Test开胸包]正在做生物监测,需要紧急发货吗?", asJsonArray.get(0).getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开胸包]正在做生物监测,需要紧急发货吗?", asJsonArray.get(0).getAsString()); @@ -261,7 +261,7 @@ asJsonArray = resultObj.get("confirmMsgs").getAsJsonArray(); assertEquals(1, asJsonArray.size()); - assertEquals("[Test开胸包]生物监测结果为无,确定要发货吗?", asJsonArray.get(0).getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开胸包]生物监测结果为无,确定要发货吗?", asJsonArray.get(0).getAsString()); /** @@ -283,7 +283,7 @@ asJsonArray = resultObj.get("confirmMsgs").getAsJsonArray(); assertEquals(1, asJsonArray.size()); - assertEquals("[Test开胸包]生物监测结果为无,确定要发货吗?", asJsonArray.get(0).getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开胸包]生物监测结果为无,确定要发货吗?", asJsonArray.get(0).getAsString()); /** @@ -306,7 +306,7 @@ asJsonArray = resultObj.get("confirmMsgs").getAsJsonArray(); assertEquals(1, asJsonArray.size()); - assertEquals("[Test开胸包]正在做生物监测,需要紧急发货吗?", asJsonArray.get(0).getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开胸包]正在做生物监测,需要紧急发货吗?", asJsonArray.get(0).getAsString()); } @@ -472,7 +472,7 @@ resultObj = toussesArray.get(0).getAsJsonObject(); assertTrue(resultObj.has("errorMsg")); - assertEquals("[Test开胸包]生物监测结果为不合格,不能发货", resultObj.get("errorMsg").getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开胸包]生物监测结果为不合格,不能发货", resultObj.get("errorMsg").getAsString()); sr1.setBiologicalMonitoringEndDate(ForgonDateUtils.safelyParseDate("3017-01-01 00:00:00")); @@ -481,7 +481,7 @@ invoiceManager.updateBiologicalMonitoringInfo(toussesArray); assertTrue(resultObj.has("errorMsg")); - assertEquals("[Test开胸包]生物监测结果为不合格,不能发货", resultObj.get("errorMsg").getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开胸包]生物监测结果为不合格,不能发货", resultObj.get("errorMsg").getAsString()); @@ -516,7 +516,7 @@ JsonArray asJsonArray = resultObj.get("confirmMsgs").getAsJsonArray(); assertEquals(1, asJsonArray.size()); - assertEquals("[Test开胸包]正在做生物监测,需要紧急发货吗?", asJsonArray.get(0).getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开胸包]正在做生物监测,需要紧急发货吗?", asJsonArray.get(0).getAsString()); /** @@ -534,7 +534,7 @@ asJsonArray = resultObj.get("confirmMsgs").getAsJsonArray(); assertEquals(1, asJsonArray.size()); - assertEquals("[Test开胸包]生物监测结果为无,确定要发货吗?", asJsonArray.get(0).getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开胸包]生物监测结果为无,确定要发货吗?", asJsonArray.get(0).getAsString()); /** * Test开胸包(包含植入物) && 生物监测结果为“无” && 填了生物监测结束时间 && 发货时间小于生物监测结束时间(即:紧急发货 ) * 返回值:{"条码":{"noBiologicalMonitoring":"","biologicalMonitoringNoResult":"条码","biologicalMonitoringFail":"","urgentDelivery":"条码"}} @@ -551,7 +551,7 @@ asJsonArray = resultObj.get("confirmMsgs").getAsJsonArray(); assertEquals(1, asJsonArray.size()); - assertEquals("[Test开胸包]正在做生物监测,需要紧急发货吗?", asJsonArray.get(0).getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开胸包]正在做生物监测,需要紧急发货吗?", asJsonArray.get(0).getAsString()); @@ -573,7 +573,7 @@ asJsonArray = resultObj.get("confirmMsgs").getAsJsonArray(); assertEquals(1, asJsonArray.size()); - assertEquals("[Test开胸包]生物监测结果为无,确定要发货吗?", asJsonArray.get(0).getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开胸包]生物监测结果为无,确定要发货吗?", asJsonArray.get(0).getAsString()); /** @@ -595,7 +595,7 @@ asJsonArray = resultObj.get("confirmMsgs").getAsJsonArray(); assertEquals(1, asJsonArray.size()); - assertEquals("[Test开胸包]生物监测结果为无,确定要发货吗?", asJsonArray.get(0).getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开胸包]生物监测结果为无,确定要发货吗?", asJsonArray.get(0).getAsString()); /** @@ -618,7 +618,7 @@ asJsonArray = resultObj.get("confirmMsgs").getAsJsonArray(); assertEquals(1, asJsonArray.size()); - assertEquals("[Test开胸包]正在做生物监测,需要紧急发货吗?", asJsonArray.get(0).getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开胸包]正在做生物监测,需要紧急发货吗?", asJsonArray.get(0).getAsString()); } /** @@ -648,7 +648,6 @@ public void testMultipleBarcode() { initCSSDData(); Session session = objectDao.getHibernateSession(); - TousseDefinition td_开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); TousseDefinition td_开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); TousseDefinition td_开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); @@ -705,7 +704,6 @@ Collection srIds = Collections.singleton(sr1.getId()); sterilizationRecordManager.completeSterilization(srIds, Constants.ORG_UNIT_CODE_CSSD, "张三", "李四", false); - //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~上面基础数据创建完成,下面开始测试~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~// String ti_开胸包1_barcode = ti_开胸包1.getBarcode(); //Test开胸包的条码 String ti_开颅包1_barcode = ti_开颅包1.getBarcode(); //Test开颅包的条码 @@ -752,7 +750,7 @@ resultObj = toussesArray.get(2).getAsJsonObject(); assertFalse(resultObj.has("confirmMsgs")); assertTrue(resultObj.has("errorMsg")); - assertEquals("[Test开口包]生物监测结果为无,确定要发货吗?", resultObj.get("errorMsg").getAsString()); + assertEquals(resultObj.get("barcode").getAsString() + "[Test开口包]生物监测结果为无,确定要发货吗?", resultObj.get("errorMsg").getAsString()); /**