Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312

src/components/followup/form/index.vue

@@ -94,6 +94,7 @@
             v-else-if="item.formType === 'date-picker'"
             v-model="form[item.model]"
             :disabled="item.disabled"
+            :editable="false"
             :type="item.dateType || dateType"
             :placeholder="item.placeholder"
             :format="item.format || format"
@@ -173,18 +174,19 @@
 </script>
 
 <style lang="scss" scoped>
-  .form-box {
-    padding: 20px 0px;
 
-  }
-  .sec-title{
-    float: none;
-    font-weight: bold;
-    margin-left: 0;
-  }
 </style>
 <style lang="scss">
-  .form-box{
+  .form-box {
+    padding: 20px 0px;
+    .sec-title{
+      float: none;
+      font-weight: bold;
+      margin-left: 0;
+    }
+    .color-gray{
+      color: #a7a7a7;
+    }
     .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:before {
       content: '*';
       color: #F56C6C;
@@ -219,6 +221,9 @@
         }
       }
     }
+    .title-obj{
+      font-size: 20px;
+    }
     .el-form-item__label{
       font-weight: bold;
     }
@@ -255,13 +260,6 @@
     .margin-left-80{
       margin-left: 80px;
     }
-
-  }
-  .checkBody{
-    .el-col{
-      float: none!important;
-    }
-
   }
 </style>
 

src/utils/followup/followapis.js

@@ -337,3 +337,55 @@ export const getPatientNumber = (data) => {
     description: '获取微信和短信病人数接口',
   })
 }
+
+
+/*
+ * 量表相关
+ */
+
+// 获取域名白名单
+export const getDomain = (data) => {
+  return fetch({
+    url: getFollowUpSC(`/followup/route/domain?type=1`),
+    method: 'get',
+    data: {},
+  })
+}
+
+// 获取展示的模块
+export const getScaleModels = (domain,scaleNo) => {
+  return fetch({
+    url: `${domain}/scale/${scaleNo}/models`,
+    method: 'get',
+    data: {},
+  })
+}
+
+// 获取量表详情
+export const getScaleDetail = (domain,planPatientsTimesId,scaleNo) => {
+  return fetch({
+    url: `${domain}/scale/${planPatientsTimesId}/${scaleNo}/info?type=2&isLine=2`,
+    method: 'get',
+    data: {},
+  })
+}
+
+// 提交量表
+export const postScale = ( domain,data ) => {
+  return fetch({
+    url: `${domain}/scale/save`,
+    method: 'post',
+    data: JSON.stringify(data),
+  })
+}
+
+// 更新量表状态
+export const updateScalesStatus = ( data ) => {
+  return fetch({
+    url: getFollowUpSC(`/followup/entering/scale/updateScalesStatus`),
+    method: 'post',
+    data: data,
+  })
+}
+
+

src/views/followup/plan-manage/dialog/add-patient-time.vue

@@ -21,6 +21,7 @@
               v-model="addPatientData.joinTime"
               type="date"
               placeholder="请选择随访开始时间"
+              :editable="false"
               format="yyyy-MM-dd"
               value-format="timestamp"
               clearable>

src/views/followup/plan-manage/dialog/change-plan.vue

@@ -41,6 +41,7 @@
             type="date"
             format="yyyy-MM-dd"
             value-format="timestamp"
+            :editable="false"
             placeholder="选择随访开始时间">
           </el-date-picker>
         </el-form-item>

src/views/followup/record-manage/dialog/followupDetail.vue

@@ -59,7 +59,7 @@
             <div class="c-content">{{enteringInfo.fuPlanTime}}</div>
           </div>
           <div class="content-div">
-            <div class="c-title">随访预约时间：</div>
+            <div class="c-title">预约随访时间：</div>
             <div class="c-content">{{enteringInfo.appointmentTime | emptyFileter}}</div>
           </div>
         </div>
