Przeglądaj źródła

Merge branch 'test' into icssDataServiceEdit

zhangxc 6 lat temu
rodzic
commit
30283b36d8

+ 1 - 1
src/css/index.css

@@ -10,7 +10,7 @@
 .iframeWrap .conditionHintPub li {
   padding-right: 18px;
   float: left;
-  line-height: 24px;
+  line-height: 25px;
 }
 .iframeWrap .conditionHintPub .conditionMain {
   padding: 17px;

+ 1 - 0
src/html/landscape.html

@@ -3,6 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <title><%= htmlWebpackPlugin.options.title %></title>
   <script src="https://cdn.bootcss.com/es5-shim/4.5.13/es5-shim.min.js"></script>

+ 0 - 1
src/js/landscapeDom.js

@@ -36,7 +36,6 @@ function bqtsFun(data){//病情提示
   })
 }
 function ybzlFun(data){//一般治疗
-  console.log('data', data)
   $(".conditionHintZhiliaoAp").prepend('<div class="treatPlanWrap"><p class="treatPlan">一般治疗: </p><div class="commonTreat clearfix">'+ data+'</div></div>')
   var commonTreatHeight = $(".commonTreat").height()
   if(commonTreatHeight > 75){

+ 1 - 12
src/js/landscapeMedical.js

@@ -76,18 +76,7 @@ post(config.pushInner,Object.assign({featureType: '1,4,5,6,7,22'},msg)).then((re
     }
   }
 })
-var msg = {
-  age: getUrlArgObject('age'),
-  sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
-  symptom: getUrlArgObject('symptomJson'),
-  vital: getUrlArgObject('vitalJson'),
-  lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
-  pacs: getUrlArgObject('pacsJson'),
-  diag: getUrlArgObject('diagJson'),
-  diseaseName: getUrlArgObject('diagJson'),
-  other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
-  hosCode:getUrlArgObject('hospitalCode') || ''
-}//推送相关信息
+
 $(".disclaimer").on("click",function() {
   openNewWin("disclaimer.html")
 })

+ 9 - 2
src/js/popup.js

