Merge remote-tracking branch 'origin/dev_zxc' into test

# Conflicts:
#	src/js/qcScore.js

src/html/qcScore.html

@@ -1013,6 +1013,237 @@
             </div>
         </div>
     </script>
+    <script type="text/html" id="outHisTmpl">
+        <div class="content-item" code="${title}">
+            <h2 class="title">${title}</h2>
+            <div class="container content-ht">
+                <div class="info-item">
+                    <div class="cont">
+                        <span class="label">姓名:</span>
+                        <span>${本人姓名}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">性别:</span>
+                        <span>${性别}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">科别:</span>
+                        <span>${临床科室}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">床号:</span>
+                        <span>${床号}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">病案号:</span>
+                        <span>${病历号}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">入院时间:</span>
+                        <span>患者因${主诉} 入院。</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">年龄:</span>
+                        <span>${年龄}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">出院时间:</span>
+                        <span>${出院时间}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">住院天数:</span>
+                        <span>${实际住院天数}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">医疗组长:</span>
+                        <span>${主诊医生}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">入院诊断:</span>
+                        <span>${入院诊断}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">出院诊断:</span>
+                        <span>${出院诊断}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">入院情况:</span>
+                        <span>${主诉}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">体格检查:</span>
+                        <span>${体格检查}</span>
+                        <span>体温${体温耳}℃</span>
+                        <span>脉搏${脉搏}次/分</span>
+                        <span>呼吸${呼吸}次/分</span>
+                        <span>血压${血压}mmHg</span>
+                        <span>${专科检查}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">辅助检查:</span>
+
+                        
+                        <span>${实验室检查}</span>
+                        <span>${影像学检查}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">住院诊治经过(包括重要发现和结论，接受的药物和其他治疗) :</span>
+                        <span>${诊治经过}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">出院时情况（症状与体征）:</span>
+                        <span>${出院时情况}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">出院状态:</span>
+                        <span>${出院状态}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">出院去向:</span>
+                        <span>${出院后去处}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">出院带药:</span>
+                        <span>${出院医嘱}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">健康教育（包括饮食指导）:</span>
+                        <span>${出院指导}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">随访计划（复诊安排）:</span>
+                        <span>时间：${复诊时间}</span>
+                        <span>地点：${复诊地点}</span>
+                        <span>复诊目的：${复诊目的}</span>
+                        <span>科室：${复诊科室}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">医生签名:</span>
+                        <span>${医生}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">记录日期:</span>
+                        <span>${病历日期}</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </script>
+    <script type="text/html" id="firstCourseTmpl">
+        <div class="content-item" code="${title}">
+            <h2 class="title">${title}</h2>
+            <div class="container content-ht">
+                <div class="info-item">
+                    <div class="cont">
+                        <span class="label">姓名:</span>
+                        <span>${本人姓名}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">性别:</span>
+                        <span>${性别}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">科别:</span>
+                        <span>${临床科室}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">床号:</span>
+                        <span>${床号}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">病案号:</span>
+                        <span>${病历号}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label"></span>
+                        <span>${病历日期}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label"></span>
+                        <span>患者，${性别}，因“${主诉}”于${入院日期}入院。</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">病历特点:</span>
+                        <span class="label">发病经过:</span>
+                        <span>${现病史发病情况}</span>
+
+                        <span class="label">体格检查:</span>
+                        <span>体温${体温}℃，脉搏${脉搏}次/分，呼吸 24 次/分，血压 96/48 mmHg，</span>
+                        <span>${专科检查}</span>
+
+                        <span class="label">辅助检查:</span>
+                        <span>${实验室检查}</span>
+                        <span>${影像学检查}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">拟诊讨论:</span>
+                        <span class="label">初步诊断:</span>
+                        <span>${初步诊断}</span>
+                        
+                        <span class="label">诊断依据:</span>
+                        <span>${本人姓名}，${年龄}，${性别}</span>
+                        <span>${主诉}</span>
+                        <span>${专科检查}</span>
+                        <span>${实验室检查}</span>
+                        <span>${影像学检查}</span>
+
+                        <span class="label">鉴别诊断:</span>
+                        <span>${鉴别诊断}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">诊疗计划:</span>
+                        <span class="label">检查计划:</span>
+                        <span>${检查计划}</span>
+                        
+                        <span class="label">治疗计划:</span>
+                        <span>${治疗计划和措施}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">医师签名:</span>
+                        <span>${医生}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">医疗组长:</span>
+                        <span>${医疗组长}</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </script>
+    <script type="text/html" id="illnessNoticeTmpl">
+        <div class="content-item" code="${title}">
+            <h2 class="title">${title}</h2>
+            <div class="container content-ht">
+                <div class="info-item">
+                    <div class="cont">
+                        <span class="label">姓名:</span>
+                        <span>${本人姓名}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">性别:</span>
+                        <span>${性别}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">科别:</span>
+                        <span>${临床科室}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">床号:</span>
+                        <span>${床号}</span>
+                    </div>
+                    <div class="cont">
+                        <span class="label">病案号:</span>
+                        <span>${病历号}</span>
+                    </div>
+                    <div class="cont">
+                        这是一份关于病危/病重告知书，医师会用通俗易懂的方式告知诊疗相关事宜。 
+                    </div>
+                    
+                    
+                </div>
+            </div>
+        </div>
+    </script>
 </head>
 <body>
     <div class="patient-info" id="patientInfo"></div>

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){
   //菜单数据填充
@@ -73,8 +75,9 @@ function initContent(data){
   let info=[];
   let nameMap={
     "入院记录":"#inHisTmpl",
-    "病案首页":"#indexTmpl",
-    "手术知情同意书":"#surgeryBookTmpl",
+    "出院小结":"#outHisTmpl",
+    "首次病程录":"#firstCourseTmpl",
+    "病危通知书":"#illnessNoticeTmpl",
   };
   for(let k in obj){
     info=formatInfoData(k,obj[k][0]);
@@ -89,12 +92,13 @@ function initContent(data){
     $("#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]||"";
   }
   return Object.assign({title:k},obj);