diff --git a/case/pages/agreement/agreement.js b/case/pages/agreement/agreement.js index 16f22f6..7d3074e 100644 --- a/case/pages/agreement/agreement.js +++ b/case/pages/agreement/agreement.js @@ -27,8 +27,9 @@ Page({ }, handleFetRubric(){ getRubric().then(res=>{ + let str = res.replace(/\ - + diff --git a/case/pages/agreement/agreement.wxss b/case/pages/agreement/agreement.wxss index e19154c..ee92e77 100644 --- a/case/pages/agreement/agreement.wxss +++ b/case/pages/agreement/agreement.wxss @@ -90,4 +90,7 @@ right:280rpx; width:280rpx; height:300rpx; +} +.con .imgstyle{ + max-width: 100%; } \ No newline at end of file diff --git a/case/pages/createCase/createCase.js b/case/pages/createCase/createCase.js index d95e24c..4061a32 100644 --- a/case/pages/createCase/createCase.js +++ b/case/pages/createCase/createCase.js @@ -71,6 +71,7 @@ Page({ uid:'', sex:null, age:'', + treatmentNum:'', admissionTime:'', caseType:[], mainDiagnose:{ @@ -571,11 +572,11 @@ Page({ this.data.medicalRecordId?this.handleEditCase():this.handleAddCase(); }), saveBasic(){ + if(this.validateBasic(true)){ this.setData({ active:1 - }) - + }) } !this.data.medicalRecordId && this.saveDraft(); }, @@ -1075,7 +1076,7 @@ Page({ }; this.setData({ 'case.dpmas':this.data.case.dpmas.concat([obj]), - 'dpmas_list':this.data.dpmas_list.concat({fileList:[]}) + 'dpmas_list':this.data.dpmas_list.concat({fileList:[],treatTime:''}) }) }, @@ -1099,7 +1100,7 @@ Page({ }, validateBasic(flag){ - let {name,uid,sex,age,admissionTime,caseType,mainDiagnose,diseaseCause,seductionReason}=this.data.case; + let {name,uid,sex,age,admissionTime,caseType,mainDiagnose,diseaseCause,seductionReason,treatmentNum}=this.data.case; let {fileList_basic}=this.data; if(!name){ flag && wx.showToast({ @@ -1143,6 +1144,20 @@ Page({ icon:"none" }) return false + }; + if(treatmentNum<1){ + flag && wx.showToast({ + title: '治疗次数不小于1次', + icon:"none" + }) + return false + } + if(treatmentNum>9999){ + flag && wx.showToast({ + title: '治疗次数不能超过9999次', + icon:"none" + }) + return false } if(mainDiagnose.select.length==0){ flag && wx.showToast({ @@ -1180,6 +1195,61 @@ Page({ }) return false } + + let {dpmas}=this.data.case; + let {dpmas_list}=this.data; + + let obj={ + 'treatTime':'', + 'content':{ + "mode":{ // 模式 + "select":"", + "otherValue":"", + }, + "plasma":{ // 血浆 + "handle":"", + "replace":"" + }, + "dose":{ // 抗凝剂量 + "select":[], + "heparin":{ // 肝素 + "firstDose":"",//首剂 + "firstDoseUnit":'1', + "append":"",//追加 + "appendUnit":'1', + }, + "lowHeparin":{ // 低分子肝素 + "value":"" + }, + "citricAcid":{ // 枸橼酸 + "bloodFlowRate":"",//血液流速 + "citricAcidFlowRate":"",//枸橼酸钠流速 + "calciumAgent":{ // 钙剂 + "select":"", + "value":"", + } + }, + "nafamostat":{ // 甲磺酸萘莫司他 + "value":"" + }, + "other":{ // 其他 + "name":"", + "dose":"" + } + } + + }, + dpmasImg:'' + }; + if(caseType.length==1 && caseType[0]==1){ + if(dpmas.length<=1){ + this.setData({ + 'case.dpmas':dpmas.concat([obj]), + 'dpmas_list':dpmas_list.concat({fileList:[],treatTime:''}) + + }) + } + } // if(seductionReason.inside.select.length==0){ // flag && wx.showToast({ // title: '请选择诱因肝内类型', @@ -1224,16 +1294,10 @@ Page({ return true }, validateRecord(flag){ - let {dpmas,admissionTime}=this.data.case; + let {dpmas,admissionTime,caseType}=this.data.case; let {dpmas_list}=this.data; - // if(caseType==1 && dpmas.length<4){ - // flag && wx.showToast({ - // title: 'DPMAS治疗不少于4次', - // icon:'none' - // }) - // return false; - // }; + // if(caseType==2 && dpmas.length<1){ // flag && wx.showToast({ // title: 'DPMAS治疗不少于1次', @@ -1396,6 +1460,16 @@ Page({ return false; } + }; + if(caseType.length==1 && caseType[0]==1){ + if(dpmas.length<=1){ + flag && wx.showToast({ + title: '病例治疗类型为DPMAS或DPMAS联合模式时,需提交至少2次人工肝治疗记录', + icon:'none' + }) + return false; + } + }; return true @@ -1918,7 +1992,7 @@ Page({ }else{ iptValue=tempValue } - if(key=='age' || key=="day"){ + if(key=='age' || key=="day" || key=="treatmentNum"){ if(e.detail.value!=''){ this.setData({ ['case.'+key]:Number(e.detail.value) @@ -2170,10 +2244,7 @@ Page({ return parts[parts.length - 1]; }, afterhandlePaint(e){ - wx.showLoading({ - title: '图片上传中', - mask: true - }) + this.setData({ showPaint:false }) diff --git a/case/pages/createCase/createCase.wxml b/case/pages/createCase/createCase.wxml index f0b219f..29a9fe0 100644 --- a/case/pages/createCase/createCase.wxml +++ b/case/pages/createCase/createCase.wxml @@ -9,7 +9,7 @@ - + @@ -53,7 +53,9 @@ 入院时间* - + {{case.admissionTime?case.admissionTime:'请选择时间'}} + + @@ -72,6 +74,14 @@ + + + 治疗次数* + + + + + 主要诊断(可多选)* @@ -164,7 +174,7 @@ 下一步 - + @@ -259,21 +269,22 @@ - 总共治疗{{case.dpmas.length}} + 总共治疗记录{{case.dpmas.length}} 第{{index+1}}次治疗 - + 治疗时间* - + {{dpmas_list[index].treatTime?dpmas_list[index].treatTime:'请选择时间'}} + @@ -519,7 +530,8 @@ 首次人工肝治疗前检测时间* - + {{case.headTime?case.headTime:'请选择时间'}} + @@ -529,7 +541,8 @@ 首次人工肝治疗后检测时间* - + {{case.afterTime?case.afterTime:'请选择时间'}} + @@ -539,13 +552,14 @@ 最后一次人工肝治疗后检测时间* - + {{case.lastTime?case.lastTime:'请选择时间'}} + - 总胆红素TB (umol/L)* + 总胆红素 TB(umol/L)* 首次治疗前 @@ -854,7 +868,8 @@ 出院时间* - + {{case.dischargeTime?case.dischargeTime:'请选择时间'}} + diff --git a/case/pages/createCase/createCase.wxss b/case/pages/createCase/createCase.wxss index 19b1540..9abc338 100644 --- a/case/pages/createCase/createCase.wxss +++ b/case/pages/createCase/createCase.wxss @@ -121,8 +121,21 @@ page{ border-bottom: none; } .basic .row .ipt{ + text-align: right; } +.viewipt{ + flex:1; + width:340rpx; + text-align: right; + font-family: UICTFontTextStyleBody; +} +.viewipt.short{ + width:240rpx; +} +.viewipt.shortlast{ + width:180rpx; +} .placeholder{ font-size: 32rpx; font-weight: 400; diff --git a/case/pages/mobileLogin/mobileLogin.js b/case/pages/mobileLogin/mobileLogin.js index 3c3cfa3..4dda797 100644 --- a/case/pages/mobileLogin/mobileLogin.js +++ b/case/pages/mobileLogin/mobileLogin.js @@ -231,7 +231,7 @@ onCancelSuccess(){ let THIS=this; if(!this.data.check){ wx.showToast({ - title: '请同意《肝胆相照用户服务协议》!', + title: '请同意《隐私协议》!', icon:'none' }) return false diff --git a/case/pages/pwdLogin/pwdLogin.js b/case/pages/pwdLogin/pwdLogin.js index f97baeb..62ab662 100644 --- a/case/pages/pwdLogin/pwdLogin.js +++ b/case/pages/pwdLogin/pwdLogin.js @@ -52,7 +52,7 @@ Page({ let {mobile,pwd,loginDevice,captchaUuid,captchaCode,checked}=this.data; if(!checked){ wx.showToast({ - title: '请同意《用户服务协议》!', + title: '请同意《隐私协议》!', icon:'none' }) return false diff --git a/case/pages/register/register.js b/case/pages/register/register.js index 2a19bb8..879381f 100644 --- a/case/pages/register/register.js +++ b/case/pages/register/register.js @@ -490,8 +490,11 @@ Page({ file } = event.detail; this.setData({ - showCrop:true, src:file.url + },()=>{ + this.setData({ + showCrop:true, + }) }) }, diff --git a/components/paintCanvas/paintCanvas.js b/components/paintCanvas/paintCanvas.js index 1e1f35e..87580cc 100644 --- a/components/paintCanvas/paintCanvas.js +++ b/components/paintCanvas/paintCanvas.js @@ -142,6 +142,10 @@ Component({ // this.triggerEvent('confirmUpload') // }, tapBtn: function (e) { + wx.showLoading({ + title: '图片上传中', + mask: true + }) utils.tapBtn(e, this, 2,this.data.paintFrom); this.hideBarsHandler() }, diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index 73d7cfa..4d610f5 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -79,11 +79,11 @@ Component({ type:4 }).then(result=>{ - if(result<4){ + if(result<20){ this.handleGetSign() }else{ wx.showToast({ - title: '每人参与病例征集不得超过20例', + title: '每人参与病例征集不得超过20例', icon:'none' }) } diff --git a/pages/index/index.js b/pages/index/index.js index c61453a..1b8b42b 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -81,12 +81,12 @@ Page({ limitCount({ type:4 }).then(result=>{ - if(result<4){ + if(result<20){ this.handleGetSign() }else{ wx.showToast({ title: '每人参与病例征集不得超过20例', - + icon:'none' }) } diff --git a/pages/personCenter/personCenter.js b/pages/personCenter/personCenter.js index 8830ce5..aaba662 100644 --- a/pages/personCenter/personCenter.js +++ b/pages/personCenter/personCenter.js @@ -75,9 +75,9 @@ Page({ type:3 }).then(result => { console.log(result); - if (result < 2) { + if (result < 5) { wx.showToast({ - title: '病例审核通过2份及以上可申请病例交流活动', + title: '病例审核通过5份及以上可申请病例交流活动', icon: 'none' }) } else { diff --git a/project.private.config.json b/project.private.config.json index 1e7bbf3..d111555 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -5,5 +5,5 @@ "compileHotReLoad": true, "urlCheck": false }, - "libVersion": "3.8.8" + "libVersion": "3.8.12" } \ No newline at end of file diff --git a/utils/config.js b/utils/config.js index 6c5f44c..d90df99 100644 --- a/utils/config.js +++ b/utils/config.js @@ -4,8 +4,11 @@ host_dev:'https://dev-case.igandan.com/api', img_dev: 'https://medical-case.oss-cn-beijing.aliyuncs.com/static', //开发环境 - host_prod:'https://case.igandan.com/api', - img_prod: 'https://medical-case.oss-cn-beijing.aliyuncs.com/static', //线上环境 + host_prod:'https://prod-casecollection.igandan.com/api', + img_prod: 'https://medical-case.oss-cn-beijing.aliyuncs.com/static', //线上环境 + + // host_dev:'https://prod-casecollection.igandan.com/api', + // img_dev: 'https://medical-case.oss-cn-beijing.aliyuncs.com/static', }; const { envVersion } = wx.getAccountInfoSync().miniProgram;