Merge branch 'dev_zxc' into test

src/css/qcScore.less

@@ -400,3 +400,9 @@
     width: 100%;
   }
 }
+.textR{
+  text-align: right;
+}
+.textL{
+  text-align: left;
+}

src/html/qcScore.html

@@ -469,25 +469,25 @@
                                     <td>${val['会诊医师']}</td>
                                 </tr>
                                 <tr>
-                                    <td  class="standard_fst">当前诊断：</td>
+                                    <td  class="standard_fst">当前诊断：</!DOCTYPE>
                                     <td colspan="3">${val['当前诊断']}</td>
                                 </tr>
                                 <tr>
-                                    <td  class="standard_fst">简要病情：</td>
+                                    <td  class="standard_fst">简要病情：</!DOCTYPE>
                                     <td colspan="3">${val['简要病情']}</td>
                                 </tr>
                                 <tr>
-                                    <td  class="standard_fst">诊疗情况：</td>
+                                    <td  class="standard_fst">诊疗情况：</!DOCTYPE>
                                     <td colspan="3">${val['诊治经过']}</td>
                                 </tr>
                                 <tr>
-                                    <td  class="standard_fst">会诊理由和目的：</td>
+                                    <td  class="standard_fst">会诊理由和目的：</!DOCTYPE>
                                     <td colspan="3">${val['会诊理由和目的']}</td>
                                 </tr>
                                 <tr>
-                                    <td  class="standard_fst">医师签名：</td>
+                                    <td  class="standard_fst">医师签名：</!DOCTYPE>
                                     <td>${val['医生']}</td>
-                                    <td >会诊日期及时间：</td>
+                                    <td >会诊日期及时间：</!DOCTYPE>
                                     <td>${val['病历日期']}</td>
                                 </tr>
                             </table>
@@ -530,25 +530,25 @@
                             <td>${val['会诊到达时间']}</td>
                         </tr>
                         <tr>
-                            <td  class="standard_fst">病史回顾描述：</td>
+                            <td  class="standard_fst">病史回顾描述：</!DOCTYPE>
                             <td colspan="3">${val['病史描述']}</td>
                         </tr>
                         <tr>
-                            <td  class="standard_fst">会诊查体：</td>
+                            <td  class="standard_fst">会诊查体：</!DOCTYPE>
                             <td colspan="3">${val['会诊查体']}</td>
                         </tr>
                         <tr>
-                            <td  class="standard_fst">当前诊断：</td>
+                            <td  class="standard_fst">当前诊断：</!DOCTYPE>
                             <td colspan="3">${val['会诊诊断']}</td>
                         </tr>
                         <tr>
-                            <td  class="standard_fst">会诊意见：</td>
+                            <td  class="standard_fst">会诊意见：</!DOCTYPE>
                             <td colspan="3">${val['记录及建议']}</td>
                         </tr>
                         <tr>
-                            <td  class="standard_fst">医师签名：</td>
+                            <td  class="standard_fst">医师签名：</!DOCTYPE>
                             <td>${val['医生']}</td>
-                            <td >会诊日期及时间：</td>
+                            <td >会诊日期及时间：</!DOCTYPE>
                             <td>${val['病历日期']}</td>
                         </tr>
                     </table>
@@ -1915,7 +1915,15 @@
             <div class="container content-ht">
                 {{each(i, val) info}}
                 <div class="content-item-wrapper">
+                    
                     <div class="info-item">
+                        <div class="contP textR">
+                            <div class="cont textL">
+                                <span class="label">病理检号:</span>
+                                <span>${病理号码}</span>
+                            </div>
+                            
+                        </div>
                         <div class="cont">
                             <span class="label">姓名:</span>
                             <span>${本人姓名}</span>
@@ -1928,6 +1936,10 @@
                             <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>
@@ -1988,10 +2000,12 @@
                             <span class="label">既往病理检查:</span>
                             <span>${既往病理检查}</span>
                         </div>
+                        {{if 性别 == '女'}}
                         <div class="cont">
                             <span class="label">妇科标本月经情况:</span>
-                            <span>${月经史}，${经期天数}，${末次月经日期}</span>
+                            <span>${月经史&&月经史+'，'}${经期天数&&经期天数+'，'}${末次月经日期&&末次月经日期}</span>
                         </div>
+                        {{/if}}
                         <div class="cont">
                             <span class="label">组织库取材情况:</span>
                             <span>${检验标本}</span>
@@ -2009,9 +2023,9 @@
                             </tr>
                             <tr>
                                 <td>1</td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
+                                <td>${检验标本}</td>
+                                <td>${事件日期}</td>
+                                <td>${事件日期}</td>
                             </tr>
                             <tr>
                                 <td>2</td>

src/js/qcScore.js

@@ -54,7 +54,7 @@ function getRecordDetail(){
      global_activeTab=$(".sub-menu .page.active").attr("code");
       initPatientInfo(info);
       initContent(result.pageData);
-      setBoxHeight();
+    
       initScoreItem(msg);
       global_flawData=msg;
 
@@ -70,6 +70,7 @@ function getRecordDetail(){
       difficultRecord(obj['疑难病例讨论记录'],'疑难病例讨论记录')
       illnessNotice(obj['病危通知书'],'病危通知书')
       pathologicTest(obj['病理检验送检单'],'病理检验送检单')
+      setBoxHeight();
     }
   });
 }