diff --git a/src/page-subspecialty/views/questionEyehistory/index.vue b/src/page-subspecialty/views/questionEyehistory/index.vue
index ec1564c..ebb1534 100644
--- a/src/page-subspecialty/views/questionEyehistory/index.vue
+++ b/src/page-subspecialty/views/questionEyehistory/index.vue
@@ -167,7 +167,8 @@
                   @change="checkboxChange('yxyjOkCheck',$event)">OK镜</van-checkbox>
                 <template v-if="dataForm.yxyjOkCheck">
                   <van-field v-model.trim="dataForm.yxyjOkInput" :rules="formRyles.requireContent" placeholder="几年"
-                    type="number" class="width-field-100 back-gley" @input="inputChange('yxyjOkCheck',$event)" />
+                    type="number" class="width-field-100 back-gley" @input="inputChange('yxyjOkCheck',$event)"
+                    @change="maxNumberChange('yxyjOkInput',$event)" />
                   <van-popover v-model="okShowPopover" trigger="click" :actions="unitList"
                     @select="onSelect($event,'yxyjOkUnit')">
                     <template #reference>
@@ -195,7 +196,8 @@
                 <p class="padd">
                   <span>已停戴有：</span>
                   <van-field v-model.trim="dataForm.yxyjOkTdTimeInput" :rules="formRyles.requireContent"
-                    placeholder="几年" class="width-field-100 back-gley" type="number" />
+                    placeholder="几年" class="width-field-100 back-gley" type="number"
+                    @change="maxNumberChange('yxyjOkTdTimeInput',$event)" />
                   <van-popover v-model="okTjTimeshowPopover" trigger="click" :actions="unitList"
                     @select="onSelect($event,'yxyjOkTdTimeUnit')">
                     <template #reference>
@@ -214,7 +216,8 @@
                   @change="checkboxChange('yxyjGmjCheck',$event)">巩膜镜</van-checkbox>
                 <template v-if="dataForm.yxyjGmjCheck">
                   <van-field v-model.trim="dataForm.yxyjGmjInput" :rules="formRyles.requireContent" placeholder="几年"
-                    type="number" class="width-field-100 back-gley" @input="inputChange('yxyjGmjCheck',$event)" />
+                    type="number" class="width-field-100 back-gley" @input="inputChange('yxyjGmjCheck',$event)"
+                    @change="maxNumberChange('yxyjGmjInput',$event)" />
                   <van-popover v-model="gmjShowPopover" trigger="click" :actions="unitList"
                     @select="onSelect($event,'yxyjGmjUnit')">
                     <template #reference>
@@ -242,7 +245,8 @@
                 <p class="padd">
                   <span>已停戴有：</span>
                   <van-field v-model.trim="dataForm.yxyjGmjTdTimeInput" :rules="formRyles.requireContent"
-                    placeholder="几年" class="width-field-100 back-gley" type="number" />
+                    placeholder="几年" class="width-field-100 back-gley" type="number"
+                    @change="maxNumberChange('yxyjGmjTdTimeInput',$event)" />
                   <van-popover v-model="gmjTjTimeshowPopover" trigger="click" :actions="unitList"
                     @select="onSelect($event,'yxyjGmjTdTimeUnit')">
                     <template #reference>
@@ -261,7 +265,8 @@
                   @change="checkboxChange('yxyjRgpCheck',$event)">RGP</van-checkbox>
                 <template v-if="dataForm.yxyjRgpCheck">
                   <van-field v-model.trim="dataForm.yxyjRgpInput" :rules="formRyles.requireContent" placeholder="几年"
-                    type="number" class="width-field-100 back-gley" @input="inputChange('yxyjRgpCheck',$event)" />
+                    type="number" class="width-field-100 back-gley" @input="inputChange('yxyjRgpCheck',$event)"
+                    @change="maxNumberChange('yxyjRgpInput',$event)" />
                   <van-popover v-model="rgpShowPopover" trigger="click" :actions="unitList"
                     @select="onSelect($event,'yxyjRgpUnit')">
                     <template #reference>
@@ -288,7 +293,8 @@
                 <p class="padd">
                   <span>已停戴有：</span>
                   <van-field v-model.trim="dataForm.yxyjRgpTdTimeInput" :rules="formRyles.requireContent"
