12.6 sickdetail

TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js

@@ -244,6 +244,20 @@ Component({
           }];
           return renderDom;
         }
+        if (customMessage.message_type === 12) {
+          let data = customMessage.data;
+          console.log(data)
+          const renderDom = [{
+            type: 'wenzhen_form',
+            order_inquiry_id:data.order_inquiry_id,
+            message_path:data.message_path,
+            case_patient_message_path:data.case_patient_message_path,
+            case_filled_fields:data.case_filled_fields,
+            case_not_fill_fields:data.case_not_fill_fields
+          }];
+          return renderDom;
+        }
+
 
       } catch (error) {}
       // 客服咨询
@@ -324,6 +338,21 @@ Component({
       app.method.navigateTo({
         url: url + "&fromType=" + encodeURIComponent(redirectUrl + "?" + params)
       })
+    },
+    goList(event){
+      console.log(event);
+      const {ismine,params,id}=event.currentTarget.dataset;
+      console.log(params);
+      if(!ismine){//未填写
+        app.method.navigateTo({
+          url:'/pages/inquiryForm/inquiryForm?params='+params+"&order_inquiry_id="+id
+        })
+      }else{//已填写
+        app.method.navigateTo({
+          url:'/pages/inquiryForm/inquiryForm?case_filled_fields='+params+"&order_inquiry_id="+id
+        })
+      }
+     // app.go(url);
     }
   },
 });

TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml

@@ -94,5 +94,20 @@
     </view>
      
   </view>
-
+  <view wx:if="{{renderDom[0].type==='wenzhen_form'}}"  class="wenzhen_form {{isMine?'my-custom':'your-custom'}}" bindtap="goList" data-ismine="{{isMine}}" data-params="{{!isMine?renderDom[0].case_not_fill_fields:renderDom[0].case_filled_fields}}" data-id="{{ renderDom[0].order_inquiry_id}}">
+    <view class="title" wx:if="{{renderDom[0].case_not_fill_fields}}">
+      <image src="../../../../../static/assets/wenzhenform.png" mode="" class="wzicon" />
+     <view class="name">问诊表</view>
+    </view>
+    <view class="title" wx:else>
+      <image src="../../../../../static/assets/wenzhenform.png" mode="" class="wzicon"/>
+     <view class="name">问诊表-已填写</view>
+    </view>
+    <view class="descform" wx:if="{{renderDom[0].case_not_fill_fields}}">
+      等待填写
+    </view>
+    <view class="descform" wx:else>
+      点击查看
+    </view>
+  </view>
 </view>

TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss

@@ -322,3 +322,60 @@ color: rgba(0,0,0,0.85);
   justify-content: space-between;
   align-items: center;
 }
+.wenzhen_form{
+  width: 60vw;
+  position: relative;
+  z-index:2;
+  border-radius: 10px 10px 10px 10px;
+  border: 1rpx solid #1ACAD3; 
+}
+.wenzhen_form .title{
+  border-radius: 16rpx 16rpx 0 0;
+  padding:20rpx;
+  display: flex;
+  align-items: center;
+  font-size: 30rpx;
+color: #FFFFFF;
+ background-color: #3CC7C0;
+}
+.wzicon{
+  margin-right: 10rpx;
+  width:42rpx;
+  height:46rpx;
+}
+.my-custom .wenzhen_form{
+  background: rgb(212, 239, 241);
+}
+.wenzhen_form .descform{
+  padding:15rpx 20rpx;
+  background-color: #ffff;
+  font-size: 28rpx;
+color: #666666;
+  border-radius: 0 0 16rpx 16rpx;
+}
+.wenzhen_form.my-custom::after{
+  content:'';
+  position: absolute;
+  top: 35rpx;
+  right: -19rpx;
+  transform: translate(-50%,-50%) rotate(-135deg);
+  width: 16rpx;
+  height: 16rpx;
+  background: #3CC7C0; 
+  border: 1rpx solid #1ACAD3;
+  /* background: rgb(255, 255, 255);
+  border: 1rpx solid #E7E7E7; */
+  border-style: none none solid solid;
+}
+.wenzhen_form.your-custom::after{
+  content:'';
+  position: absolute;
+  top: 35rpx;
+  left: 0;
+  transform: translate(-50%,-50%) rotate(45deg);
+  width: 16rpx;
+  height: 16rpx;
+  background: #3CC7C0; 
+  border: 1rpx solid #1ACAD3;
+  border-style: none none solid solid
+}

TUIService/TUIKit/components/TUIChat/components/MessageList/index.wxml

@@ -35,7 +35,7 @@
             </view>
             <TipMessage  wx:if="{{item.type === 'TIMGroupTipElem'}}" message="{{item}}"/>
             <view  wx:if="{{item.type !== 'TIMGroupTipElem'}}"   class="{{item.flow === 'out' ? 't-self-message':'t-recieve-message'}} {{item.type=='TIMCustomElem'?'custom_center':''}}" >
-                <image class="t-message-avatar" wx:if="{{(item.flow === 'in' && item.type!='TIMCustomElem') || filter.formateText(item.payload.data).message_type==7}}" src="{{item.avatar || img_host+'/doctor_avatar.png'}}" data-value="{{item}}" bindtap="getMemberProfile" />
+                <image class="t-message-avatar" wx:if="{{(item.flow === 'in' && item.type!='TIMCustomElem') || filter.formateText(item.payload.data).message_type==7 || filter.formateText(item.payload.data).message_type==12}}" src="{{item.avatar || img_host+'/doctor_avatar.png'}}" data-value="{{item}}" bindtap="getMemberProfile" />
                 <view class="read-receipts" wx:if="{{conversation.type === 'C2C' && item.flow==='out' }}">
                     <view wx:if="{{item.isPeerRead}}" >已读</view>
                     <view wx:else>未读</view>
@@ -53,7 +53,7 @@
                     <FileMessage wx:if="{{item.type === 'TIMFileElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
                     <MergerMessage wx:if="{{item.type === 'TIMRelayElem'}}"  message="{{item}}" isMine="{{item.flow === 'out'}}"/>
                 </view>
-                <image class="t-message-avatar" wx:if="{{(item.flow === 'out' && item.type!='TIMCustomElem') || (item.flow=== 'out' && item.type=='TIMCustomElem' && filter.formateText(item.payload.data).message_type==10)}}"  src="{{item.avatar || 'https://img.applets.igandanyiyuan.com/applet/patient/static/patient_avatar.png'}}"  data-value="{{item}}" bindtap="getMemberProfile"/>
+                <image class="t-message-avatar" wx:if="{{(item.flow === 'out' && item.type!='TIMCustomElem') || (item.flow=== 'out' && item.type=='TIMCustomElem' && filter.formateText(item.payload.data).message_type==10) || (item.flow=== 'out' && item.type=='TIMCustomElem' && filter.formateText(item.payload.data).message_type==12)}}"  src="{{item.avatar || 'https://img.applets.igandanyiyuan.com/applet/patient/static/patient_avatar.png'}}"  data-value="{{item}}" bindtap="getMemberProfile"/>
             </view>
         </view>
     </view>

api/consultOrder.js

