治疗方案修改

src/css/indexHorizontal.less

@@ -409,4 +409,25 @@ color: @grayColor;
 }
 .boldFont {
     font-weight: bold;
+}
+.diagTitle {
+    color: #3b9ed0;
+    position: relative;
+    margin: 0 0 10px;
+    font-weight: 500;
+    i {
+        position: relative;
+        display: inline-block;
+        width: 4px;
+        height: 4px;
+        background: #3b9ed0;
+        border-radius: 50%;
+        top: -4px;
+        margin-right: 6px;
+    }
+}
+.diagDescription{
+    color: #333;
+    font-weight: 600;
+    margin: 5px 0 10px;
 }

src/css/indexVert.less

@@ -373,4 +373,25 @@
     width: 100%;
     height: 1px;
     background: #D1D1D1;
+}
+.diagTitle {
+    color: #3b9ed0;
+    position: relative;
+    margin: 0 0 10px;
+    font-weight: 500;
+    i {
+        position: relative;
+        display: inline-block;
+        width: 4px;
+        height: 4px;
+        background: #3b9ed0;
+        border-radius: 50%;
+        top: -4px;
+        margin-right: 6px;
+    }
+}
+.diagDescription{
+    color: #333;
+    font-weight: 600;
+    margin: 5px 0 10px;
 }

src/css/reset.css

@@ -46,7 +46,6 @@ li {
   list-style: none;
 }
 a {
-  text-decoration: none;
   color: #000;
 }
 button {

src/css/treatPlan.less

@@ -0,0 +1,81 @@
+.treatPlan,.treatDrug{
+    position: relative;
+    line-height: 36px;
+    min-height: 36px;
+  
+}
+.treatPlanBg,.treatDrugBg {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    z-index: 1;
+}
+.treatPlanBg {
+    background: #2fc79c;
+    opacity: 0.1;
+    filter:alpha(opacity=10);
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=10);";
+}
+.treatDrugBg {
+    background: #EAF7FA;
+}
+.treatPlanTitle, .treatDrugTitle {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    z-index: 2;
+}
+.drugCategoryBox {
+    position: relative;
+    line-height: 36px;
+    // border-bottom: 1px dashed #d2d2d2;
+}
+.drugNameBox {
+    padding-right: 15px;
+    position: relative;
+    display: inline-block;
+
+}
+.drugName{
+    display: inline-block;
+    text-decoration:underline;
+}
+.infoMsg {
+    position: absolute;
+    right: 1px;
+    top: 10px;
+    display: none;
+    width: 14px;
+    height: 14px;
+    background: url(/images/msg1.png) center center no-repeat;
+}
+
+.infoMsg:hover {
+    background: url(/images/msg2.png) center center no-repeat;
+}
+.drugNameBox:hover {
+    .infoMsg {
+        display: inline-block;
+    }
+}
+.diagTitle {
+    color: #3b9ed0;
+    position: relative;
+    margin: 10px 0 10px 0;
+    font-weight: 500;
+    i {
+        position: relative;
+        display: inline-block;
+        width: 4px;
+        height: 4px;
+        background: #3b9ed0;
+        border-radius: 50%;
+        top: -4px;
+        margin-right: 6px;
+    }
+}
+.diagDescription{
+    color: #333;
+    font-weight: 600;
+    margin: 5px 0 10px;
+}

src/html/treatplan.html

@@ -22,11 +22,17 @@
                 <div class="conditionMain conditionHintZhiliaoAp">
                     <!-- <p class="conditionHintZhiliaoNull pushEmpty">暂无推荐</p> -->
                     <div class="treatPlanNullWrap">
-                            <p class="treatPlan">一般治疗</p>
+                            <div  class="treatPlan">
+                                <p class="treatPlanBg"></p>
+                                <p class="treatPlanTitle">一般治疗</p>
+                            </div>
                             <p class="treatPlanNullText">暂无推荐</p>
                     </div>
                     <div class="treatMedicineWarp">
