Merge branch 'test' into byll

src/css/qcScore.less

@@ -77,10 +77,19 @@
     width:70%;
     height: 100%;
     position: relative;
+    /*overflow-y: auto;*/
   }
   .content-item{
     display: none;
     height: 100%;
+
+    /**********危急值记录*************/
+    &.danger-record{
+      height:auto;
+      .title{
+        /*position: unset;*/
+      }
+    }
     .title{
       position: absolute;
       top: 0;
@@ -100,69 +109,100 @@
       height: 100%;
       overflow-y: auto;
     }
-    .info-item{
-      border-bottom: 1px @borderColor solid;
-      margin-bottom: 10px;
-      .info-title{
-        font-weight: bold;
-        margin-bottom: 10px;
+    .info-table{
+      margin: 0 0 15px;
+    }
+    table{
+      width: 100%;
+      border:1px @tableBorderColor solid;
+    }
+    .inline-table{
+      display: inline;
+      border: none;
+      td{
+        border: none;
       }
     }
-    .cont{
-      display: inline-block;
-      min-width: 33%;
-      margin-bottom: 15px;/*
+    .inner-table table{
+      border: none;
+      td{
+        border: none;
+        text-align: left;
+        vertical-align: text-bottom;
+        &[rowspan]{
+          font-weight: bold;
+          width: 100px;
+          padding-left: 0;
+        }
+      }
+    }
+    .embed-table{
+      border:1px @tableBorderColor solid;
+      &>tbody>tr:first-child>td{
+        padding: 0;
+        border:none;
+        &>table td{
+          border:1px @tableBorderColor solid;
+          line-height: 20px;
+          padding: 7px 8px;
+        }
+      }
       .table-tip{
-        line-height: 20px;
-        padding: 7px 8px;
-        border:1px @tableBorderColor solid;
-      }*/
+        text-align: left;
+      }
+    }
+    th{
       table{
-        width: 100%;
-        border:1px @tableBorderColor solid;
+        border:none;
+      }
+      border:1px @tableBorderColor solid;
+      background: @thBgColor;
+      line-height: 20px;
+      padding: 7px 8px;
+    }
+    td{
+      text-align: center;
+      border:1px @tableBorderColor solid;
+      padding:7px  8px;
+      height: 20px;
+      table,td{
+        border:none;
       }
-      .embed-table{
-        border:1px @tableBorderColor solid;
-        &>tbody>tr:first-child>td{
-          padding: 0;
-          border:none;
-          &>table td{
-            border:1px @tableBorderColor solid;
-            line-height: 20px;
-            padding: 7px 8px;
-          }
+    }
+    .info-item{
+      border-bottom: 1px @borderColor solid;
+      .cont{
+        display: inline-block;
+        min-width: 33%;
+        margin-bottom: 15px;
+        span{
+          line-height: 20px;
+          vertical-align: middle;
         }
-        .table-tip{
-          text-align: left;
+        .label{
+          display: inline-block;
+          /*min-width: 70px;*/
+          font-weight: bold;
+          overflow-x: hidden;
         }
       }
-      th{
-        table{
-          border:none;
-        }
-        border:1px @tableBorderColor solid;
-        background: @thBgColor;
-        line-height: 20px;
-        padding: 7px 8px;
+      &.cont-2 .cont{
+        min-width: 48%;
       }
-      td{
-        text-align: center;
-        border:1px @tableBorderColor solid;
-        padding:7px  8px;
-        height: 20px;
-        table,td{
-          border:none;
-        }
+      &.cont-4 .cont{
+        min-width: 23%;
       }
-      span{
-        line-height: 20px;
-        vertical-align: middle;
+      &.cont-5 .cont{
+        min-width: 19%;
       }
-      .label{
-        display: inline-block;
-        min-width: 70px;
+      &.no-border{
+        border-bottom: none;
+        margin-bottom: 0;
+      }
+      margin-bottom: 10px;
+      .info-title{
         font-weight: bold;
-        overflow-x: hidden;
+        margin-bottom: 10px;
       }
     }
   }
@@ -284,4 +324,44 @@
       }
     }
   }
-}
+}
+/*******手术知情同意书*********/
+.surgery-book{
+  .book-item{
+    margin-bottom:15px;
+    :not(:first-child){
+      text-indent: 15px;
+    }
+    .intent{
+      text-indent: 30px;
+    }
+    .intent-1{
+      margin-left: 48px;
+      text-indent: 0;
+    }
+    .clearfix{
+      p{
+        width: 100%;
+      }
+    }
+    .fr{
+      margin-top: 25px;
+      text-align: right;
+    }
+  }
+}
+
+/********术后首次病程记录及谈话记录*******/
+.surgery-af{
+  .af-title{
+    margin-bottom: 15px;
+    span {
+      display: inline-block;
+      width: 50%;
+      font-weight: bold;
+    }
+  }
+  .cont{
+    width: 100%;
+  }
+}

src/js/maps.js

@@ -78,21 +78,26 @@ const keyMaps= {
     "科别":"科别",
     "床号":"床号",
     "病历号":"病案号",
-    "入病房时间":"入院时间",
+    "入院日期":"入院时间",
     "年龄":"年龄",
     "出院时间":"出院时间",
     "实际住院天数":"住院天数",
     "主诊医生":"医疗组长",
     "入院诊断":"入院诊断",
-    "入病房时间":"入病房时间",
+    "出院诊断":"出院诊断",
     "主诉":"入院情况",
     "体格检查":"体格检查",
+    "体温耳":"体温",
+    "脉搏":"脉搏",
+    "呼吸":"呼吸",
+    "血压":"血压",
+    "辅助检查":"辅助检查",
     "诊治经过":"住院诊治经过(包括重要发现和结论，接受的药物和其他治疗)",
     "出院时情况":"出院时情况（症状与体征）",
     "出院状态":"出院状态",
     "出院后去处":"出院去向",
     "出院医嘱":"出院带药",
-    "手术外伤史":"健康教育（包括饮食指导）",
+    "出院指导":"健康教育（包括饮食指导）",
     "随访复访安排":"随访计划（复诊安排）",
     "医生":"医生签名",
     "病历日期":"记录日期",

src/js/qcScore.js

@@ -12,6 +12,8 @@ const global_age = getUrlArgObject("age");
 let global_activeTab=$(".sub-menu .page.active").attr("code");  //当前激活菜单项
 
 $(function(){
+  //getSubMenu();
+  //initScoreItem();
   getRecordDetail();
 function initMenu(data){
   //菜单数据填充
@@ -74,22 +76,38 @@ function initContent(data){
   let info=[];
   let nameMap={
     "入院记录":"#inHisTmpl",
-    "病案首页":"#indexTmpl"
+    "出院小结":"#outHisTmpl",
+    "病案首页":"#indexTmpl",
+    "手术知情同意书":"#surgeryBookTmpl",
+    "首次病程录":"#firstCourseTmpl",
+    "病危通知书":"#illnessNoticeTmpl",
+    "术后首次病程及谈话记录":"#surgeryAfRecord",
+    "危急值记录":"#dangerRecore",
   };
   for(let k in obj){
-    info=formatInfoData(k,obj[k][0]);
-    nameMap[k]&&$(nameMap[k]).tmpl(info).appendTo("#contentInfo");
+    for(let i in obj[k]){console.log(i,k)
+      info=formatInfoData(k,obj[k][i]);
+      nameMap[k]&&$(nameMap[k]).tmpl(info).appendTo("#contentInfo");
+    }
+  }
+  if(obj["病案首页"][0]["出院诊断"]){
+    const diag = JSON.parse(obj["病案首页"][0]["出院诊断"]);
+    $("#tableTmpl").tmpl({k:"出院诊断",data:diag}).appendTo("#diagTable");
+  }
+  if(obj["病案首页"][0]["手术信息"]){
+    const diag = JSON.parse(obj["病案首页"][0]["手术信息"]);
+    $("#tableTmpl").tmpl({k:"手术信息",data:diag}).appendTo("#surgeryTable");
   }
   $(".content-item[code="+global_activeTab+"]").show();
+  console.log(obj)
 }
 
 function formatInfoData(k,data){
   let obj = {},name="";
   for(let i in data){
-    name=i.replace(/[^\u4e00-\u9fa5|a-zA-Z0-9]+/g,"").replace(/^[0-9]+/,"a");    //过滤key中存在的特殊符号，模板会渲染不出来且不报错
+    name=i.replace(/[^\u4e00-\u9fa5|a-zA-Z0-9]+/g,"");    //过滤key中存在的特殊符号，模板会渲染不出来且不报错
     obj[name]=data[i]||"";
   }
-  console.log(data["出院诊断"]);
   return Object.assign({title:k},obj);
 }