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

src/html/qcScore.html

@@ -473,21 +473,21 @@
                                     <td colspan="3">${val['当前诊断']}</td>
                                 </tr>
                                 <tr>
-                                    <td  class="standard_fst">简要病情：</!DOCTYPE>
+                                    <td  class="standard_fst">简要病情：</td>
                                     <td colspan="3">${val['简要病情']}</td>
                                 </tr>
                                 <tr>
-                                    <td  class="standard_fst">诊疗情况：</!DOCTYPE>
+                                    <td  class="standard_fst">诊疗情况：</td>
                                     <td colspan="3">${val['诊治经过']}</td>
                                 </tr>
                                 <tr>
-                                    <td  class="standard_fst">会诊理由和目的：</!DOCTYPE>
+                                    <td  class="standard_fst">会诊理由和目的：</td>
                                     <td colspan="3">${val['会诊理由和目的']}</td>
                                 </tr>
                                 <tr>
-                                    <td  class="standard_fst">医师签名：</!DOCTYPE>
+                                    <td  class="standard_fst">医师签名：</td>
                                     <td>${val['医生']}</td>
-                                    <td >会诊日期及时间：</!DOCTYPE>
+                                    <td >会诊日期及时间：</td>
                                     <td>${val['病历日期']}</td>
                                 </tr>
                             </table>
@@ -530,25 +530,25 @@
                             <td>${val['会诊到达时间']}</td>
                         </tr>
                         <tr>
-                            <td  class="standard_fst">病史回顾描述：</!DOCTYPE>
+                            <td  class="standard_fst">病史回顾描述：</td>
                             <td colspan="3">${val['病史描述']}</td>
                         </tr>
                         <tr>
-                            <td  class="standard_fst">会诊查体：</!DOCTYPE>
+                            <td  class="standard_fst">会诊查体：</td>
                             <td colspan="3">${val['会诊查体']}</td>
                         </tr>
                         <tr>
-                            <td  class="standard_fst">当前诊断：</!DOCTYPE>
+                            <td  class="standard_fst">当前诊断：</td>
                             <td colspan="3">${val['会诊诊断']}</td>
                         </tr>
                         <tr>
-                            <td  class="standard_fst">会诊意见：</!DOCTYPE>
+                            <td  class="standard_fst">会诊意见：</td>
                             <td colspan="3">${val['记录及建议']}</td>
                         </tr>
                         <tr>
-                            <td  class="standard_fst">医师签名：</!DOCTYPE>
+                            <td  class="standard_fst">医师签名：</td>
                             <td>${val['医生']}</td>
-                            <td >会诊日期及时间：</!DOCTYPE>
+                            <td >会诊日期及时间：</td>
                             <td>${val['病历日期']}</td>
                         </tr>
                     </table>
@@ -1968,7 +1968,7 @@
                         </div>
                         <div class="cont">
                             <span class="label">科室\病区:</span>
-                            <span>${临床科室}${病区}</span>
+                            <span>${临床科室}\${病区}</span>
                         </div>
                         <div class="cont">
                             <span class="label">床号:</span>
@@ -2030,7 +2030,7 @@
                         {{/if}}
                         <div class="cont">
                             <span class="label">组织库取材情况:</span>
-                            <span>${检验标本}</span>
+                            <span>${送检组织取材部位}</span>
                         </div>
                         <div class="cont">
                             <span class="label">分子病理检测需求:</span>
@@ -2045,7 +2045,7 @@
                             </tr>
                             <tr>
                                 <td>1</td>
-                                <td>${检验标本}</td>
+                                <td>${送检标本名称}</td>
                                 <td>${事件日期}</td>
                                 <td>${事件日期}</td>
                             </tr>

src/js/itemManager.js

@@ -21,7 +21,8 @@ function getTabData(activePage){
         casesId: casesId,
         name: name, //条目名
         isReject: isReject, //1-单项否决 0-非
-        isUsed: isUsed //0-未启用 1-启用
+        isUsed: isUsed, //0-未启用 1-启用
+        size: 15
     }
     post(api.getQcCasesEntryAll,param).then(res =>{
         if(res.data.code == '0'){

src/js/qcList.js

@@ -35,7 +35,8 @@ function getTabData(activePage){
         name: name, //条目名
         level:level,//病历等级
         behosDateStart: behosDateStart, //1-单项否决 0-非
-        behosDateEnd: behosDateEnd //0-未启用 1-启用
+        behosDateEnd: behosDateEnd, //0-未启用 1-启用
+        size: 15
     }
     post(api.qcList,param).then(res =>{
         if(res.data.code == '0'){

src/js/qcScore.js

@@ -54,26 +54,31 @@ function getRecordDetail(){
      global_activeTab=$(".sub-menu .page.active").attr("code");
       initPatientInfo(info);console.log(21,global_activeTab)
       initContent(result.pageData);
-    
       initScoreItem(msg);
       global_flawData=msg;
-
       let obj = JSON.parse(result.pageData)
-     
-      wardRound(obj['查房记录'],'查房记录')
-      preoperation(obj['术前讨论、术前小结'],'术前讨论、术前小结')
-      summary(obj['阶段小结'],'阶段小结')
-      operationRecord(obj['手术记录'],'手术记录')
-      applicationForm(obj['会诊申请单'],'会诊申请单')
-      resultForm(obj['会诊结果单'],'会诊结果单')
-      consultationNote(obj['会诊记录'],'会诊记录')
-      difficultRecord(obj['疑难病例讨论记录'],'疑难病例讨论记录')
-      illnessNotice(obj['病危通知书'],'病危通知书')
-      pathologicTest(obj['病理检验送检单'],'病理检验送检单')
+      
+      infoNotNull(obj,'查房记录')&&wardRound(obj['查房记录'],'查房记录')
+      infoNotNull(obj,'术前讨论、术前小结')&&preoperation(obj['术前讨论、术前小结'],'术前讨论、术前小结')
+      infoNotNull(obj,'阶段小结')&&summary(obj['阶段小结'],'阶段小结')
+      infoNotNull(obj,'手术记录')&&operationRecord(obj['手术记录'],'手术记录')
+      infoNotNull(obj,'会诊申请单')&&applicationForm(obj['会诊申请单'],'会诊申请单')
+      infoNotNull(obj,'会诊结果单')&&resultForm(obj['会诊结果单'],'会诊结果单')
+      infoNotNull(obj,'会诊记录')&&consultationNote(obj['会诊记录'],'会诊记录')
+      infoNotNull(obj,'疑难病例讨论记录')&&difficultRecord(obj['疑难病例讨论记录'],'疑难病例讨论记录')
+      infoNotNull(obj,'病危通知书')&&illnessNotice(obj['病危通知书'],'病危通知书')
+      infoNotNull(obj,'病理检验送检单')&&pathologicTest(obj['病理检验送检单'],'病理检验送检单')
       setBoxHeight();
     }
   });
 }
+//判断模块内容是否不为空
+function infoNotNull(obj,moduleName){
+  if( obj[moduleName]&&obj[moduleName].length > 0 &&Object.keys(obj[moduleName][0]).length !== 0 ){
+    return true
+  }
+  return false
+}
 //填充患者信息
 function initPatientInfo(data){
   const obj=Object.assign({},data,{age:!global_age||global_age=="null"?"-":global_age});