Merge branch 'dev-scaleHype-20190428' of...

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

src/views/followup/record-manage/models/hypertension/hypeDataSourceBaseInfo.js

@@ -16,6 +16,53 @@ export default ($this) => {
       labmsg: '次',
       rules: [{required: true, message: '请输入姓名', trigger: ['submit','change']}],
     },
+
+    {
+      formType: 'date-picker',
+      className: 'float-none',
+      prop: 'followUpDate',
+      model: 'followUpDate',
+      placeholder: '请选择',
+      label: '随访日期：',
+      format: 'yyyy-MM-dd',
+      valueFormat: 'yyyy-MM-dd',
+      dateType: 'date',
+      type: 'date',
+      rules: [{required: true, message: '请选择随访日期', trigger: ['submit','change']}],
+      spanNum: 12,
+    },
+
+    {
+      formType: 'radio',
+      className: 'obj-form-title',
+      prop: 'followUpWay',
+      model: 'followUpWay',
+      spanNum: 24,
+      label: '随访方式：',
+      options: [
+        { label: '门诊', value: '门诊' },
+        { label: '家庭', value: '家庭' },
+        { label: '电话', value: '电话' },
+      ],
+      rules: [{ required: true, message: '请选择随访方式', trigger: ['submit','change'] }],
+      changeFun: (e)=>{
+      }
+    },
+
+    {
+      formType: 'input',
+      className: 'float-none',
+      prop: 'followUpNumber',
+      model: 'followUpNumber',
+      label: '编号：',
+      disabled: false,
+      placeholder: '请输入编号',
+      spanNum: 12,
+      maxlength: 30,
+      type: 'text',
+      labmsg: '次',
+      rules: [{required: false, message: '请输入编号', trigger: ['submit','change']}],
+    },
   ]
 }
 

src/views/followup/record-manage/models/hypertension/hypeDataSourceHelpChecking.js

