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

# Conflicts:
#	src/css/qcScore.less

src/css/qcScore.less

@@ -406,6 +406,10 @@
 .textL{
   text-align: left;
 }
+.textPreLine{
+  white-space: pre-line;
+}
+
 /********缺陷总览*********/
 .flaw-table{
   height: 100%;

src/html/qcScore.html

@@ -196,9 +196,8 @@
                                 </p>
                                 <p class="lineBlock">
                                     <span class="lineTitle">体格检查：</span>
-                                    <span>体温 ${val['体温(耳)']}℃，脉搏 ${val['脉搏']}次/分，呼吸 ${val['呼吸']}次/分，血压${val['血压']}mmHg，</span>
-                                    
-                                    <span>${val['专科检查']}</span>
+                                    <span>体温 ${val['体温(耳)']}℃，脉搏 ${val['脉搏']}次/分，呼吸 ${val['呼吸']}次/分，血压${val['血压']}mmHg</span>
+                                    <span>${val['专科检查']&&'，'+val['专科检查']}</span>
                                 </p>
                                 <p class="lineBlock">
                                     <span class="lineTitle">辅助检查：</span>
@@ -212,8 +211,16 @@
                                     <span>${val['术前诊断']}</span>
                                 </p>
                                 <p class="lineBlock">
-                                    <span class="lineTitle">2.手术指征与禁忌征：</span>
-                                    <span>${val['现病史-发病情况']}</span>
+                                    <span class="lineTitle">2.手术指征与禁忌症：</span>
+                                    <p class="lineBlock">
+                                        <span class="lineTitle">手术指征：</span>
+                                        <span>${val['手术指征']}</span>
+                                    </p>
+                                    <p class="lineBlock">
+                                        <span class="lineTitle">禁忌症：</span>
+                                        <span>${val['手术禁忌症']}</span>
+                                    </p>
+                                    
                                 </p>
                                 <p class="lineBlock">
                                     <span class="lineTitle">3.可替代方案：</span>
@@ -221,11 +228,23 @@
                                 </p>
                                 <p class="lineBlock">
                                     <span class="lineTitle">4.拟施手术方式、名称及可能的变更：</span>
-                                    <span>${val['可能的变更']}</span>
+                                    
+                                    <p class="lineBlock">
+                                        <span class="lineTitle">手术方式：</span>
+                                        <span>${val['手术方式']}</span>
+                                    </p>
+                                    <p class="lineBlock">
+                                        <span class="lineTitle">手术名称：</span>
+                                        <span>${val['手术名称']}</span>
+                                    </p>
+                                    <p class="lineBlock">
+                                        <span class="lineTitle">可能的变更：</span>
+                                        <span>${val['可能的变更']}</span>
+                                    </p>
                                 </p>
                                 <p class="lineBlock">
                                     <span class="lineTitle">5.计划多次手术：</span>
-                                    <span>${val['辅助检查结果']}</span>
+                                    <span>是 否</span>
                                 </p>
                                 <p class="lineBlock">
                                     <span class="lineTitle">6.拟施麻醉方式：</span>
@@ -233,7 +252,7 @@
                                 </p>
                                 <p class="lineBlock">
                                     <span class="lineTitle">7.术前特殊准备：</span>
-                                    <span>${val['手术禁忌症']}</span>
+                                    <span>${val['术前准备']}</span>
                                 </p>
                                 <p class="lineBlock">
                                     <span class="lineTitle">8.主要术中、术后风险及防范措施：</span>
@@ -2133,7 +2152,7 @@
                         </div>
                         <div class="contP">
                             <span class="label">2、体格检查:</span>
-                            <span>体温${体温耳}℃，脉搏${脉搏}次/分，呼吸${呼吸} 次/分，血压${血压} mmHg，</span>
+                            <span>体温${体温}℃，脉搏${脉搏}次/分，呼吸${呼吸} 次/分，血压${血压} mmHg，</span>
                             <span>${专科检查}</span>
                         </div>
                         <div class="contP">
@@ -2151,16 +2170,15 @@
                             </div>
                             <div class="contP">
                                 <span class="label">诊断依据:</span>
-                                <p>${本人姓名}，${年龄}，${性别}</p>
-                                <p>${主诉}</p>
-                                <p>${专科检查}</p>
-                                <p>${实验室检查}</p>
-                                <p>${影像学检查}</p>
+                                <p>（1）${本人姓名}，${年龄}，${性别}</p>
+                                <p>（2）${主诉}</p>
+                                <p>（3）${专科检查}</p>
+                                <p>（4）${实验室检查}${影像学检查}</p>
                             </div>
                         </div>
                        <div class="contP">
                             <span class="label">鉴别诊断:</span>
-                            <span>${鉴别诊断}</span>
+                            <span class="textPreLine">${鉴别诊断}</span>
                        </div>
                     </div>
                     <div class="contP">
@@ -2193,7 +2211,7 @@
             <h2 class="title">${title}</h2>
             <div class="container content-ht">
                 {{each(i,val) info}}
-
+                <div class="content-item-wrapper">
                     <div class="info-item">
                         <div class="cont">
                             <span class="label">姓名:</span>
@@ -2291,6 +2309,7 @@
                         </div>
                     
                     </div>
+                </div>
                 {{/each}}
             </div>
         </div>
@@ -2377,62 +2396,64 @@
             <h2 class="title">${title}</h2>
             <div class="container content-ht">
                 {{each(i, val) info}}
-                <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="contP">
-                        <span class="label">抢救时间:</span>
-                        <span>${事件日期}-${抢救结束时间}</span>
-                    </div>
-                    <div class="contP">
-                        <span class="label">病情变化:</span>
-                        <span>${抢救病情}</span>
-                    </div>
-                    <div class="contP">
-                        <span class="label">手术名称或操作名称（如无则不填）:</span>
-                        <span>${手术名称}</span>
-                    </div>
-                    <div class="contP">
-                        <span class="label">抢救措施:</span>
-                        <span>${抢救措施}</span>
-                    </div>
-                    <div class="contP">
-                        <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 class="content-item-wrapper">
+                    <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="contP">
+                            <span class="label">抢救时间:</span>
+                            <span>${事件日期}-${抢救结束时间}</span>
+                        </div>
+                        <div class="contP">
+                            <span class="label">病情变化:</span>
+                            <span>${抢救病情}</span>
+                        </div>
+                        <div class="contP">
+                            <span class="label">手术名称或操作名称（如无则不填）:</span>
+                            <span>${手术名称}</span>
+                        </div>
+                        <div class="contP">
+                            <span class="label">抢救措施:</span>
+                            <span>${抢救措施}</span>
+                        </div>
+                        <div class="contP">
+                            <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>
                 </div>
                 {{/each}}