From 6b053091a36dad9622fa7a4405450bd4ba6b3815 Mon Sep 17 00:00:00 2001
From: Brice Zele <bricezele1@gmail.com>
Date: Thu, 7 Apr 2022 14:48:10 +0100
Subject: [PATCH] =?UTF-8?q?Cr=C3=A9ation=20et=20modification=20des=20consu?=
 =?UTF-8?q?ltations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/main/AndroidManifest.xml      |   2 +-
 screens/home/IMarker.js                       | 331 +++++++++---------
 .../agent/ExecuterPrescriptionScreen.js       |  55 ++-
 .../ModifierExecutionPrescriptionScreen.js    |   1 +
 .../wallet/agent/ModifierFeuilleSoinScreen.js | 119 +++++--
 .../wallet/agent/SaisirFeuilleSoinScreen.js   |  64 ++--
 utils/i18n/fr.json                            |  12 +-
 7 files changed, 352 insertions(+), 232 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 7feb002b..b2bcc48a 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
 
         <meta-data
                 android:name="com.google.android.geo.API_KEY"
-                android:value="AIzaSyCz4B9uUu3gkuu78Sf72gPWZ3t_qKqf5zg"/>
+                android:value="AIzaSyBUQoQYY31-S3DPp7aRRIAjEda8T2pZvJE"/>
 
         <activity
                 android:name=".MainActivity"
diff --git a/screens/home/IMarker.js b/screens/home/IMarker.js
index 21a600eb..e329b1fa 100755
--- a/screens/home/IMarker.js
+++ b/screens/home/IMarker.js
@@ -5,179 +5,178 @@ import {Animated, Easing, Image, Platform, StyleSheet, View,} from 'react-native
 const userposi = require('./../../datas/img/png/user_place.png');
 const mnetwork = require('./../../datas/img/png/home_network.png');
 const othernetwork = require('./../../datas/img/png/other_net.png');