@@ -4,7 +4,7 @@ export default ($this) => {
   return [
     {
       formType: 'input',
-      className: 'float-none obj-form-title',
+      className: 'float-none',
       prop: 'helpCheck',
       model: 'helpCheck',
       disabled: false,
@@ -18,7 +18,7 @@ export default ($this) => {
     },
     {
       formType: 'radio',
-      className: 'obj-form-title',
+      className: 'float-none',
       prop: 'medicationObedience',
       model: 'medicationObedience',
       spanNum: 24,
@@ -35,7 +35,7 @@ export default ($this) => {
 
     {
       formType: 'radio',
-      className: 'obj-form-title',
+      className: 'float-none',
       prop: 'medicalSideSffects',
       model: 'medicalSideSffects',
       spanNum: 24,
@@ -50,10 +50,10 @@ export default ($this) => {
     },
     {
       formType: 'input',
-      className: 'float-none obj-form-title2',
+      className: 'float-none',
       linkageRule: [{name: 'medicalSideSffects',value: ['有']}],
-      prop: 'remark',
-      model: 'remark',
+      prop: 'adrsMark',
+      model: 'adrsMark',
       disabled: false,
       placeholder: '请输入药物不良反应',
       spanNum: 12,
@@ -62,6 +62,24 @@ export default ($this) => {
       labmsg: '',
       rules: [{ required: true, message: '请输入药物不良反应', trigger: ['submit','change'] }]
     },
+
+    {
+      formType: 'radio',
+      className: 'float-none radio-block',
+      prop: 'followUpClassification',
+      model: 'followUpClassification',
+      spanNum: 24,
+      label: '此次随访分类：',
+      options: [
+        { label: '控制满意（血压控制满意，无其他异常）', value: '控制满意' },
+        { label: '控制不满意（血压控制不满意，无其他异常）', value: '控制不满意' },
+        { label: '不良反应（存在药物不良反应）', value: '不良反应' },
+        { label: '并发症（出现新的并发症或并发症出现异常）', value: '并发症' },
+      ],
+      rules: [{ required: true, message: '请选择此次随访分类', trigger: ['submit','change'] }],
+      changeFun: (e)=>{
+      }
+    },
   ]
 }
 

src/views/followup/record-manage/models/hypertension/hypeDataSourceNextFollowDay.js

+export default ($this) => {
+  return [
+    {
+      formType: 'date-picker',
+      className: 'float-none',
+      prop: 'nextFollowDay',
+      model: 'nextFollowDay',
+      placeholder: '请选择',
+      label: '下次随访日期：',
+      format: 'yyyy-MM-dd',
+      valueFormat: 'yyyy-MM-dd',
+      dateType: 'date',
+      type: 'date',
+      rules: [{required: true, message: '请选择下次随访日期', trigger: ['submit','change']}],
+      spanNum: 12,
+    },
+  ]
+}

src/views/followup/record-manage/models/hypertension/hypeDataSourceReferral.js

+import { checkRange, checkIsInteger, checkNumberIsToFixed } from '@/utils/followup/followupUtils/checkField';
+
+export default ($this) => {
+  return [
+    {
+      formType: 'input',
+      className: 'float-none',
+      prop: 'aaa',
+      model: 'aaa',
+      label: '原因：',
+      disabled: false,
+      placeholder: '请输入原因',
+      spanNum: 12,
+      maxlength: 30,
+      type: 'text',
+      rules: [{required: false, message: '请输入原因', trigger: ['submit','change']}],
+      changeFun: (val)=>{
+        // console.log($this.formData)
+        // console.log(val)
+      },
+    },
+    {
+      formType: 'input',
+      className: 'float-none',
+      prop: 'bbb',
+      model: 'bbb',
+      label: '机构及科别：',
+      disabled: false,
+      placeholder: '请输入机构及科别',
+      spanNum: 12,
+      maxlength: 30,
+      type: 'text',
+      rules: [{required: false, message: '请输入机构及科别', trigger: ['submit','change']}],
+      changeFun: (val)=>{
+      },
+    },
+  ]
+}

src/views/followup/record-manage/models/hypertension/hypeDataSourceSign.js

@@ -45,15 +45,14 @@ export default ($this) => {
       rules: [{required: true, message: '请输入身高', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }, {validator: checkNumberIsToFixed , trigger: ['submit','change']}],
       changeFun: (val)=>{
         $this.addComponents.forEach((item,index)=>{
-          if(item.formName == 'hypertension_002'){
+          if(item.name == 'hypeDataSourceSign'){
             $this.addComponents[index].formObject.bodyHeight = val;
           }
         })
-
       },
       blurFunc: (val)=>{
         $this.addComponents.forEach((item,index)=>{
-          if(item.formName == 'hypertension_002'){
+          if(item.name == 'hypeDataSourceSign'){
             let bodyWeight = $this.addComponents[index].formObject.bodyWeight
             let bodyHeight = $this.addComponents[index].formObject.bodyHeight
             if(bodyWeight && bodyHeight){
@@ -82,14 +81,14 @@ export default ($this) => {
       rules: [{required: true, message: '请输入体重', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }, {validator: checkNumberIsToFixed , trigger: ['submit','change']}],
       changeFun: (val)=>{
         $this.addComponents.forEach((item,index)=>{
-          if(item.formName == 'hypertension_002'){
+          if(item.name == 'hypeDataSourceSign'){
             $this.addComponents[index].formObject.bodyWeight = val;
           }
         })
       },
       blurFunc: (val)=>{
         $this.addComponents.forEach((item,index)=>{
-          if(item.formName == 'hypertension_002'){
+          if(item.name == 'hypeDataSourceSign'){
             let bodyWeight = $this.addComponents[index].formObject.bodyWeight
             let bodyHeight = $this.addComponents[index].formObject.bodyHeight
             if(bodyWeight && bodyHeight){
@@ -131,11 +130,11 @@ export default ($this) => {
     },
     {
       formType: 'input',
-      className: 'obj-form-title',
-      linkageRule: [{name: 'symptom',value: ['其他']}],
+      className: 'float-none',
       prop: 'remark',
       model: 'remark',
       disabled: false,
+      label: '其他',
       placeholder: '请输入其他体征',
       spanNum: 12,
       maxlength: 30,

src/views/followup/record-manage/models/hypertension/hypeDataSourceSignature.js

+export default ($this) => {
+  return [
+    {
+      formType: 'input',
+      className: 'float-none',
+      prop: 'doctorSignature',
+      model: 'doctorSignature',
+      label: '随访医生签名：',
+      disabled: false,
+      placeholder: '请输入随访人员姓名',
+      spanNum: 12,
+      maxlength: 30,
+      type: 'text',
+      labmsg: '次',
+      rules: [{required: true, message: '请输入随访医生签名', trigger: ['submit','change']}],
+    },
+  ]
+}

src/views/followup/record-manage/models/hypertension/hypeDataSourceSymptom.js

@@ -2,18 +2,47 @@ import { checkMobile } from '@/utils/followup/followupUtils/checkField';
 
 export default ($this) => {
   return [
+
+    {
+      formType: 'radio',
+      className: 'obj-form-title',
+      prop: 'hasSymptom',
+      model: 'hasSymptom',
+      label: '是否有症状：',
+      disabled: false,
+      spanNum: 24,
+      options: [
+        { label: '无', value: '无', disabled: false },
+        { label: '有', value: '有', disabled: false },
+      ],
+      rules: [{ required: true, message: '请选择是否有症状', trigger: ['submit','change'] }],
+      changeFun: (e) => {
+        if(e == '有') {
+          $this.addComponents.forEach((item,index)=>{
+            if(item.name == 'hypeDataSourceSymptom'){
+              $this.addComponents[index].formObject = {
+                ...$this.addComponents[index].formObject,
+                symptom: []
+              }
+            }
+          })
+        }
+      }
+
+    },
     {
       formType: 'checkbox',
-      className: 'float-none obj-form-title',
+      className: 'float-none obj-form-title2',
+      linkageRule: [{name: 'hasSymptom', value: ['有']}],
       prop: 'symptom',
       model: 'symptom',
-      label: '选择的症状：',
+      label: '症状类型：',
       disabled: false,
       changeFun: (val) => {
       },
       spanNum: 24,
       options: [
-        {label: '无症状', value: '无症状', disabled: false},
+        // {label: '无症状', value: '无症状', disabled: false},
         {label: '头痛头晕', value: '头痛头晕', disabled: false},
         {label: '恶心呕吐', value: '恶心呕吐', disabled: false},
         {label: '眼花耳鸣', value: '眼花耳鸣', disabled: false},
@@ -28,7 +57,7 @@ export default ($this) => {
     },
     {
       formType: 'input',
-      className: 'float-none obj-form-title2',
+      className: 'float-none obj-form-title3',
       linkageRule: [{name: 'symptom',value: ['其他']}],
       prop: 'remark',
       model: 'remark',

src/views/followup/record-manage/patient-scale/hypertension.vue

@@ -33,11 +33,15 @@
   // 量表模块数据模型
 
   // 高血压
+  import hypeDataSourceBaseInfo from '../models/hypertension/hypeDataSourceBaseInfo'
   import hypeDataSourceSymptom from '../models/hypertension/hypeDataSourceSymptom'
   import hypeDataSourceSign from '../models/hypertension/hypeDataSourceSign'
   import hypeDataSourceLifeMode from '../models/hypertension/hypeDataSourceLifeMode'
   import hypeDataSourceHelpChecking from '../models/hypertension/hypeDataSourceHelpChecking'
   import hypeDataSourceMedicationUse from '../models/hypertension/hypeDataSourceMedicationUse'
+  import hypeDataSourceReferral from '../models/hypertension/hypeDataSourceReferral'
+  import hypeDataSourceNextFollowDay from '../models/hypertension/hypeDataSourceNextFollowDay'
+  import hypeDataSourceSignature from '../models/hypertension/hypeDataSourceSignature'
 
   export default {
     data(){
@@ -116,14 +120,16 @@
                   })
                 });
               }
-              this.$emit('checkEnd',false);
             }else{
               this.dataSubmit();
             }
 
+            this.$emit('checkEnd',false);
 
           })
 
+        }else{
+          this.$emit('checkEnd',false);
         }
       },
       showModule(val){
@@ -164,12 +170,17 @@
       // 获取量表类型
       initScaleType(){
         this.addComponentsSourceList = [
-          {name: 'BaseInfo0',formObject: {symptom: []},showModule: true,formName: 'hypertension_001',className: 'obj-form-title',dataSource: hypeDataSourceSymptom(this), hideTitle: false, title: '症状'},
-          {name: 'BaseInfo0',formObject: {},showModule: true,formName: 'hypertension_002',className: 'obj-form-title',dataSource: hypeDataSourceSign(this), hideTitle: false, title: '体征'},
-          {name: 'BaseInfo0',formObject: {},showModule: true,formName: 'hypertension_003',className: 'obj-form-title',dataSource: hypeDataSourceLifeMode(this), hideTitle: false, title: '生活方式指导'},
-          {name: 'BaseInfo0',formObject: {},showModule: true,formName: 'hypertension_004',className: 'obj-form-title',dataSource: hypeDataSourceHelpChecking(this), hideTitle: false, title: '辅助检查'},
-          {name: 'BaseInfo0',formObject: {},showModule: true,formName: 'hypertension_005',className: 'obj-form-title',dataSource: hypeDataSourceMedicationUse(this), hideTitle: false, title: '用药情况'},
+          {name: 'hypeDataSourceBaseInfo',formObject: {},showModule: true,formName: 'hypertension_001',className: 'obj-form-title',dataSource: hypeDataSourceBaseInfo(this), hideTitle: true, title: '基本信息'},
+          {name: 'hypeDataSourceSymptom',formObject: {},showModule: true,formName: 'hypertension_002',className: 'obj-form-title',dataSource: hypeDataSourceSymptom(this), hideTitle: false, title: '症状'},
+          {name: 'hypeDataSourceSign',formObject: {bmi: 0,},showModule: true,formName: 'hypertension_003',className: 'obj-form-title',dataSource: hypeDataSourceSign(this), hideTitle: false, title: '体征'},
+          {name: 'hypeDataSourceLifeMode',formObject: {},showModule: true,formName: 'hypertension_004',className: 'obj-form-title',dataSource: hypeDataSourceLifeMode(this), hideTitle: false, title: '生活方式指导'},
+          {name: 'hypeDataSourceHelpChecking',formObject: {},showModule: true,formName: 'hypertension_005',className: 'obj-form-title',dataSource: hypeDataSourceHelpChecking(this), hideTitle: false, title: '辅助检查'},
+          {name: 'hypeDataSourceMedicationUse',formObject: {},showModule: true,formName: 'hypertension_006',className: 'obj-form-title',dataSource: hypeDataSourceMedicationUse(this), hideTitle: false, title: '用药情况'},
+          {name: 'hypeDataSourceReferral',formObject: {aaa:'',bbb:''},showModule: true,formName: 'hypertension_007',className: 'obj-form-title',dataSource: hypeDataSourceReferral(this), hideTitle: false, title: '转诊'},
+          {name: 'hypeDataSourceNextFollowDay',formObject: {nextFollowDay:''},showModule: true,formName: 'hypertension_008',className: 'obj-form-title',dataSource: hypeDataSourceNextFollowDay(this), hideTitle: true, title: '下次随访日期'},
+          {name: 'hypeDataSourceSignature',formObject: {doctorSignature:''},showModule: true,formName: 'hypertension_009',className: 'obj-form-title',dataSource: hypeDataSourceSignature(this), hideTitle: true, title: '随访医生签名'},
         ]
+        this.addComponents = this.addComponentsSourceList
       },
       // 获取白名单域名
       getWhiteDomain(){
@@ -177,7 +188,9 @@
           if(res.code=='000000'){
             this.domain = res.data;
             // 获取量表模块
-            this.getFormModules();
+//            this.getFormModules();
+            // 目前模块先写死，记得后面和后台沟通改！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！
+
             if(this.showBtn!='0'){
               // 获取量表详情
               this.getFormDetail();
@@ -303,7 +316,7 @@
         line-height: 60px;
         height: 60px;
         font-weight: bold;
-        font-size: 18px;
+        font-size: 22px;
         border-bottom: 1px dashed #ccc;
       }
     }

src/views/followup/record-manage/patient-scale/stroke.vue

@@ -128,11 +128,12 @@
                   })
                 });
               }
-              this.$emit('checkEnd',false);
+
             }else{
               this.dataSubmit();
             }
 
+            this.$emit('checkEnd',false);
 
           })
 
@@ -322,7 +323,7 @@
       line-height: 60px;
       height: 60px;
       font-weight: bold;
-      font-size: 18px;
+      font-size: 22px;
       border-bottom: 1px dashed #ccc;
     }
   }