Merge remote-tracking branch 'origin/TCM0513' into testNew

src/css/cdssHorizontal.less

@@ -456,7 +456,7 @@
         float: left;
         height: 30px;
         padding: 0 12px;
-        margin-top: 14px;
+      margin-top: 9px;
         border-radius: 8px 8px 0px 0px;
         img {
             vertical-align: middle;
@@ -516,7 +516,7 @@
         .detail {
             padding: 0 8px 8px 4px;
             margin-right: 20px;
-            max-height: 118px;
+          max-height: 125px;
             overflow-y: hidden;
             position: relative;
             .go-push {

src/js/cdss.js

@@ -197,8 +197,8 @@ function getVersion() {
 }
 function getDisclaimer() {
     return post(config.disclaimer, {}).then((res) => {
-        const data = res.data.data.find(item => item.disclaimerCode == "2");
-        $(".responsibility").html(data.description);
+        const data = res.data.data.filter(item => item.disclaimerCode == "2");
+        $(".responsibility").html((data[0] || {}).description);
         // $(".iframeWrap").css({height: $(window).height()-115-$(".responsibility").height()+"px"})
 
     })

src/js/cdssHorizontal.js

@@ -292,8 +292,7 @@ function renderPushData(){
       renderCheckup(checkupPush,checkupNum,null,true)
       renderSymptomPush(symptomPush,symptomNum,null,true)
       renderDiag(diagPush)
-
-        if (medicinesPush.length > 0 || operationsPush.length > 0 || generaTreatPush || nursePush) {
+        if (medicinesPush.length > 0 || operationsPush.length > 0 || generaTreatPush || nursePush.length > 0) {
         let str = `<img class="treatIcon" src = ${titleConfigH["treat"].icon} /><span>${titleConfigH["treat"].name}</span>`
         $(".rightBoxTitle").append(str)
         renderDisName()
@@ -496,7 +495,7 @@ function renderPushWarning(){
   return getPusgWarning().then(res =>{
     hasCompleteTnterface++
     if(res.data.code == '0'){
-      const result = res.data.data
+        const result = res.data.data;
       let billMsgList = result.billMsgList || []  //开单合理性提醒
       let highRiskList = result.highRiskList || []  //高危药品、手术
       let criticalValList = result.criticalValList || []  //危急值提醒

src/js/tcmiss.js

@@ -46,8 +46,8 @@ function getTcmMr(mrId, config) {
 
 //获取处方推荐
 function getTcmData(param, config) {
-    const item = config.planDetails.find((it) => it.code === "treatment");
-    const num = (item || {}).number || 3;
+    const item = config.planDetails.filter((it) => it.code === "treatment");
+    const num = (item[0] || {}).number || 3;
     const {tcmDiag, tcmSyndrome} = param;
     if (!tcmDiag) {     //没有推送入参时不显示推送模块
         $(".recipe").hide();
@@ -58,8 +58,8 @@ function getTcmData(param, config) {
     $('#zhenghou').text(tcmSyndrome);
     treatUrl = targetUrl + '?jibing=' + tcmDiag + "&zhengxing=" + tcmSyndrome;
     //处方推荐
-    get('/lantone/private/zycftj?jibing=' + tcmDiag + "&zhengxing=" + tcmSyndrome).then((res) => {
-        //console.log(res)
+    get(window.encodeURI('/lantone/private/zycftj?jibing=' + tcmDiag + "&zhengxing=" + tcmSyndrome)).then((res) => {
+        console.log("窗口地址：", treatUrl)
         let data = res.data.data || []
         if (!data.length) {   //没有处方时不显示推送模块
             $(".recipe").hide();
@@ -86,7 +86,6 @@ function getTcmData(param, config) {
 function renderTcm(data, num = 3) {
     let str = ``, it;
     $("#goTreat").hide();
-    console.log(num)
     const n = num < data.length ? num : data.length;
     for (let i = 0; i < n; i++) {
         it = data[i];
@@ -109,7 +108,7 @@ function renderTcm(data, num = 3) {
     $('.detail ul').html(str);
     //更多治法
     $("#goTreat").on('click', function () {
-        openNewWin(treatUrl, true);
+        openNewWin(window.encodeURI(treatUrl), true);
     });
 }