-
 class IMarker extends PureComponent {
-    constructor(props) {
-        super(props)
-        const data = this.props.data
-        this.state = {
-            animation: new Animated.Value(0),
-            subanimation: new Animated.Value(0),
-            coordinate: {
-                longitude: parseFloat(data.longitude),
-                latitude: parseFloat(data.latitude),
-            }
-        }
-    }
+     constructor(props) {
+          super(props)
+          const data = this.props.data
+          this.state = {
+               animation: new Animated.Value(0),
+               subanimation: new Animated.Value(0),
+               coordinate: {
+                    longitude: parseFloat(data.longitude),
+                    latitude: parseFloat(data.latitude),
+               }
+          }
+     }
 
-    componentWillReceiveProps(nextProps) {
-        const duration = 500
-        const oldCoord = {
-            longitude: parseFloat(this.props.data.longitude),
-            latitude: parseFloat(this.props.data.latitude),
-        }
-        const coord = {
-            longitude: parseFloat(nextProps.data.longitude),
-            latitude: parseFloat(nextProps.data.latitude),
-        }
-        if (oldCoord.longitude !== coord.longitude || oldCoord.latitude !== coord.latitude) {
-            if (Platform.OS === 'android') {
-                if (this.markerRef) {
-                    this.markerRef._component.animateMarkerToCoordinate(
-                        coord,
-                        duration
-                    );
-                }
-            } else {
-                /*this.state.coordinate.timing({
-                  cord,
-                  duration
-                }).start();
-            */
-            }
-        }
-    }
-
-    startAnimation() {
-        const initialValue = 0
-        const finalValue = 1
-        this.state.animation.setValue(initialValue);  //Step 3
-        Animated.timing(     //Step 4
-            this.state.animation,
-            {
-                toValue: finalValue,
-                duration: 500,
-                easing: Easing.linear(),
-                useNativeDriver: true
-            }
-        ).start();
-    }
-
-    handleViewRef = ref => this.view = ref;
-
-    render() {
-        const {data, network, isSelected} = this.props;
-        const color = isSelected ? "#F48FB1A0" : "transparent"
-        const colorSup = isSelected ? "#F06292A0" : "transparent"
-        const display = isSelected ? "block" : "none";
-        if (data.longitude && data.latitude) {
-
-            return (
-                <Marker.Animated
-                    coordinate={this.state.coordinate.longitude ? this.state.coordinate : {
-                        longitude: data.longitude,
-                        latitude: data.latitude
-                    }}
-                    id={data.id}
-                    title={this.props.title}
-                    ref={(re) => {
-                        this.markerRef = re
-                    }}
-
-                    onPress={e => {
-                        if (!this.props.isUser)
-                            this.props.onPress(data)
-                    }}
-                    image={this.getImage(data)}
-                />
-
-            );
-        }
-        return (<View/>)
-
-    }
-
-    error(erro) {
-        console.log("on error render image");
-        console.log(erro);
-    }
-
-    componentDidMount() {
-
-
-    }
-
-    componentDidUpdate(prevProps, prevState, snapshot) {
-        if (this.props.isUser)
-            if (this.markerRef && this.props.isNeedFocus) {
-                this.markerRef._component.showCallout()
-            }
-    }
-
-    getImage(data) {
-        const {isUser, network} = this.props;
-        if (isUser) {
-            return userposi
-        } else if (network && data.network === network.name) {
-            return mnetwork
-        }
-        return othernetwork
-    }
-
-    getIcon(data) {
-        const {isSelected} = this.props
-        return isSelected ? (
-            <Animated.View style={{
-                width: 32,
-                height: 32,
-                justifyContent: 'center',
-                alignItems: 'center',
-                borderRadius: 16,
-                backgroundColor: isSelected ? "#81D4FAA0" : "transparent",
-                transform: [
-                    {
-                        scaleX: this.animatedValue.interpolate({
-                            inputRange: [0, 1],
-                            outputRange: [1, 32]
-                        })
-                    },
-                    {
-                        scaleY: this.animatedValue.interpolate({
-                            inputRange: [0, 1],
-                            outputRange: [1, 32]
-                        })
+     componentWillReceiveProps(nextProps) {
+          const duration = 500
+          const oldCoord = {
+               longitude: parseFloat(this.props.data.longitude),
+               latitude: parseFloat(this.props.data.latitude),
+          }
+          const coord = {
+               longitude: parseFloat(nextProps.data.longitude),
+               latitude: parseFloat(nextProps.data.latitude),
+          }
+          if (oldCoord.longitude !== coord.longitude || oldCoord.latitude !== coord.latitude) {
+               if (Platform.OS === 'android') {
+                    if (this.markerRef) {
+                         this.markerRef._component.animateMarkerToCoordinate(
+                             coord,
+                             duration
+                         );
                     }
-                ]
-            }}>
-                <Image style={{alignSelf: 'center'}} source={this.getImage(data)}/>
-            </Animated.View>
-        ) : (<Image style={{alignSelf: 'center'}} source={this.getImage(data)}/>);
+               } else {
+                    /*this.state.coordinate.timing({
+                      cord,
+                      duration
+                    }).start();
+                */
+               }
+          }
+     }
 
-    }
+     startAnimation() {
+          const initialValue = 0
+          const finalValue = 1
+          this.state.animation.setValue(initialValue);  //Step 3
+          Animated.timing(     //Step 4
+              this.state.animation,
+              {
+                   toValue: finalValue,
+                   duration: 500,
+                   easing: Easing.linear(),
+                   useNativeDriver: true
+              }
+          ).start();
+     }
 
-    startLoopSelectedAnimation() {
-        const initialValue = 0
-        const finalValue = 1
-        this.state.animation.setValue(initialValue);  //Step 3
-        Animated.loop(Animated.timing(     //Step 4
-            this.state.subanimation,
-            {
-                toValue: finalValue,
-                duration: 1000,
-                easing: Easing.linear(),
-                useNativeDriver: true
-            }
-        ), {iteration: -1}).start();
-    }
+     handleViewRef = ref => this.view = ref;
+
+     render() {
+          const {data, network, isSelected} = this.props;
+          const color = isSelected ? "#F48FB1A0" : "transparent"
+          const colorSup = isSelected ? "#F06292A0" : "transparent"
+          const display = isSelected ? "block" : "none";
+          if (data.longitude && data.latitude) {
+
+               return (
+                   <Marker.Animated
+                       coordinate={this.state.coordinate.longitude ? this.state.coordinate : {
+                            longitude: data.longitude,
+                            latitude: data.latitude
+                       }}
+                       id={data.id}
+                       title={this.props.title}
+                       ref={(re) => {
+                            this.markerRef = re
+                       }}
+
+                       onPress={e => {
+                            if (!this.props.isUser)
+                                 this.props.onPress(data)
+                       }}
+                       image={this.getImage(data)}
+                   />
+
+               );
+          }
+          return (<View/>)
+
+     }
+
+     error(erro) {
+          console.log("on error render image");
+          console.log(erro);
+     }
+
+     componentDidMount() {
+
+
+     }
+
+     componentDidUpdate(prevProps, prevState, snapshot) {
+          if (this.props.isUser)
+               if (this.markerRef && this.props.isNeedFocus) {
+                    this.markerRef._component.showCallout()
+               }
+     }
+
+     getImage(data) {
+          const {isUser, network} = this.props;
+          if (isUser) {
+               return userposi
+          } else if (network && data.network === network.name) {
+               return mnetwork
+          }
+          return othernetwork
+     }
+
+     getIcon(data) {
+          const {isSelected} = this.props
+          return isSelected ? (
+              <Animated.View style={{
+                   width: 32,
+                   height: 32,
+                   justifyContent: 'center',
+                   alignItems: 'center',
+                   borderRadius: 16,
+                   backgroundColor: isSelected ? "#81D4FAA0" : "transparent",
+                   transform: [
+                        {
+                             scaleX: this.animatedValue.interpolate({
+                                  inputRange: [0, 1],
+                                  outputRange: [1, 32]
+                             })
+                        },
+                        {
+                             scaleY: this.animatedValue.interpolate({
+                                  inputRange: [0, 1],
+                                  outputRange: [1, 32]
+                             })
+                        }
+                   ]
+              }}>
+                   <Image style={{alignSelf: 'center'}} source={this.getImage(data)}/>
+              </Animated.View>
+          ) : (<Image style={{alignSelf: 'center'}} source={this.getImage(data)}/>);
+
+     }
+
+     startLoopSelectedAnimation() {
+          const initialValue = 0
+          const finalValue = 1
+          this.state.animation.setValue(initialValue);  //Step 3
+          Animated.loop(Animated.timing(     //Step 4
+              this.state.subanimation,
+              {
+                   toValue: finalValue,
+                   duration: 1000,
+                   easing: Easing.linear(),
+                   useNativeDriver: true
+              }
+          ), {iteration: -1}).start();
+     }
 }
 
 const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-        width: 52,
-        height: 52
-    },
-    ring: {}
+     container: {
+          flex: 1,
+          width: 52,
+          height: 52
+     },
+     ring: {}
 });
 