@@ -111,7 +111,15 @@ $(".conditionHintTips").on('click','.calculate',function(e){
     }
   }
   for(var s = 0;s < paramsJson.content.details.length;s++){
-    if(paramsJson.content.details[s].controlType == 2 && paramsJson.content.details[s].value == ''){
+    var hasSelect = false
+    if(paramsJson.content.details[s].controlType == 0) {
+      for(let i = 0; i < paramsJson.content.details[s].details.length; i++) {
+        if(paramsJson.content.details[s].details[i].state == '1') {
+          hasSelect = true
+        }
+      }
+    }
+    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('');
       return;
@@ -135,7 +143,6 @@ $(".conditionHintTips").on('click','.calculate',function(e){
       }
       that.parent().find(".calculateError").css("display","none")
     }else{
-      console.log(res)
       that.parent().find(".calculateError").html(data.msg).css("display","block")
       that.parent().find(".calculateResult").html('')
     }

+ 4 - 0
src/js/promise.js

@@ -45,6 +45,10 @@ const post = function(url,data){
       url:url,
       data:JSON.stringify(data),
       contentType:"application/json; charset=UTF-8",
+      beforeSend :function(xmlHttp){
+        xmlHttp.setRequestHeader("If-Modified-Since","0");
+        xmlHttp.setRequestHeader("Cache-Control","no-cache");
+      },
       success:function(res){
         resolve({data:res});
       },

+ 0 - 2
src/js/scale.js

@@ -26,11 +26,9 @@ $(function () {
       const data = res.data.data
       if (res.data.code == 0) {
         scaleInfo = data;
-        console.log('scaleInfo', scaleInfo)
         for (var i = 0; i < scaleInfo.length; i++) {
           if (scaleInfo[i].type == 1) {
             var scaleList = JSON.parse(scaleInfo[i].content)
-            console.log('scaleList', scaleList)
             renderCalcu(scaleList)
           } else {
             $('.content').append(scaleInfo[i].content)

+ 38 - 45
src/landscape.js

@@ -24,9 +24,45 @@ var msg = {
 window.msg = msg
 window.pushMessage = {}
 
+post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
+  var data = res.data
+  if(data.code == 0){
+    $(".diseaseName").html(msg.diag)
+    var result = data.data;
+    var num = 0;
+    if(!!(result.commonTreatment && result.commonTreatment.content)){
+      $(".treatPlanNull").css("display","none")
+      ++num
+      ybzlFun(result.commonTreatment.content)//一般治疗
+    } else {
+      $(".treatPlanNull").css("display","block")
+    }
+    if(!!result.treatment && result.treatment.length>0){
+      $(".treatMedicineNull").css("display","none")
+      ++num
+      cyywFun(result.treatment)//常用药物
+    } else {
+      $(".treatMedicineNull").css("display","block")
+      $(".treatMedicine").css("display","none")
+    }
+    $(".conditionHintZhiliaoAp ").on('click',".slideDown",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}`)
+    })
+    if(num == 0){
+      $(".conditionHintZhiliaoNull").css("display","block")
+    }
+  }else{
+    $(".treatMedicine").css("display","none")
+    $(".treatPlanNull").css("display","block")
+    $(".treatMedicineNull").css("display","block")
+  }
+})
+
+
 post(config.pushInner,Object.assign({featureType: '1,4,5,6,7,22'},msg)).then((res)=>{
   var data = res.data
   if(data.code == 0){
+    
     var result = data.data;
     if(result.medicalIndications && result.medicalIndications.length>0){//病情提示
       window.pushMessage = result.medicalIndications;//计算的需要的相关数据
@@ -76,53 +112,10 @@ post(config.pushInner,Object.assign({featureType: '1,4,5,6,7,22'},msg)).then((re
     }
   }
 })
-var msg = {
-  age: getUrlArgObject('age'),
-  sex: getUrlArgObject('sex') == '男'?1:(getUrlArgObject('sex') == '女'?2:(getUrlArgObject('sex') == '通用'?3:getUrlArgObject('sex'))),
-  symptom: getUrlArgObject('symptomJson'),
-  vital: getUrlArgObject('vitalJson'),
-  lis: getUrlArgObject('lisJson')? JSON.parse(getUrlArgObject('lisJson')) : [],
-  pacs: getUrlArgObject('pacsJson'),
-  diag: getUrlArgObject('diagJson'),
-  diseaseName: getUrlArgObject('diagJson'),
-  other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
-  hosCode:getUrlArgObject('hospitalCode') || ''
-}//推送相关信息
+
 $(".disclaimer").on("click",function() {
   openNewWin("disclaimer.html")
 })
-post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
-  var data = res.data
-  if(data.code == 0){
-    $(".diseaseName").html(msg.diag)
-    var result = data.data;
-    var num = 0;
-    if(result.commonTreatment && result.commonTreatment.content){
-      $(".treatPlanNull").css("display","none")
-      ++num
-      ybzlFun(result.commonTreatment.content)//一般治疗
-    } else {
-      $(".treatPlanNull").css("display","block")
-    }
-    if(result.treatment && result.treatment.length>0){
-      $(".treatMedicineNull").css("display","none")
-      ++num
-      cyywFun(result.treatment)//常用药物
-    } else {
-      $(".treatMedicineNull").css("display","block")
-      $(".treatMedicine").css("display","none")
-    }
-    $(".conditionHintZhiliaoAp ").on('click',".slideDown",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}`)
-    })
-    if(num == 0){
-      $(".conditionHintZhiliaoNull").css("display","block")
-    }
-  }else{
-    $(".treatMedicine").css("display","none")
-    $(".treatPlanNull").css("display","block")
-    $(".treatMedicineNull").css("display","block")
-  }
-})
+