Merge branch 'test' of http://192.168.2.236:10080/zhouna/icssDService into test

src/css/index.less

@@ -398,6 +398,15 @@
       .drug{
         display: inline-block;
         margin:0 20px 10px 0;
+        .medicineWaring{
+          display: inline-block;
+          padding: 0 3px;
+          height: 18px;
+          font-size: 12px;
+          background: #F4C051;
+          border-radius: 4px;
+          vertical-align: middle;
+        }
         p{
           color: #7C828E;
           i{

src/js/treatplan.js

@@ -55,7 +55,7 @@ function cyywFun(data){//常用药物
     for(var j = 0;j < tmpVal.medicitionsList.length;j++){
       var tmpPart = tmpVal.medicitionsList[j]
       strPart += '<div class="drug"><span class="'+(tmpPart.forbidden == 2?'medicine medicineDis':'medicine')+'">'+tmpPart.medicitionName+'<a class="infoMsg" target="_blank" href="drugInfo.html?type=8&position=5&name='+tmpPart.medicitionName+'" title="点击该名称可看详细说明"></a></span> ' +
-        '<span class="'+(tmpPart.forbidden == 2?'medicineWaringDis':'medicineWaring')+'">'+(tmpPart.forbidden == 1?'慎用':tmpPart.forbidden == 2?'禁用':'')+'</span>' +
+        (tmpPart.forbidden==0?'':'<span class="medicineWaring">'+(tmpPart.forbidden == 1?'慎用':tmpPart.forbidden == 2?'禁用':'')+'</span>') +
         '<p class="'+(tmpPart.forbidden == 2?"medicineWaringDisMsg":"")+'"><i>'+tmpPart.rate+'</i> 使用率</p></div>'
     }
     $(".drugWarp").append('<div class="medicinePart clearfix">'+str+'<div class="drugCont">'+strPart+'</div></div>')