修改计算公式计算结果样式

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

@@ -50,14 +50,21 @@ 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="请输入"' +(deepDetail.isShow == 0 ? 'readonly':'') + ' 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>'
               }

src/js/indexVertDom.js

@@ -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" ${deepDetail.isShow=='0' ? 'readonly':''} 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>'
                   }

src/js/popup.js

@@ -104,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

@@ -107,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)
             }
@@ -126,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('');