-                    placeholder="几年" type="number" class="width-field-100 back-gley" />
+                    placeholder="几年" type="number" class="width-field-100 back-gley"
+                    @change="maxNumberChange('yxyjRgpTdTimeInput',$event)" />
                   <van-popover v-model="rgpTjTimeshowPopover" trigger="click" :actions="unitList"
                     @select="onSelect($event,'yxyjRgpTdTimeUnit')">
                     <template #reference>
@@ -307,7 +313,8 @@
                   @change="checkboxChange('yxyjRjCheck',$event)">软镜</van-checkbox>
                 <template v-if="dataForm.yxyjRjCheck">
                   <van-field v-model.trim="dataForm.yxyjRjInput" :rules="formRyles.requireContent" placeholder="几年"
-                    type="number" class="width-field-100 back-gley" @input="inputChange('yxyjRjCheck',$event)" />
+                    type="number" class="width-field-100 back-gley" @input="inputChange('yxyjRjCheck',$event)"
+                    @change="maxNumberChange('yxyjRjInput',$event)" />
                   <van-popover v-model="rjshowPopover" trigger="click" :actions="unitList"
                     @select="onSelect($event,'yxyjRjUnit')">
                     <template #reference>
@@ -334,7 +341,8 @@
                 <p class="padd">
                   <span>已停戴有：</span>
                   <van-field v-model.trim="dataForm.yxyjRjTdTimeInput" :rules="formRyles.requireContent"
-                    placeholder="几年" type="number" class="width-field-100 back-gley" />
+                    placeholder="几年" type="number" class="width-field-100 back-gley"
+                    @change="maxNumberChange('yxyjRjTdTimeInput',$event)" />
                   <van-popover v-model="rjTjTimeshowPopover" trigger="click" :actions="unitList"
                     @select="onSelect($event,'yxyjRjTdTimeUnit')">
                     <template #reference>
@@ -412,8 +420,7 @@
             <template #input>
               <p>
                 <span class="li-row-title">7、孕哺期：</span>
-                <van-radio-group v-model="dataForm.ybqRadio" direction="horizontal"
-                  @change="radioChange('ybqRadio')">
+                <van-radio-group v-model="dataForm.ybqRadio" direction="horizontal" @change="radioChange('ybqRadio')">
                   <van-radio name="否认">否认</van-radio>
                   <van-radio name="有">是</van-radio>
                 </van-radio-group>
@@ -486,7 +493,7 @@
           <van-field required :rules="formRyles.requireQuestion" name="radio">
             <template #input>
               <p>
-                <span class="li-row-title">11、药物过敏史：</span>
+                <span class="li-row-title">11、食物和药物过敏史：</span>
                 <van-radio-group v-model="dataForm.ywgmsRadio" direction="horizontal"
                   @change="radioChange('ywgmsRadio')">
                   <van-radio name="否认">否认</van-radio>
@@ -495,9 +502,20 @@
               </p>
             </template>
           </van-field>
-          <van-field v-if="dataForm.ywgmsRadio==='有'" v-model.trim="dataForm.ywgmsInput"
-            :rules="formRyles.requireContent" rows="2" autosize maxlength="150" show-word-limit type="textarea"
-            placeholder="请输入药物过敏史" />
+          <div v-if="dataForm.ywgmsRadio==='有'">
+            <van-field name="checkboxGroup" class="background-field" :rules="formRyles.requireQuestion">
+              <template #input>
+                <van-checkbox-group v-model="dataForm.ywgmsCheck" direction="horizontal"
+                  @change="checkChange('ywgmsCheck')">
+                  <van-checkbox v-for="(item,index) in swywGmsList" :key="index" :name="item" shape="square">{{ item }}
+                  </van-checkbox>
+                </van-checkbox-group>
+              </template>
+            </van-field>
+            <van-field v-if="dataForm.ywgmsCheck.includes('其它')" v-model.trim="dataForm.ywgmsInput"
+              :rules="formRyles.requireContent" rows="2" autosize maxlength="150" show-word-limit type="textarea"
+              placeholder="请输入食物、药物过敏史" />
+          </div>
         </div>
         <div class="li-row nobackground">
           <van-field required :rules="formRyles.requireQuestion" name="radio">
