1.添加人工协助弹窗判断

baselib/schemas/com.yingyangfly.baselib.db.AppDataBase/1.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "efa093b14cdd56f01fccd3bb8ea019ae",
+    "identityHash": "67320e3248d63c82074793d0c4c36090",
     "entities": [
       {
         "tableName": "Questions",
@@ -204,7 +204,7 @@
       },
       {
         "tableName": "QuestionRecords",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `correctOptionId` TEXT, `correctOptionName` TEXT, `examinationId` TEXT, `examinationTitle` TEXT, `manualHelp` TEXT, `orgCode` TEXT, `orgName` TEXT, `score` TEXT, `status` TEXT, `title` TEXT, `usedTime` TEXT, `questionOptionName` TEXT, `selectedItemId` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `correctOptionId` TEXT, `correctOptionName` TEXT, `examinationId` TEXT, `examinationTitle` TEXT, `manualHelp` TEXT, `orgCode` TEXT, `orgName` TEXT, `score` TEXT, `status` TEXT, `title` TEXT, `usedTime` TEXT, `questionOptionName` TEXT, `selectedItemId` INTEGER NOT NULL, `isCorrect` TEXT, PRIMARY KEY(`id`))",
         "fields": [
           {
             "fieldPath": "id",
@@ -289,6 +289,12 @@
             "columnName": "selectedItemId",
             "affinity": "INTEGER",
             "notNull": true
+          },
+          {
+            "fieldPath": "isCorrect",
+            "columnName": "isCorrect",
+            "affinity": "TEXT",
+            "notNull": false
           }
         ],
         "primaryKey": {
@@ -304,7 +310,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'efa093b14cdd56f01fccd3bb8ea019ae')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '67320e3248d63c82074793d0c4c36090')"
     ]
   }
 }

baselib/src/main/java/com/yingyangfly/baselib/db/QuestionOptionBean.java