@@ -150,7 +150,7 @@
       },
       goToScale(val) {
         this.$router.push({path: '/followup/record-manage/form-template',
-          query: {doctorId: val.doctorId, scaleNo: val.scaleNo, planPatientsTimesId: val.planPatientsTimesId, showBtn: 1}});
+          query: {doctorId: this.enteringInfo.doctorId, scaleNo: val.scaleNo, planPatientsTimesId: this.enteringInfo.planPatientsTimesId, showBtn: 1}});
       }
     },
     filters: {

src/views/followup/record-manage/form-template.vue

@@ -3,7 +3,7 @@
     <div class="form-template">
       <BreadCrumb
         :curmbFirst="'随访管理'"
-        :curmbSecond="'录入管理'"
+        :curmbSecond="breadTxt"
         :curmbThird="'录入量表'"
         :jumPathThird="jumPathThird"
       />
@@ -46,11 +46,12 @@
   export default {
     data(){
       return {
+        breadTxt: '录入管理',
+        jumPathThird: '/followup/record-manage/record-list',
         checkStart: false,
         showBtn: '1',
         resourceId: '',
         saveWay: 1,
-        jumPathThird: '/followup/record-manage/record-list'
       }
     },
     components: {
@@ -73,7 +74,18 @@
         this.showBtn = String(this.$route.query.showBtn);
       }
       // 0003 脑卒中、0002 糖尿病、0001 高血压
-    }
+    },
+//    beforeRouteEnter  (to, from, next) {
+//      next(vm=>{
+//        if(from.name=='planDetail'){
+//          vm.breadTxt = '计划管理';
+//          vm.jumPathThird = '/followup/plan-manage/plan-list'
+//        }else{
+//          vm.breadTxt = '录入管理';
+//          vm.jumPathThird = '/followup/record-manage/record-list'
+//        }
+//      })
+//    },
   }
 </script>
 
@@ -81,7 +93,7 @@
 
   @import '../../../style/followup/followup-common';
   @import '../../../style/followup/element-reset.css';
-  
+
   .form-show-scrollY{
     width: 100%; height: 100%; overflow: hidden; overflow-y: scroll;
     &::-webkit-scrollbar{

src/views/followup/record-manage/models/stroke/dataSourceBaseInfo.js

@@ -49,7 +49,7 @@ export default ($this) => {
       ],
       rules: [{ required: true, message: '请选择随访轮次', trigger: ['submit','change'] }],
       changeFun: (e)=>{
-        console.log(e)
+        // console.log(e)
         if(e == '12个月'){
           $this.needRule = false;
           localStorage.setItem('needRule',false);

src/views/followup/record-manage/models/stroke/dataSourceBaseInfo0.js

@@ -55,7 +55,7 @@ export default ($this) => {
       valueFormat: 'yyyy-MM-dd',
       dateType: 'date',
       type: 'date',
-      rules: [{required: true, message: '本次调查时间', trigger: ['submit','change']}],
+      rules: [{required: true, message: '请选择本次调查时间', trigger: ['submit','change']}],
       spanNum: 12,
     },
   ]

src/views/followup/record-manage/models/stroke/dataSourceBaseInfo2.js

@@ -59,7 +59,7 @@ export default ($this) => {
         { label: '是', value: '是', disabled: false },
         { label: '否', value: '否', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择本次调查是否为被调查者本人', trigger: ['submit','change'] }]
     },
     {
       formType: 'radio',
@@ -78,7 +78,7 @@ export default ($this) => {
         { label: '兄弟姐妹', value: '兄弟姐妹', disabled: false },
         { label: '其他', value: '其他', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择提供信息者与被调查者之间关系', trigger: ['submit','change'] }]
     },
     {
       formType: 'input',

src/views/followup/record-manage/models/stroke/dataSourceCheckLab.js

@@ -18,7 +18,7 @@ export default ($this) => {
       valueFormat: 'yyyy-MM-dd',
       dateType: 'date',
       type: 'date',
-      rules: [{required: true, message: '请选择检查时间', trigger: ['submit','change']}],
+      rules: [{required: false, message: '请选择检查时间', trigger: ['submit','change']}],
       spanNum: 6,
     },
     {
@@ -33,7 +33,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'mmol/L', type: 'append'}],
-      rules: [{required: true, message: '请输入空腹血糖', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }],
+      rules: [{required: false, message: '请输入空腹血糖', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }],
     },
 
 
@@ -53,7 +53,7 @@ export default ($this) => {
       valueFormat: 'yyyy-MM-dd',
       dateType: 'date',
       type: 'date',
-      rules: [{required: true, message: '请选择检查时间', trigger: ['submit','change']}],
+      rules: [{required: false, message: '请选择检查时间', trigger: ['submit','change']}],
       spanNum: 6,
     },
     {
@@ -68,7 +68,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'mmol/L', type: 'append'}],
-      rules: [{required: true, message: '请输入甘油三酯', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }],
+      rules: [{required: false, message: '请输入甘油三酯', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }],
     },
     {
       formType: 'input',
@@ -82,7 +82,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'mmol/L', type: 'append'}],
-      rules: [{required: true, message: '请输入胆固醇', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }],
+      rules: [{required: false, message: '请输入胆固醇', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }],
     },
     {
       formType: 'input',
@@ -96,7 +96,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'mmol/L', type: 'append'}],
-      rules: [{required: true, message: '请输入低密度脂蛋白胆固醇', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }],
+      rules: [{required: false, message: '请输入低密度脂蛋白胆固醇', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }],
     },
     {
       formType: 'input',
@@ -110,7 +110,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'mmol/L', type: 'append'}],
-      rules: [{required: true, message: '请输入高密度脂蛋白胆固醇', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }],
+      rules: [{required: false, message: '请输入高密度脂蛋白胆固醇', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }],
     },
   ]
 }