-                        <p class="treatDrug">药物治疗</p>
+                        <div class="treatDrug">
+                                <p class="treatDrugBg"></p>
+                                <p class="treatDrugTitle">药物治疗</p>
+                        </div>
                         <p class="treatMedicineNullText">暂无推荐</p>
                         <div class="drugWarp"></div>
                     </div>

src/js/index.js

@@ -152,7 +152,7 @@ function getPageInfo() {
           (labRecommend.length > 0 || pacsRecommend.length >0) && renderMultRecommendInfo('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
           break;
         case "cure_show": //治疗方案
-          JSON.stringify(treatResult)!='{}'&&treatResult.commonTreatment&&treatResult.treatment.length > 0&&renderTreat('treatRecommend','治疗方案',treatResult)
+          JSON.stringify(treatResult)!='{}'&&treatResult.commonTreatment&&treatResult.treatmentPlan&&treatResult.treatmentPlan.length > 0&&renderTreat('treatRecommend','治疗方案',treatResult)
           break;
         case "diagnose_show": //推荐诊断
         diagRecommend.length > 0 && renderRecommendInfo(confArr[i].showNum,'diagRecommend', '推荐诊断', diagRecommend, true,7,2)

src/js/indexHorizontal.js

@@ -145,7 +145,7 @@ function getPageInfo() {
           (labRecommend.length > 0 || pacsRecommend.length >0) && renderMultRecommendInfo(labsAndPacMode,labAndPacsImg, 'labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
           break;
         case "cure_show": //治疗方案
-          if(JSON.stringify(treatResult)!='{}'&&treatResult.commonTreatment&&treatResult.treatment.length > 0) {
+          if(JSON.stringify(treatResult)!='{}'&&treatResult.commonTreatment&&treatResult.treatmentPlan&&treatResult.treatmentPlan.length > 0) {
             tipsNum++;
             renderTreat(treatImg, 'treatRecommend','治疗方案',treatResult)
           }

src/js/indexHorizontalDom.js

@@ -144,7 +144,7 @@ function renderTreat(icon, className,title, data) {
                 </div>`
     $('.infomationBox').append(str)
     const commonTreatmentInfo = data.commonTreatment&&data.commonTreatment.content || ""
-    const treatmentList = data.treatment || []
+    const treatmentList = data.treatmentPlan || []
     renderTreatText('commonTreatment', '一般治疗', commonTreatmentInfo, className+'box')
     renderTreatDrug('drugTreatment', '药物治疗', treatmentList, className+'box')
 }
@@ -205,42 +205,53 @@ function renderTreatDrug(className,title,data, parentNode) {
     if(data.length ==0) {
         $('.' + className+'Info').append('<span class="recommendNull">暂无推荐</span>')
     }
-    for(let i = 0; i < data.length; i++) {
-        let childrenNodeStr = `<p class="drugTreatmentInfoItemBox">
-            ${i+1}.${data[i].bigdrugsName}${data[i].subdrugsName&&"("+data[i].subdrugsName+")"}:`
-        for (let j = 0; j < data[i].medicitionsList.length; j++) {
-            childrenNodeStr += `<span class="durgNameBox ${(data[i].medicitionsList[j].forbidden == '2' ? 'medicineWaringDis' : '' )}">${data[i].medicitionsList[j].medicitionName}`
-            if(data[i].medicitionsList[j].forbidden == '1') {
-                childrenNodeStr += `<span class="medicineWaring">慎用</span>`
-            } else if(data[i].medicitionsList[j].forbidden == '2') {
-                childrenNodeStr += `<span  class="medicineWaringDisMsg">禁用</span>`
-            }
-            childrenNodeStr += `<span  title="点击i图标可查看详细说明" class="infoMsg" data-name=${data[i].medicitionsList[j].medicitionName}></span>`
-            if(j !== data[i].medicitionsList.length-1) {
-                childrenNodeStr += ','
+    for(let i = 0; i <  data.length; i++) {
+        let childrenNodeStr =`<div class = "drugTreatmentInfoItemBox">
+            <p class="diagTitle"><i></i>${data[i].title}</p>`
+            for(let j = 0; j < data[i].meditionDetails.length; j++) {
+                if(data[i].meditionDetails[j].description) {
+                    childrenNodeStr += `<p class="diaDescription">${data[i].meditionDetails[j].description}</p>`
+                }
             }
-            childrenNodeStr += '</span></span>'
-            // childrenNodeStr += `<span class="${(data[i].medicitionsList[j].forbidden == '2' ? 'medicineWaringDis' : '' )}">使用率${data[i].medicitionsList[j].rate}</span>`
-            // if(j === data[i].medicitionsList.length-1) {
-            //     childrenNodeStr += ';'
-            // } else {
-            //     childrenNodeStr += ','
-            // }
-        }
-        childrenNodeStr += ` </p>`
+            childrenNodeStr +=`</div>`
         $('.' + className+'Info').append(childrenNodeStr)
     }
-    $('.' + className+'Info'+ ' .infoMsg').on('click', function(){
-        const infoMsgName = $(this).attr('data-name')
-        openNewWin(`information.html?type=8&position=5&name=${infoMsgName}`)
-    })
+    // for(let i = 0; i < data.length; i++) {
+    //     let childrenNodeStr = `<p class="drugTreatmentInfoItemBox">
+    //         ${i+1}.${data[i].bigdrugsName}${data[i].subdrugsName&&"("+data[i].subdrugsName+")"}:`
+    //     for (let j = 0; j < data[i].medicitionsList.length; j++) {
+    //         childrenNodeStr += `<span class="durgNameBox ${(data[i].medicitionsList[j].forbidden == '2' ? 'medicineWaringDis' : '' )}">${data[i].medicitionsList[j].medicitionName}`
+    //         if(data[i].medicitionsList[j].forbidden == '1') {
+    //             childrenNodeStr += `<span class="medicineWaring">慎用</span>`
+    //         } else if(data[i].medicitionsList[j].forbidden == '2') {
+    //             childrenNodeStr += `<span  class="medicineWaringDisMsg">禁用</span>`
+    //         }
+    //         childrenNodeStr += `<span  title="点击i图标可查看详细说明" class="infoMsg" data-name=${data[i].medicitionsList[j].medicitionName}></span>`
+    //         if(j !== data[i].medicitionsList.length-1) {
+    //             childrenNodeStr += ','
+    //         }
+    //         childrenNodeStr += '</span></span>'
+    //         // childrenNodeStr += `<span class="${(data[i].medicitionsList[j].forbidden == '2' ? 'medicineWaringDis' : '' )}">使用率${data[i].medicitionsList[j].rate}</span>`
+    //         // if(j === data[i].medicitionsList.length-1) {
+    //         //     childrenNodeStr += ';'
+    //         // } else {
+    //         //     childrenNodeStr += ','
+    //         // }
+    //     }
+    //     childrenNodeStr += ` </p>`
+    //     $('.' + className+'Info').append(childrenNodeStr)
+    // }
+    // $('.' + className+'Info'+ ' .infoMsg').on('click', function(){
+    //     const infoMsgName = $(this).attr('data-name')
+    //     openNewWin(`information.html?type=8&position=5&name=${infoMsgName}`)
+    // })
     
-    var drugTreatmentHeight = $(".drugTreatmentInfo").height()
-    if(drugTreatmentHeight > 75){
-        $(".treatDrugBox").append('<span class="more">更多</span>')
-    } else if(drugTreatmentHeight > 30) {
-        $(".drugTreatmentInfo").append('<span class="more">更多</span>')
-    }
+    // var drugTreatmentHeight = $(".drugTreatmentInfo").height()
+    // if(drugTreatmentHeight > 75){
+    //     $(".treatDrugBox").append('<span class="more">更多</span>')
+    // } else if(drugTreatmentHeight > 30) {
+    //     $(".drugTreatmentInfo").append('<span class="more">更多</span>')
+    // }
     $(".infomationBox .drugTreatmentbox").on('click',".more",function(){
         openNewWin(`treatplan.html?msg=${encodeURIComponent(JSON.stringify(msg))}`)
         // 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}`)

src/js/indexVertDom.js

@@ -174,7 +174,7 @@ function renderTreat(className,title, data) {
                 </div>`
     $('.recommendWrap').append(str)
     const commonTreatmentInfo = data.commonTreatment&&data.commonTreatment.content || ""
-    const treatmentList = data.treatment || []
+    const treatmentList = data.treatmentPlan || []
     renderTreatText('commonTreatment', '一般治疗', commonTreatmentInfo, className+'box')
     renderTreatDrug('drugTreatment', '常用药物治疗', treatmentList, className+'box')
 }
@@ -215,50 +215,61 @@ function renderTreatDrug(className,title,data, parentNode) {
     if(data.length ==0) {
         $('.' + className+'Info').append('<span class="recommendNull">暂无推荐</span>')
     }
-    for(let i = 0; i < data.length; i++) {
-        let childrenNodeStr = `<p class="drugTreatmentInfoItemBox">
-            ${i+1}.${data[i].bigdrugsName}${data[i].subdrugsName&&"("+data[i].subdrugsName+")"}:`
-        for (let j = 0; j < data[i].medicitionsList.length; j++) {
-            childrenNodeStr += `<span class="durgNameBox ${(data[i].medicitionsList[j].forbidden == '2' ? 'medicineWaringDis' : '' )}"><span class="durgName">${data[i].medicitionsList[j].medicitionName}</span>`
-            if(data[i].medicitionsList[j].forbidden == '1') {
-                childrenNodeStr += `<span class="medicineWaring">慎用</span>`
-            } else if(data[i].medicitionsList[j].forbidden == '2') {
-                childrenNodeStr += `<span  class="medicineWaringDisMsg">禁用</span>`
-            }
-            childrenNodeStr += `<span  title="点击i图标可查看详细说明" class="infoMsg" data-name=${data[i].medicitionsList[j].medicitionName}></span>`
-            if(j !== data[i].medicitionsList.length-1) {
-                childrenNodeStr += ','
+    for(let i = 0; i <  data.length; i++) {
+        let childrenNodeStr =`<div class = "drugTreatmentInfoItemBox">
+            <p class="diagTitle"><i></i>${data[i].title}</p>`
+            for(let j = 0; j < data[i].meditionDetails.length; j++) {
+                if(data[i].meditionDetails[j].description) {
+                    childrenNodeStr += `<p class="diagDescription">${data[i].meditionDetails[j].description}</p>`
+                }
             }
-            childrenNodeStr += '</span></span>'
-            //隐藏使用率
-            // childrenNodeStr += `<span class="${(data[i].medicitionsList[j].forbidden == '2' ? 'medicineWaringDis' : '' )}">使用率${data[i].medicitionsList[j].rate}</span>`
-            // if(j === data[i].medicitionsList.length-1) {
-            //     childrenNodeStr += ';'
-            // } else {
-            //     childrenNodeStr += ','
-            // }
-        }
-        childrenNodeStr += ` </p>`
+            childrenNodeStr +=`</div>`
         $('.' + className+'Info').append(childrenNodeStr)
     }
-    $('.' + className+'Info'+ ' .infoMsg').on('click', function(){
-        const infoMsgName = $(this).attr('data-name')
-        openNewWin(`information.html?type=8&position=5&name=${infoMsgName}`)
-    })
-    var treatList = $(".drugTreatmentInfo").find(".drugTreatmentInfoItemBox")
-    for(var h = 0;h < treatList.length;h++){ 
-        if($(treatList[h]).height() > 25){
-        $(treatList[h]).addClass('recommendInfoItemBoxLimit').append('<span class="slideDown">更多 <i></i></span>')
-        }
-        $(".drugTreatmentInfo").on('click',".slideDown",function(){
-        $(this).parents(".drugTreatmentInfoItemBox ").removeClass("recommendInfoItemBoxLimit").append('<span class="slideup">收起 <i></i></span>')
-        $(this).remove()
-        })
-        $(".drugTreatmentInfo").on('click',".slideup",function(){
-        $(this).parents(".drugTreatmentInfoItemBox ").addClass("recommendInfoItemBoxLimit").append('<span class="slideDown">更多 <i></i></span>')
-        $(this).remove()
-        })
-    }
+    // for(let i = 0; i < data.length; i++) {
+    //     let childrenNodeStr = `<p class="drugTreatmentInfoItemBox">
+    //         ${i+1}.${data[i].bigdrugsName}${data[i].subdrugsName&&"("+data[i].subdrugsName+")"}:`
+        // for (let j = 0; j < data[i].medicitionsList.length; j++) {
+        //     childrenNodeStr += `<span class="durgNameBox ${(data[i].medicitionsList[j].forbidden == '2' ? 'medicineWaringDis' : '' )}"><span class="durgName">${data[i].medicitionsList[j].medicitionName}</span>`
+        //     if(data[i].medicitionsList[j].forbidden == '1') {
+        //         childrenNodeStr += `<span class="medicineWaring">慎用</span>`
+        //     } else if(data[i].medicitionsList[j].forbidden == '2') {
+        //         childrenNodeStr += `<span  class="medicineWaringDisMsg">禁用</span>`
+        //     }
+        //     childrenNodeStr += `<span  title="点击i图标可查看详细说明" class="infoMsg" data-name=${data[i].medicitionsList[j].medicitionName}></span>`
+        //     if(j !== data[i].medicitionsList.length-1) {
+        //         childrenNodeStr += ','
+        //     }
+        //     childrenNodeStr += '</span></span>'
+        //     //隐藏使用率
+        //     // childrenNodeStr += `<span class="${(data[i].medicitionsList[j].forbidden == '2' ? 'medicineWaringDis' : '' )}">使用率${data[i].medicitionsList[j].rate}</span>`
+        //     // if(j === data[i].medicitionsList.length-1) {
+        //     //     childrenNodeStr += ';'
+        //     // } else {
+        //     //     childrenNodeStr += ','
+        //     // }
+        // }
+        // childrenNodeStr += ` </p>`
+        // $('.' + className+'Info').append(childrenNodeStr)
+    // }
+    // $('.' + className+'Info'+ ' .infoMsg').on('click', function(){
+    //     const infoMsgName = $(this).attr('data-name')
+    //     openNewWin(`information.html?type=8&position=5&name=${infoMsgName}`)
+    // })
+    // var treatList = $(".drugTreatmentInfo").find(".drugTreatmentInfoItemBox")
+    // for(var h = 0;h < treatList.length;h++){ 
+    //     if($(treatList[h]).height() > 25){
+    //     $(treatList[h]).addClass('recommendInfoItemBoxLimit').append('<span class="slideDown">更多 <i></i></span>')
+    //     }
+    //     $(".drugTreatmentInfo").on('click',".slideDown",function(){
+    //     $(this).parents(".drugTreatmentInfoItemBox ").removeClass("recommendInfoItemBoxLimit").append('<span class="slideup">收起 <i></i></span>')
+    //     $(this).remove()
+    //     })
+    //     $(".drugTreatmentInfo").on('click',".slideup",function(){
+    //     $(this).parents(".drugTreatmentInfoItemBox ").addClass("recommendInfoItemBoxLimit").append('<span class="slideDown">更多 <i></i></span>')
+    //     $(this).remove()
+    //     })
+    // }
 }
 
 function renderRecommendConditTips(className,title,data) {