@@ -16,12 +16,10 @@ public class QuestionOptionBean {
 
     @PrimaryKey
     private long id;
-
     private String correctOption;
     private String optionKey;
     private String optionVal;
     private long questionId;
-
     @Ignore
     private String updateBy;
     @Ignore

baselib/src/main/java/com/yingyangfly/baselib/db/QuestionRecordsBean.java

@@ -19,12 +19,11 @@ public class QuestionRecordsBean {
 
     @PrimaryKey
     private long id;
-
     private String correctOptionId;
     private String correctOptionName;
     private String examinationId;
     private String examinationTitle;
-    private String manualHelp;
+    private String manualHelp;//0 需要人工帮助，1不需要
     private String orgCode;
     private String orgName;
     private String score;
@@ -32,9 +31,10 @@ public class QuestionRecordsBean {
     private String title;
     private String usedTime;
     private String questionOptionName;
-
     private long selectedItemId;
 
+    private String isCorrect;
+
     @Ignore
     private String createBy;
     @Ignore
@@ -274,4 +274,15 @@ public class QuestionRecordsBean {
     public void setSelectedItemId(long selectedItemId) {
         this.selectedItemId = selectedItemId;
     }
+
+    public String getIsCorrect() {
+        if (TextUtils.isEmpty(isCorrect)) {
+            return "";
+        }
+        return isCorrect;
+    }
+
+    public void setIsCorrect(String isCorrect) {
+        this.isCorrect = isCorrect;
+    }
 }

baselib/src/main/java/com/yingyangfly/baselib/dialog/AnswerJudgmentFragment.kt

@@ -0,0 +1,68 @@
+package com.yingyangfly.baselib.dialog
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.RadioGroup
+import androidx.fragment.app.DialogFragment
+import com.gyf.immersionbar.BarHide
+import com.gyf.immersionbar.ktx.immersionBar
+import com.yingyangfly.baselib.R
+import com.yingyangfly.baselib.utils.ViewTool
+
+/**
+ * 协助判断
+ */
+class AnswerJudgmentFragment : DialogFragment() {
+
+    private var radioChoice: RadioGroup? = null
+    var onDialogClickListener: ((status: String) -> Unit)? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        isCancelable = false
+        dialog?.setCanceledOnTouchOutside(true)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        dialog?.window?.setLayout(
+            ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT
+        )
+        dialog?.window?.setBackgroundDrawableResource(R.color.transparent)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+    ): View? {
+        immersionBar {
+            hideBar(BarHide.FLAG_HIDE_BAR)
+            navigationBarColor(R.color.transparent)
+        }
+        val rootView = ViewTool.inflateFragmentPixels(
+            activity, R.layout.fragment_answer_judgment, container, 1194, 834
+        )
+        findId(rootView)
+        init()
+        return rootView
+    }
+
+    private fun findId(rootView: View) {
+        radioChoice = rootView.findViewById(R.id.radioChoice)
+    }
+
+    private fun init() {
+        if (radioChoice != null) {
+            radioChoice?.setOnCheckedChangeListener { group, checkedId ->
+                if (checkedId == R.id.radioCorrect) {
+                    onDialogClickListener?.invoke("1")
+                    dismiss()
+                } else if (checkedId == R.id.radioDeny) {
+                    onDialogClickListener?.invoke("2")
+                    dismiss()
+                }
+            }
+        }
+    }
+}

baselib/src/main/res/color/txt_radio_color.xml

@@ -0,0 +1,5 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+    <item android:color="@android:color/white" android:state_checked="true" />
+    <!-- not selected -->
+    <item android:color="@color/color_FF222222" android:state_checked="false" />
+</selector>

baselib/src/main/res/drawable/bg_choice_item.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_FF979797" />
+    <corners android:radius="@dimen/divider_8px" />
+    <solid android:color="@color/color_FFF6F4F4" />
+</shape>

baselib/src/main/res/drawable/bg_selected_choice_item.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_FF4A76FF" />
+    <corners android:radius="@dimen/divider_8px" />
+    <solid android:color="@color/color_FF4A76FF" />
+    <padding
+        android:left="@dimen/divider_31px"
+        android:right="@dimen/divider_31px" />
+</shape>

baselib/src/main/res/drawable/bg_unselected_choice_item.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_FF979797" />
+    <corners android:radius="@dimen/divider_8px" />
+    <solid android:color="@color/color_FFF6F4F4" />
+    <padding
+        android:left="@dimen/divider_31px"
+        android:right="@dimen/divider_31px"/>
+</shape>

baselib/src/main/res/drawable/selector_questions_choice.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+    <item android:drawable="@drawable/bg_selected_choice_item" android:state_checked="true" />
+    <item android:drawable="@drawable/bg_selected_choice_item" android:state_selected="true" />
+    <item android:drawable="@drawable/bg_unselected_choice_item" />
+</selector>
+
+

baselib/src/main/res/layout/fragment_answer_judgment.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/headlayout"
+        android:layout_width="@dimen/divider_667px"
+        android:layout_height="@dimen/divider_427px"
+        android:theme="@style/Theme.MaterialComponents.NoActionBar"
+        app:cardBackgroundColor="@android:color/white"
+        app:cardCornerRadius="@dimen/divider_20px"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:strokeColor="@color/color_FF979797"
+        app:strokeWidth="@dimen/divider_1px">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="@dimen/divider_191px"
+                android:layout_height="match_parent"
+                android:background="@color/color_FF4A76FF"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="@dimen/divider_65px"
+                    android:layout_height="@dimen/divider_86px"
+                    android:layout_gravity="center"
+                    android:background="@mipmap/icon_doctor_head" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvYear"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/divider_31px"
+                    android:background="@color/color_FF4A76FF"
+                    android:gravity="center_horizontal"
+                    android:text="@string/accompanying_personnel_judgment"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_24px" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_16px"
+                    android:gravity="center"
+                    android:text="@string/can_the_accompanying_personnel_determine_the_patient_answer_is_correct"
+                    android:textColor="@color/color_FF222222"
+                    android:textSize="@dimen/divider_32px"
+                    android:textStyle="bold" />
+
+                <RadioGroup
+                    android:id="@+id/radioChoice"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/divider_32px"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/radioCorrect"
+                        android:layout_width="@dimen/divider_191px"
+                        android:layout_height="@dimen/divider_90px"
+                        android:background="@drawable/selector_questions_choice"
+                        android:button="@null"
+                        android:gravity="center"
+                        android:text="@string/correct"
+                        android:textColor="@color/txt_radio_color"
+                        android:textSize="@dimen/divider_24px"
+                        android:textStyle="bold" />
+
+                    <RadioButton
+                        android:id="@+id/radioDeny"
+                        android:layout_width="@dimen/divider_191px"
+                        android:layout_height="@dimen/divider_90px"
+                        android:layout_marginStart="@dimen/divider_12px"
+                        android:background="@drawable/selector_questions_choice"
+                        android:button="@null"
+                        android:gravity="center"
+                        android:text="@string/deny"
+                        android:textColor="@color/txt_radio_color"
+                        android:textSize="@dimen/divider_24px"
+                        android:textStyle="bold" />
+
+                </RadioGroup>
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

baselib/src/main/res/values/colors.xml

@@ -22,7 +22,7 @@
     <color name="bgDefault">#ffFaFaFa</color>
     <color name="colorTxtDefault">#D8000000</color>
     <color name="color_000000">#000000</color>
-    <color name="color_FF222222">#F222222</color>
+    <color name="color_FF222222">#FF222222</color>
     <color name="color_FF4174FF">#FF4174FF</color>
     <color name="color_FF6D9AFF">#FF6D9AFF</color>
     <color name="color_FC426CFB">#FC426CFB</color>
@@ -37,4 +37,5 @@
     <color name="color_FF81D7FF">#FF81D7FF</color>
     <color name="color_FF1AA1FF">#FF1AA1FF</color>
     <color name="color_FF92ADFF">#FF92ADFF</color>
+    <color name="color_FFF6F4F4">#FFF6F4F4</color>
 </resources>

baselib/src/main/res/values/dimens.xml

@@ -49,6 +49,7 @@
     <dimen name="divider_290px" tools:ignore="ResourceName">290px</dimen>
     <dimen name="divider_289px" tools:ignore="ResourceName">289px</dimen>
     <dimen name="divider_270px" tools:ignore="ResourceName">270px</dimen>
+    <dimen name="divider_265px" tools:ignore="ResourceName">265px</dimen>
     <dimen name="divider_264px" tools:ignore="ResourceName">264px</dimen>
     <dimen name="divider_260px" tools:ignore="ResourceName">260px</dimen>
     <dimen name="divider_250px" tools:ignore="ResourceName">250px</dimen>
@@ -64,10 +65,12 @@
     <dimen name="divider_203px" tools:ignore="ResourceName">203px</dimen>
     <dimen name="divider_200px" tools:ignore="ResourceName">200px</dimen>
     <dimen name="divider_195px" tools:ignore="ResourceName">195px</dimen>
+    <dimen name="divider_191px" tools:ignore="ResourceName">191px</dimen>
     <dimen name="divider_190px" tools:ignore="ResourceName">190px</dimen>
     <dimen name="divider_184px" tools:ignore="ResourceName">184px</dimen>
     <dimen name="divider_180px" tools:ignore="ResourceName">180px</dimen>
     <dimen name="divider_176px" tools:ignore="ResourceName">176px</dimen>
+    <dimen name="divider_175px" tools:ignore="ResourceName">175px</dimen>
     <dimen name="divider_160px" tools:ignore="ResourceName">160px</dimen>
     <dimen name="divider_146px" tools:ignore="ResourceName">146px</dimen>
     <dimen name="divider_140px" tools:ignore="ResourceName">140px</dimen>
@@ -97,7 +100,9 @@
     <dimen name="divider_100px" tools:ignore="ResourceName">100px</dimen>
     <dimen name="divider_98px" tools:ignore="ResourceName">98px</dimen>
     <dimen name="divider_92px" tools:ignore="ResourceName">92px</dimen>
+    <dimen name="divider_90px" tools:ignore="ResourceName">90px</dimen>
     <dimen name="divider_88px" tools:ignore="ResourceName">88px</dimen>
+    <dimen name="divider_86px" tools:ignore="ResourceName">86px</dimen>
     <dimen name="divider_85px" tools:ignore="ResourceName">85px</dimen>
     <dimen name="divider_82px" tools:ignore="ResourceName">82px</dimen>
     <dimen name="divider_80px" tools:ignore="ResourceName">80px</dimen>

baselib/src/main/res/values/strings.xml

@@ -1,10 +1,14 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="app_name">base</string>
-    <string name="good" tools:ignore="ResourceName">好的</string>
+    <string name="good">好的</string>
     <string name="there_is_currently_no_data_available">暂时没有数据</string>
-    <string name="please_rate_this_interview" tools:ignore="ResourceName">请为本次问诊打分</string>
-    <string name="mark" tools:ignore="ResourceName">评分</string>
-    <string name="cancel" tools:ignore="ResourceName">取消</string>
-    <string name="complete" tools:ignore="ResourceName">完成</string>
+    <string name="please_rate_this_interview">请为本次问诊打分</string>
+    <string name="mark">评分</string>
+    <string name="cancel">取消</string>
+    <string name="complete">完成</string>
     <string name="dialog_determine">确定</string>
+    <string name="accompanying_personnel_judgment">请陪同人员判定</string>
+    <string name="correct">是</string>
+    <string name="deny">否</string>
+    <string name="can_the_accompanying_personnel_determine_the_patient_answer_is_correct">请陪同人员判定患者回答是否正确？</string>
 </resources>

evaluation/src/main/java/com/yingyangfly/evaluation/adapter/ExaminationAdapter.kt

@@ -26,7 +26,7 @@ class ExaminationAdapter(override val layoutId: Int = R.layout.item_examination)
             binding.examinationLayout.setBackgroundResource(R.color.color_FFCFD9FF)
         }
 
-        binding.imageArrow.setOnSingleClickListener {
+        binding.examinationLayout.setOnSingleClickListener {
             onClickListener?.invoke(item)
         }
     }

evaluation/src/main/java/com/yingyangfly/evaluation/entity/SaveAnswerRecordBean.kt

@@ -12,4 +12,5 @@ class SaveAnswerRecordBean {
     var score: String = ""
     var title: String = ""
     var usedTime: String = ""
+    var isCorrect: String = ""
 }

evaluation/src/main/java/com/yingyangfly/evaluation/questionlist/QuestionListActivity.kt

@@ -1,11 +1,13 @@
 package com.yingyangfly.evaluation.questionlist
 
 import android.annotation.SuppressLint
+import android.text.TextUtils
 import android.view.MotionEvent
 import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.yingyangfly.baselib.db.QuestionOptionBean
 import com.yingyangfly.baselib.db.QuestionRecordsBean
+import com.yingyangfly.baselib.dialog.AnswerJudgmentFragment
 import com.yingyangfly.baselib.dialog.TipsDialog
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
@@ -47,10 +49,14 @@ class QuestionListActivity : BaseMVVMActivity<ActivityQuestionListBinding, Quest
             rvSelectedItem.adapter = questionListAdapter
         }
         questionListAdapter.onClickListener = {
-            if (questionRecordsBean != null && questionRecordsDao != null) {
-                questionRecordsBean?.selectedItemId = it.id
-                questionRecordsBean?.questionOptionName = it.optionVal
-                questionRecordsDao?.update(questionRecordsBean!!)
+            runOnUiThread {
+                if (questionRecordsBean != null) {
+                    if (TextUtils.equals("0", questionRecordsBean?.manualHelp)) {
+                        showAnswerJudgmentDialog(it)
+                    } else {
+                        saveAnswer(it)
+                    }
+                }
             }
         }
     }
