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

src/html/qcList.html

@@ -15,8 +15,8 @@
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
-                    <span>病历号：</span>
-                    <input class="patientNumInp" type="text" placeholder="请输入病历号">
+                    <span>病人住院序号：</span>
+                    <input class="patientNumInp" type="text" placeholder="请输入病人住院序号">
                 </span>
                 <span class="filterItem typeFilter">
                     <span>病人姓名：</span>
@@ -62,7 +62,7 @@
                     <thead>
                     <th class="textCenter" ></th>
                     <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
-                    <th class="beHospitalId textCenter" code="behospital_code">病历号</th>
+                    <th class="beHospitalId textCenter" code="behospital_code">病人住院序号</th>
                     <th class="patientNo textCenter" code="file_code">病案号</th>
                     <th class="patientName textCenter" code="name" style="width: 100px;">病人姓名</th>
                     <th class="patientSex textCenter" code="sex">性别</th>

src/html/qcListDept.html

@@ -15,8 +15,8 @@
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
-                    <span>病历号：</span>
-                    <input class="patientNumInp" type="text" placeholder="请输入病历号">
+                    <span>病人住院序号：</span>
+                    <input class="patientNumInp" type="text" placeholder="请输入病人住院序号">
                 </span>
                 <span class="filterItem typeFilter">
                     <span>病人姓名：</span>
@@ -62,7 +62,7 @@
                     <thead>
                     <th class="textCenter" ></th>
                     <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
-                    <th class="beHospitalId textCenter" code="behospital_code">病历号</th>
+                    <th class="beHospitalId textCenter" code="behospital_code">病人住院序号</th>
                     <th class="patientNo textCenter" code="file_code">病案号</th>
                     <th class="patientName textCenter" code="name" style="width: 100px;">病人姓名</th>
                     <th class="patientSex textCenter" code="sex">性别</th>

src/html/qcListPerson.html

@@ -15,8 +15,8 @@
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
-                    <span>病历号：</span>
-                    <input class="patientNumInp" type="text" placeholder="请输入病历号">
+                    <span>病人住院序号：</span>
+                    <input class="patientNumInp" type="text" placeholder="请输入病人住院序号">
                 </span>
                 <span class="filterItem typeFilter">
                     <span>病人姓名：</span>
@@ -62,7 +62,7 @@
                     <thead>
                     <th class="textCenter" ></th>
                     <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
-                    <th class="beHospitalId textCenter" code="behospital_code">病历号</th>
+                    <th class="beHospitalId textCenter" code="behospital_code">病人住院序号</th>
                     <th class="patientNo textCenter" code="file_code">病案号</th>
                     <th class="patientName textCenter" code="name" style="width: 100px;">病人姓名</th>
                     <th class="patientSex textCenter" code="sex">性别</th>

src/js/qcScore.js

@@ -366,11 +366,12 @@ function formatFlawKeys(data){
     let hml='<div class="inner-table"><table>';
     const colNum = Math.ceil(questionMapping.length/2);
     let tdVal='';
-    for(let i=0;i<questionMapping.length;){console.log(name,i,questionMapping.length)
+    const regexp = /(【(.+?)】)/g;
+    for(let i=0;i<questionMapping.length;){console.log(questionMapping[i].val.match(regexp))
       if(questionMapping[i+1]){
-        tdVal="<td>"+questionMapping[i].name+"${"+questionMapping[i].val.replace(/[【|】]/g,'')+"}</td><td>"+questionMapping[i+1].name+"${"+questionMapping[i+1].val.replace(/[【|】]/g,'')+"}</td>";
+        tdVal="<td>"+questionMapping[i].name+extractVars(questionMapping[i].val)+"</td><td>"+questionMapping[i+1].name+extractVars(questionMapping[i+1].val)+"</td>";
       }else{
-        tdVal="<td>"+questionMapping[i].name+"${"+questionMapping[i].val.replace(/[【|】]/g,'')+"}</td><td></td>";
+        tdVal="<td>"+questionMapping[i].name+extractVars(questionMapping[i].val)+"</td><td></td>";
       }
       if(i==0){
         hml=hml+`<tr><td rowspan="${colNum}">${name}</td>${tdVal}`;