@@ -536,6 +554,90 @@
                 </van-checkbox-group>
               </template>
             </van-field>
+            <div v-if="dataForm.qtbsCheck.includes('甲亢')" class="margin-top-10 width-field-100 flex-2">
+              甲亢：
+              <van-field v-model.trim="dataForm.qtbsJkInput" :rules="formRyles.requireContent" placeholder="几年"
+                type="number" class="width-field-100 back-gley" @change="maxNumberChange('qtbsJkInput',$event)" />
+              <van-popover v-model="rjshowPopover" trigger="click" :actions="unitList"
+                @select="onSelect($event,'qtbsJkUnit')">
+                <template #reference>
+                  <span class="unitClass">
+                    {{ dataForm.qtbsJkUnit }}
+                    <van-icon name="arrow-down" size="14" />
+                  </span>
+                </template>
+              </van-popover>
+            </div>
+            <div v-if="dataForm.qtbsCheck.includes('甲减')" class="margin-top-10 width-field-100 flex-2">
+              甲减：
+              <van-field v-model.trim="dataForm.qtbsJjInput" :rules="formRyles.requireContent" placeholder="几年"
+                type="number" class="width-field-100 back-gley" @change="maxNumberChange('qtbsJjInput',$event)" />
+              <van-popover v-model="rjshowPopover" trigger="click" :actions="unitList"
+                @select="onSelect($event,'qtbsJjUnit')">
+                <template #reference>
+                  <span class="unitClass">
+                    {{ dataForm.qtbsJjUnit }}
+                    <van-icon name="arrow-down" size="14" />
+                  </span>
+                </template>
+              </van-popover>
+            </div>
+            <div v-if="dataForm.qtbsCheck.includes('高血压')" class="margin-top-10 width-field-100 flex-2">
+              高血压：
+              <van-field v-model.trim="dataForm.qtbsGxyInput" :rules="formRyles.requireContent" placeholder="几年"
+                type="number" class="width-field-100 back-gley" @change="maxNumberChange('qtbsGxyInput',$event)" />
+              <van-popover v-model="rjshowPopover" trigger="click" :actions="unitList"
+                @select="onSelect($event,'qtbsGxyUnit')">
+                <template #reference>
+                  <span class="unitClass">
+                    {{ dataForm.qtbsGxyUnit }}
+                    <van-icon name="arrow-down" size="14" />
+                  </span>
+                </template>
+              </van-popover>
+            </div>
+            <div v-if="dataForm.qtbsCheck.includes('抑郁')" class="margin-top-10 width-field-100 flex-2">
+              抑郁：
+              <van-field v-model.trim="dataForm.qtbsYyInput" :rules="formRyles.requireContent" placeholder="几年"
+                type="number" class="width-field-100 back-gley" @change="maxNumberChange('qtbsYyInput',$event)" />
+              <van-popover v-model="rjshowPopover" trigger="click" :actions="unitList"
+                @select="onSelect($event,'qtbsYyUnit')">
+                <template #reference>
+                  <span class="unitClass">
+                    {{ dataForm.qtbsYyUnit }}
+                    <van-icon name="arrow-down" size="14" />
+                  </span>
+                </template>
+              </van-popover>
+            </div>
+            <div v-if="dataForm.qtbsCheck.includes('焦虑')" class="margin-top-10 width-field-100 flex-2">
+              焦虑：
+              <van-field v-model.trim="dataForm.qtbsJlInput" :rules="formRyles.requireContent" placeholder="几年"
+                type="number" class="width-field-100 back-gley" @change="maxNumberChange('qtbsJlInput',$event)" />
+              <van-popover v-model="rjshowPopover" trigger="click" :actions="unitList"
+                @select="onSelect($event,'qtbsJlUnit')">
+                <template #reference>
+                  <span class="unitClass">
+                    {{ dataForm.qtbsJlUnit }}
+                    <van-icon name="arrow-down" size="14" />
+                  </span>
+                </template>
+              </van-popover>
+            </div>
+            <div v-if="dataForm.qtbsCheck.includes('糖尿病')" class="margin-top-10 width-field-100 flex-2">
+              糖尿病：
+              <van-field v-model.trim="dataForm.qtbsTnbInput" :rules="formRyles.requireContent" placeholder="几年"
+                type="number" class="width-field-100 back-gley" @change="maxNumberChange('qtbsTnbInput',$event)" />
+              <van-popover v-model="rjshowPopover" trigger="click" :actions="unitList"
+                @select="onSelect($event,'qtbsTnbUnit')">
+                <template #reference>
+                  <span class="unitClass">
+                    {{ dataForm.qtbsTnbUnit }}
+                    <van-icon name="arrow-down" size="14" />
+                  </span>
+                </template>
+              </van-popover>
+            </div>
             <van-field v-if="dataForm.qtbsCheck.includes('其它')" v-model.trim="dataForm.qtbsInput"
               :rules="formRyles.requireContent" class="margin-top-10" rows="2" autosize maxlength="150" show-word-limit
               type="textarea" placeholder="请输入其它全身病史" />
