diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8986e1f..9378abd 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,20 +8,25 @@
     "easyinput",
     "FBSJ",
     "FILESYSTEMS",
+    "GYSD",
     "idcard",
     "JBXX",
     "JCWB",
+    "JDJL",
     "JMRS",
     "localdata",
     "LYFS",
     "NIHSS",
     "nvue",
     "plusempty",
+    "RSCS",
+    "RSYW",
     "RYPG",
     "SFXHCZ",
     "SFYNCZ",
     "splashscreen",
     "TZCZYS",
+    "TZJL",
     "uniui",
     "uview",
     "vueuse",
diff --git a/components/CodeFormItem/CodeFormItem.vue b/components/CodeFormItem/CodeFormItem.vue
index 07f5c14..3062f0d 100644
--- a/components/CodeFormItem/CodeFormItem.vue
+++ b/components/CodeFormItem/CodeFormItem.vue
@@ -1,6 +1,7 @@
 <template>
   <view>
-    <uni-easyinput :value="value" type="text" placeholder="请输入" @input="$emit('on-change', $event)" v-if="config.type === 'input'" />
+    <uni-easyinput :value="value" type="text" placeholder="请输入" @change="$emit('on-change', $event)" @confirm="$emit('on-change', $event)"
+                   v-if="config.type === 'input'" />
 
     <uni-datetime-picker type="datetime" :value="value" :modelValue="value" @change="$emit('on-change', $event)"
                          v-else-if="config.type === 'datetime'" />
@@ -8,6 +9,10 @@
     <uni-data-checkbox :value="value" :localdata="config.range" @change="$emit('on-change', $event.detail.value)"
                        v-else-if="config.type === 'radio'" />
 
+
+    <uni-data-checkbox :value="value" :multiple="true" :localdata="config.range" @change="$emit('on-change', $event.detail.value)"
+                       v-else-if="config.type === 'checkbox'" />
+
     <uni-data-select :value="value" :modelValue="value" :localdata="config.range" @change="$emit('on-change', $event)"
                      v-else-if="config.type === 'select'"></uni-data-select>
 
@@ -16,23 +21,39 @@
       {{ value }}
       <uni-icons type="forward" v-if="config.rightArrow" size="16" />
     </view>
+
+    <!-- 跳页面的 -->
+    <view v-else-if="config.type === 'page'" class="flex-1 flex justify-end uni-secondary-color u-font-sm" style="height: 35px;"
+          @click="onOpenPage">
+      <text class="u-m-r-20">{{ value || config.rightText }}</text>
+      <uni-icons type="forward" v-if="config.rightArrow" size="16" />
+    </view>
   </view>
 </template>
 
 <script lang="ts" setup>
 import { CODE_DICT } from '@/config/code'
 import type { IConfig } from '@/config/code'
-import { computed } from 'vue'
+import { computed, inject } from 'vue'
+import type { Ref } from 'vue'
 
 interface IProps {
   code: string
-  value: string
+  value: string | Array<string>
 }
 
+const firstAidId = inject<Ref<string>>('firstAidId')
 const props = defineProps<IProps>()
 defineEmits(['on-change'])
 
 const config = computed<IConfig>(() => CODE_DICT[props.code])
