Merge branch 'test' into dev_zxc

src/html/qcScore.html

@@ -930,8 +930,10 @@
                             <tr>
                                 <td rowspan="2">个人习惯史:</td>
                                 <td style="width: 60px;">吸烟:</td>
-                                {{if 吸烟==="有"}}
+                                {{if 吸烟 }}
+                                {{if 吸烟==="有" }}
                                 <td>${吸烟}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${每日吸烟}支/每天&nbsp;&nbsp;&nbsp;&nbsp;${已吸烟}年</td>
+                               {{/if}}
                                 {{else}}
                                 <td>${吸烟}</td>
                                 {{/if}}