@@ -688,7 +790,7 @@ export default {
         ybykSssRadio: '',
         ybykSssInput: '',
         // 孕哺期
-        ybqRadio:'',
+        ybqRadio: '',
         // 眼睛是否有不适
         yjbsCheckbox: [],
         // 要求手术原因
@@ -700,8 +802,9 @@ export default {
         // 外伤/手术史
         wsOperaRadio: '',
         wsOperaInput: '',
-        // 药物过敏史
+        // 食物和药物过敏史
         ywgmsRadio: '',
+        ywgmsCheck: [],
         ywgmsInput: '',
         // 瘢痕体质
         bhtzRadio: '',
@@ -710,6 +813,24 @@ export default {
         qtbsRadio: '',
         qtbsCheck: [],
         qtbsInput: '',
+        // 甲亢
+        qtbsJkInput: '',
+        qtbsJkUnit: '年',
+        // 甲减
+        qtbsJjInput: '',
+        qtbsJjUnit: '年',
+        // 高血压
+        qtbsGxyInput: '',
+        qtbsGxyUnit: '年',
+        // 抑郁
+        qtbsYyInput: '',
+        qtbsYyUnit: '年',
+        // 焦虑
+        qtbsJlInput: '',
+        qtbsJlUnit: '年',
+        // 糖尿病
+        qtbsTnbInput: '',
+        qtbsTnbUnit: '年',
         // 半年内服药史
         fysRadio: '',
         fysCheck: [],
@@ -723,6 +844,7 @@ export default {
         jzsInput: ''
       },
       visualSymptomslist: ['视疲劳', '眩光', '眼干', '无'],
+      swywGmsList: ['青霉素类', '头孢类', '牛奶、鸡蛋、海鲜等食物', '芒果、桃子等食物', '其它'],
       causesOperationlist: ['体检', '戴镜不适', '改变形象', '方便工作生活', '其它'],
       tijianList: ['兵检', '军检', '医检', '公务员', '警校'],
       historyList: ['甲亢', '甲减', '高血压', '抑郁', '焦虑', '糖尿病', '其它'],
@@ -854,7 +976,7 @@ export default {
     },
     // input改变时
     inputChange(text, e) {
-      console.log(e)
+      console.log('input改变时', e)
       e ? this.dataForm[text] = true : ''
     },
     checkboxChange(text, e) {
@@ -898,7 +1020,13 @@ export default {
       if (e.target.value >= 100) {
         this.dataForm[text] = ''
         Dialog.confirm({
-          message: '输入的年数不得大于100，请仔细查看后重新填写'
+          message: '输入的数值不得大于100，请仔细查看后重新填写'
+        })
+      }
+      if (e.target.value == 0) {
+        this.dataForm[text] = ''
+        Dialog.confirm({
+          message: '输入的数值不可以为0，请重新填写'
         })
       }
     },
@@ -935,7 +1063,7 @@ export default {
       if (this.dataForm.yxyjRadio === '有' && !this.dataForm.yxyjOkCheck && !this.dataForm.yxyjGmjCheck && !this.dataForm.yxyjRgpCheck && !this.dataForm.yxyjRjCheck) {
         return Dialog.alert({
           title: '提醒',
-          message: '第四项戴隐形眼镜请填写完整后提交，谢谢配合',
+          message: '戴隐形眼镜请填写完整后提交，谢谢配合',
           theme: 'round-button'
         })
       }