Merge pull request #18 from Team-ReMind/feat/onboarding_other

[feat] release apk 추출
Team-ReMind · May 23, 2024 · e1f9604 · e1f9604
2 parents 46a2cc5 + 53b8372
commit e1f9604
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/src/main/java/com/example/remind/feature/screens/doctor/DoctorRegisterScreen.kt b/app/src/main/java/com/example/remind/feature/screens/doctor/DoctorRegisterScreen.kt
@@ -19,6 +19,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -82,6 +83,7 @@ fun DoctorRegisterScreen(
                     modifier = Modifier.padding(top = 15.dp)
                 ) {
                     itemsIndexed(uiState.acceptList.patientDtos) { index, item ->
+                        val status = acceptStatusMap[item.memberId] ?: false
                         RequestListItem(
                             data = uiState.acceptList.patientDtos.get(index),
                             onClick = {
@@ -91,7 +93,7 @@ fun DoctorRegisterScreen(
                                     )
                                 )
                             },
-                            status = acceptStatusMap[item.memberId] ?: false
+                            status = status
                         )
                     }
                 }

diff --git a/app/src/main/java/com/example/remind/feature/screens/doctor/DoctorViewModel.kt b/app/src/main/java/com/example/remind/feature/screens/doctor/DoctorViewModel.kt
@@ -64,7 +64,7 @@ class DoctorViewModel @Inject constructor(
                     memberId = event.memberId
                 ))
                 getPatientInfo(event.memberId)
-                getMoodChartData(year, month, date, event.memberId)
+                getMoodChartData(year, month, date-6, event.memberId)
                 navigateToRoute(
                     destination = Screens.Doctor.PatienceManage.route,
                     current = Screens.Doctor.DoctorMain.route,

diff --git a/app/src/main/java/com/example/remind/feature/screens/doctor/PatientManageScreen.kt b/app/src/main/java/com/example/remind/feature/screens/doctor/PatientManageScreen.kt
@@ -67,6 +67,9 @@ fun PatientManageScreen(
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val effectFlow = viewModel.effect
     val scrollState = rememberScrollState()
+    LaunchedEffect(Unit) {
+        viewModel.getPatients()
+    }
     LaunchedEffect(true) {
         effectFlow.collectLatest { effect ->
             when(effect) {