+
+// mrs nihss 等打开页面
+// 并把code传过去
+function onOpenPage() {
+  const name = CODE_DICT[props.code].page?.name
+  uni.$u.openPage(name, false, `code=${props.code}&firstAidId=${firstAidId?.value}`)
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/components/DetailAidRecord/DetailAidRecord.vue b/components/DetailAidRecord/DetailAidRecord.vue
index d0ce1d2..9c53613 100644
--- a/components/DetailAidRecord/DetailAidRecord.vue
+++ b/components/DetailAidRecord/DetailAidRecord.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="">
     <uni-section type="line" title="患者急救记录" titleFontSize="16px"> </uni-section>
-    <uni-forms :modelValue="codeAidForm" :label-width="160" class="white uni-radius-lg uni-pa-10">
+    <uni-forms :modelValue="codeAidForm" :label-width="160" err-show-type="toast" class="white uni-radius-lg uni-pa-10">
       <uni-forms-item :name="key" v-for="key in part1" :key="key">
         <template v-slot:label>
           <view class="full-height flex" style="width: 135px">
@@ -32,7 +32,9 @@
                            @change="onChange('JMRS-Y', $event.detail.value)">
         </uni-data-checkbox>
       </uni-forms-item>
-      <view class="white">
+
+      <!-- 未溶栓原因 是否静脉溶栓=否的时候显示-->
+      <view class="white" v-if="codeAidForm['JMRS-Y'] === '否'">
         <view>未溶栓原因</view>
         <uni-data-checkbox mode="list" :multiple="true" v-model="codeAidForm['JMRS-WRSYY']" :localdata="CODE_DICT['JMRS-WRSYY'].range"
                            class="white uni-radius-lg uni-pa-6" @change="onChange('JMRS-WRSYY', $event.detail.value)">
@@ -42,19 +44,26 @@
                          @change="onChange('JMRS-WRSYY-ELSE', $event)" />
         </view>
       </view>
+
+
+      <!--  是否静脉溶栓=是的时候显示-->
+      <view class="white" v-else>
+        <JMRS @on-change="onChange" />
+
+      </view>
     </uni-forms>
   </view>
 </template>
 
 <script lang="ts" setup>
-import { reactive, computed, inject, ref } from 'vue';
+import { reactive, computed, inject } from 'vue';
 import type { Ref } from 'vue'
 import { GET_GENDER_TEXT_BY_CODE, CHU_BU_PAN_DUAN } from '@/config/service'
 import { useServiceStore } from '@/store/modules/service';
 import { CODE_DICT } from '@/config/code';
 import { computeBMI } from '@/utils/common'
 
-
+defineExpose({ init })
 const firstAidId = inject<Ref<string>>('firstAidId')
 const serviceStore = useServiceStore()
 
@@ -94,8 +103,14 @@ async function onChange(code: string, value: string) {
       return
     }
     if (code === 'RYPG-HEIGHT') {
+      //  身高变了 计算BMI
       codeAidForm['RYPG-BMI'] = computeBMI(value, codeAidForm['RYPG-WEIGHT'])
     }
+
+    if (code.includes('_ELSE')) {
+      // TODO: 其他
+      return
+    }
     const answer = typeof value === 'string' ? [value] : value
     const param = { codeAndAnswerList: [{ questionCode: code, answer, time: '' }], firstAidId: firstAidId?.value, sourceId: '', sourceType: '' }
     await uni.$u.api.updateAidCode(param)
@@ -107,6 +122,8 @@ async function onChange(code: string, value: string) {
 
 
 function init() {
+  console.log('aid record init');
+
 
   // 同步store里的急救信息
   if (!currentPatient.value) return
diff --git a/components/DetailBase/DetailBase.vue b/components/DetailBase/DetailBase.vue
index 3d27e54..34ab491 100644
--- a/components/DetailBase/DetailBase.vue
+++ b/components/DetailBase/DetailBase.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="">
+  <view>
     <uni-section type="line" title="患者基本信息" titleFontSize="16px"> </uni-section>
     <uni-forms :modelValue="baseInfo" :label-width="160" class="white uni-radius-lg uni-pa-10">
       <uni-forms-item label="扫描身份证" name="" @click="onScan">
@@ -28,8 +28,8 @@
       </uni-forms-item>
 
       <template v-for="(item, key) in codeForm" :key="key">
-        <uni-forms-item :name="key" :label="CODE_DICT[key].text" v-if="computeShow(key)">
-          <CodeFormItem :code="key" :value="item" :show="computeShow(key)" @on-change="onChange(key, $event)" />
+        <uni-forms-item :name="key" :label="CODE_DICT[key].text" v-if="computeShow(key, codeForm)">
+          <CodeFormItem :code="key" :value="item" :show="computeShow(key, codeForm)" @on-change="onChange(key, $event)" />
         </uni-forms-item>
       </template>
     </uni-forms>
@@ -48,6 +48,9 @@ import { useUserStore } from '@/store/modules/user'
 import { GENDER_LIST, FIRST_AID_ZL_TYPE } from '@/config/service'
 import { CODE_DICT } from '@/config/code';
 import { useServiceStore } from '@/store/modules/service';
+import { computeShow } from '@/utils/common'
+
+defineExpose({ init })
 
 const firstAidId = inject<Ref<string>>('firstAidId')
 const userStore = useUserStore()
@@ -77,18 +80,6 @@ const nationList = ref([])
 const token = computed(() => userStore.token)
 const currentPatient = computed(() => serviceStore.currentPatient)
 
-// 提交创建急救
-async function onSubmit() {
-  const param = { ...baseInfo, }
-  try {
-    const { firstAidId, firstAidStatus } = await uni.$u.api.createAid(param)
-    uni.$u.toast('创建成功')
-    uni.$u.openPage('detail2', false, `firstAidId=${firstAidId}&firstAidStatus=${firstAidStatus}`)
-  } catch (error) {
-    uni.$u.alertError(error)
-  }
-}
-
 // 扫描身份证
 function onScan() {
   uni.chooseImage({
@@ -173,13 +164,6 @@ async function onChange(code: string, value: string) {
   }
 }
 
-// 计算code form 前置条件的显示
-function computeShow(code: string) {
-  const { showType } = CODE_DICT[code]
-  if (!showType) return true
-  return (showType.type === 'value' && codeForm[showType.code] === showType.value)
-}
-
 // 查民族列表
 async function getNationList() {
   try {
diff --git a/components/JMRS/JMRS.vue b/components/JMRS/JMRS.vue
new file mode 100644
index 0000000..630f22c
--- /dev/null
+++ b/components/JMRS/JMRS.vue
@@ -0,0 +1,95 @@
+<template>
+  <view>
+    <uni-forms-item v-for="key in CODE_LIST_1" :key="key" :label="CODE_DICT[key].text" :name="key">
+      <CodeFormItem :code="key" :value="codeAidForm[key]" @on-change="onChange(key, $event)" />
+    </uni-forms-item>
+
+    <!-- 溶栓开始前 -->
+    <uni-collapse ref="collapse">
+      <uni-collapse-item :border="false" :open="true">
+        <template v-slot:title><text class="uni-main-color">溶栓开始前</text></template>
+        <view class="u-p-l-30 u-p-t-20">
+          <uni-forms-item v-for="key in CODE_LIST_2" :key="key" :name="key">
+            <template v-slot:label>
+              <view class="full-height flex" style="width: 135px">
+                <!-- @ts-ignore -->
+                {{ CODE_DICT[key]?.text }} <text v-if="CODE_DICT[key].description"
+                      class="uni-secondary-color">{{ CODE_DICT[key].description }}</text>
+              </view>
+            </template>
+            <CodeFormItem :code="key" :value="codeAidForm[key]" @on-change="onChange(key, $event)" />
+          </uni-forms-item>
+        </view>
+      </uni-collapse-item>
+    </uni-collapse>
+
+    <template v-for="key in CODE_LIST_3" :key="key" :name="key">
+      <uni-forms-item v-if="computeShow(key, codeAidForm)">
+        <template v-slot:label>
+          <view class="full-height flex" style="width: 135px">
+            <!-- @ts-ignore -->
+            {{ CODE_DICT[key]?.text }} <text v-if="CODE_DICT[key].description"
+                  class="uni-secondary-color">{{ CODE_DICT[key].description }}</text>
+          </view>
+        </template>
+        <CodeFormItem :code="key" :value="codeAidForm[key]" @on-change="onChange(key, $event)" />
+      </uni-forms-item>
+    </template>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { CODE_DICT } from '@/config/code';
+import { computed, reactive } from 'vue';
+import { computeShow } from '@/utils/common'
+import { useServiceStore } from '@/store/modules/service';
+
+const emits = defineEmits(['on-change'])
+
+const serviceStore = useServiceStore()
+
+const currentPatient = computed(() => serviceStore.currentPatient)
+const currentCar = computed(() => serviceStore.currentCar)
+
+const CODE_LIST_1 = ['JMRS-TOOL', 'JMRS-TH-TIME', 'JMRS-SIGN']
+// 溶栓前form item list
+const CODE_LIST_2 = ['JMRS-Q-NIHSS', 'JMRS-Q-SYSTOLIC-PRESSURE', 'JMRS-Q-DIASTOLIC-PRESSURE']
+
+const CODE_LIST_3 = ['JMRS-RSCS', 'JMRS-TIME', 'JMRS-RSYW-ZL', 'JMRS-RSYW-ZL-ELSE', 'JMRS-TZJL', 'JMRS-JDJL', 'JMRS-GYSD', 'JMRS-15-NIHSS', 'JMRS-30-NIHSS', 'JMRS-45-NIHSS', 'JMRS-60-NIHSS', 'JMRS-H-NIHSS', 'JMRS-BFZ']
+
+const codeAidForm = reactive({
+  'JMRS-TOOL': '去查看',
+  'JMRS-TH-TIME': '',
+  'JMRS-SIGN': '去签署',
+  'JMRS-Q-NIHSS': '',
+  'JMRS-Q-SYSTOLIC-PRESSURE': '',
+  'JMRS-Q-DIASTOLIC-PRESSURE': '',
+  'JMRS-RSCS': '', 'JMRS-TIME': '', 'JMRS-RSYW-ZL': '', 'JMRS-RSYW-ZL-ELSE': '', 'JMRS-TZJL': '', 'JMRS-JDJL': '', 'JMRS-GYSD': '', 'JMRS-15-NIHSS': '', 'JMRS-30-NIHSS': '', 'JMRS-45-NIHSS': '', 'JMRS-60-NIHSS': '', 'JMRS-H-NIHSS': '', 'JMRS-BFZ': ['']
+})
+
+function onChange(key, event) {
+  codeAidForm[key] = event
+  emits('on-change', key, event)
+}
+
+function init() {
+
+  // 同步store里的急救信息
+  if (!currentPatient.value) return
+  // 同步code信息
+  const { recordValDict } = currentPatient.value
+  if (!recordValDict) return
+
+  for (const key in codeAidForm) {
+    if (!recordValDict[key]) continue
+    if (CODE_DICT[key].type === 'checkbox') {
+      codeAidForm[key] = recordValDict[key][0]?.answer || ['']
+    } else {
+      codeAidForm[key] = recordValDict[key][0]?.answer[0] || ['']
+    }
+  }
+}
+
+
+init()
+</script>
diff --git a/components/NameGenderAge/NameGenderAge.vue b/components/NameGenderAge/NameGenderAge.vue
new file mode 100644
index 0000000..fc11f7d
--- /dev/null
+++ b/components/NameGenderAge/NameGenderAge.vue
@@ -0,0 +1,25 @@
+<template>
+  <uni-card :border="false">
+    <view class="uni-secondary-color u-font-sm">
+      <text class="u-m-r-30">{{ currentPatient?.patientName }}</text>
+      <text class="u-m-r-30">{{ currentPatient?.patientAge }}</text>
+      <text>{{ gender }}</text>
+    </view>
+  </uni-card>
+</template>
+
+<script lang="ts" setup>
+import { useServiceStore } from '@/store/modules/service';
+import { computed } from 'vue';
+import { GET_GENDER_TEXT_BY_CODE } from '@/config/service';
+
+const serviceStore = useServiceStore()
+
+const currentPatient = computed(() => serviceStore.currentPatient)
+
+const gender = computed(() => {
+  const val = currentPatient.value?.patientGender
+  if (!val) return ''
+  return GET_GENDER_TEXT_BY_CODE(Number(val))
+})
+</script>
diff --git a/config/code.ts b/config/code.ts
index 43e65f1..94f80c3 100644
--- a/config/code.ts
+++ b/config/code.ts
@@ -3,13 +3,16 @@ export interface IConfig {
   description?: string
   rightArrow?: boolean
   type: string
-  default: string
+  default?: string
+  mode?: string
   range?: { value: string; text: string }[]
   showType?: {
     type: string
     code: string
     value: string
   }
+  page?: { name: string }
+  rightText?: string
 }
 
 // 患者基本信息
@@ -98,12 +101,7 @@ export const AID_RECORD_DICT = {
   },
   'RYPG-WEIGHT': { text: '体重', description: '(kg)', type: 'text', default: '' },
   'RYPG-GENDER': { text: '性别', description: '', type: 'text', default: '' },
-  'RYPG-BMI': {
-    text: 'BMI',
-    description: '',
-    type: 'text',
-    default: '',
-  },
+  'RYPG-BMI': { text: 'BMI', description: '', type: 'text', default: '' },
   'RYPG-SYSTOLIC-PRESSURE': {
     text: '收缩压',
     description: '(mmHg)',
@@ -128,16 +126,18 @@ export const AID_RECORD_DICT = {
   'RYPG-MRS': {
     text: '本次入院mRS评分',
     description: '',
-    type: 'text',
+    type: 'page',
     rightArrow: true,
     default: '',
+    page: { name: 'MRS' },
   },
   'RYPG-NIHSS': {
     text: '本次入院NIHSS评分',
     description: '',
-    type: 'text',
+    type: 'page',
     rightArrow: true,
     default: '',
+    page: { name: 'NIHSS' },
   },
   'RYPG-BLOOD-REPORT-TIME': {
     text: '血样完成时间',
@@ -196,5 +196,169 @@ export const AID_RECORD_DICT = {
   },
 }
 
+export const CODE_JMRS = {
+  'JMRS-TOOL': {
+    text: '辅助工具',
+    type: 'page',
+    rightText: '去查看',
+    rightArrow: true,
+    page: { name: 'JMRS-TOOL' },
+  },
+  'JMRS-TH-TIME': {
+    text: '谈话开始时间',
+    type: 'datetime',
+    default: '',
+    valueType: 'string',
+  },
+  'JMRS-SIGN': {
+    text: '签署知情同意书',
+    type: 'page',
+    rightText: '去签署',
+    rightArrow: true,
+    page: { name: 'JMRS-SIGN' },
+  },
+  'JMRS-Q-NIHSS': {
+    text: 'NIHSS评分',
+    description: '',
+    type: 'page',
+    rightArrow: true,
+    default: '',
+    page: { name: 'NIHSS' },
+  },
+  'JMRS-Q-SYSTOLIC-PRESSURE': {
+    text: '收缩压',
+    description: '(mmHg)',
+    type: 'input',
+    inputType: 'digit',
+    default: '',
+  },
+  'JMRS-Q-DIASTOLIC-PRESSURE': {
+    text: '舒张压',
+    description: '(mmHg)',
+    type: 'input',
+    inputType: 'digit',
+    default: '',
+  },
+  'JMRS-RSCS': {
+    text: '开始静脉溶栓场所',
+    type: 'select',
+    range: [
+      { value: '急救车', text: '急救车' },
+      { value: '本院急诊科', text: '本院急诊科' },
+      { value: '本院CT室', text: '本院CT室' },
+      { value: '本院病房', text: '本院病房' },
+      { value: '外院', text: '外院' },
+    ],
+    default: '',
+  },
+  'JMRS-TIME': {
+    text: '开始静脉溶栓时间',
+    type: 'datetime',
+    default: '',
+    valueType: 'string',
+  },
+  'JMRS-RSYW-ZL': {
+    text: '静脉溶栓药物',
+    type: 'select',
+    range: [
+      { value: 'rt-PA(mg)', text: 'rt-PA(mg)' },
+      { value: '尿激酶', text: '尿激酶' },
+      { value: '阿尼普酶', text: '阿尼普酶' },
+      { value: '瑞替普酶', text: '瑞替普酶' },
+      { value: '替奈普酶', text: '替奈普酶' },
+      { value: '其他', text: '其他' },
+    ],
+    default: '',
+  },
+  'JMRS-RSYW-ZL-ELSE': {
+    text: 'rt-PA(mg)',
+    type: 'input',
+    inputType: 'digit',
+    default: '',
+    showType: {
+      type: 'valueInclude',
+      code: 'JMRS-RSYW-ZL',
+      value: 'rt-PA(mg)',
+    },
+  },
+  'JMRS-TZJL': {
+    text: '团注剂量',
+    description: '(mm)',
+    type: 'input',
+    inputType: 'digit',
+    default: '',
+  },
+  'JMRS-JDJL': {
+    text: '静滴剂量',
+    description: '(mm)',
+    type: 'input',
+    inputType: 'digit',
+    default: '',
+  },
+  'JMRS-GYSD': {
+    text: '给药速度',
+    description: '(mm/h)',
+    type: 'input',
+    inputType: 'digit',
+    default: '',
+  },
+  'JMRS-15-NIHSS': {
+    text: 'NIHSS(15min)',
+    description: '',
+    type: 'page',
+    rightArrow: true,
+    default: '',
+    page: { name: 'NIHSS' },
+  },
+  'JMRS-30-NIHSS': {
+    text: 'NIHSS(30min)',
+    description: '',
+    type: 'page',
+    rightArrow: true,
+    default: '',
+    page: { name: 'NIHSS' },
+  },
+  'JMRS-45-NIHSS': {
+    text: 'NIHSS(45min)',
+    description: '',
+    type: 'page',
+    rightArrow: true,
+    default: '',
+    page: { name: 'NIHSS' },
+  },
+  'JMRS-60-NIHSS': {
+    text: 'NIHSS(60min)',
+    description: '',
+    type: 'page',
+    rightArrow: true,
+    default: '',
+    page: { name: 'NIHSS' },
+  },
+  'JMRS-H-NIHSS': {
+    text: 'NIHSS(溶栓后)',
+    description: '',
+    type: 'page',
+    rightArrow: true,
+    default: '',
+    page: { name: 'NIHSS' },
+  },
+  'JMRS-BFZ': {
+    text: '溶栓并发症',
+    type: 'checkbox',
+    mode: 'list',
+    default: '',
+    range: [
+      { value: '无', text: '无' },
+      { value: '颅内出血', text: '颅内出血' },
+      { value: '消化道出血', text: '消化道出血' },
+      { value: '牙龈出血', text: '牙龈出血' },
+      { value: '其他部位出血', text: '其他部位出血' },
+      { value: '再灌注损伤', text: '再灌注损伤' },
+      { value: '血管源性唇舌水肿', text: '血管源性唇舌水肿' },
+      { value: '其他', text: '其他' },
+    ],
+  },
+}
+
 // all, you know?
-export const CODE_DICT: { [key: string]: IConfig } = { ...BASE_CODE_DICT, ...AID_RECORD_DICT }
+export const CODE_DICT: { [key: string]: IConfig } = { ...BASE_CODE_DICT, ...AID_RECORD_DICT, ...CODE_JMRS }
diff --git a/config/service.ts b/config/service.ts
index 96d0208..70b36da 100644
--- a/config/service.ts
+++ b/config/service.ts
@@ -42,3 +42,13 @@ export const CHU_BU_PAN_DUAN = [
   { value: '短暂性脑缺血发作', text: '短暂性脑缺血发作' },
   { value: '其他', text: '其他' },
 ]
+
+// mrs
+export const MRS_LIST = [
+  { value: '0', text: '完全无症状(0分)' },
+  { value: '1', text: '尽管有症状，但无明显功能障碍，能完成所有日常工作和生活（1分）' },
+  { value: '2', text: '轻度残疾，不能完成病前所有活动，但不需帮助能照料自己的日常事务（2分）' },
+  { value: '3', text: '中度残疾，需部分帮助，但能独立行走（3分）' },
+  { value: '4', text: '中重度残疾，不能独立行走，日常生活需别人帮助（4分）' },
+  { value: '5', text: '重度残疾，卧床，二便失禁，日常生活完全依赖他人（5分）' },
+]
diff --git a/hooks/useGetFirstAidId.ts b/hooks/useGetFirstAidId.ts
new file mode 100644
index 0000000..a9bd284
--- /dev/null
+++ b/hooks/useGetFirstAidId.ts
@@ -0,0 +1,17 @@
+import { onLoad } from '@dcloudio/uni-app'
+import { ref } from 'vue'
+
+export function useGetFirstAidId(callback?: Function) {
+  const firstAidId = ref('')
+  onLoad(option => {
+    if (option?.firstAidId) {
+      firstAidId.value = option.firstAidId
+      // 新建过来的
+      callback && callback(option.firstAidId)
+    } else {
+      firstAidId.value = ''
+    }
+  })
+
+  return { firstAidId }
+}
diff --git a/pages.json b/pages.json
index fb39af7..97471d8 100644
--- a/pages.json
+++ b/pages.json
@@ -40,6 +40,30 @@
 			"style": {
 				"navigationBarTitleText": "create-aid"
 			}
+		},
+		{
+			"path": "pages/MRS/MRS",
+			"style": {
+				"navigationBarTitleText": "MRS"
+			}
+		},
+		{
+			"path": "pages/NIHSS/NIHSS",
+			"style": {
+				"navigationBarTitleText": "NIHSS"
+			}
+		},
+		{
+			"path": "pages/JMRS-TOOL/JMRS-TOOL",
+			"style": {
+				"navigationBarTitleText": "JMRS-TOOL"
+			}
+		},
+		{
+			"path": "pages/JMRS-SIGN/JMRS-SIGN",
+			"style": {
+				"navigationBarTitleText": "JMRS-SIGN"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/JMRS-SIGN/JMRS-SIGN.vue b/pages/JMRS-SIGN/JMRS-SIGN.vue
new file mode 100644
index 0000000..c921a91
--- /dev/null
+++ b/pages/JMRS-SIGN/JMRS-SIGN.vue
@@ -0,0 +1,8 @@
+<template>
+  <div class="JMRS-SIGN">JMRS-SIGN</div>
+</template>
+
+<script lang="ts" setup>
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/pages/JMRS-TOOL/JMRS-TOOL.vue b/pages/JMRS-TOOL/JMRS-TOOL.vue
new file mode 100644
index 0000000..a6762b8
--- /dev/null
+++ b/pages/JMRS-TOOL/JMRS-TOOL.vue
@@ -0,0 +1,8 @@
+<template>
+  <div class="JMRS-TOOL">JMRS-TOOL</div>
+</template>
+
+<script lang="ts" setup>
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/pages/MRS/MRS.vue b/pages/MRS/MRS.vue
new file mode 100644
index 0000000..9a9b15c
--- /dev/null
+++ b/pages/MRS/MRS.vue
@@ -0,0 +1,37 @@
+<template>
+  <view class="u-p-30">
+    <NameGenderAge />
+
+    <uni-card title="评分标准" :border="false">
+      <uni-data-checkbox mode="list" v-model="formData.value" :localdata="MRS_LIST"></uni-data-checkbox>
+
+      <view class="flex justify-center u-p-30">
+        <u-button type="primary" size="medium" @click="onSubmit" class="bg-main" shape="circle">提交</u-button>
+      </view>
+    </uni-card>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { reactive } from 'vue';
+import { MRS_LIST } from '@/config/service'
+import { useGetFirstAidId } from '@/hooks/useGetFirstAidId';
+
+const { firstAidId } = useGetFirstAidId()
+
+const formData = reactive({ value: '' })
+
+async function onSubmit() {
+  try {
+    const answer = [formData.value]
+    const param = { codeAndAnswerList: [{ questionCode: 'RYPG-MRS', answer, time: '' }], firstAidId: firstAidId?.value, sourceId: '', sourceType: '' }
+    await uni.$u.api.updateAidCode(param)
+    uni.$u.toast('更新成功')
+
+    // 更新数据
+    uni.navigateBack()
+  } catch (error) {
+    uni.$u.alertError(error)
+  }
+}
+</script>
diff --git a/pages/NIHSS/NIHSS.vue b/pages/NIHSS/NIHSS.vue
new file mode 100644
index 0000000..a7cd2a8
--- /dev/null
+++ b/pages/NIHSS/NIHSS.vue
@@ -0,0 +1,8 @@
+<template>
+  <div class="NIHSS">NIHSS</div>
+</template>
+
+<script lang="ts" setup>
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/pages/detail2/detail2.vue b/pages/detail2/detail2.vue
index fb3208a..3b8118b 100644
--- a/pages/detail2/detail2.vue
+++ b/pages/detail2/detail2.vue
@@ -79,28 +79,29 @@
       <!-- right -->
       <view class="flex-3">
         <!-- 患者基本信息 -->
-        <DetailBase v-if="showMode === 'base'" />
+        <DetailBase ref="baseRef" v-show="showMode === 'base'" />
 
         <!-- 患者急救记录 -->
-        <DetailAidRecord v-else />
-
+        <DetailAidRecord ref="recordRef" v-show="showMode === 'record'" />
       </view>
     </view>
-
   </view>
 </template>
 
 <script lang="ts" setup>
-import { onLoad } from '@dcloudio/uni-app'
 import { useServiceStore } from '@/store/modules/service';
 import { computed, ref, provide } from 'vue';
 import { GET_GENDER_TEXT_BY_CODE } from '@/config/service';
 import { useNextNode } from '@/hooks/useNextNode'
+import { useGetFirstAidId } from '@/hooks/useGetFirstAidId';
+import { onShow } from '@dcloudio/uni-app'
 
 const serviceStore = useServiceStore()
 const { nextNode, intervalGetNextCode, leftTime } = useNextNode()
+const { firstAidId } = useGetFirstAidId(getAidInfo)
 
-const firstAidId = ref('')
+const baseRef = ref()
+const recordRef = ref()
 const showMode = ref('base') // 当前显示的模块 base 基本信息, record急救记录
 const currentPatient = computed(() => serviceStore.currentPatient)
 
@@ -126,14 +127,11 @@ function onCreateRecord() {
 
 }
 
-onLoad((option) => {
-  if (option?.firstAidId) {
-    firstAidId.value = option.firstAidId
-    // 新建过来的
-    getAidInfo(option.firstAidId)
-  } else {
-    firstAidId.value = ''
-  }
+onShow(async () => {
+  console.log('show');
+  await getAidInfo(firstAidId.value)
+  baseRef.value?.init()
+  recordRef.value?.init()
 })
 
 intervalGetNextCode()
diff --git a/pages/loading/loading.vue b/pages/loading/loading.vue
index ed614de..8c94335 100644
--- a/pages/loading/loading.vue
+++ b/pages/loading/loading.vue
@@ -65,6 +65,8 @@ function onSettingCancel() {
 
 // 打开页面
 function openPage(name) {
+  timer && clearInterval(timer)
+  timer = 0
   uni.$u.openPage(name, true)
 }
 
diff --git a/store/modules/service.ts b/store/modules/service.ts
index ae44b4c..37e9e05 100644
--- a/store/modules/service.ts
+++ b/store/modules/service.ts
@@ -32,6 +32,16 @@ export interface ServiceState {
   currentPatient: null | IPatient
   currentCar: null | ICar
   device: null | { deviceNo: string; host: string }
+  score: {
+    'RYPG-MRS': string
+    'RYPG-NIHSS': string
+    'JMRS-Q-NIHSS': string
+    'JMRS-15-NIHSS': string
+    'JMRS-30-NIHSS': string
+    'JMRS-45-NIHSS': string
+    'JMRS-60-NIHSS': string
+    'JMRS-H-NIHSS': string
+  }
 }
 
 export const useServiceStore = defineStore({
@@ -40,6 +50,16 @@ export const useServiceStore = defineStore({
     currentPatient: null, // 当前病友的信息
     device: null, // 当前设备的信息
     currentCar: null, // 车的信息
+    score: {
+      'RYPG-MRS': '',
+      'RYPG-NIHSS': '',
+      'JMRS-Q-NIHSS': '',
+      'JMRS-15-NIHSS': '',
+      'JMRS-30-NIHSS': '',
+      'JMRS-45-NIHSS': '',
+      'JMRS-60-NIHSS': '',
+      'JMRS-H-NIHSS': '',
+    },
   }),
 
   getters: {
@@ -47,9 +67,19 @@ export const useServiceStore = defineStore({
     host: ({ device }) => device?.host || '',
     carNo: ({ currentCar }) => currentCar?.carNo || '', // 平车编号
     currentFirstAidId: ({ currentPatient }) => currentPatient?.firstAidId,
+    // 查mrs NIHSS评分
+    getScore:
+      ({ score }) =>
+      (type: string) =>
+        score[type],
   },
 
   actions: {
+    // 设置 mrs NIHSS评分
+    setScore(type: string, value: string) {
+      this.score[type] = value
+    },
+
     setCurrentPatient(patient: IPatient | null) {
       this.currentPatient = patient
     },
diff --git a/uni.scss b/uni.scss
index aafd2d1..438279e 100644
--- a/uni.scss
+++ b/uni.scss
@@ -159,3 +159,11 @@ $u-type-success: #1bb299;
 .uni-forms-item.is-direction-left {
   align-items: center;
 }
+
+.uni-collapse-item__title {
+  border: none !important;
+}
+
+.uni-collapse {
+  padding-bottom: 25px;
+}
diff --git a/utils/common.ts b/utils/common.ts
index da583c3..4438cc2 100644
--- a/utils/common.ts
+++ b/utils/common.ts
@@ -1,3 +1,5 @@
+import { CODE_DICT } from '@/config/code'
+
 /**
  * 打开页面 timeout 1s执行
  * @param {string} pageName 页面的名称 同文件名 文件夹名
@@ -38,3 +40,16 @@ export function computeBMI(height: string, weight: string): string {
   const w = Number(weight)
   return (w / ((h * h) / 100 / 100)).toFixed(2)
 }
+
+// 计算code form 前置条件的显示
+export function computeShow(code: string, codeForm: any) {
+  const { showType } = CODE_DICT[code]
+  if (!showType) return true
+  if (showType.type === 'value' && codeForm[showType.code] === showType.value) {
+    return true
+  }
+  if (showType.type === 'valueInclude' && codeForm[showType.code].includes(showType.value)) {
+    return true
+  }
+  return false
+}