Merge branch 'test' into syfTempMaster

src/css/index.css

@@ -179,6 +179,7 @@
 .iframeWrap .illnessTable {
   color: #267FD7;
   line-height: 28px;
+  cursor: pointer;
 }
 .iframeWrap h4 {
   color: #000;

src/css/index.less

@@ -198,6 +198,7 @@
   .illnessTable {
     color: @colorBlue;
     line-height: 28px;
+    cursor: pointer;
   }
   .conditionHint{
   }
@@ -359,9 +360,13 @@
   .conditionHintTips .mayIllness{
     margin: 20px 0 0 0;
     border-top:1px #E8EAEC solid;
+    line-height: 30px;
     span,a,.modalMainOne,.modalMainTwo{
       border-bottom:none;
     }
+    .diagName {
+      border-bottom: 1px solid #1E1E1E;
+    }
     span .infoMsg{
       float: none;
       top: 5px;

src/css/indexVert.less

@@ -137,7 +137,7 @@
     }
 }
 .durgName, .diagName {
-    border-bottom: 1px solid #D1D1D1;
+    border-bottom: 1px solid #1E1E1E;
 }
 
 .recommendInfoBox p {

src/css/popup.css

@@ -121,6 +121,9 @@
 .popupModal .modalMainTwo .radioCheck input[type=text]:hover {
   border: 1px solid #3B9ED0;
 }
+.popupModal .modalMainTwo .radioCheck input[type=text]:focus {
+  border: 1px solid #3B9ED0;
+}
 .popupModal .modalMainTwo .radioChecks {
   height: 30px;
   line-height: 30px;

src/css/popup.less

@@ -121,7 +121,9 @@
       input[type=text]:hover {
         border: 1px solid #3B9ED0;
       }
-
+      input[type=text]:focus {
+        border: 1px solid #3B9ED0;
+      }
     }
     .radioChecks {
       height: 30px;

src/js/illness.js

@@ -35,12 +35,12 @@ post(config.pushInner,Object.assign({featureType: '22'},msg)).then((res)=>{
 function bqtsFun(data){//病情提示
   for(var k = 0;k < data.length;k++){
     var tmpBq = data[k]
-    var tmpBqStr = '<div class="mayIllness">患者可能有 <span data-name='+tmpBq.name+'>'+tmpBq.name+'<span target="_blank" title="点击该名称可看详细说明" class="infoMsg" href="information.html?type=22&position=2&name='+tmpBq.name+'"></span></span> :';
+    var tmpBqStr = '<div class="mayIllness">患者可能有 <span class="diagName" data-name='+tmpBq.name+'>'+tmpBq.name+'<span target="_blank" title="点击该名称可看详细说明" class="infoMsg" href="information.html?type=22&position=2&name='+tmpBq.name+'"></span></span> :';
     var tmpBqDetailStr = ''
     for(var m = 0;m < tmpBq.details.length;m++){
       var tmpBqDetail = tmpBq.details[m]
       if(tmpBqDetail.type == 1){
-        tmpBqDetailStr+=tmpBqStr+ "<span 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+"】</span>"+
+        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>"+
           '</div>';
       }
       if(tmpBqDetail.type == 2){
@@ -50,20 +50,27 @@ function bqtsFun(data){//病情提示
         for(var n = 0;n < tmpBqDetail.content.details.length;n++){
           var deepDetail = tmpBqDetail.content.details[n]
           if(deepDetail.controlType == 2){//0-radio,1-checkbox,2-text,3-dropdownlist
-            deepDetailStr+='<li class="radioCheck"><span class="modalMaintltle">请输入'+deepDetail.name+': </span><input type="text" placeholder="请输入" value="'+deepDetail.value+'"><i class="uint">'+deepDetail.uint+'</i></li>'
+            if(deepDetail.isShow == 0) {
+              deepDetailStr+='<li class="radioCheck"><span class="modalMaintltle">'+deepDetail.name+': </span>' + deepDetail.value +' '+ deepDetail.uint+'</li>'
+            } else {
+              deepDetailStr+='<li class="radioCheck"><span class="modalMaintltle">请输入'+deepDetail.name+': </span><input class="'+ tmpBqDetail.content.name+deepDetail.name+'" type="text" placeholder="请输入"' +(deepDetail.isShow == 0 ? 'readonly':'') + ' value="'+deepDetail.value+'"><i class="uint">'+deepDetail.uint+'</i></li>'
+            }
           }
           if(deepDetail.controlType == 0){
             let tooDeepDetailStr = ''
             for(var f = 0;f<deepDetail.details.length;f++){
               var tooDeepDetail = deepDetail.details[f]
-              if(deepDetail.name == '性别'){
-                tooDeepDetailStr+='<li class="radioChecks '+(tooDeepDetail.state == 1?"radioCheckSec":"")+'" data-select="'+(tooDeepDetail.state == 1?"select":"")+'"><i></i><span>'+tooDeepDetail.detailName+'</span></li>'
+              if(deepDetail.isShow == '0'){
+                if(tooDeepDetail.state == 1) {
+                  // tooDeepDetailStr+='<li><span>'+tooDeepDetail.detailName+'</span></li>'
+                  tooDeepDetailStr+='<li class="radioChecks" data-select="'+(tooDeepDetail.state == 1?"select":"")+'"><span>'+tooDeepDetail.detailName+'</span></li>'
+                }
               }else{
                 tooDeepDetailStr+='<li class="radioChecks"><i></i><span>'+tooDeepDetail.detailName+'</span>'+(tooDeepDetail.state == 1?"<a>（智能推荐）</a>":"")+'</li>'
               }
             }
             deepDetailStr+='<li class="radioCheck"><span class="modalMaintltle">'+deepDetail.name+': </span>'+
-              '<ul class="clearfix caculateLis">'+
+              '<ul class="clearfix caculateLis" data-isShow="'+deepDetail.isShow+'">'+
               tooDeepDetailStr+
               '</ul>'+
               '</li>'

src/js/indexHorizontalDom.js

@@ -148,7 +148,7 @@ function renderTreatDrug(className,title,data, parentNode) {
     }
     for(let i = 0; i < data.length; i++) {
         let childrenNodeStr = `<p class="drugTreatmentInfoItemBox">
-            ${i+1}.${data[i].bigdrugsName}(${data[i].subdrugsName}):`
+            ${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].medicitionName}`
             if(data[i].medicitionsList[j].drugsForbidden == '1') {

src/js/indexVertDom.js

@@ -110,7 +110,7 @@ function renderTreatDrug(className,title,data, parentNode) {
     }
     for(let i = 0; i < data.length; i++) {
         let childrenNodeStr = `<p class="drugTreatmentInfoItemBox">
-            ${i+1}.${data[i].bigdrugsName}(${data[i].subdrugsName}):`
+            ${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"><span class="durgName">${data[i].medicitionsList[j].medicitionName}</span>`
             if(data[i].medicitionsList[j].drugsForbidden == '1') {
@@ -173,20 +173,32 @@ function renderRecommendConditTips(className,title,data) {
             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>`
           }
           if(tmpBqDetail.type == 2){
+
+            
+
+
+
+
             var deepDetailName = `<div class="modalTitle">${tmpBqDetail.content.name}<i class="closeModal"></i></div>`
             var deepDetailStr = ''
             var deepDetailResultStr = ''
             for(var n = 0;n < tmpBqDetail.content.details.length;n++){
               var deepDetail = tmpBqDetail.content.details[n]
               if(deepDetail.controlType == 2){//0-radio,1-checkbox,2-text,3-dropdownlist
-                deepDetailStr+=`<li class="radioCheck"><span class="modalMaintltle">请输入${deepDetail.name}: </span><input type="text" placeholder="请输入" value=${deepDetail.value}><i class="uint">${deepDetail.uint}</i></li>`
+                if(deepDetail.isShow == 0) {
+                    deepDetailStr+=`<li class="radioCheck"><span class="modalMaintltle">${deepDetail.name}: </span>${deepDetail.value} ${deepDetail.uint}</li>`
+                } else {
+                    deepDetailStr+=`<li class="radioCheck"><span class="modalMaintltle">请输入${deepDetail.name}: </span><input type="text" class="${tmpBqDetail.content.name+deepDetail.name}" ${deepDetail.isShow=='0' ? 'readonly':''} placeholder="请输入" value=${deepDetail.value}><i class="uint">${deepDetail.uint}</i></li>`
+                }
               }
               if(deepDetail.controlType == 0){
                 let tooDeepDetailStr = ''
                 for(var f = 0;f<deepDetail.details.length;f++){
                   var tooDeepDetail = deepDetail.details[f]
-                  if(deepDetail.name == '性别'){
-                    tooDeepDetailStr+='<li class="radioChecks '+(tooDeepDetail.state == 1?"radioCheckSec":"")+'" data-select="'+(tooDeepDetail.state == 1?"select":"")+'"><i></i><span>'+tooDeepDetail.detailName+'</span></li>'
+                  if(deepDetail.isShow == '0'){
+                    if(tooDeepDetail.state == 1) {
+                      tooDeepDetailStr+='<li class="radioChecks" data-select="'+(tooDeepDetail.state == 1?"select":"")+'"><span>'+tooDeepDetail.detailName+'</span></li>'
+                    }
                   }else{
                     tooDeepDetailStr+='<li class="radioChecks"><i></i><span>'+tooDeepDetail.detailName+'</span>'+(tooDeepDetail.state == 1?"<a>（智能推荐）</a>":"")+'</li>'
                   }
@@ -194,7 +206,7 @@ function renderRecommendConditTips(className,title,data) {
                 
                 
                 deepDetailStr+=`<li class="radioCheck"><span class="modalMaintltle">${deepDetail.name}: </span>
-                                <ul class="clearfix caculateLis">
+                                <ul class="clearfix caculateLis" data-isShow = ${deepDetail.isShow}>
                                     ${tooDeepDetailStr}
                                 </ul>
                             </li>`

src/js/popup.js

@@ -3,6 +3,10 @@ const $ = require("jquery");
 
 $(".conditionHintTips").on('click',".radioChecks",function(e){
   e.stopPropagation()
+  const isShow = $(this).parent().attr("data-isShow")
+  if(isShow == '0') {
+    return
+  }
   $(this).attr("data-select","select").children("i").css({
     "background":"url('../images/sex2.png') center center no-repeat"
   })
@@ -100,9 +104,8 @@ $(".conditionHintTips").on('click','.calculate',function(e){
             }
           }
         }
-        if(tmpPushMsgDetailContentVal.controlType == 2){
-          var domLis = that.parent(".modalMainTwo").children().find("input[type=text]").eq(m)
-          tmpPushMsgDetailContentVal.value = $(domLis).val()
+        if(tmpPushMsgDetailContentVal.controlType == 2&&tmpPushMsgDetailContentVal.isShow !='0'){
+          tmpPushMsgDetailContentVal.value = $('.'+paramsJson.content.name+tmpPushMsgDetailContentVal.name).val()
         }
         tmpDetailArr.push(tmpPushMsgDetailContentVal)
       }

src/js/popupEdit.js

@@ -4,6 +4,10 @@ const $ = require("jquery");
 function bindTipsEvent() {
 
     $(".conditTips").on('click',".radioChecks",function(e){
+        const isShow =  $(this).parent().attr("data-isShow")
+        if(isShow == '0') {
+          return;
+        }
         e.stopPropagation()
         $(this).attr("data-select","select").children("i").css({
           "background":"url('../images/sex2.png') center center no-repeat"
@@ -103,9 +107,8 @@ function bindTipsEvent() {
                   }
                 }
               }
-              if(tmpPushMsgDetailContentVal.controlType == 2){
-                var domLis = that.parent(".modalMainTwo").children().find("input[type=text]").eq(m)
-                tmpPushMsgDetailContentVal.value = $(domLis).val()
+              if(tmpPushMsgDetailContentVal.controlType == 2&&tmpPushMsgDetailContentVal.isShow !='0'){
+                tmpPushMsgDetailContentVal.value = $('.'+paramsJson.content.name+tmpPushMsgDetailContentVal.name).val()
               }
               tmpDetailArr.push(tmpPushMsgDetailContentVal)
             }
@@ -122,6 +125,7 @@ function bindTipsEvent() {
               }
             }
           }
+        
           if(paramsJson.content.details[s].controlType == 2 && paramsJson.content.details[s].value == ''|| paramsJson.content.details[s].controlType == 0 && !hasSelect){
             that.parent().find(".calculateError").css("display","block");
             that.parent().find(".calculateResult").html('');

src/js/treatplan.js

@@ -49,7 +49,11 @@ function ybzlFun(data){//一般治疗
 function cyywFun(data){//常用药物
   for(var i = 0;i < data.length;i++){
     var tmpVal = data[i];
-    var str = '<div class="drugType">'+(i+1)+'. '+tmpVal.bigdrugsName+'<p>('+tmpVal.subdrugsName+')</p></div>';
+    var str = '<div class="drugType">'+(i+1)+'. '+tmpVal.bigdrugsName
+    if(tmpVal.subdrugsName) {
+      str += '<p>('+tmpVal.subdrugsName+')</p>';
+    }
+    str +='</div>'
     var strPart = '';
     for(var j = 0;j < tmpVal.medicitionsList.length;j++){
       var tmpPart = tmpVal.medicitionsList[j]