@@ -15,7 +15,7 @@ function cancelPay(data){ //问诊订单取消支付
   return request('/patient/order/inquiry/cancel-pay/'+data,'PUT',{},true)
 };
 function sickInfo(data){ //获取患者问诊病例
-  return request('/case','GET',data)
+  return request('/case/inquiry','GET',data)
 };
 function getRate(id){ //获取患者问诊病例
   return request('/patient/inquiry/evaluation/'+id,'GET')

api/sickRecord.js

@@ -14,8 +14,13 @@ function pathographyGroup(){ //获取家庭成员病情记录分组
 function pathographyDelete(id){ // 删除家庭成员病情记录
   return request('/patient/pathography/'+id,'DELETE')
 };
+function sendFields(data){ // 删除家庭成员病情记录
+  return request('/case/fields/patient','POST',data,true)
+};
 
 module.exports={
+  pathographyGroup,
+  sendFields,
   isExist,
   pathographyList,
   pathographyDetail

filters/filter.wxs

@@ -158,7 +158,19 @@ function formatChufang(arr){
    }
    return flag
 }
+
+function formatwenzhenList(arr,type){
+  var obj=null;
+  for (var i = 0; i < arr.length; ++i) {
+    if(arr[i]==type){
+      return {NUMBER:i+1,ISHAS:true}
+    }
+   };
+   return {ISHAS:false}
+  }
+
 module.exports = {
+  formatwenzhenList:formatwenzhenList,
   formatChufang:formatChufang,
   formatInquiryType:formatInquiryType,
   formatDate: formatDate,

pages/inquiryForm/inquiryForm.js

@@ -1,19 +1,558 @@
 // pages/inquiryForm/inquiryForm.js
 const app = getApp()
+import {nation,job} from "../../api/common"
+import {sendFields} from "../../api/sickRecord"
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
+    obj:{
+      height:'身高',
+      weight:'体重',
+      nation_id:'民族',
+      job_id:'职业',
+      marital_status:'婚姻状态',
+      allergy_history:'是否有过敏史？',
+      family_history:'是否有家族病史？',
+      is_pregnant:'是否处于备孕、妊娠、哺乳期？',
+      is_operation:'是否做过手术？',
+      drink_wine_status:'是否有饮酒史?',
+      smoke_status:'是否有吸烟史？',
+      chemical_compound_status:'是否有接触过化学物?',
+      diagnosis_hospital:'确诊医院是？',
+      is_take_medicine:'服用药品是？'
 
     },
+    showNation:false,
+    showJob:false,
+    showMarital:false,
+    nationname:'',
+    order_inquiry_id:'',
+    jobname:'',
+    hideGuomin:false,
+    hideFamilysick:false,
+    hidePregnant:false,
+    hideOperation:false,
+    hideChemical:false,
+    hideHospital:false,
+    hideDrug:false,
+    personInfo:{},
+    showBtn:true,
+    maritalColumn: [{
+      text: '未婚',
+      value: 0
+    }, {
+      text: '已婚 ',
+      value: 1
+    }, {
+      text: '离异 ',
+      value: 2
+    }],
+    nationcolumns:[],
+    jobcolumns:[],
+    list1:[],
+    list2:[],
+    startIndex1:1,
+    showList:[{
+      isHas:false,
+      index:1
+    },{
+      isHas:false,
+      index:2
+    },{
+      isHas:false,
+      index:3  
+    },{
+      isHas:false,
+      index:4
+    },{
+      isHas:false,
+      index:5
+    },{
+      isHas:false,
+      index:6
+    },{
+      isHas:false,
+      index:7
+    },{
+      isHas:false,
+      index:8
+    },{
+      isHas:false,
+      index:9
+    }]
     
+
+  },
+  handleSendFields(){
+    const {order_inquiry_id,personInfo,list1,list2,marital_name,jobname,nationname}=this.data;
+    console.log(personInfo)
+    const fields=[];
+  for (let i = 0; i <list1.length; i++) {
+   if(list1[i]=='height' && !personInfo.height){
+      wx.showToast({
+        title: '请填写身高',
+        icon:'none'
+      })
+      return false
+   }
+   if (list1[i]=='height' && personInfo.height) {
+    if (!/^3[5-9](\.\d+)?$|^[4-9][0-9](\.\d+)?$|^1[0-9][0-9](\.\d+)?$|^2[1-4][0-9](\.\d+)?$|250/.test(personInfo.height)) {
+      wx.showToast({
+        title: `请输入范围内身高！`,
+        icon: 'none',
+      });
+      return false;
+    }
+  };
+    if(list1[i]=='weight' && !personInfo.weight){
+      wx.showToast({
+        title: '请填写体重',
+        icon:'none'
+      })
+      return false
+  }
+  
+  if (list1[i]=='weight' && personInfo.weight) {
+    if (!/^[2-9](\.\d+)?$|^[1-9][0-9](\.\d+)?$|^1[0-9]{1,2}(\.\d+)?$|200/.test(personInfo.weight)) {
+      wx.showToast({
+        title: `请输入范围内体重！`,
+        icon: 'none',
+      });
+      return false;
+    }
+  }
+  if(list1[i]=='marital_status' && !marital_name){
+    wx.showToast({
+      title: '请选择婚姻状态',
+      icon:'none'
+    })
+    return false
+ }
+ if(list1[i]=='nation_id' && !nationname){
+  wx.showToast({
+    title: '请选择民族',
+    icon:'none'
+  })
+  return false
+}
+if(list1[i]=='job_id' && !jobname){
+  wx.showToast({
+    title: '请选择职业',
+    icon:'none'
+  })
+  return false
+}
+    
+}
+for (let i = 0; i < list2.length; i++) {
+  if( list2[i]=="is_allergy_history"){
+ if(!personInfo.is_allergy_history && personInfo.is_allergy_history!=0){
+    wx.showToast({
+      title: '请选择是否有过敏史',
+      icon:'none'
+    })
+    return false
+  }
+  if(personInfo.is_allergy_history==1 && !personInfo.allergy_history){
+    wx.showToast({
+      title: '请填写过敏源',
+      icon:'none'
+    })
+    return false
+  }
+  
+ 
+  }else if(list2[i]=="is_family_history"){
+    if(!personInfo.is_family_history && personInfo.is_family_history!=0){
+      wx.showToast({
+        title: '请选择是否有家族病史',
+        icon:'none'
+      })
+      return false
+    }
+    if(personInfo.is_family_history==1 && !personInfo.family_history){
+      wx.showToast({
+        title: '请填写家族病史',
+        icon:'none'
+      })
+      return false
+    }
+  
+  }else if(list2[i]=="is_pregnant"){
+    if(!personInfo.is_pregnant && personInfo.is_pregnant!=0){
+      wx.showToast({
+        title: '请选择是否处于备孕、妊娠、哺乳期',
+        icon:'none'
+      })
+      return false
+    }
+    if(personInfo.is_pregnant==1 && !personInfo.is_pregnant){
+      wx.showToast({
+        title: '请填写请描述您目前所处阶段，如备孕中、哺乳期中、妊娠月份',
+        icon:'none'
+      })
+      return false
+    }
+  
+  }else if(list2[i]=="is_operation"){
+    if(!personInfo.is_operation && personInfo.is_operation!=0){
+      wx.showToast({
+        title: '请选择是否做过手术',
+        icon:'none'
+      })
+      return false
+    }
+    if(personInfo.is_operation==1 && !personInfo.operation){
+      wx.showToast({
+        title: '请描述具体手术名称和做手术医院',
+        icon:'none'
+      })
+      return false
+    }
+    
+  }else if(list2[i]=="drink_wine_status"){
+    if(!personInfo.drink_wine_status){
+      wx.showToast({
+        title: '请选择是否有饮酒史',
+        icon:'none'
+      })
+      return false
+    }
+  }else if(list2[i]=="smoke_status"){
+    if(!personInfo.smoke_status){
+      wx.showToast({
+        title: '请选择是否有吸烟史',
+        icon:'none'
+      })
+      return false
+    }
+  }else if(list2[i]=="chemical_compound_status"){
+    if(!personInfo.chemical_compound_status){
+      wx.showToast({
+        title: '是否有接触过化学物',
+        icon:'none'
+      })
+      return false
+    }
+    if(personInfo.chemical_compound_status && personInfo.chemical_compound_status!=1 && !personInfo.chemical_compound_describe){
+      wx.showToast({
+        title: '请详细填写接触过的相关化学物',
+        icon:'none'
+      })
+      return false
+    }
+  }else if(list2[i]=="diagnosis_hospital"){
+    if(!personInfo.diagnosis_hospital){
+      wx.showToast({
+        title: '请填写确诊医院名称',
+        icon:'none'
+      })
+      return false
+    }
+  
+  }else if(list2[i]=="is_take_medicine"){
+    if(!personInfo.is_take_medicine && personInfo.is_take_medicine!=0){
+      wx.showToast({
+        title: '请填写是否正在服药',
+        icon:'none'
+      })
+      return false
+    }
+    if(personInfo.is_take_medicine==1 && !personInfo.drugs_name){
+      wx.showToast({
+        title: '请填服药名称',
+        icon:'none'
+      })
+      return false
+    }
+  }
+  
+}
+    
+    sendFields({
+      order_inquiry_id,
+      fields:personInfo,
+    }).then(data=>{
+      wx.showToast({
+        title: '发送成功',
+        icon:'none'
+      }),
+      wx.navigateBack()
+      
+    })
+  },
+  openMaritalPicker() {
+      this.setData({
+        showMarital: true
+      })
+  },
+  closeMaritalPicker() {
+    this.setData({
+      showMarital: false
+    })
+  },
+  onConfirmMaritalPicker(event) {
+    const {
+      value
+    } = event.detail;
+  
+    this.setData({
+      showMarital: false,
+      marital_name:value.text,
+     'personInfo.marital_status':value.value
+    })
+  },
+  onChangeRadio(event) {
+    let key = event.target.dataset.id;
+    let obj= "personInfo."+key;
+    this.setData({
+       [obj]:Number(event.detail)
+    });
+    if(key=="chemical_compound_status" && event.detail==1){
+      this.setData({
+        "personInfo.chemical_compound_describe":''
+      })
+    }else if(event.detail==0){
+       if(key=="is_allergy_history"){
+         this.setData({
+         "personInfo.allergy_history":'',
+         hideGuomin:false
+         })
+       };
+       if(key=="is_pregnant"){
+        this.setData({
+          "personInfo.pregnant":'',
+           hidePregnant:false
+          })
+       }
+       if(key=="is_family_history"){
+        this.setData({
+          "personInfo.family_history":'',
+           hideFamilysick:false
+          })
+       }
+    }
+  },
+  handelFocus(e) {
+    let key = e.target.dataset.id;
+    let value = e.target.dataset.value;
+    let obj="personInfo."+value;
+    if (!e.detail.value) {
+      this.setData({
+        [key]: false,
+        [obj]: e.detail.value
+      })
+    } else {
+      this.setData({
+        [key]: true,
+        [obj]: e.detail.value
+      })
+    }
+  },
+  onConfirmNation(event) {
+    const {
+      value
+    } = event.detail;
+    this.setData({
+     "nationname": `${value.nation_name}`,
+     "personInfo.nation_id": `${value.nation_id}`,
+     showNation: false
+    })
+  },
+  showNation() {
+   
+      this.setData({
+        showNation: true
+      })
+
+  },
+  onCancelNation() {
+    this.setData({
+      showNation: false
+    })
+  },
+  onConfirmJob(event) {
+    const {
+      value
+    } = event.detail;
+    this.setData({
+     "jobname": `${value.job_name}`,
+     "personInfo.job_id": `${value.job_id}`,
+      showJob: false
+    })
+  },
+  showJob() {
+      this.setData({
+        showJob: true
+      }) 
+  },
+  onCancelJob() {
+    this.setData({
+      showJob: false
+    })
+  },
+  commonMethods(arr1,arr2){
+    this.setData({
+      list1:arr1,
+      list2:arr2
+    });
+    let count=0;
+    arr2.forEach((item)=>{
+       if(item=="allergy_history"){
+         count++;
+        this.setData({
+          'showList[0].isHas':true,
+          'showList[0].index':1
+        })
+       }else if(item=="family_history"){
+         count++;
+        this.setData({
+          'showList[1].isHas':true,
+          'showList[1].index':count
+        })
+       }else if(item=="is_pregnant"){
+        count++;
+        this.setData({
+          'showList[2].isHas':true,
+          'showList[2].index':count
+        })
+       }else if(item=="is_operation"){
+        count++;
+        this.setData({
+          'showList[3].isHas':true,
+          'showList[3].index':count
+        })
+       }else if(item=="drink_wine_status"){
+        count++;
+        this.setData({
+          'showList[4].isHas':true,
+          'showList[4].index':count
+        })
+       }else if(item=="smoke_status"){
+        count++;
+        this.setData({
+          'showList[5].isHas':true,
+          'showList[5].index':count
+        })
+       }else if(item=="chemical_compound_status"){
+        count++;
+        this.setData({
+          'showList[6].isHas':true,
+          'showList[6].index':count
+        })
+       }else if(item=="diagnosis_hospital"){
+        count++;
+        this.setData({
+          'showList[7].isHas':true,
+          'showList[7].index':count
+        })
+       }else if(item=="is_take_medicine"){
+        count++;
+        this.setData({
+          'showList[8].isHas':true,
+          'showList[8].index':count
+        })
+       }
+    })
+
+  },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    this.getNation();
+    this.getJob();
+       if(options.order_inquiry_id){
+         this.setData({
+          order_inquiry_id:options.order_inquiry_id
+         })
+       }
+      if(options.case_filled_fields){
         
+        let data=JSON.parse(options.case_filled_fields);
+        let arr1=[];
+        let arr2=[];
+      
+        this.setData({
+          personInfo:data,
+          showBtn:false
+        });
+        if(data.is_allergy_history==1){
+          this.setData({
+            hideGuomin:true
+          })
+        }
+        if(data.is_family_history==1){
+          this.setData({
+            hideFamilysick:true
+          })
+        }
+        if(data.is_operation==1){
+          this.setData({
+            hideOperation:true
+          })
+        }
+        if(data.is_pregnant==1){
+          this.setData({
+            hidePregnant:true
+          })
+        }
+        if(data.chemical_compound_status && data.chemical_compound_status!=1){
+          this.setData({
+            hideChemical:true
+          })
+        }
+        if(data.diagnosis_hospital){
+          this.setData({
+            hideHospital:true
+          })
+        }
+        if(data.is_take_medicine==1){
+          this.setData({
+           hideDrug:true
+          })
+        }
+        let {maritalColumn,jobcolumns,nationcolumns}=this.data;
+        if(data.marital_status==0 || data.marital_status){
+          let select=maritalColumn.filter(item=>{return item.value==data.marital_status});
+          this.setData({
+            'marital_name':select[0].text
+          })
+        };
+       
+       
+      
+        Object.keys(data).forEach(function(key){
+          if(key=="weight" || key=="height" || key=="marital_status" || key=="nation_id" || key=="job_id"){
+            arr1.push(key);
+         }else{
+            arr2.push(key);
+         }
+          })
+          this.commonMethods(arr1,arr2);
+         
+
+
+      }
+     if(options.params){
+       let data=JSON.parse(options.params);
+       let {obj}=this.data;
+       let arr1=[];
+       let arr2=[];
+        data.forEach(item => {
+        if(item=="weight" || item=="height" || item=="marital_status" || item=="nation_id" || item=="job_id"){
+           arr1.push(item);
+        }else{
+           arr2.push(item);
+        }
+       
+      })
+      this.commonMethods(arr1,arr2);
+     
+     }
   },
 
   /**
@@ -22,7 +561,34 @@ Page({
   onReady() {
 
   },
-
+  getNation(){
+    nation().then(data=>{
+        this.setData({
+          nationcolumns:data
+        })
+        let {personInfo}=this.data;
+        if(personInfo.nation_id || personInfo.nation_id==0){
+          let select=data.filter(item=>{return item.nation_id==personInfo.nation_id});
+          this.setData({
+            'nationname':select[0].nation_name
+          })
+        }
+    })
+  },
+ getJob(){
+    job().then(data=>{
+      this.setData({
+        jobcolumns:data
+      })
+      let {personInfo}=this.data;
+      if(personInfo.job_id || personInfo.job_id==0){
+         let select=data.filter(item=>{return item.job_id==personInfo.job_id});
+        this.setData({
+          'jobname':select[0].job_name
+        })
+      }
+    })
+  },
   /**
    * 生命周期函数--监听页面显示
    */

pages/inquiryForm/inquiryForm.wxml

@@ -1,61 +1,62 @@
 <!--pages/inquiryForm/inquiryForm.wxml-->
+<wxs src="../../filters/filter.wxs" module="filter"></wxs>
 <nav navName="问诊表"></nav>
 <view class="page">
    <view class="questionbox">
     <view class="cellbox">
    <view class="basictitle">基本信息</view>
-    <view class="cell" >
+    <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'height').ISHAS}}">
         <view class="cellrow">
           <view class="name">
