Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

src/components/report/BtnReport.vue

@@ -681,6 +681,7 @@ export default {
                 //if (e.sexId) e.sexId = dddw(this.dict.sex, "id", e.sexId, "displayName")
                 // if (e.patientRegisterNo) e.patientRegisterNo = " " + e.patientRegisterNo
                 if (e.patientNo) e.patientNo = "'" + e.patientNo
+                if (e.idNo) e.idNo = "'" + e.idNo
                 if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) {
                     e.groupPack = e.medicalPackageName  // dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName")
                 } else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) {

src/views/customerReport/positiveResultsList.vue

@@ -179,20 +179,31 @@
               :summary-method="getSummaris"
             >
               <el-table-column label="阳性结果人员清单">
-                <el-table-column :label="`开始时间： ${summary.startDate || ''} 结束时间：${summary.endDate || ''}体检人员共计： ${(summary.maleCount+summary.femaleCount)} 男性： ${summary.maleCount} 女性： ${summary.femaleCount}`" align="left">
+                <el-table-column :label="`开始时间： ${summary.startDate || ''} 结束时间：${summary.endDate || ''}体检人员共计： ${(summary.maleCount+summary.femaleCount)}人 男性： ${summary.maleCount}人 女性： ${summary.femaleCount}人`" align="left">
                                   <el-table-column
                   prop="diagnosisName"
                   label="诊断名称"
                 ></el-table-column>
                 <el-table-column
-                  prop="patientNames"
+                  prop="PatientNameDetail"
                   label="人员清单"
-                ></el-table-column>
+                >
+                <template slot-scope="scope">
+                  <div>
+                    <span v-for="(item, index) in scope.row.PatientNameDetail" :key="index">{{item}}</span>
+                  </div>
+                </template>
+                </el-table-column>
                 <el-table-column
                   prop="patientCount"
                   label="人数"
+                  align="center"
                 ></el-table-column>
-                <el-table-column prop="percentage" label="占百分比">
+                <el-table-column prop="percentage" label="占百分比" align="center">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.percentage }}%</span
+                    >
+                  </template>
                 </el-table-column>
                 </el-table-column>
               </el-table-column>

src/views/fee-settings/Asbitem.vue

@@ -432,24 +432,31 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
           <el-col :span="24">
           <el-form-item label="推荐理由" prop="">
             <el-input v-model="form.suggestReason" type="textarea" :autosize="{ minRows: 2, maxRows: 2 }"
               @input="($event) => changeUpdate($event, 'suggestReason')" />
           </el-form-item>
         </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="24">
           <el-form-item label="临床意义" prop="">
             <el-input v-model="form.clinicalMeaning" type="textarea" :autosize="{ minRows: 2, maxRows: 2 }"
               @input="($event) => changeUpdate($event, 'clinicalMeaning')" />
           </el-form-item>
         </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="24">
           <el-form-item label="警告事项" prop="">
             <el-input v-model="form.warn" type="textarea" :autosize="{ minRows: 2, maxRows: 2 }"
               @input="($event) => changeUpdate($event, 'warn')" />
           </el-form-item>
         </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="16">
           <el-form-item label="默认结果" prop="" class="my-el-form-item">
             <!-- <el-input v-model="form.defaultResult"></el-input> -->
@@ -471,6 +478,7 @@
             </el-select>
           </el-form-item>
         </el-col>
+        </el-row>
         <el-row>
           <el-col :span="4">
             <el-form-item label="启用诊断" prop="">