Merge branch 'test' into dev_zxc

src/html/qcScore.html

@@ -760,10 +760,6 @@
                         <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>
@@ -870,7 +866,7 @@
                             <tr>
                                 <td rowspan="2">个人习惯史:</td>
                                 <td style="width: 60px;">吸烟:</td>
-                                <td>${吸烟}</td>
+                                <td>${吸烟}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${每日吸烟}支/每天&nbsp;&nbsp;&nbsp;&nbsp;${已吸烟}年</td>
                             </tr>
                             <tr>
                                 <td style="width: 60px;">饮酒:</td>
@@ -881,7 +877,13 @@
                     </div>
                 </div>
                 <div class="info-item">
-                    <div class="info-title">婚姻、月经及生育史</div>
+                    <div class="info-title">
+                        {{if 性别==="男"}}
+                        婚姻、生育史
+                        {{else}}
+                        婚姻、月经及生育史
+                        {{/if}}
+                    </div>
                     <div class="cont">
                         <span class="label">婚姻状况:</span>
                         <span>${婚姻状况}</span>
@@ -896,7 +898,7 @@
                     </div>
                     <div class="cont">
                         <span class="label">子女健康状况:</span>
-                        <span>${子女健康状况}</span>
+                        <span>${子女健康状况}(${婚姻状况})</span>
                     </div>
                     <div class="cont">
                         <span class="label">配偶健康状况:</span>
@@ -907,6 +909,7 @@
                         <span>${顺产足月} - ${早产} - ${流产} - ${存活}  (足-早-流-存)</span>
                     </div>
                 </div>
+                {{if 性别!=="男"}}
                 <div class="info-item">
                     <div class="cont">
                         <span class="label">月经史:</span>
@@ -924,6 +927,7 @@
                         <span>${月经量}</span>
                     </div>
                 </div>
+                {{/if}}
                 <div class="info-item">
                     <div class="info-title">家族史</div>
                     <div class="cont">
@@ -2506,13 +2510,13 @@
             <h2 class="title">${title}</h2>
             <div class="container">
                 <div class="patient-info">
-                    <span>姓名：${本人姓名}</span>
-                    <span>性别：${性别}</span>
-                    <span>科别：${临床科室}</span>
-                    <span>床号：${床号}</span>
-                    <span>病案号：${病历号}</span>
+                    <span><b>姓名：</b>${姓名}</span>
+                    <span><b>性别：</b>${性别}</span>
+                    <span><b>科别：</b>${临床科室}</span>
+                    <span><b>床号：</b>${床号}</span>
+                    <span><b>病案号：</b>${病历号}</span>
                 </div>
-                <div class="info-item no-border">
+                <div class="info-item no-border clearfix">
                     <div class="cont">
                         <span class="label">记录时间:</span>
                         <span>${病历日期}</span>