-           1、身高（CM）
+            {{filter.formatwenzhenList(list1,'height').NUMBER}}、身高（CM）
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请输入身高" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
+            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请输入身高" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
 
           </view>
         </view>
       </view>
-      <view class="cell" >
+      <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'weight').ISHAS}}">
         <view class="cellrow">
           <view class="name">
-          2、体重（KG）
+            {{filter.formatwenzhenList(list1,'weight').NUMBER}}、体重（KG）
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请输入体重" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
+            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请输入体重" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
 
           </view>
         </view>
       </view>
-      <view class="cell" >
+      <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'marital_status').ISHAS}}" bindtap="openMaritalPicker">
         <view class="cellrow">
           <view class="name">
-           3、婚姻状况
+            {{filter.formatwenzhenList(list1,'marital_status').NUMBER}}、婚姻状况
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择婚姻状况" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
+            <input type="text" value="{{marital_name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择婚姻状况" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
             <image src="{{img_host+'/righticon.png'}}"  class="righticon"></image>
 
           </view>
         </view>
       </view>
-      <view class="cell" >
+      <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'nation_id').ISHAS}}" bindtap="showNation">
         <view class="cellrow">
           <view class="name">
-           4、民族
+            {{filter.formatwenzhenList(list1,'nation_id').NUMBER}}、民族
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择民族" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
+            <input type="text" value="{{nationname}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择民族" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
             <image src="{{img_host+'/righticon.png'}}"  class="righticon"></image>
           </view>
         </view>
       </view>