src/views/followup/record-manage/models/stroke/dataSourceLifeStyleGuide.js

@@ -11,9 +11,9 @@ export default ($this) => {
       spanNum: 24,
       options: [
         {label: '经常运动（相当于快步走的中等强度运动，且每周≥3次、每次≥30分钟，包含中度、重度体力劳动者）', value: '经常运动（相当于快步走的中等强度运动，且每周≥3次、每次≥30分钟，包含中度、重度体力劳动者）', disabled: false},
-        {label: '缺乏运动 (不符合上述经常运动标准者）', value: '缺乏运动 (不符合上述经常运动标准者）', disabled: false},
+        {label: '缺乏运动（不符合上述经常运动标准者）', value: '缺乏运动（不符合上述经常运动标准者）', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
+      rules: [{required: true, message: '请选择是否运动', trigger: ['submit','change']}]
     },
     {
       formType: 'radio',
@@ -28,7 +28,7 @@ export default ($this) => {
         {label: '否', value: '否', disabled: false},
         {label: '是', value: '是', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
+      rules: [{required: true, message: '请选择是否吸烟', trigger: ['submit','change']}]
     },
     {
       formType: 'radio',
@@ -44,7 +44,7 @@ export default ($this) => {
         {label: '少量饮酒', value: '少量饮酒', disabled: false},
         {label: '经常大量饮酒（白酒≥3次/周，每次≥2两）', value: '经常大量饮酒（白酒≥3次/周，每次≥2两）', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
+      rules: [{required: true, message: '请选择是否饮酒', trigger: ['submit','change']}]
     },
     {
       formType: 'radio',
@@ -60,7 +60,7 @@ export default ($this) => {
         {label: '偏淡', value: '偏淡', disabled: false},
         {label: '适中', value: '适中', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
+      rules: [{required: true, message: '请选择口味', trigger: ['submit','change']}]
     },
     {
       formType: 'radio',
@@ -76,7 +76,7 @@ export default ($this) => {
         {label: '偏素', value: '偏素', disabled: false},
         {label: '均衡', value: '均衡', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
+      rules: [{required: true, message: '请选择荤素', trigger: ['submit','change']}]
     },
     {
       formType: 'radio',
@@ -92,7 +92,7 @@ export default ($this) => {
         {label: '3-4天/周', value: '3-4天/周', disabled: false},
         {label: '≤2天/周', value: '≤2天/周', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
+      rules: [{required: true, message: '请选择是否吃蔬菜', trigger: ['submit','change']}]
     },
     {
       formType: 'radio',
@@ -108,7 +108,7 @@ export default ($this) => {
         {label: '3-4天/周', value: '3-4天/周', disabled: false},
         {label: '≤2天/周', value: '≤2天/周', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
+      rules: [{required: true, message: '请选择是否吃水果', trigger: ['submit','change']}]
     },
 
   ]

src/views/followup/record-manage/models/stroke/dataSourceMainSickControl.js

@@ -19,7 +19,7 @@ export default ($this) => {
         { label: '无', value: '无', disabled: false },
         { label: '有', value: '有', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择随访期间有无新发脑血管病事件', trigger: ['submit','change'] }]
     },
     {
       formType: 'input',
@@ -66,7 +66,7 @@ export default ($this) => {
         { label: '县级医院', value: '县级医院', disabled: false },
         { label: '社区或乡镇卫生机构', value: '社区或乡镇卫生机构', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择就诊机构级别', trigger: ['submit','change'] }]
     },
     {
       formType: 'radio',
@@ -83,7 +83,7 @@ export default ($this) => {
         { label: '蛛网膜下腔出血', value: '蛛网膜下腔出血', disabled: false },
         { label: '短暂性脑缺血发作（TIA）', value: '短暂性脑缺血发作（TIA）', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择主要诊断', trigger: ['submit','change'] }]
     },
     {
       formType: 'radio',
@@ -98,7 +98,13 @@ export default ($this) => {
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择住院期间是否接受康复治疗', trigger: ['submit','change'] }]
+    },
+    {
+      formType: 'div',
+      name: '（注：两次发病时间应相隔28天以上，如有二次及以上发病者，请单独记录）',
+      className: 'obj-form-title color-gray',
+      spanNum: 24,
     },
     {
       formType: 'radio',
@@ -113,7 +119,7 @@ export default ($this) => {
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择出院后是否接受康复治疗', trigger: ['submit','change'] }]
     },
 
   ]

src/views/followup/record-manage/models/stroke/dataSourceMainSickControl2.js

@@ -7,7 +7,7 @@ export default ($this) => {
     },
     {
       formType: 'date-picker',
-      className: 'obj-form-title',
+      className: 'obj-form-title sec-title',
       prop: 'assessTime',
       model: 'assessTime',
       placeholder: '请选择',
@@ -16,9 +16,26 @@ export default ($this) => {
       valueFormat: 'yyyy-MM-dd',
       dateType: 'date',
       type: 'date',
-      rules: [{ required: true, message: '请选择评估时间', trigger: ['submit','change'] }],
+      rules: [{ required: false, message: '请选择评估时间', trigger: ['submit','change'] }],
       spanNum: 6,
     },
+
+    {
+      formType: 'input',
+      className: 'obj-form-title sec-title',
+      // linkageRule: [{name: 'type',value: ['其他']}],
+      prop: 'assessPeople',
+      model: 'assessPeople',
+      disabled: false,
+      label: '评估人：',
+      placeholder: '请输入评估人',
+      spanNum: 12,
+      maxlength: 20,
+      type: 'text',
+      labmsg: '',
+      rules: [{ required: false, message: '请输入评估人', trigger: ['submit','change'] }]
+    },
+
     {
       formType: 'radio',
       className: 'obj-form-title radio-block',
@@ -35,7 +52,7 @@ export default ($this) => {
         { label: '4（重度残疾，不能独立行走，无他人帮助不能满足自身日常生活需求）', value: '4（重度残疾，不能独立行走，无他人帮助不能满足自身日常生活需求）', disabled: false },
         { label: '5（严重残疾，持续卧床、二便失禁，需持续护理和关注，日常生活完全依赖他人）', value: '5（严重残疾，持续卧床、二便失禁，需持续护理和关注，日常生活完全依赖他人）', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择评分值', trigger: ['submit','change'] }],
+      rules: [{ required: false, message: '请选择评分值', trigger: ['submit','change'] }],
       changeFun: (e)=>{
         // console.log(e)
       }

src/views/followup/record-manage/models/stroke/dataSourceMainSickControl3.js

@@ -19,7 +19,7 @@ export default ($this) => {
         { label: '无', value: '无', disabled: false },
         { label: '有', value: '有', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }],
+      rules: [{ required: true, message: '请选择随访期间是否新发心脏病', trigger: ['submit','change'] }],
       changeFun(e){
         if(e == '有') {
           $this.addComponents.forEach((item,index)=>{
@@ -45,7 +45,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{ required: true, message: '首次确诊时间', trigger: ['submit','change'] }],
+      rules: [{ required: true, message: '请选择首次确诊时间', trigger: ['submit','change'] }],
       spanNum: 6,
     },
     {
@@ -67,7 +67,7 @@ export default ($this) => {
         { label: '具体不详', value: '具体不详', disabled: false },
         { label: '其他', value: '其他', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择心脏病类型', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择心脏病类型', trigger: ['submit'] }]
     },
     {
       formType: 'input',
@@ -130,7 +130,7 @@ export default ($this) => {
         { label: '县级医院', value: '县级医院', disabled: false },
         { label: '社区或乡镇卫生机构', value: '社区或乡镇卫生机构', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择评分值', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择就诊机构级别', trigger: ['submit','change'] }]
     },
 
 
@@ -146,7 +146,7 @@ export default ($this) => {
         { label: '无', value: '无', disabled: false },
         { label: '有', value: '有', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }],
+      rules: [{ required: true, message: '请选择是否有房颤', trigger: ['submit','change'] }],
 
     },
     {
@@ -162,7 +162,7 @@ export default ($this) => {
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }],
+      rules: [{ required: true, message: '请选择是否服用抗栓药物', trigger: ['submit','change'] }],
       changeFun(e){
         if(e == '是') {
           $this.addComponents.forEach((item,index)=>{
@@ -179,7 +179,7 @@ export default ($this) => {
     },
     {
       formType: 'checkbox',
-      className: 'obj-form-title2',
+      className: 'obj-form-title3',
       prop: 'drugVariety',
       model: 'drugVariety',
       label: '用药品种：',
@@ -196,11 +196,11 @@ export default ($this) => {
         { label: '氯吡格雷', value: '氯吡格雷', disabled: false },
         { label: '其他', value: '其他', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择评分值', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择用药品种', trigger: ['submit'] }]
     },
     {
       formType: 'radio',
-      className: 'obj-form-title2',
+      className: 'obj-form-title3',
       prop: 'medicationSituation',
       model: 'medicationSituation',
       label: '用药情况：',
@@ -211,7 +211,7 @@ export default ($this) => {
         { label: '规律', value: '规律', disabled: false },
         { label: '不规律', value: '不规律', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择用药情况', trigger: ['submit','change'] }]
     },
 
 

src/views/followup/record-manage/models/stroke/dataSourceMainSickControl4.js

@@ -17,10 +17,10 @@ export default ($this) => {
       disabled: false,
       spanNum: 24,
       options: [
-        { label: '否', value: '否', disabled: false },
-        { label: '是', value: '是', disabled: false },
+        { label: '无', value: '无', disabled: false },
+        { label: '有', value: '有', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择随访期间新发现有高血压', trigger: ['submit','change'] }]
     },
     {
       formType: 'date-picker',
@@ -29,28 +29,44 @@ export default ($this) => {
       model: 'diagnoseTime',
       placeholder: '请选择',
       label: '首次确诊时间：',
-      linkageRule: [{ name: 'haveHypertension', value: ['是'] }],
+      linkageRule: [{ name: 'haveHypertension', value: ['有'] }],
       format: 'yyyy',
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{ required: true, message: '首次确诊时间', trigger: ['submit','change'] }],
+      rules: [{ required: true, message: '请选择首次确诊时间', trigger: ['submit','change'] }],
       spanNum: 6,
     },
+
     {
       formType: 'radio',
-      className: 'obj-form-title3',
+      className: 'obj-form-title',
+      prop: 'takeHypotensorFf',
+      model: 'takeHypotensorFf',
+      label: '是否有高血压（包括既往及本次随访期间新发现的高血压患者）：',
+      disabled: false,
+      spanNum: 24,
+      options: [
+        { label: '无', value: '无', disabled: false },
+        { label: '有', value: '有', disabled: false },
+      ],
+      rules: [{ required: true, message: '请选择是否有高血压', trigger: ['submit','change'] }],
+
+    },
+    {
+      formType: 'radio',
+      className: 'obj-form-title2',
       prop: 'takeHypotensor',
       model: 'takeHypotensor',
       label: '是否服降压药：',
-      linkageRule: [{ name: 'haveHypertension', value: ['是'] }],
+      linkageRule: [{ name: 'takeHypotensorFf', value: ['有'] }],
       disabled: false,
       spanNum: 24,
       options: [
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }],
+      rules: [{ required: true, message: '请选择是否服降压药', trigger: ['submit','change'] }],
       changeFun(e){
         if(e == '是') {
           $this.addComponents.forEach((item,index)=>{
@@ -66,7 +82,7 @@ export default ($this) => {
     },
     {
       formType: 'checkbox',
-      className: 'obj-form-title4',
+      className: 'obj-form-title3',
       prop: 'typesOfMedication',
       model: 'typesOfMedication',
       label: '用药种类：',
@@ -86,12 +102,12 @@ export default ($this) => {
         {label: 'ARB', value: 'ARB', disabled: false},
         {label: '其他', value: '其他', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
+      rules: [{required: true, message: '请选择用药种类', trigger: ['submit']}]
     },
 
     {
       formType: 'radio',
-      className: 'obj-form-title4',
+      className: 'obj-form-title3',
       prop: 'medicationSituation',
       model: 'medicationSituation',
       label: '用药情况：',
@@ -102,16 +118,16 @@ export default ($this) => {
         { label: '规律', value: '规律', disabled: false },
         { label: '不规律', value: '不规律', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择用药情况', trigger: ['submit','change'] }]
     },
 
     {
       formType: 'radio',
-      className: 'obj-form-title3',
+      className: 'obj-form-title2',
       prop: 'bloodPressureControl',
       model: 'bloodPressureControl',
       label: '血压控制情况：',
-      linkageRule: [{ name: 'haveHypertension', value: ['是'] }],
+      linkageRule: [{ name: 'takeHypotensorFf', value: ['有'] }],
       disabled: false,
       spanNum: 24,
       options: [
@@ -119,7 +135,7 @@ export default ($this) => {
         { label: '不达标', value: '不达标', disabled: false },
         { label: '不清楚', value: '不清楚', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择血压控制情况', trigger: ['submit','change'] }]
     },
 
 

src/views/followup/record-manage/models/stroke/dataSourceMainSickControl5.js

@@ -2,7 +2,6 @@ export default ($this) => {
   return [
 
 
-
     {
       formType: 'div',
       name: '3.4 血脂异常',
@@ -20,7 +19,7 @@ export default ($this) => {
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }],
+      rules: [{ required: true, message: '请选择随访期间是否新发现有血脂异常', trigger: ['submit','change'] }],
       changeFun(e){
         if(e == '是') {
           $this.addComponents.forEach((item,index)=>{
@@ -40,14 +39,14 @@ export default ($this) => {
       prop: 'diagnoseTime',
       model: 'diagnoseTime',
       placeholder: '确诊时间',
-      label: '确诊时间：',
+      label: '首次确诊时间：',
       linkageRule: [{ name: 'haveDyslipidemia', value: ['是'] }],
       format: 'yyyy',
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
       spanNum: 6,
-      rules: [{ required: true, message: '请选择确诊时间', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择首次确诊时间', trigger: ['submit','change'] }]
     },
     {
       formType: 'checkbox',
@@ -68,7 +67,23 @@ export default ($this) => {
         {label: '低HDL-C', value: '低HDL-C', disabled: false},
         {label: '不详', value: '不详', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
+      rules: [{required: true, message: '请选择血脂异常类型', trigger: ['submit']}]
+    },
+
+    {
+      formType: 'radio',
+      className: 'obj-form-title',
+      prop: 'dyslipidemiaIf',
+      model: 'dyslipidemiaIf',
+      label: '是否有血脂异常（包括既往及本次随访期间新发现的血脂异常患者）：',
+      disabled: false,
+      spanNum: 24,
+      options: [
+        { label: '否', value: '否', disabled: false },
+        { label: '是', value: '是', disabled: false },
+      ],
+      rules: [{ required: true, message: '请选择是否有血脂异常', trigger: ['submit','change'] }],
+
     },
     {
       formType: 'radio',
@@ -76,14 +91,14 @@ export default ($this) => {
       prop: 'takeAntilipemicAgents',
       model: 'takeAntilipemicAgents',
       label: '是否服用调脂药：',
-      linkageRule: [{name: 'haveDyslipidemia', value: ['是']}],
+      linkageRule: [{name: 'dyslipidemiaIf', value: ['是']}],
       disabled: false,
       spanNum: 24,
       options: [
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }],
+      rules: [{ required: true, message: '请选择是否服用调脂药', trigger: ['submit','change'] }],
       changeFun(e){
         if(e == '是') {
           $this.addComponents.forEach((item,index)=>{
@@ -114,7 +129,7 @@ export default ($this) => {
         {label: '贝特类', value: '贝特类', disabled: false},
         {label: '其他', value: '其他', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
+      rules: [{required: true, message: '请选择调脂药', trigger: ['submit']}]
     },
 
   ]

src/views/followup/record-manage/models/stroke/dataSourceMainSickControl6.js

@@ -17,7 +17,7 @@ export default ($this) => {
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择随访期间是否新发现有糖尿病', trigger: ['submit','change'] }]
     },
     {
       formType: 'date-picker',
@@ -25,14 +25,30 @@ export default ($this) => {
       prop: 'diagnoseTime',
       model: 'diagnoseTime',
       placeholder: '确诊时间',
-      label: '确诊时间：',
+      label: '首次确诊时间：',
       linkageRule: [{ name: 'haveDiabetes', value: ['是'] }],
       format: 'yyyy',
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
       spanNum: 6,
-      rules: [{ required: true, message: '确诊时间', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择首次确诊时间', trigger: ['submit','change'] }]
+    },
+
+    {
+      formType: 'radio',
+      className: 'obj-form-title',
+      prop: 'strokeMedicalIf',
+      model: 'strokeMedicalIf',
+      label: '是否为糖尿病患者（包括既往及本次随访期间新发现的糖尿病患者）：',
+      disabled: false,
+      spanNum: 24,
+      options: [
+        { label: '否', value: '否', disabled: false },
+        { label: '是', value: '是', disabled: false },
+      ],
+      rules: [{ required: true, message: '请选择是否有血脂异常', trigger: ['submit','change'] }],
+
     },
     {
       formType: 'radio',
@@ -40,14 +56,14 @@ export default ($this) => {
       prop: 'takeHypoglycemicDrugs',
       model: 'takeHypoglycemicDrugs',
       label: '是否服用降糖药：',
-      linkageRule: [{ name: 'haveDiabetes', value: ['是'] }],
+      linkageRule: [{ name: 'strokeMedicalIf', value: ['是'] }],
       disabled: false,
       spanNum: 24,
       options: [
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }],
+      rules: [{ required: true, message: '请选择是否服用降糖药', trigger: ['submit','change'] }],
       changeFun(e){
         if(e == '是') {
           $this.addComponents.forEach((item,index)=>{
@@ -78,30 +94,30 @@ export default ($this) => {
         {label: '胰岛素', value: '胰岛素', disabled: false},
         {label: '其他', value: '其他', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
-    },
-    {
-      formType: 'input',
-      className: 'obj-form-title3',
-      linkageRule: [{name: 'hypoglycemicDrugsType',value: ['其他']}],
-      prop: 'remark',
-      model: 'remark',
-      label: '其他降糖药：',
-      disabled: false,
-      placeholder: '请输入其他降糖药',
-      spanNum: 12,
-      maxlength: 30,
-      type: 'text',
-      labmsg: '',
-      rules: [{ required: true, message: '请输入其他降糖药', trigger: ['submit','change'] }]
+      rules: [{required: true, message: '请选择降糖药', trigger: ['submit']}]
     },
+    // {
+    //   formType: 'input',
+    //   className: 'obj-form-title3',
+    //   linkageRule: [{name: 'hypoglycemicDrugsType',value: ['其他']}],
+    //   prop: 'remark',
+    //   model: 'remark',
+    //   label: '其他降糖药：',
+    //   disabled: false,
+    //   placeholder: '请输入其他降糖药',
+    //   spanNum: 12,
+    //   maxlength: 30,
+    //   type: 'text',
+    //   labmsg: '',
+    //   rules: [{ required: true, message: '请输入其他降糖药', trigger: ['submit','change'] }]
+    // },
     {
       formType: 'radio',
       className: 'obj-form-title2',
       prop: 'bloodSugarControl',
       model: 'bloodSugarControl',
       label: '血糖控制情况：',
-      linkageRule: [{ name: 'haveDiabetes', value: ['是'] }],
+      linkageRule: [{ name: 'strokeMedicalIf', value: ['是'] }],
       disabled: false,
       spanNum: 24,
       options: [
@@ -109,7 +125,7 @@ export default ($this) => {
         { label: '未达标', value: '未达标', disabled: false },
         { label: '不清楚', value: '不清楚', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请选择血糖控制情况', trigger: ['submit','change'] }]
     },
 
   ]

src/views/followup/record-manage/models/stroke/dataSourceTreatmentSituation.js

@@ -17,7 +17,7 @@ export default ($this) => {
         {label: '否', value: '否', disabled: false},
         {label: '是', value: '是', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}],
+      rules: [{required: true, message: '请选择是否使用支架术', trigger: ['submit','change']}],
       changeFun(e){
         if(e == '是') {
           $this.addComponents.forEach((item,index)=>{
@@ -47,7 +47,7 @@ export default ($this) => {
         {label: '左侧', value: '左侧', disabled: false},
         {label: '右侧', value: '右侧', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
+      rules: [{required: true, message: '请选择支架术位置', trigger: ['submit']}]
     },
     {
       formType: 'date-picker',
@@ -61,7 +61,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{required: true, message: '请选择左侧手术时间', trigger: ['submit','change']}],
+      rules: [{required: true, message: '请选择支架左侧手术时间', trigger: ['submit','change']}],
       spanNum: 12,
     },
     {
@@ -76,7 +76,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{required: true, message: '请选择右侧手术时间', trigger: ['submit','change']}],
+      rules: [{required: true, message: '请选择支架右侧手术时间', trigger: ['submit','change']}],
       spanNum: 12,
     },
 
@@ -93,7 +93,7 @@ export default ($this) => {
         {label: '否', value: '否', disabled: false},
         {label: '是', value: '是', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}],
+      rules: [{required: true, message: '请选择是否使用内膜剥脱术', trigger: ['submit','change']}],
       changeFun(e){
         if(e == '是') {
           $this.addComponents.forEach((item,index)=>{
@@ -123,7 +123,7 @@ export default ($this) => {
         {label: '左侧', value: '左侧', disabled: false},
         {label: '右侧', value: '右侧', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
+      rules: [{required: true, message: '请选择内膜剥脱术位置', trigger: ['submit']}]
     },
     {
       formType: 'date-picker',
@@ -137,7 +137,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{required: true, message: '左侧内膜剥脱术手术时间', trigger: ['submit','change']}],
+      rules: [{required: true, message: '请选择左侧内膜剥脱术手术时间', trigger: ['submit','change']}],
       spanNum: 12,
     },
     {
@@ -152,7 +152,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{required: true, message: '右侧内膜剥脱术手术时间', trigger: ['submit','change']}],
+      rules: [{required: true, message: '请选择右侧内膜剥脱术手术时间', trigger: ['submit','change']}],
       spanNum: 12,
     },
 
@@ -168,7 +168,7 @@ export default ($this) => {
         {label: '否', value: '否', disabled: false},
         {label: '是', value: '是', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
+      rules: [{required: true, message: '请选择是否使用颅内外血管搭桥术', trigger: ['submit','change']}]
     },
     {
       formType: 'date-picker',
@@ -182,7 +182,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{required: true, message: '手术时间', trigger: ['submit','change']}],
+      rules: [{required: true, message: '请选择颅内外血管搭桥术', trigger: ['submit','change']}],
       spanNum: 12,
     },
 

src/views/followup/record-manage/models/stroke/dataSourceTreatmentSituation2.js

@@ -19,7 +19,7 @@ export default ($this) => {
         {label: '否', value: '否', disabled: false},
         {label: '是', value: '是', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
+      rules: [{required: true, message: '请选择是否使用介入术', trigger: ['submit','change']}]
     },
     {
       formType: 'date-picker',
@@ -33,7 +33,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{required: true, message: '手术时间', trigger: ['submit','change']}],
+      rules: [{required: true, message: '请选择介入术-手术时间', trigger: ['submit','change']}],
       spanNum: 6,
     },
     {
@@ -48,7 +48,7 @@ export default ($this) => {
         {label: '否', value: '否', disabled: false},
         {label: '是', value: '是', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
+      rules: [{required: true, message: '请选择是否使用搭桥术', trigger: ['submit','change']}]
     },
     {
       formType: 'date-picker',
@@ -62,7 +62,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{required: true, message: '手术时间', trigger: ['submit','change']}],
+      rules: [{required: true, message: '请选择搭桥术-手术时间', trigger: ['submit','change']}],
       spanNum: 6,
     },
 

src/views/followup/record-manage/models/stroke/dataSourceTreatmentSituation3.js

@@ -18,7 +18,7 @@ export default ($this) => {
         {label: '否', value: '否', disabled: false},
         {label: '是', value: '是', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
+      rules: [{required: true, message: '请选择是否接受过出血性卒中外科干预', trigger: ['submit','change']}]
     },
     {
       formType: 'input',
@@ -48,7 +48,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{required: true, message: '手术时间', trigger: ['submit','change']}],
+      rules: [{required: true, message: '请选择手术时间', trigger: ['submit','change']}],
       spanNum: 6
     },
   ]

src/views/followup/record-manage/record-list.vue

@@ -49,11 +49,12 @@
           </el-table-column>
           <el-table-column prop="mobilePhone" label="手机号" min-width="100" align="center"></el-table-column>
           <el-table-column prop="name" label="随访计划名称" min-width="150" align="center"></el-table-column>
-          <el-table-column prop="followupType" label="随访时间" min-width="150" align="center">
+          <el-table-column prop="followupType" label="随访时间" min-width="200" align="center">
           <template slot-scope="scope">
             <span>{{scope.row.fuPlanInfo}}</span><br/>
-            <span v-if="scope.row.appointmentTime">{{scope.row.appointmentTime}}</span><br/>
-            <span v-if="!scope.row.appointmentTime">{{scope.row.fuPlanTime}}</span>
+            <span v-if="scope.row.fuPlanExecuteTime">{{scope.row.fuPlanExecuteTime}}</span>
+            <span v-if="!scope.row.fuPlanExecuteTime && scope.row.appointmentTime">{{scope.row.appointmentTime}}</span><br/>
+            <span v-if="!scope.row.fuPlanExecuteTime && !scope.row.appointmentTime">{{scope.row.fuPlanTime}}</span>
           </template>
           </el-table-column>
           <el-table-column prop="status" label="随访状态" min-width="100" align="center">
@@ -226,7 +227,7 @@
           this.$router.push({path: '/followup/record-manage/form-template',
             query: {doctorId: this.formList.doctorId, scaleNo: this.formList.scalesList[0].resourceId, planPatientsTimesId: row.fuPlanPatientTimesId,planTimesId : row.fuPlanTimesId, showBtn: 1}})
         }else {
-          this.$message.warning('暂不支持录入量表!')
+          this.$message.warning('暂无量表!')
         }
       //  不区分量表列表长度问题，直接调试量表录入
       //   this.$router.push({

src/views/followup/reservation-manage/reservation-list.vue

@@ -28,6 +28,7 @@
                 end-placeholder="结束日期"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
+                :editable="false"
                 style="width: 380px;">
               </el-date-picker>
             </el-form-item>

src/views/home.vue

@@ -224,7 +224,7 @@ export default {
             this.$router.push({path: '/followup/record-manage/form-template',
               query: {doctorId: this.formList.doctorId, scaleNo: this.formList.scalesList[0].resourceId, planPatientsTimesId: row.planPatientTimesId, showBtn: 1}})
           }else {
-            this.$message.warning('暂不支持录入量表!')
+            this.$message.warning('暂无量表!')
           }
         },
         changeFollowStatus(row) {
@@ -347,7 +347,7 @@ export default {
                             color: #666;
                             margin-top: 15px;
                         }
-                        
+
                     }
                 }
             }