Commit 505edae6 authored by Marco Descher's avatar Marco Descher
Browse files

[17027] EncounterService#transferToCoverage return encounter on WARN

parent 7f3401d6

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

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ public class EncounterService implements IEncounterService { 
						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);

						result.addMessage(SEVERITY.WARNING, message, encounter);

					}

					

				} else {

bundles/ch.elexis.core/src-gen/ch/elexis/core/model/IBillableOptifier.java

+5 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
package ch.elexis.core.model;



import ch.rgw.tools.Result;

import ch.rgw.tools.Result.SEVERITY;



/**

 * <!-- begin-user-doc --> A representation of the model object '<em><b>IBillable
@@ -22,8 +23,11 @@ import ch.rgw.tools.Result; 
 * @generated

 */

public interface IBillableOptifier<T extends IBillable> {



	/**

	 * <!-- begin-user-doc --> <!-- end-user-doc -->

	 * <!-- begin-user-doc --> 

	 * The returned result is of {@link SEVERITY#WARNING if only a partial amount could be billed.}

	 * <!-- end-user-doc -->

	 * @model type="ch.elexis.core.types.Result&lt;ch.elexis.core.model.IBilled&gt;"

	 * @generated

	 */

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

+3 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ import ch.elexis.core.model.IBilled; 
import ch.elexis.core.model.IBillingSystemFactor;

import ch.elexis.core.model.IEncounter;

import ch.rgw.tools.Result;

import ch.rgw.tools.Result.SEVERITY;



public interface IBillingService {
@@ -45,7 +46,8 @@ public interface IBillingService { 
	 * @param billable

	 * @param encounter

	 * @param amount

	 * @return a Result, that may contain a message even if its ok

	 * @return a {@link Result} that returns a {@link SEVERITY#WARNING} if only a partial amount

	 *         could be billed

	 */

	public Result<IBilled> bill(IBillable billable, IEncounter encounter, double amount);