-      <view class="cell" >
+      <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'job_id').ISHAS}}" bindtap="showJob">
         <view class="cellrow">
           <view class="name">
-           5、职业
+            {{filter.formatwenzhenList(list1,'job_id').NUMBER}}、职业
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请选择职业" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
+            <input type="text" value="{{jobname}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请选择职业" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
             <image src="{{img_host+'/righticon.png'}}"  class="righticon"></image>
           </view>
         </view>
@@ -66,85 +67,85 @@
      <view class="basictitle">个人情况</view>
      <view class="sickHis">
         <view class="list">
-          <view class="qa">
+          <view class="qa" wx:if="{{showList[0].isHas}}">
-            <view class="num">1、</view>
+            <view class="num">{{showList[0].index}}、</view>
             <view class="titlebox">
               <view class="title">您是否有过敏史？</view>
               <view class="radio" >
-                <van-radio-group value="{{ filter.numberTOstring(personInfo.is_allergy_history) }}" class="singlegroup" data-id="is_allergy_history" bind:change="onChangeRadio" direction="horizontal">
+                <van-radio-group disabled="{{!showBtn}}" value="{{ filter.numberTOstring(personInfo.is_allergy_history) }}" class="singlegroup" data-id="is_allergy_history" bind:change="onChangeRadio" direction="horizontal">
                   <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
                   <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
                 </van-radio-group>
               </view>
               <!-- hidden="{{checkGuomin!=1}}" -->
               <view class="radiotip" hidden="{{personInfo.is_allergy_history!=1}}">
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done" bindinput="handelFocus"  value="{{personInfo.allergy_history}}" data-id="hideGuomin" data-value="allergy_history"></textarea>
+                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done" bindinput="handelFocus" disabled="{{!showBtn}}"  value="{{personInfo.allergy_history}}" data-id="hideGuomin" data-value="allergy_history"></textarea>
                 <view class="textbox" hidden="{{hideGuomin}}">
                   <view class="desc"><text>过敏史：</text>请填写过敏源，如药物，请写出药名；如食物，请写具体如鸡蛋、牛奶等（限制50个字）</view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="qa">
+          <view class="qa" wx:if="{{showList[1].isHas}}">
-            <view class="num">2、</view>
+            <view class="num">{{showList[1].index}}、</view>
             <view class="titlebox">
               <view class="title">您是否有家族病史？</view>
               <view class="radio">
-                <van-radio-group class="singlegroup" value="{{filter.numberTOstring(personInfo.is_family_history)}}"   data-id="is_family_history" bind:change="onChangeRadio" direction="horizontal">
+                <van-radio-group disabled="{{!showBtn}}" class="singlegroup" value="{{filter.numberTOstring(personInfo.is_family_history)}}"   data-id="is_family_history" bind:change="onChangeRadio" direction="horizontal">
                   <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
                   <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
                 </van-radio-group>
               </view>
               <view class="radiotip" hidden="{{personInfo.is_family_history!=1}}">
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.family_history}}" data-id="hideFamilysick" data-value="family_history"></textarea>
+                <textarea placeholder=" " disabled="{{!showBtn}}" show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.family_history}}" data-id="hideFamilysick" data-value="family_history"></textarea>
                 <view class="textbox" hidden="{{hideFamilysick}}">
                   <view class="desc"><text>家族病史：</text>请详细填写相关家族病史（限制50个字）</view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="qa" wx:if="{{sex==2}}">
+          <view class="qa" wx:if="{{showList[2].isHas}}">
-            <view class="num">{{startIndex}}、</view>
+            <view class="num">{{showList[2].index}}、</view>
             <view class="titlebox">
               <view class="title">您是否处于备孕、妊娠、哺乳期？</view>
               <view class="radio">
-                <van-radio-group value="{{ filter.numberTOstring(personInfo.is_pregnant) }}"  bind:change="onChangeRadio"   data-id="is_pregnant"  direction="horizontal" class="singlegroup">
+                <van-radio-group disabled="{{!showBtn}}" value="{{ filter.numberTOstring(personInfo.is_pregnant) }}"  bind:change="onChangeRadio"   data-id="is_pregnant"  direction="horizontal" class="singlegroup">
                   <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
                   <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
                 </van-radio-group>
               </view>
               <view class="radiotip" hidden="{{personInfo.is_pregnant!=1}}">
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.pregnant}}" data-id="hidePregnant" data-value="pregnant"></textarea>
+                <textarea placeholder=" " disabled="{{!showBtn}}" show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.pregnant}}" data-id="hidePregnant" data-value="pregnant"></textarea>
                 <view class="textbox" hidden="{{hidePregnant}}">
                   <view class="desc">请描述您目前所处阶段，如备孕中、哺乳期中、妊娠月份。（限制50个字）</view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="qa">
