update merge hospital

src/services/sales/HospitalService.js

@@ -218,35 +218,15 @@ exports.updateHospitalService = async (validateData, id, req) => {
         );
     }
 
-<<<<<<< HEAD
-    let existingHospital = null;
-
-    if (validateData.name && validateData.city_id) {
-        existingHospital = await prisma.hospital.findFirst({
-=======
     if (validateData.name && validateData.city_id) {
         const existingHospital = await prisma.hospital.findFirst({
->>>>>>> update_fitur_sales
             where: {
                 name: validateData.name,
                 city_id: validateData.city_id,
                 deletedAt: null,
-<<<<<<< HEAD
-                // NOT: {
-                //     id: id,
-                // }
-            }
-        });
-
-        if (existingHospital) {
-            throw new HttpException('Hospital with same name in this city already exists', 400);
-        }
-    }
-=======
                 NOT: { id }
             }
         });
->>>>>>> update_fitur_sales
 
         if (existingHospital) {
             throw new HttpException('Hospital with same name in this city already exists', 400);