@@ -147,7 +153,6 @@ class QuestionListActivity : BaseMVVMActivity<ActivityQuestionListBinding, Quest
         runOnUiThread {
             //底部按钮展示逻辑
             binding {
-
                 btnPrevious.visibility = if (questionIndex > 0) {
                     View.VISIBLE
                 } else {
@@ -178,34 +183,68 @@ class QuestionListActivity : BaseMVVMActivity<ActivityQuestionListBinding, Quest
         }
     }
 
+    /**
+     * 展示人工判断弹窗
+     */
+    private fun showAnswerJudgmentDialog(bean: QuestionOptionBean) {
+        runOnUiThread {
+            val answerJudgmentFragment = AnswerJudgmentFragment()
+            answerJudgmentFragment.onDialogClickListener = {
+                if (questionRecordsDao != null) {
+                    questionRecordsBean?.isCorrect = it
+                    questionRecordsBean?.selectedItemId = bean.id
+                    questionRecordsBean?.questionOptionName = bean.optionVal
+                    questionRecordsDao?.update(questionRecordsBean!!)
+                }
+            }
+            answerJudgmentFragment.show(supportFragmentManager, "answerJudgmentFragment")
+        }
+    }
+
+    /**
+     * 保存答案
+     */
+    private fun saveAnswer(bean: QuestionOptionBean) {
+        runOnUiThread {
+            if (questionRecordsDao != null) {
+                questionRecordsBean?.selectedItemId = bean.id
+                questionRecordsBean?.questionOptionName = bean.optionVal
+                questionRecordsDao?.update(questionRecordsBean!!)
+            }
+        }
+    }
+
     /**
      * 提交数据
      */
     private fun saveData() {
-        if (questionRecordsBeans.isNullOrEmpty().not()) {
-            val saveAnswerRecordBean = mutableListOf<SaveAnswerRecordBean>()
-            questionRecordsBeans.forEach {
-                val saveAnswerRecord = SaveAnswerRecordBean().apply {
-                    correctOptionId = it.selectedItemId
-                    id = it.id
-                    score = it.score
-                    correctOptionName = it.questionOptionName
-                    title = it.title
-                    usedTime = time.toString()
+        runOnUiThread {
+            if (questionRecordsBeans.isNullOrEmpty().not()) {
+                val saveAnswerRecordBean = mutableListOf<SaveAnswerRecordBean>()
+                questionRecordsBeans.forEach {
+                    val saveAnswerRecord = SaveAnswerRecordBean().apply {
+                        correctOptionId = it.selectedItemId
+                        id = it.id
+                        score = it.score
+                        correctOptionName = it.questionOptionName
+                        title = it.title
+                        usedTime = time.toString()
+                        isCorrect = it.isCorrect
+                    }
+                    id = it.id.toString()
+                    saveAnswerRecord.examinationId = examinationId
+                    saveAnswerRecord.examinationTitle = examinationTitle
+                    saveAnswerRecordBean.add(saveAnswerRecord)
                 }
-                id = it.id.toString()
-                saveAnswerRecord.examinationId = examinationId
-                saveAnswerRecord.examinationTitle = examinationTitle
-                saveAnswerRecordBean.add(saveAnswerRecord)
+                viewModel.saveAnswerRecord(saveAnswerRecordBean, fail = {
+                    it.toast()
+                }, success = {
+                    JumpUtil.jumpActivityWithUrl(
+                        RouterUrlCommon.evaluationHistory, "other", mContext
+                    )
+                    finish()
+                })
             }
-            viewModel.saveAnswerRecord(saveAnswerRecordBean, fail = {
-                it.toast()
-            }, success = {
-                JumpUtil.jumpActivityWithUrl(
-                    RouterUrlCommon.evaluationHistory, "other", mContext
-                )
-                finish()
-            })
         }
     }
 }

evaluation/src/main/res/layout/activity_other_evaluation.xml

@@ -23,7 +23,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/divider_32px"
-            android:text="@string/evaluation"
+            android:text="@string/other_evaluations"
             android:textColor="@android:color/white"
             android:textSize="@dimen/divider_34px"
             android:textStyle="bold"