+          <view class="qa" wx:if="{{showList[3].isHas}}">
-            <view class="num">{{startIndex+1}}、</view>
+            <view class="num">{{showList[3].index}}、</view>
             <view class="titlebox">
               <view class="title">是否做过手术</view>
               <view class="radio">
-                <van-radio-group  value="{{ filter.numberTOstring(personInfo.is_operation) }}"  data-id="is_operation"  bind:change="onChangeRadio" direction="horizontal" class="singlegroup">
+                <van-radio-group  disabled="{{!showBtn}}" value="{{ filter.numberTOstring(personInfo.is_operation) }}"  data-id="is_operation"  bind:change="onChangeRadio" direction="horizontal" class="singlegroup">
                   <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
                   <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
                 </van-radio-group>
               </view>
               <view class="radiotip" hidden="{{personInfo.is_operation !=1}}">
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.operation}}" data-id="hideOperation" data-value="operation"></textarea>
+                <textarea placeholder=" " disabled="{{!showBtn}}" show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.operation}}" data-id="hideOperation" data-value="operation"></textarea>
                 <view class="textbox" hidden="{{hideOperation}}">
                   <view class="desc">请描述具体手术名称和做手术医院</view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="qa">
+          <view class="qa" wx:if="{{showList[4].isHas}}">
-            <view class="num">{{startIndex+2}}、</view>
+            <view class="num">{{showList[4].index}}、</view>
             <view class="titlebox">
               <view class="title">是否有饮酒史</view>
               <view class="radio">
-                <van-radio-group value="{{ filter.numberTOstring(personInfo.drink_wine_status) }}"   data-id="drink_wine_status"  bind:change="onChangeRadio" direction="horizontal" class="group">
+                <van-radio-group disabled="{{!showBtn}}" value="{{ filter.numberTOstring(personInfo.drink_wine_status) }}"   data-id="drink_wine_status"  bind:change="onChangeRadio" direction="horizontal" class="group">
                   <van-radio name="1" checked-color="#3cc7c0">从不</van-radio>
                   <van-radio name="2" checked-color="#3cc7c0">偶尔</van-radio>
                   <van-radio name="3" checked-color="#3cc7c0">经常</van-radio>
@@ -154,12 +155,12 @@
               </view>
             </view>
           </view>
-          <view class="qa">
+          <view class="qa" wx:if="{{showList[5].isHas}}">
-            <view class="num">{{startIndex+3}}、</view>
+            <view class="num">{{showList[5].index}}、</view>
             <view class="titlebox">
               <view class="title">是否有吸烟史</view>
               <view class="radio">
-                <van-radio-group value="{{ filter.numberTOstring(personInfo.smoke_status) }}"  data-id="smoke_status" bind:change="onChangeRadio" direction="horizontal" class="group">
+                <van-radio-group disabled="{{!showBtn}}" value="{{ filter.numberTOstring(personInfo.smoke_status) }}"  data-id="smoke_status" bind:change="onChangeRadio" direction="horizontal" class="group">
                   <van-radio name="1" checked-color="#3cc7c0">从不</van-radio>
                   <van-radio name="2" checked-color="#3cc7c0">偶尔</van-radio>
                   <van-radio name="3" checked-color="#3cc7c0">经常</van-radio>
@@ -169,12 +170,12 @@
               </view>
             </view>
           </view>
-          <view class="qa">
+          <view class="qa" wx:if="{{showList[6].isHas}}">
-            <view class="num">{{startIndex+4}}、</view>
+            <view class="num">{{showList[6].index}}、</view>
             <view class="titlebox">
               <view class="title">是否有接触过化学物</view>
               <view class="radio">
-                <van-radio-group value="{{filter.numberTOstring(personInfo.chemical_compound_status)}}"   data-id="chemical_compound_status"    bind:change="onChangeRadio" direction="horizontal" class="group">
+                <van-radio-group disabled="{{!showBtn}}" value="{{filter.numberTOstring(personInfo.chemical_compound_status)}}"   data-id="chemical_compound_status"    bind:change="onChangeRadio" direction="horizontal" class="group">
                   <van-radio name="1" checked-color="#3cc7c0">从不</van-radio>
                   <van-radio name="2" checked-color="#3cc7c0">偶尔</van-radio>
                   <van-radio name="3" checked-color="#3cc7c0">经常</van-radio>
@@ -183,7 +184,7 @@
               </view>
              
               <view class="radiotip" wx:if="{{(personInfo.chemical_compound_status!=1 && personInfo.chemical_compound_status)}}">
-                <textarea placeholder=" "  show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done" value="{{personInfo.chemical_compound_describe}}" bindinput="handelFocus"  data-id="hideChemical" data-value="chemical_compound_describe"></textarea>
+                <textarea placeholder=" " disabled="{{!showBtn}}"  show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done" value="{{personInfo.chemical_compound_describe}}" bindinput="handelFocus"  data-id="hideChemical" data-value="chemical_compound_describe"></textarea>
                 <view class="textbox" hidden="{{hideChemical}}">
                   <view class="desc"><text>化学物：</text>请详细填写接触过的相关化学物（限制50个字）</view>
                 </view>
@@ -191,27 +192,31 @@
 
             </view>
           </view>
-          <view class="qa">
+          <view class="qa" wx:if="{{showList[7].isHas}}">
-            <view class="num">{{startIndex+45}}、</view>
+            <view class="num">{{showList[7].index}}、</view>
             <view class="titlebox">
               <view class="title">确诊医院是？</view>
-             
               <view class="radiotip" >
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.family_history}}" data-id="hideFamilysick" data-value="family_history"></textarea>
+                <textarea placeholder=" " disabled="{{!showBtn}}" show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.diagnosis_hospital}}" data-id="hideHospital" data-value="diagnosis_hospital"></textarea>
-                <view class="textbox" hidden="{{hideFamilysick}}">
+                <view class="textbox" hidden="{{hideHospital}}">
                   <view class="desc"><text></text>请填写确诊医院名称</view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="qa">
+          <view class="qa" wx:if="{{showList[8].isHas}}">
-            <view class="num">{{startIndex+6}}、</view>
+            <view class="num">{{showList[8].index}}、</view>
             <view class="titlebox">
-              <view class="title">服用药品是？</view>
+              <view class="title">是否正在服药？</view>
-             
+              <view class="radio">
-              <view class="radiotip" >
+                <van-radio-group  disabled="{{!showBtn}}" value="{{ filter.numberTOstring(personInfo.is_take_medicine) }}"  data-id="is_take_medicine"  bind:change="onChangeRadio" direction="horizontal" class="singlegroup">
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.family_history}}" data-id="hideFamilysick" data-value="family_history"></textarea>
+                  <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
-                <view class="textbox" hidden="{{hideFamilysick}}">
+                  <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
+                </van-radio-group>
+              </view>
+              <view class="radiotip" hidden="{{personInfo.is_take_medicine !=1}}">
+                <textarea placeholder=" " disabled="{{!showBtn}}" show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.drugs_name}}" data-id="hideDrug" data-value="drugs_name"></textarea>
+                <view class="textbox" hidden="{{hideDrug}}">
                   <view class="desc"><text></text>请详细填写所服药物（限制50个字）</view>
                 </view>
               </view>
@@ -221,15 +226,16 @@
       </view>
    </view>
    </view>
