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

src/css/qcScore.less

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

src/html/qcScore.html

@@ -469,7 +469,7 @@
                                     <td>${val['会诊医师']}</td>
                                 </tr>
                                 <tr>
-                                    <td  class="standard_fst">当前诊断：</td>
+                                    <td  class="standard_fst">当前诊断：</!DOCTYPE>
                                     <td colspan="3">${val['当前诊断']}</td>
                                 </tr>
                                 <tr>
@@ -1937,7 +1937,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>
@@ -1950,13 +1958,17 @@
                             <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>
+                            <span>${临床科室}\${病区}</span>
                         </div>
                         <div class="cont">
                             <span class="label">床号:</span>
@@ -2010,13 +2022,15 @@
                             <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>
+                            <span>${送检组织取材部位}</span>
                         </div>
                         <div class="cont">
                             <span class="label">分子病理检测需求:</span>
@@ -2031,9 +2045,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/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,25 +54,31 @@ function getRecordDetail(){
      global_activeTab=$(".sub-menu .page.active").attr("code");
       initPatientInfo(info);console.log(21,global_activeTab)
       initContent(result.pageData);
-      setBoxHeight();
       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});