修改获取治疗方案字段传参diseaseName

src/index.js

@@ -16,7 +16,7 @@ var msg = {
   lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
   pacs: getUrlArgObject('pacsJson'),
   diag: getUrlArgObject('diagJson'),
-  diseaseName: getUrlArgObject('diagJson'),
+  diseaseName: getUrlArgObject('diseaseName'),
   other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
   hosCode:getUrlArgObject('hospitalCode') || ''
 }//推送相关信息

src/js/illness.js

@@ -60,7 +60,7 @@ function bqtsFun(data){//病情提示
     for(var m = 0;m < tmpBq.details.length;m++){
       var tmpBqDetail = tmpBq.details[m]
       if(tmpBqDetail.type == 1){
-        tmpBqDetailStr+=tmpBqStr+ "<div target='_blank' data-scaleName="+tmpBqDetail.content.name+" href='scale.html?featureType=21&sex="+msg.sex+"&lis="+JSON.stringify(msg.lis)+"&diag="+msg.diag+"&scaleName="+tmpBqDetail.content.name+"&symptom="+msg.symptom+"&other="+msg.other+"&pacs="+msg.pacs+"&vital="+msg.vital+"&age="+msg.age+"&scaleId="+tmpBqDetail.content.id+"' class='illnessTable'>【"+tmpBqDetail.content.name+"】</div>"+
+        tmpBqDetailStr+=tmpBqStr+ "<div target='_blank' data-scaleName="+tmpBqDetail.content.name+" href='scale.html?featureType=21&sex="+msg.sex+"&lis="+JSON.stringify(msg.lis)+"&diseaseName"+msg.diseaseName+"&diag="+msg.diag+"&scaleName="+tmpBqDetail.content.name+"&symptom="+msg.symptom+"&other="+msg.other+"&pacs="+msg.pacs+"&vital="+msg.vital+"&age="+msg.age+"&scaleId="+tmpBqDetail.content.id+"' class='illnessTable'>【"+tmpBqDetail.content.name+"】</div>"+
           '</div>';
       }
       if(tmpBqDetail.type == 2){
@@ -159,6 +159,6 @@ function bqtsFun(data){//病情提示
   })
   $(".illnessTable").on('click',function(){
     const scaleName = $(this).attr('data-scaleName')
-    openNewWin(`scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&scaleName=${scaleName}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}`)
+    openNewWin(`scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&diseaseName=${msg.diseaseName}&scaleName=${scaleName}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}`)
   })
 }

src/js/index.js

@@ -30,7 +30,7 @@ if(mrId) {
     lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
     pacs: getUrlArgObject('pacsJson'),
     diag: getUrlArgObject('diagJson'),
-    diseaseName: getUrlArgObject('diagJson'),
+    diseaseName: getUrlArgObject('diseaseName'),
     other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
     hosCode:getUrlArgObject('hospitalCode') || '',
     plan:getUrlArgObject('plan') || '0',
@@ -49,7 +49,7 @@ if(mrId) {
 //     lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
 //     pacs: getUrlArgObject('pacsJson'),
 //     diag: getUrlArgObject('diagJson'),
-//     diseaseName: getUrlArgObject('diagJson'),
+//     diseaseName: getUrlArgObject('diseaseName'),
 //     other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
 //     hosCode:getUrlArgObject('hospitalCode') || '',
 //     plan:getUrlArgObject('plan') || '0',

src/js/indexHorizontal.js

@@ -51,7 +51,7 @@ if(mrId) {
     lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
     pacs: getUrlArgObject('pacsJson'),
     diag: getUrlArgObject('diagJson'),
-    diseaseName: getUrlArgObject('diagJson'),
+    diseaseName: getUrlArgObject('diseaseName'),
     other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
     hosCode:getUrlArgObject('hospitalCode') || '',
     plan:getUrlArgObject('plan') || '0',

src/js/indexHorizontalDom.js

@@ -102,7 +102,7 @@ function renderMultRecommendInfo(icon, className,title,data, hasInfo, type, posi
 function renderTreat(icon, className,title, data) {
     $('.infoTabBox').append(`<span class="infoTab treatTab"  data-box="${className}">${title}</span>`)
     const str = `<div class="informationBox recommendInfoWrapper ${className} clearfix">
-                    <span class="diagName">${msg.diag}</span>
+                    <span class="diagName">${msg.diseaseName?msg.diseaseName:''}</span>
                     <div class="recommendInfoBox clearfix ${className + 'box'}"></div>
                 </div>`
     $('.infomationBox').append(str)
@@ -131,7 +131,7 @@ function renderTreatText(className,title,data, parentNode) {
         $(".treatTextBox").append('<span class="more">更多</span>')
     }
     $(".infomationBox .treatTextBox").on('click',".more",function(){
-        openNewWin(`treatplan.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${msg.lis}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}`)
+        openNewWin(`treatplan.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&diseaseName=${msg.diseaseName}&vitalJson=${msg.vital}&lisJson=${msg.lis}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}`)
       })
     
 }
@@ -181,7 +181,7 @@ function renderTreatDrug(className,title,data, parentNode) {
         $(".drugTreatmentInfo").append('<span class="more">更多</span>')
     }
     $(".infomationBox .drugTreatmentbox").on('click',".more",function(){
-        openNewWin(`treatplan.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${msg.lis}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}`)
+        openNewWin(`treatplan.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${msg.lis}&pacsJson=${msg.pacs}&diseaseName=${msg.diseaseName}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}`)
       })
     var treatList = $(".drugTreatmentInfo").find(".drugTreatmentInfoItemBox")
     // for(var h = 0;h < treatList.length;h++){ 
@@ -237,26 +237,8 @@ function renderTipsInfoText(className,title,data, parentNode) {
         }
     }
    
-    // const childrenNodeBoxStr = `
-    //     <div class = "treatItemBox ${className + 'box'}">
-    //         <p class="treatItemTitle">${title}:</p>
-    //         <div class="treatTextBox">
-    //             <p class="${className + 'Info'} clearfix"></p>
-    //         </div>
-    //     </div>
-    // `
     $('.' + parentNode).append(childrenNodeBoxStr)
-    // if(!data) {
-    //     data = '<span class="recommendNull">暂无推荐</span>'
-    // }
-    // $('.' + className+'Info').html(data)
-    // var commonTreatHeight = $(".commonTreatmentInfo").height()
-    // if(commonTreatHeight > 75){
-    //     $(".treatTextBox").append('<span class="more">更多</span>')
-    // }
-    // $(".treat .treatTextBox").on('click',".more",function(){
-    //     openNewWin(`treatplan.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${msg.lis}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}`)
-    //   })
+  
     
 }
 
@@ -297,7 +279,7 @@ function renderRecommendConditTips(icon, className,title,data) {
         for(var m = 0;m < tmpBq.details.length;m++){
           var tmpBqDetail = tmpBq.details[m]
           if(tmpBqDetail.type == 1){
-            tmpBqDetailStr+=`<span data-url=scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&scaleName=${tmpBqDetail.content.name}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}&scaleId=${tmpBqDetail.content.id} class="illnessTable">【${tmpBqDetail.content.name}】</span>`
+            tmpBqDetailStr+=`<span data-url=scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&diseaseName=${msg.diseaseName}&scaleName=${tmpBqDetail.content.name}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}&scaleId=${tmpBqDetail.content.id} class="illnessTable">【${tmpBqDetail.content.name}】</span>`
           }
           if(tmpBqDetail.type == 4){
             tmpBqDetailStr+=`<span class="sriticalinfo">&nbsp;${tmpBqDetail.content.name}(诊断要点)</span>`
@@ -316,7 +298,7 @@ function renderRecommendConditTips(icon, className,title,data) {
         openNewWin(infoMsgUrl)
       })
       $(".conditTipsbox").on('click',".more",function(){
-        // openNewWin(`illness.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${JSON.stringify(msg.lis)}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}&msg=${JSON.stringify(msg)}`)
+        // openNewWin(`illness.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${JSON.stringify(msg.lis)}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&diseaseName=${msg.diseaseName}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}&msg=${JSON.stringify(msg)}`)
         openNewWin(`illness.html?msg=${encodeURIComponent(JSON.stringify(msg))}`)
 
       })

src/js/indexVertDom.js

@@ -100,7 +100,7 @@ function renderTipsInfoMsg(className,title,data, parentNode) {
 
 function renderTreat(className,title, data) {
     const str = `<div class="recommendInfoWrapper ${className}">
-                    <h4><i></i>${title}${msg.diag?'('+msg.diag+')':''}</h4>
+                    <h4><i></i>${title}${msg.diseaseName?'('+msg.diseaseName+')':''}</h4>
                     <div class="recommendInfoBox clearfix ${className + 'box'}"></div>
                 </div>`
     $('.recommendWrap').append(str)
@@ -224,7 +224,7 @@ function renderRecommendConditTips(className,title,data) {
         for(var m = 0;m < tmpBq.details.length;m++){
           var tmpBqDetail = tmpBq.details[m]
           if(tmpBqDetail.type == 1){
-            tmpBqDetailStr+=`<span data-url=scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&scaleName=${tmpBqDetail.content.name}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}&scaleId=${tmpBqDetail.content.id} class="illnessTable">${tmpBqDetail.content.name}</span>`
+            tmpBqDetailStr+=`<span data-url=scale.html?featureType=21&sex=${msg.sex}&lis=${JSON.stringify(msg.lis)}&diag=${msg.diag}&diseaseName=${msg.diseaseName}&scaleName=${tmpBqDetail.content.name}&symptom=${msg.symptom}&other=${msg.other}&pacs=${msg.pacs}&vital=${msg.vital}&age=${msg.age}&scaleId=${tmpBqDetail.content.id} class="illnessTable">${tmpBqDetail.content.name}</span>`
           }
           if(tmpBqDetail.type == 2){
             var deepDetailName = `<div class="modalTitle">${tmpBqDetail.content.name}<i class="closeModal"></i></div>`

src/js/treatplan.js

@@ -13,7 +13,7 @@ var msg = {
   lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
   pacs: getUrlArgObject('pacsJson'),
   diag: getUrlArgObject('diagJson'),
-  diseaseName: getUrlArgObject('diagJson'),
+  diseaseName: getUrlArgObject('diseaseName'),
   other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
   hosCode:getUrlArgObject('hospitalCode') || ''
 }//推送相关信息
@@ -44,7 +44,7 @@ post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
 
 function ybzlFun(data){//一般治疗
   $(".conditionHintZhiliaoAp").prepend('<div class="treatPlanWrap clearfix"><p class="treatPlan">一般治疗</p><p class="commonTreat clearfix">'+data+'</p></div>')
-  $(".diseaseName").html(' ( '+msg.diag+' )')
+  $(".diseaseName").html(' ( '+msg.diseaseName+' )')
 }
 function cyywFun(data){//常用药物
   for(var i = 0;i < data.length;i++){