+   <view class="bottom" wx:if="{{showBtn}}">
+     <view class="btn" bindtap="handleSendFields">发送给医生</view>
+   </view>
 
 </view>
 
 <van-popup show="{{ showMarital }}" round position="bottom" custom-style="height:auto" bind:close="closeMaritalPicker">
   <van-picker show-toolbar title="请选择婚姻状况" columns="{{ maritalColumn }}" bind:cancel="closeMaritalPicker" bind:confirm="onConfirmMaritalPicker" />
 </van-popup>
-<van-popup show="{{ showCity}}" round position="bottom" custom-style="height: 50%" bind:close="onClose">
+
-  <van-picker columns="{{ columns }}" show-toolbar title="选择地区" columns="{{ columns }}" value-key="area_name" bind:cancel="onCancel" bind:change="onChangePicker" bind:confirm="onConfirm" />
-</van-popup>
 <van-popup show="{{ showSick }}" position="bottom" custom-style="height: auto">
     <van-picker show-toolbar title="选择所患疾病" columns="{{ sickcolumns }}" value-key="disease_class_name" bind:cancel="onCancelSick" bind:confirm="onConfirmSick" />
   </van-popup>

pages/inquiryForm/inquiryForm.wxss

@@ -11,6 +11,7 @@
 .questionbox{
   overflow-y: scroll;
   margin-top: 172rpx;
+  flex:1;
 }
 .cellbox .cell{
   background-color: #fff;
@@ -144,3 +145,20 @@ margin-bottom: 20rpx;
 .van-radio{
   margin-bottom: 10rpx!important;
 }
+.bottom{
+  width:100%;
+  height:160rpx;
+  background-color: #fff;
+}
+.bottom .btn{
+  font-size: 30rpx;
+color: #FFFFFF;
+  height:80rpx;
+  display: flex;
+ 
+  justify-content: center;
+  align-items: center;
+  background: #3CC7C0;
+border-radius: 8rpx;
+  margin:40rpx 32rpx;
+}

pages/my/my.js

@@ -53,6 +53,11 @@ Page({
       url: '/pages/familyDoc/familyDoc',
     })
   }),
