[28412] try recharge billed at new date after verifier result not ok

Author: huthomas

bundles/ch.elexis.core.services/src/ch/elexis/core/services/EncounterService.java

@@ -212,7 +212,9 @@ private void addVerrechnet(IEncounter encounter, ICodeElement billable, double a
 			if (!addRes.isOK()) {
 				String message = "Achtung: durch den Fall wechsel wurde die Position " + billable.getCode()
 						+ " automatisch entfernt.\n" + addRes.toString();
-				result.addMessage(SEVERITY.WARNING, message, encounter);
+				if (result != null) {
+					result.addMessage(SEVERITY.WARNING, message, encounter);
+				}
 			}
 		}
 	}
@@ -225,12 +227,16 @@ private void removeVerrechnet(IEncounter encounter, IBilled billed, Result<IEnco
 			Result<?> removeRes = BillingServiceHolder.get().removeBilled(billed, encounter);
 			if (!removeRes.isOK()) {
 				String message = "Achtung: Position " + billed.getCode() + " konnte nicht entfernt werden.";
-				result.addMessage(SEVERITY.WARNING, message, encounter);
+				if (result != null) {
+					result.addMessage(SEVERITY.WARNING, message, encounter);
+				}
 			}
 			LocalLockServiceHolder.get().releaseLock(lockResult.getLockInfo());
 		} else {
 			String message = "Achtung: Locking von Position " + billed.getCode() + " fehlgeschlagen.";
-			result.addMessage(SEVERITY.WARNING, message, encounter);
+			if (result != null) {
+				result.addMessage(SEVERITY.WARNING, message, encounter);
+			}
 		}
 	}
 
@@ -245,7 +251,9 @@ private Optional<ICodeElement> getMatchingVerrechenbar(IBilled billed, IEncounte
 			if (matchingVerrechenbar.isEmpty()) {
 				String message = "Achtung: durch den Fall wechsel wurde die Position " + billable.getCode()
 						+ " automatisch entfernt, da diese im neuen Fall nicht vorhanden ist.";
-				result.addMessage(SEVERITY.WARNING, message, encounter);
+				if (result != null) {
+					result.addMessage(SEVERITY.WARNING, message, encounter);
+				}
 			} else {
 				return matchingVerrechenbar;
 			}
@@ -556,16 +564,20 @@ public Result<IEncounter> setEncounterDate(IEncounter encounter, LocalDate newDa
 			for (IBillableVerifier verifier : verifiers) {
 				Result<IBilled> result = verifier.verify(encounter);
 				if (!result.isOK()) {
+					if (ret.isOK()) {
+						ret = new Result<>(Result.SEVERITY.WARNING, 0, StringUtils.EMPTY, encounter, false);
+					}
 					// remove invalid billed on new date
 					List<Result<IBilled>.msg> messages = result.getMessages();
 					for (msg msg : messages) {
 						if (msg.getObject() instanceof IBilled) {
 							IBilled billed = (IBilled) msg.getObject();
 							IBillable billable = billed.getBillable();
 							if (billable != null) {
-								encounter.removeBilled(billed);
+								// reCharge removes and adds max amount if lower amount is allowed
+								reCharge(Collections.singletonList(billed), encounter, null);
 								String message = "Achtung: durch die Änderung wurde die Position " + billable.getCode()
-										+ " automatisch entfernt.\nLimitation: " + msg.getText();
+										+ " automatisch angepasst oder entfernt.\nLimitation: " + msg.getText();
 								ret.addMessage(SEVERITY.WARNING, message, encounter);
 							}
 						}