-export default IMarker;
+export default IMarker;
\ No newline at end of file
diff --git a/screens/wallet/agent/ExecuterPrescriptionScreen.js b/screens/wallet/agent/ExecuterPrescriptionScreen.js
index 459d20b8..bfac2a8c 100644
--- a/screens/wallet/agent/ExecuterPrescriptionScreen.js
+++ b/screens/wallet/agent/ExecuterPrescriptionScreen.js
@@ -78,7 +78,7 @@ import * as Utils from "../../../utils/UtilsFunction";
 import {displayToast, uppercaseFirstLetter} from "../../../utils/UtilsFunction";
 import {store} from "../../../redux/store";
 import Fontisto from "react-native-vector-icons/Fontisto";
-import {Typography} from "../../../config/typography";
+import {FontWeight, Typography} from "../../../config/typography";
 
 let moment = require('moment-timezone');
 
@@ -530,6 +530,8 @@ const ExecuterPrescriptionScreen = ({
 
     const PriceModal = Yup.object().shape({
         price: Yup.number().required(I18n.t('THIS_FIELD_IS_REQUIRED')),
+        examen_quantite: Yup.number(),
+        code_acte: Yup.object()
     });
 
     const renderDialogQRCodeScanner = () => {
@@ -564,7 +566,9 @@ const ExecuterPrescriptionScreen = ({
     const renderPriceModal = () => (
         <Formik validationSchema={PriceModal}
                 initialValues={{
-                    price: '',
+                    examen_quantite: '' + elementToSetPrice !== null ? !elementToSetPrice.drugs ? elementToSetPrice.quantity : '' : '',
+                    code_acte: '' + elementToSetPrice !== null ? !elementToSetPrice.drugs ? elementToSetPrice.act : '' : '',
+                    price: elementToSetPrice !== null ? !elementToSetPrice.drugs ? elementToSetPrice.act.amount : '' : ''
                 }}
                 onSubmit={(values) => {
                     console.log("Value", elementToSetPrice);
@@ -664,6 +668,53 @@ const ExecuterPrescriptionScreen = ({
                                     keyboardType='numeric'
                                 />
 
+
+                                {values.code_acte !== '' ?
+                                    values.code_acte.billing_type === 'UNIT_PRICE' && (<TextInput
+                                        style={{marginTop: 10}}
+                                        placeholder={I18n.t('QUANTITE')}
+                                        value={'' + values.examen_quantite}
+                                        onChangeText={handleChange('examen_quantite')}
+                                        onBlur={handleBlur('examen_quantite')}
+                                        success={touched.examen_quantite && !errors.examen_quantite}
+                                        touched={touched.examen_quantite}
+                                        error={errors.examen_quantite}
+                                        keyboardType='numeric'
+                                    />) : null}
+
+                                <View>
+                                    <TextInput
+                                        style={{marginTop: 10}}
+                                        placeholder={I18n.t('AMOUNT')}
+                                        value={'' + ((values.code_acte.amount !== null) ? parseFloat(values.examen_quantite) * parseFloat(values.price) : values.price)}
+                                        editable={values.code_acte.amount === null}
+                                        onChangeText={handleChange('price')}
+                                        onBlur={handleBlur('price')}
+                                        success={touched.price && !errors.price}
+                                        touched={touched.price}
+                                        error={errors.price}
+                                        keyboardType='numeric'
+                                    />
+                                    <View style={{
+                                        position: 'absolute',
+                                        left: responsiveWidth(82),
+                                        top: 20,
+                                        flexDirection: 'row'
+                                    }}>
+                                        <View
+                                            style={{
+                                                width: 1,
+                                                borderLeftColor: '#f0f0f0',
+                                                height: 40,
+                                                left: -8,
+                                                borderLeftWidth: 1,
+
+                                            }}
+                                        />
+                                        <Text style={[Typography.body1, FontWeight.bold]}>{values.code_acte.code}</Text>
+                                    </View>
+                                </View>
+
                                 <Button
                                     loading={checkInsuranceCoverageAmount.loading}
                                     full
diff --git a/screens/wallet/agent/ModifierExecutionPrescriptionScreen.js b/screens/wallet/agent/ModifierExecutionPrescriptionScreen.js
index d33dfde8..6b2ae2db 100644
--- a/screens/wallet/agent/ModifierExecutionPrescriptionScreen.js
+++ b/screens/wallet/agent/ModifierExecutionPrescriptionScreen.js
@@ -540,6 +540,7 @@ const ModifierExecutionPrescriptionScreen = ({
 
     const PriceModal = Yup.object().shape({
         price: Yup.number().required(I18n.t('THIS_FIELD_IS_REQUIRED')),
+        examen_quantite: Yup.number(),
     });
 
     const renderDialogQRCodeScanner = () => {
diff --git a/screens/wallet/agent/ModifierFeuilleSoinScreen.js b/screens/wallet/agent/ModifierFeuilleSoinScreen.js
index 207f9243..249c589b 100644
--- a/screens/wallet/agent/ModifierFeuilleSoinScreen.js
+++ b/screens/wallet/agent/ModifierFeuilleSoinScreen.js
@@ -616,13 +616,15 @@ const ModifierFeuilleSoinScreen = ({
     const AddNewExamen = Yup.object().shape({
         examen_name: Yup.string().required(I18n.t('THIS_FIELD_IS_REQUIRED')),
         code_acte: Yup.number().required(I18n.t('THIS_FIELD_IS_REQUIRED')),
-        examen_quantite: Yup.number().required(I18n.t('THIS_FIELD_IS_REQUIRED'))
+        examen_quantite: Yup.number().required(I18n.t('THIS_FIELD_IS_REQUIRED')),
+        amount: Yup.number().required(I18n.t('THIS_FIELD_IS_REQUIRED'))
     });
 
 
     const ModifyNewExamen = Yup.object().shape({
         examen_name: Yup.string().required(I18n.t('THIS_FIELD_IS_REQUIRED')),
-        examen_quantite: Yup.number().required(I18n.t('THIS_FIELD_IS_REQUIRED'))
+        examen_quantite: Yup.number(),
+        amount: Yup.number().required(I18n.t('THIS_FIELD_IS_REQUIRED'))
     });
 
     const AddNewMedicament = Yup.object().shape({
@@ -779,7 +781,7 @@ const ModifierFeuilleSoinScreen = ({
                             care_condition: consultation._care_condition,
                             act_action: "UPDATE",
                             act_type: "PERFORMANCE",
-                            act_id: values.code_acte.id,
+                            act_id: elementToSetPrice.id,
                             tmp_sheet_id: tmpSheetId,
                             performances: [
                                 {
@@ -846,12 +848,20 @@ const ModifierFeuilleSoinScreen = ({
                                                      }}>
                                         <Dropdown
                                             label={I18n.t('CODE_ACTE')}
-                                            data={getNetworkAct.result !== null ? getNetworkAct.result?.response : []}
+                                            data={getNetworkAct.result !== null ? getNetworkAct.result?.response.filter(act => act.type === 'CONSULTATION') : []}
                                             useNativeDriver={true}
                                             value={typeof values.code_acte !== "number" && values.code_acte.name}
                                             onChangeText={(value, index, data) => {
                                                 setFieldTouched('code_acte');
                                                 setFieldValue('code_acte', value);
+                                                if (value.amount !== null) {
+                                                    setFieldValue('amount_prestation', value.amount);
+                                                    fetchGetAmountConsultation({
+                                                        network_id: wallet.id_network,
+                                                        amount: '' + value.amount,
+                                                        care_condition: consultation._care_condition
+                                                    });
+                                                }
                                             }}
                                             valueExtractor={(value) => {
                                                 return value
@@ -868,17 +878,13 @@ const ModifierFeuilleSoinScreen = ({
                                         value={values.amount_prestation}
                                         onChangeText={(value) => {
                                             setFieldValue('amount_prestation', value);
-                                            console.log({
-                                                network_id: wallet.id_network,
-                                                amount: '' + value,
-                                                care_condition: careConditon
-                                            });
                                             fetchGetAmountConsultation({
                                                 network_id: wallet.id_network,
                                                 amount: '' + value,
                                                 care_condition: consultation._care_condition
                                             });
                                         }}
+                                        editable={false}
                                         onBlur={handleBlur('amount_prestation')}
                                         success={touched.amount_prestation && !errors.amount_prestation}
                                         touched={touched.amount_prestation}
@@ -901,7 +907,7 @@ const ModifierFeuilleSoinScreen = ({
                                         editable={false}
                                         value={getAmountConsultation.result !== null ? getAmountConsultation.result.response.insurance_amount :
                                             elementToSetPrice !== null ? elementToSetPrice.drugs === null
-                                                ? values.moderator_ticket
+                                                ? values.insurance_amount
                                                 : '' : ''}/>
 
                                     <View style={{
@@ -1036,11 +1042,20 @@ const ModifierFeuilleSoinScreen = ({
                                                  }}>
                                     <Dropdown
                                         label={I18n.t('CODE_ACTE')}
-                                        data={getNetworkAct.result !== null ? getNetworkAct.result?.response : []}
+                                        data={getNetworkAct.result !== null ? getNetworkAct.result?.response.filter(act => act.type === 'CONSULTATION') : []}
                                         useNativeDriver={true}
                                         onChangeText={(value, index, data) => {
                                             setFieldTouched('code_acte');
                                             setFieldValue('code_acte', value);
+
+                                            if (value.billing_type !== 'FREE') {
+                                                setFieldValue('amount_prestation', value.amount);
+                                                fetchGetAmountConsultation({
+                                                    network_id: wallet.id_network,
+                                                    amount: '' + value.amount,
+                                                    care_condition: consultation._care_condition
+                                                });
+                                            }
                                         }}
                                         valueExtractor={(value) => {
                                             return value
@@ -1054,6 +1069,7 @@ const ModifierFeuilleSoinScreen = ({
                                 <TextInput
                                     style={{marginTop: 10}}
                                     placeholder={I18n.t('AMOUNT')}
+                                    editable={values.code_acte !== '' ? values.code_acte.billing_type === 'FREE' : true}
                                     value={values.amount_prestation}
                                     onChangeText={handleChange('amount_prestation')}
                                     onBlur={handleBlur('amount_prestation')}
@@ -1574,7 +1590,7 @@ const ModifierFeuilleSoinScreen = ({
                                                  }}>
                                     <Dropdown
                                         label={I18n.t('CODE_ACTE')}
-                                        data={getNetworkAct.result !== null ? getNetworkAct.result?.response : []}
+                                        data={getNetworkAct.result !== null ? getNetworkAct.result?.response.filter(act => act.type === 'EXAM') : []}
                                         useNativeDriver={true}
                                         onChangeText={(value, index, data) => {
                                             console.log("Value", value);
@@ -1636,7 +1652,8 @@ const ModifierFeuilleSoinScreen = ({
                 initialValues={{
                     examen_name: elementToSetPrice !== null ? !elementToSetPrice.drugs ? elementToSetPrice.description : '' : '',
                     examen_quantite: '' + elementToSetPrice !== null ? !elementToSetPrice.drugs ? elementToSetPrice.quantity : '' : '',
-                    code_acte: '' + elementToSetPrice !== null ? !elementToSetPrice.drugs ? elementToSetPrice.act : '' : ''
+                    code_acte: '' + elementToSetPrice !== null ? !elementToSetPrice.drugs ? elementToSetPrice.act : '' : '',
+                    amount: elementToSetPrice !== null ? !elementToSetPrice.drugs ? elementToSetPrice.act.amount : null : null
                 }}
                 onSubmit={(values) => {
 
@@ -1646,10 +1663,11 @@ const ModifierFeuilleSoinScreen = ({
                             return elementToSetPrice.id === exam.id ? {
                                 ...exam,
                                 id: exam.id,
+                                amount: values.amount,
                                 act_id: values.code_acte.id,
                                 act: values.code_acte,
                                 description: values.examen_name,
-                                quantity: values.examen_quantite,
+                                quantity: null,
                                 unit_price: exam.unit_price,
                                 to_delete: false
                             } : exam;
@@ -1708,7 +1726,7 @@ const ModifierFeuilleSoinScreen = ({
                                                  }}>
                                     <Dropdown
                                         label={I18n.t('CODE_ACTE')}
-                                        data={getNetworkAct.result !== null ? getNetworkAct.result?.response : []}
+                                        data={getNetworkAct.result !== null ? getNetworkAct.result?.response.filter(act => (act.type === "EXAM_OR_OTHER")) : []}
                                         useNativeDriver={true}
                                         value={typeof values.code_acte !== "number" && values.code_acte.name}
                                         onChangeText={(value, index, data) => {
@@ -1727,7 +1745,7 @@ const ModifierFeuilleSoinScreen = ({
 
                                 <TextInput
                                     style={{marginTop: 10}}
-                                    placeholder={I18n.t('NAME')}
+                                    placeholder={I18n.t('DESCRIPTION')}
                                     value={values.examen_name}
                                     onChangeText={handleChange('examen_name')}
                                     onBlur={handleBlur('examen_name')}
@@ -1736,17 +1754,52 @@ const ModifierFeuilleSoinScreen = ({
                                     error={errors.examen_name}
                                 />
 
-                                <TextInput
-                                    style={{marginTop: 10}}
-                                    placeholder={I18n.t('QUANTITE')}
-                                    value={'' + values.examen_quantite}
-                                    onChangeText={handleChange('examen_quantite')}
-                                    onBlur={handleBlur('examen_quantite')}
-                                    success={touched.examen_quantite && !errors.examen_quantite}
-                                    touched={touched.examen_quantite}
-                                    error={errors.examen_quantite}
-                                    keyboardType='numeric'
-                                />
+                                {/*                                {values.code_acte !== '' ?
+                                    values.code_acte.billing_type === 'UNIT_PRICE' && (<TextInput
+                                        style={{marginTop: 10}}
+                                        placeholder={I18n.t('QUANTITE')}
+                                        value={'' + values.examen_quantite}
+                                        onChangeText={handleChange('examen_quantite')}
+                                        onBlur={handleBlur('examen_quantite')}
+                                        success={touched.examen_quantite && !errors.examen_quantite}
+                                        touched={touched.examen_quantite}
+                                        error={errors.examen_quantite}
+                                        keyboardType='numeric'
+                                    />) : null}*/}
+
+                                <View>
+                                    <TextInput
+                                        style={{marginTop: 10}}
+                                        placeholder={I18n.t('AMOUNT')}
+                                        value={values.code_acte !== '' ? values.code_acte.billing_type === 'FREE' ? I18n.t('AMOUNT_FREE') : `${values.code_acte.unit_value} = ${values.code_acte.amount}` : ''}
+                                        editable={false}
+                                        onChangeText={handleChange('amount')}
+                                        onBlur={handleBlur('amount')}
+                                        success={touched.amount && !errors.amount}
+                                        touched={touched.amount}
+                                        error={errors.amount}
+                                        keyboardType='numeric'
+                                    />
+                                    {/*                                    <View style={{
+                                        position: 'absolute',
+                                        left: responsiveWidth(82),
+                                        top: 20,
+                                        flexDirection: 'row'
+                                    }}>
+                                        <View
+                                            style={{
+                                                width: 1,
+                                                borderLeftColor: '#f0f0f0',
+                                                height: 40,
+                                                left: -8,
+                                                borderLeftWidth: 1,
+
+                                            }}
+                                        />
+                                        <Text
+                                            style={[Typography.body1, FontWeight.bold]}>{values.code_acte.unit_value}</Text>
+                                    </View>*/}
+                                </View>
 
                                 <Button
                                     style={{marginTop: 20, marginBottom: 20}}
@@ -1984,7 +2037,7 @@ const ModifierFeuilleSoinScreen = ({
                                         ]}
                                         key={item.id}>
                                         <Text body2 semibold numberOfLines={2}>
-                                            {`${item.quantity} ${item.description}  ${item.unit_price ? ' - ' + item.unit_price : ''} \n ${item.act.name}`}
+                                            {`${item.description}  ${item.unit_price ? ' - ' + item.unit_price : ''} \n ${item.act.name}`}
                                         </Text>
                                         <View style={styles.iconRight}>
                                             <TouchableOpacity onPress={() => {
@@ -2924,7 +2977,7 @@ const ModifierFeuilleSoinScreen = ({
                                     styles.iconNavigationButton,
                                     {
                                         borderRadius: 5,
-                                        width: 100,
+                                        width: 150,
                                         height: 30,
                                         flexDirection: "row",
                                         backgroundColor:
@@ -2936,7 +2989,7 @@ const ModifierFeuilleSoinScreen = ({
                                 onPress={e => {
                                     setModalListPrestation(true);
                                 }}>
-                                <Text whiteColor>{I18n.t('PRESTATION')}</Text>
+                                <Text whiteColor>{I18n.t('CONSULTATION')}</Text>
                                 <MaterialCommunityIcons
                                     name="medical-bag"
                                     size={20}
@@ -2949,7 +3002,7 @@ const ModifierFeuilleSoinScreen = ({
                                     styles.iconNavigationButton,
                                     {
                                         borderRadius: 5,
-                                        width: 100,
+                                        width: 170,
                                         height: 30,
                                         flexDirection: "row",
                                         backgroundColor:
@@ -2961,7 +3014,7 @@ const ModifierFeuilleSoinScreen = ({
                                 onPress={e => {
                                     setModalExamen(true);
                                 }}>
-                                <Text whiteColor>{I18n.t('EXAMEN')}</Text>
+                                <Text whiteColor>{I18n.t('ACTE_EXAMEN')}</Text>
                                 <FontAwesome5
                                     name="file-medical"
                                     size={20}
@@ -2974,7 +3027,7 @@ const ModifierFeuilleSoinScreen = ({
                                     styles.iconNavigationButton,
                                     {
                                         borderRadius: 5,
-                                        width: 110,
+                                        width: 120,
                                         height: 30,
                                         flexDirection: "row",
                                         backgroundColor:
diff --git a/screens/wallet/agent/SaisirFeuilleSoinScreen.js b/screens/wallet/agent/SaisirFeuilleSoinScreen.js
index 4b966bbc..f2132586 100644
--- a/screens/wallet/agent/SaisirFeuilleSoinScreen.js
+++ b/screens/wallet/agent/SaisirFeuilleSoinScreen.js
@@ -677,7 +677,7 @@ const SaisirFeuilleSoinScreen = ({
 
     const AddNewPrestation = Yup.object().shape({
         amount_prestation: Yup.number().required(I18n.t('THIS_FIELD_IS_REQUIRED')),
-        code_acte: Yup.number().required(I18n.t('THIS_FIELD_IS_REQUIRED')),
+        code_acte: Yup.object().required(I18n.t('THIS_FIELD_IS_REQUIRED')),
         frais_deplacement: Yup.number(),
         date_prestation: Yup.date(),
         ticker_moderateur: Yup.number(),
@@ -685,8 +685,8 @@ const SaisirFeuilleSoinScreen = ({
 
     const AddNewExamen = Yup.object().shape({
         examen_name: Yup.string().required(I18n.t('THIS_FIELD_IS_REQUIRED')),
-        code_acte: Yup.number().required(I18n.t('THIS_FIELD_IS_REQUIRED')),
-        examen_quantite: Yup.number().required(I18n.t('THIS_FIELD_IS_REQUIRED'))
+        code_acte: Yup.object().required(I18n.t('THIS_FIELD_IS_REQUIRED')),
+        amount: Yup.number(),
     });
 
     const AddNewMedicament = Yup.object().shape({
@@ -818,7 +818,7 @@ const SaisirFeuilleSoinScreen = ({
                         codeActeRef.shake(200)
                     else {
                         setPrestations([{
-                            act_id: values.code_acte,
+                            act_id: values.code_acte.id,
                             amount: values.amount_prestation,
                             home_visit_fees: values.frais_deplacement
                         }, ...prestations]);
@@ -852,6 +852,7 @@ const SaisirFeuilleSoinScreen = ({
                   isSubmitting,
               }) => (
                 <ScrollView style={{flex: 1}}>
+                    {console.log("Errors", errors)}
                     <View style={[styles.containModal, {backgroundColor: Color.containerBackgroundColor}]}>
                         <Modal
                             isVisible={modalPrestation}
@@ -893,11 +894,20 @@ const SaisirFeuilleSoinScreen = ({
                                                  }}>
                                     <Dropdown
                                         label={I18n.t('CODE_ACTE')}
-                                        data={getNetworkAct.result !== null ? getNetworkAct.result?.response : []}
+                                        data={getNetworkAct.result !== null ? getNetworkAct.result?.response.filter(act => act.type === 'CONSULTATION') : []}
                                         useNativeDriver={true}
                                         onChangeText={(value, index, data) => {
                                             setFieldTouched('code_acte');
-                                            setFieldValue('code_acte', value.id);
+                                            console.log("Value", value);
+                                            setFieldValue('code_acte', value);
+                                            if (value.billing_type !== 'FREE') {
+                                                setFieldValue('amount_prestation', value.amount);
+                                                fetchGetAmountConsultation({
+                                                    network_id: wallet.id_network,
+                                                    amount: '' + value.amount,
+                                                    care_condition: careConditon
+                                                });
+                                            }
                                         }}
                                         valueExtractor={(value) => {
                                             return value
@@ -910,6 +920,7 @@ const SaisirFeuilleSoinScreen = ({
 
                                 <TextInput
                                     style={{marginTop: 10}}
+                                    editable={values.code_acte !== '' ? values.code_acte.billing_type === 'FREE' : true}
                                     placeholder={I18n.t('AMOUNT')}
                                     value={values.amount_prestation}
                                     onChangeText={(text) => {
@@ -922,7 +933,7 @@ const SaisirFeuilleSoinScreen = ({
                                     }}
                                     onBlur={handleBlur('amount_prestation')}
                                     success={touched.amount_prestation && !errors.amount_prestation}
-                                    touched={touched.amount_prestation} A
+                                    touched={touched.amount_prestation}
                                     error={errors.amount_prestation}
 
                                 />
@@ -1261,15 +1272,15 @@ const SaisirFeuilleSoinScreen = ({
         <Formik validationSchema={AddNewExamen}
                 initialValues={{
                     examen_name: '',
-                    examen_quantite: '',
-                    code_acte: ''
+                    code_acte: '',
+                    amount: ''
                 }}
                 onSubmit={(values) => {
                     console.log("Value", values);
                     setExamens([{
-                        act_id: values.code_acte,
+                        act_id: values.code_acte.id,
                         description: values.examen_name,
-                        quantity: values.examen_quantite
+                        quantity: null
                     }, ...examens]);
                     setModalExamen(false);
                     Utils.displayToast(I18n.t('EXAMENS_SUCCESSFULLY_ADD'));
@@ -1321,12 +1332,12 @@ const SaisirFeuilleSoinScreen = ({
                                                  }}>
                                     <Dropdown
                                         label={I18n.t('CODE_ACTE')}
-                                        data={getNetworkAct.result !== null ? getNetworkAct.result?.response : []}
+                                        data={getNetworkAct.result !== null ? getNetworkAct.result?.response.filter(act => (act.type === "EXAM_OR_OTHER")) : []}
                                         useNativeDriver={true}
                                         onChangeText={(value, index, data) => {
                                             console.log("Value", value);
                                             setFieldTouched('code_acte');
-                                            setFieldValue('code_acte', value.id);
+                                            setFieldValue('code_acte', value);
                                         }}
                                         valueExtractor={(value) => {
                                             return value
@@ -1339,7 +1350,7 @@ const SaisirFeuilleSoinScreen = ({
 
                                 <TextInput
                                     style={{marginTop: 10}}
-                                    placeholder={I18n.t('NAME')}
+                                    placeholder={I18n.t('DESCRIPTION')}
                                     value={values.examen_name}
                                     onChangeText={handleChange('examen_name')}
                                     onBlur={handleBlur('examen_name')}
@@ -1350,13 +1361,14 @@ const SaisirFeuilleSoinScreen = ({
 
                                 <TextInput
                                     style={{marginTop: 10}}
-                                    placeholder={I18n.t('QUANTITE')}
-                                    value={values.examen_quantite}
-                                    onChangeText={handleChange('examen_quantite')}
-                                    onBlur={handleBlur('examen_quantite')}
-                                    success={touched.examen_quantite && !errors.examen_quantite}
-                                    touched={touched.examen_quantite}
-                                    error={errors.examen_quantite}
+                                    placeholder={I18n.t('AMOUNT')}
+                                    value={values.code_acte !== '' ? values.code_acte.billing_type === 'FREE' ? I18n.t('AMOUNT_FREE') : `${values.code_acte.unit_value} = ${values.code_acte.amount}` : ''}
+                                    editable={false}
+                                    onChangeText={handleChange('amount')}
+                                    onBlur={handleBlur('amount')}
+                                    success={touched.amount && !errors.amount}
+                                    touched={touched.amount}
+                                    error={errors.amount}
                                     keyboardType='numeric'
                                 />
 
@@ -2018,7 +2030,7 @@ const SaisirFeuilleSoinScreen = ({
                                     styles.iconNavigationButton,
                                     {
                                         borderRadius: 5,
-                                        width: 100,
+                                        width: 150,
                                         height: 30,
                                         flexDirection: "row",
                                         backgroundColor:
@@ -2038,7 +2050,7 @@ const SaisirFeuilleSoinScreen = ({
                                         );
                                     } else setModalPrestation(true);
                                 }}>
-                                <Text whiteColor>{I18n.t('PRESTATION')}</Text>
+                                <Text whiteColor>{I18n.t('CONSULTATION')}</Text>
                                 <MaterialCommunityIcons
                                     name="medical-bag"
                                     size={20}
@@ -2051,7 +2063,7 @@ const SaisirFeuilleSoinScreen = ({
                                     styles.iconNavigationButton,
                                     {
                                         borderRadius: 5,
-                                        width: 100,
+                                        width: 170,
                                         height: 30,
                                         flexDirection: "row",
                                         backgroundColor:
@@ -2063,7 +2075,7 @@ const SaisirFeuilleSoinScreen = ({
                                 onPress={e => {
                                     setModalExamen(true);
                                 }}>
-                                <Text whiteColor>{I18n.t('EXAMEN')}</Text>
+                                <Text whiteColor>{I18n.t('ACTE_EXAMEN')}</Text>
                                 <FontAwesome5
                                     name="file-medical"
                                     size={20}
@@ -2076,7 +2088,7 @@ const SaisirFeuilleSoinScreen = ({
                                     styles.iconNavigationButton,
                                     {
                                         borderRadius: 5,
-                                        width: 110,
+                                        width: 120,
                                         height: 30,
                                         flexDirection: "row",
                                         backgroundColor:
diff --git a/utils/i18n/fr.json b/utils/i18n/fr.json
index 57d3ac3e..af78b9c3 100755
--- a/utils/i18n/fr.json
+++ b/utils/i18n/fr.json
@@ -628,7 +628,7 @@
   "LONGUE": "Longue",
   "ACCIDENT": "Accident",
   "GROSSESSE": "Grossesse",
-  "ADD_PRESTATION": "Ajouter une prestation",
+  "ADD_PRESTATION": "Ajouter une consultation",
   "ADD_PRESCRIPTION": "Ajouter une prescription",
   "VISITE_DOMICILE": "Visite domicile ",
   "CODE_ACTE": "Code acte ",
@@ -689,8 +689,8 @@
   "MODIFIER_EXAMEN": "Modifier examen",
   "EXAMENS_SUCCESSFULLY_MODIFY": "Examen modifié avec succès",
   "PRESTATION_SUCCESSFULLY_MODIFY": "Prestation modifié avec succès",
-  "MODIFY_PRESTATION": "Modifier une prestation",
-  "LIST_PRESTATION": "Liste des prestations",
+  "MODIFY_PRESTATION": "Modifier une consultation",
+  "LIST_PRESTATION": "Liste des consultations",
   "NO_CONSULTATION": "Aucune consultation",
   "NO_EXECUTION": "Aucune exécution",
   "LISTE_CONSULTATION": "Liste des consultations",
@@ -725,5 +725,9 @@
   "ECH": "Ech.",
   "PER": "Per.",
   "ASSURE_SUSPENDU": "Cet assuré est suspendu",
-  "ASSURE_PRINCIPAL_SUSPENDU": "L'assuré principal est suspendu"
+  "ASSURE_PRINCIPAL_SUSPENDU": "L'assuré principal est suspendu",
+  "CONSULTATION": "Consultation",
+  "ACTE_EXAMEN": "Autre acte et examen",
+  "AMOUNT_FREE": "Montant libre",
+  "DESCRIPTION": "Description"
 }