+  goSickMange:throttle(function(){
+    app.method.navigateTo({
+      url: '/pages/sickManage/sickManage',
+    })
+  }),
   goAddress:throttle(function(){
     app.method.navigateTo({
       url: '/pages/address/address',

pages/my/my.wxml

@@ -79,6 +79,10 @@
           <image src="../../assets/images/edoc_new.png"  class="myicon"></image>
           <view class="name">家庭档案</view>
         </view>
+        <view class="iconcell"  bindtap="goSickMange">
+          <image src="../../assets/images/sickManage.png"  class="myicon"></image>
+          <view class="name">病情管理</view>
+        </view>
       </view>
     </view>
    <view class="dcellcontent">

pages/my/my.wxss

@@ -161,7 +161,8 @@ color: rgba(0,0,0,0.65);
   font-size: 28rpx;
 }
 .service .iconbox{
-  width:430rpx;
+  display: flex;
+  justify-content: space-between;
 }
 .service .iconbox .name {
   margin-top: 10rpx;

pages/sickDetail/sickDetail.js

@@ -1,16 +1,36 @@
 // pages/sickDetail/sickDetail.js
+const app = getApp()
+import {pathographyDetail} from "../../api/sickRecord"
+import {throttle} from "../../utils/util"
+import {pathographyListDelte} from "../../api/sickRecord"
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
+    sickInfo:{},
+    index:0,
+    pathography_id:'',
+    show:false,
+    message:'',
     
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
+  onDel() {
+   this.setData({
+     show:true,
+     message:"确定删除该病情记录？"
+   })
+ },
+ confirm:throttle(function(event){
+  if(event.detail){
+    this.handlePathographyListDelte();
+  }
+}),
   previewImage(event) {
     let id = event.currentTarget.dataset.id;
     let urls = this.data.sick.diagnose_images;
@@ -19,9 +39,35 @@ Page({
       urls: urls // 需要预览的图片http链接列表
     })
   },
-  onLoad(options) {
+  handlePathographyListDelte(){
-
+    let id=this.data.pathography_id
+    pathographyListDelte(id).then(data=>{
+     wx.showToast({
+       title: '删除成功',
+       icon:'none'
+     })
+    });
+    wx.navigateBack();
   },
+  handlepathographyDetail(id){
+    pathographyDetail(id).then(data=>{
+     this.setData({
+      sickInfo:data
+     })
+    })
+  },
+  onLoad(options) {
+    if(options.pathography_id){
+      this.setData({
+        pathography_id:options.pathography_id
+      })
+       this.handlepathographyDetail(options.pathography_id);
+  };
+  if(options.index){
+    this.setData({
+      index:options.index
+     })
+   }
 
   /**
    * 生命周期函数--监听页面初次渲染完成

pages/sickDetail/sickDetail.json

@@ -1,6 +1,7 @@
 {
   "usingComponents": {
     "nav":"../../components/nav/nav",
+    "dialog":"../../components/dialog/dialog",
     "van-icon": "@vant/weapp/icon/index"
   },
   "navigationStyle":"custom",

pages/sickDetail/sickDetail.wxml

@@ -1,130 +1,141 @@
 <!--pages/sickDetail/sickDetail.wxml-->
+<wxs src="../../filters/filter.wxs" module="filters"></wxs>
 <nav navName="病情详情"></nav>
 <view class="page">
   <view class="content">
     <view class="countcell">
     <view class="left">
-    <view class="name">第一份病例 </view>
+    <view class="name">第{{index}}份病例 </view>
-    <view class="time">填写时间：2022-12-20 </view>
+    <view class="time">填写时间：{{filters.transforDay(sickInfo.created_at,"date")}} </view>
     </view>
-    <van-icon name="delete-o"  class="icon"/>
+    <van-icon name="delete-o"  class="icon" bindtap="onDel"/>
   </view>
   <view class="infobox">
      <view class="title">基础信息</view>
      <view class="basiccell">
         <view class="namebox">
-          <view class="name">贺俊青</view>
+          <view class="name">{{sickInfo.name}}</view>
-          <view class="age">男｜30岁</view>
+          <view class="age"><text wx:if="{{sickInfo.sex==1}}" decode="true">男</text><text wx:elif="{{sickInfo.sex==2}}" decode="true">女</text><text wx:else decode="true">未知</text>｜{{sickInfo.age}}岁</view>
         </view>
         <view class="info">
-        <view class="infocell">
+        <view class="infocell"  wx:if="{{!(sickInfo.height==null && sickInfo.weight==null && sickInfo.nation_name==null && sickInfo.job_name==null && sickInfo.marital_status==null)}}">
-          <view class="cell">身高：<text class="desc">170cm</text></view>
+          <view class="cell">身高：<text class="desc">{{sickInfo.height}}cm</text></view>
-          <view class="cell">体重：<text class="desc">170cm</text></view>
+          <view class="cell">体重：<text class="desc">{{sickInfo.weight}}kg
-          <view class="cell">民族：<text class="desc">170cm</text></view>
+          </text></view>
-          <view class="cell" >民族：<text class="desc">170cm</text></view>
+          <view class="cell">民族：<text class="desc">{{sickInfo.nation_name}}</text></view>
-          <view class="cell">民族：<text class="desc">170cm</text></view>
+          <view class="cell" >职业：<text class="desc">{{sickInfo.job_name}}</text></view>
+          <view class="cell">婚姻：<text class="desc" wx:if="{{sickInfo.marital_status==0}}">未婚</text><text wx:elif="{{sickInfo.marital_status==1}}">已婚</text><text wx:elif="{{sickInfo.marital_status==2}}">离异</text></view>
         </view>
      </view>
-      <view class="row">
+      <view class="row" wx:if="{{sickInfo.disease_desc}}">
          <view class="name">所患疾病：</view>
-         <view class="desc">肝炎</view>
+         <view class="desc">{{sickInfo.disease_class_name}}</view>
       </view>
-      <view class="row">
+      <view class="row" wx:if="{{sickInfo.diagnosis_date}}">
          <view class="name">确诊日期：</view>
-         <view class="desc">肝炎</view>
+         <view class="desc">{{sickInfo.diagnosis_date}}</view>
       </view>
-      <view class="row">
+      <view class="row" wx:if="{{sickInfo.diagnosis_hospital}}">
          <view class="name">确诊医院：</view>
-         <view class="desc">肝炎</view>
+         <view class="desc">{{sickInfo.diagnosis_hospital}}</view>
       </view>
-     <view class="rowtip">
+     <view class="rowtip" wx:if="{{sickInfo.is_take_medicine!=null}}">
         <view class="row">
           <view class="name">正在服用的药品信息：</view>
-          <view class="desc">肝炎</view>
+          <view class="desc">{{sickInfo.is_take_medicine==1?'有':'无'}}</view>
         </view>
-        <view class="tip">详细描述：阿托伐他汀钙片8片 （用法用量</view>
+        <view class="tip">{{sickInfo.drugs_name}};</view>
      </view>
-     <view class="row top">
+     <view class="row top" wx:if="{{sickInfo.disease_desc}}">
          <view class="name">病情描述：</view>
-         <view class="desc">肝炎详细描述：阿托伐他汀钙片8片 （用法用量详细描述：阿托伐他汀钙片8片 （用法用量</view>
+         <view class="desc">{{sickInfo.disease_desc}}</view>
       </view>
-      <view class="row top">
+      <view class="row top" wx:if="{{sickInfo.product.length>0}}">
          <view class="name">用药意向：</view>
-         <view class="desc">肝炎详细描述：阿托伐他汀钙片8片 （用法用量详细描述：阿托伐他汀钙片8片 （用法用量</view>
+         <view class="desc">
+           <text v-for="{{sickInfo.product}}">{{item}};</text>
          </view>
-      <view class="rowtip">
+      </view>
+      <view class="rowtip" wx:if="{{sickInfo.diagnose_images.length > 0}}">
         <view class="row">
           <view class="name">复诊凭证（病例/处方单/检查报告/住院单)</view>
         </view>
         <view class="imgtip">
-          <image src="{{item}}" class="img" wx:for="{{diagnose_images}}" mode="aspectFill" wx:for-index="idx" wx:key="idx" bindtap="previewImage" data-id="{{idx}}" ></image>
+          <image src="{{sickInfo}}" class="img" wx:for="{{sickInfo.diagnose_images}}" mode="aspectFill" wx:for-index="idx" wx:key="idx" bindtap="previewImage" data-id="{{idx}}" ></image>
         </view>
       </view>
      </view>
   
   </view>
-  <view class="infobox">
+  <view class="infobox" wx:if="{{!(sickInfo.is_allergy_history==null && sickInfo.is_family_history==null && sickInfo.is_pregnant==null && sickInfo.is_operation==null && sickInfo.drink_wine_status==null && sickInfo.smoke_status==null && sickInfo.chemical_compound_status==null) }}">
     <view class="title">其他信息</view>
     <view class="basiccell">
       <view class="info">
-        <view class="row top">
+        <view class="row top" wx:if="{{sickInfo.is_allergy_history!=null}}">
          <view class="name">过敏史：</view>
-         <view class="desc">肝炎详细描述：阿托伐他汀钙片8片 （用法用量详细描述：阿托伐他汀钙片8片 （用法用量</view>
+         <view class="desc">{{sickInfo.is_allergy_history==0?"无":sickInfo.allergy_history}}</view>
       </view>
-     <view class="row top">
+     <view class="row top"  wx:if="{{sickInfo.is_family_history!=null}}">
          <view class="name">家族史：</view>
-         <view class="desc">肝炎详细描述：阿托伐他汀钙片8片 （用法用量详细描述：阿托伐他汀钙片8片 （用法用量</view>
+         <view class="desc">{{sickInfo.is_family_history==0?"无":sickInfo.family_history}}</view>
       </view>
      
-     <view class="rowtip">
+     <view class="rowtip" wx:if="{{sickInfo.is_pregnant!=null}}">
         <view class="row">
           <view class="name">是否备孕、妊娠或者哺乳期：</view>
-          <view class="desc">肝炎</view>
+          <view class="desc">{{sickInfo.is_pregnant==0?"无":'是'}}</view>
         </view>
-        <view class="tip">详细描述：阿托伐他汀钙片8片 （用法用量</view>
+        <view class="tip" wx:if="{{sickInfo.pregnant}}">{{sickInfo.pregnant}}</view>
      </view>
-     <view class="rowtip">
+     <view class="rowtip" wx:if="{{sickInfo.drink_wine_status!=null}}">
         <view class="row">
           <view class="name">饮酒史：</view>
-          <view class="desc">肝炎</view>
+          <view class="desc">{{sickInfo.drink_wine_status==1?'从不':sickInfo.drink_wine_status==2?'偶尔':sickInfo.drink_wine_status==3?'经常':sickInfo.drink_wine_status==4?'每天':sickInfo.drink_wine_status==5?'已戒酒':'其他'}}</view>
         </view>
      </view>
-     <view class="rowtip">
+     <view class="rowtip" wx:if="{{sickInfo.smoke_status!=null}}">
         <view class="row">
           <view class="name">吸烟史：</view>
-          <view class="desc">肝炎</view>
+          <view class="desc">{{sickInfo.smoke_status==1?'从不':sickInfo.smoke_status==2?'偶尔':sickInfo.smoke_status==3?'经常':sickInfo.smoke_status==4?'每天':sickInfo.smoke_status==5?'已戒烟':'其他'}}</view>
         </view>
      </view>
-     <view class="row top">
+     <view class="row top" wx:if="{{sickInfo.is_operation!=null}}">
          <view class="name">手术史：</view>
-         <view class="desc">肝炎详细描述：阿托伐他汀钙片8片 （用法用量详细描述：阿托伐他汀钙片8片 （用法用量</view>
+         <view class="desc">{{sickInfo.is_operation==0?'否':sickInfo.operation}}</view>
       </view>
-     <view class="rowtip">
+     <view class="rowtip" wx:if="{{sickInfo.chemical_compound_status!=null}}">
         <view class="row">
           <view class="name">接触化学物：</view>
-          <view class="desc">肝炎</view>
+          <view class="desc">{{sickInfo.chemical_compound_status==1?'从不':sickInfo.chemical_compound_status==2?'偶尔':sickInfo.chemical_compound_status==3?'经常':sickInfo.chemical_compound_status==4?'每天':'其他'}}</view>
         </view>
-        <view class="tip">详细描述：阿托伐他汀钙片8片 （用法用量</view>
+        <view class="tip" wx:if="{{sickInfo.chemical_compound_status && sickInfo.chemical_compound_status!=1}}">{{sickInfo.chemical_compound_describe}}</view>
      </view>
     </view>
     </view>
   </view>
-  <view class="infobox">
+  <view class="infobox" wx:if="{{sickInfo.order_prescription}}">
     <view class="title">处方信息</view>
-    <view class="basiccell">
+    <view class="basiccell" style="margin-bottom: 20rpx;">
       <view class="row">
          <view class="name">诊断：</view>
-         <view class="desc">肝炎</view>
+         <view class="desc">{{sickInfo.order_prescription.icd_name}}</view>
       </view>
       <view class="row">
          <view class="name">时间：</view>
-         <view class="desc">肝炎</view>
+         <view class="desc">{{sickInfo.order_prescription.doctor_created_time}}</view>
       </view>
       <view class="row top">
          <view class="name">药品：</view>
-         <view class="desc">肝炎详细描述：阿托伐他汀钙片8片 （用法用量详细描述：阿托伐他汀钙片8片 （用法用量</view>
+         <view class="desc">
+            <text  wx:for="{{sickInfo.order_prescription.product}}" >{{item.product_name}}{{item.product_spec}};</text>
+         </view>
+      </view>
+      <view class="row">
+         <view class="name">医嘱：</view>
+         <view class="desc">{{sickInfo.order_prescription.doctor_advice}}</view>
       </view>
     </view>
   </view>
   </view>
 </view>
+<dialog bind:confirm="confirm" showDialog="{{show}}" message="{{message}}"></dialog>

pages/sickManage/sickManage.js

@@ -1,6 +1,6 @@
 
 const app = getApp()
-import {family} from "../../api/familyDoc"
+import {pathographyGroup} from "../../api/sickRecord"
 import {throttle} from "../../utils/util"
 Page({
 
@@ -16,7 +16,7 @@ Page({
     this.handleFamily();
   },
   handleFamily(){
-    family().then(data=>{
+    pathographyGroup().then(data=>{
       this.setData({
         isTriggered:false,
         list:data
@@ -30,13 +30,13 @@ Page({
   },
   goInfo:throttle(function(){
     app.method.navigateTo({
-      url: '/pages/sickDetail/sickDetail',
+      url: '/pages/familyDoc/familyDoc',
     })
   }),
-  goMember:throttle(function(event){
+  goRecord:throttle(function(event){
     let id=event.currentTarget.dataset.id;
     app.method.navigateTo({
-      url: '/pages/memberDetail/memberDetail?family_id='+id,
+      url: '/pages/sickRecord/sickRecord?family_id='+id+"&showRadio=false",
     })
   }),
   /**

pages/sickManage/sickManage.wxml

@@ -4,17 +4,20 @@
   <view class="hasdata">
     <scroll-view scroll-y="true" bindrefresherrefresh="handleRefresher" class="scrollbox" refresher-triggered="{{isTriggered}}"	refresher-threshold="100"	refresher-enabled="true"  class="namebox" wx:if="{{list.length>0}}">
    
-        <view class="namecell" bindtap="goMember" wx:for="{{list}}" wx:key="family_id" data-id="{{item.family_id}}">
+        <view class="namecell" bindtap="goRecord" wx:for="{{list}}" wx:key="family_id" data-id="{{item.family_id}}">
-        <view class="name">{{item.card_name}}(<text wx:if="{{item.sex==1}}">男</text><text wx:elif="{{item.sex==2}}">女</text><text wx:else>未知</text>，{{item.age}}岁)</view>
+        <view class="namecon">
+          <view class="name" >{{item.name}}<text wx:if="{{item.sex==1}}" decode="true">&nbsp;&nbsp;男</text><text wx:elif="{{item.sex==2}}" decode="true">&nbsp;&nbsp;女</text><text wx:else decode="true">&nbsp;&nbsp;未知</text>｜{{item.age}}岁</view>
+          <view class="count">共有{{item.count}}份病例</view>
+        </view>
         <image src="{{img_host+'/righticon.png'}}" class="righticon"></image>
       </view>
    
     </scroll-view>
     <view class="nodata" wx:else>
-      <image src="{{img_host+'/member.png'}}"  class="memberimg"></image>
+      <image src="../../assets/images/noManage.png"  class="memberimg"></image>
       <view class="tips">当前暂未添加任何家庭成员哦~</view>
       <view class="btnbox add nobtn">
-        <view class="btn" bindtap="goInfo">立即添加</view>
+        <view class="btn" bindtap="goInfo">添加家庭成员</view>
       </view>
     </view>
     <view class="btnbox add" wx:if="{{list.length>0}}">

pages/sickManage/sickManage.wxss

@@ -41,6 +41,7 @@
 }
 
 .namecell{
+  overflow: hidden;
   display: flex;
   margin:0 32rpx;
   height: 142rpx;
@@ -94,3 +95,9 @@ color: #999999;
 .img {
   padding:14rpx 29rpx;
 }
+.count{
+  margin-top: 20rpx;
+  font-size: 24rpx;
+font-weight: 400;
+color: #666666;
+}

pages/sickRecord/sickRecord.js

@@ -14,6 +14,7 @@ Page({
     message:'',
     page:1,
     currentId:'',
+    showRadio:true,
     isLock:false,
     per_page:10,
     img_host:'https://oss.prod.applets.igandanyiyuan.com/applet/patient/static',
@@ -48,10 +49,11 @@ Page({
        title: '删除成功',
        icon:'none'
      })
-    })
+     this.handleRefresher();
+    });
+
   },
   onChange(event) {
-   
     this.setData({
       radio: event.detail,
     });
@@ -108,10 +110,10 @@ Page({
       url: '/pages/memberDetail/memberDetail',
     })
   }),
-  goMember:throttle(function(event){
+  goDetail:throttle(function(event){
-    let id=event.currentTarget.dataset.id;
+    let {id,index}=event.currentTarget.dataset;
     app.method.navigateTo({
-      url: '/pages/memberDetail/memberDetail?family_id='+id,
+      url: '/pages/sickDetail/sickDetail?pathography_id='+id+"&index="+index,
     })
   }),
   /**
@@ -121,6 +123,17 @@ Page({
      this.setData({
       family_id:options.family_id
      })
+    
+     if(options.showRadio){
+       this.setData({
+         showRadio:false
+       })
+     }else{
+      this.setData({
+        showRadio:true
+      })
+     }
+     this.handleFamily();
   },
 
   /**
@@ -137,7 +150,8 @@ Page({
     this.setData({
       img_host:app.hostConfig().imghost
     });
-    this.handleFamily();
+    
+    
   },
 
   /**

pages/sickRecord/sickRecord.wxml

@@ -7,8 +7,8 @@
        <van-swipe-cell right-width="{{ 65 }}" wx:for="{{list}}" wx:key="pathography_id" data-id="{{item.pathography_id}}"  async-close bind:close="onDel">
        <van-cell-group>
         <view class="namecell"  >
-          <van-radio  right="leftcon" name="{{item.pathography_id}}" checked-color="#3CC7C0;"></van-radio>
+          <van-radio  right="leftcon" name="{{item.pathography_id}}" checked-color="#3CC7C0;" wx:if="{{showRadio}}"></van-radio>
-           <view class="rightcon">
+           <view class="rightcon" bindtap="goDetail"  data-id="{{item.pathography_id}}" data-index="{{index+1}}">
             <view class="time">{{item.created_at}}</view>
             <view class="disease">
              <view > {{item.disease_class_name}}</view>

pages/writeSick/writeSick.js

@@ -160,6 +160,8 @@ Page({
         // }
       }
 
+    }else{
+      this.handleOnlineSick(this.data.family_id);
     }
   },
   handleSetValue(data){
@@ -180,11 +182,18 @@ Page({
       }
       for (const key in obj) {
         if (key != "product") {
+          if(key=="is_taboo" && !data[key]){
+            this.setData({
+              [key]: null
+            })
+          }else{
             this.setData({
               [key]: data[key]
             })
           }
          
+        }
+
       };
       if (data.disease_desc) {
         this.setData({