report

src/components/doctorCheck/PatientRegisterList.vue

@@ -28,6 +28,13 @@
           </el-option>
         </el-select>
       </div>
+      <div class="query">
+        <span>体检类别：</span>
+        <el-select v-model="local.query.medicalTypeIds" placeholder="请选择" clearable filterable
+          style="width: 200px" size="small" multiple collapse-tags>
+          <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName" :value="item.id" />
+        </el-select>
+      </div>
       <div class="query">
         <span>人员状态：</span>
         <el-select v-model="local.query.completeFlag" placeholder="请选择" clearable style="width: 80px" size="small">
@@ -70,10 +77,8 @@
     </div>
 
     <!-- 人员列表 -->
-    <el-table :data="dataList" border width="100%"
-      :height="tableHeight" row-key="id"
-      size="small" highlight-current-row @row-click="rowClick" @row-dblclick="rowDblclick" ref="info" id="info"
-      style="border-radius:10px;">
+    <el-table :data="dataList" border width="100%" :height="tableHeight" row-key="id" size="small" highlight-current-row
+      @row-click="rowClick" @row-dblclick="rowDblclick" ref="info" id="info" style="border-radius:10px;">
       <el-table-column prop="customerOrgParentName" label="单位" width="120" sortable>
         <template slot-scope="scope">
           <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
@@ -185,8 +190,8 @@
     </div>
 
     <!--通用选单位、体检次数、分组的控件-->
-    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX" :close-on-click-modal="false" :append-to-body="true"
-      width="880px" height="600px">
+    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX" :close-on-click-modal="false"
+      :append-to-body="true" width="880px" height="600px">
       <CusOrgOCX :useCustomerOrg="false" :initDateType="'medicalStartDate'" />
     </el-dialog>
 
@@ -233,6 +238,8 @@ export default {
           checkAsb: '', //检查项目   
           checkCompleteFlag: '',  //检查项目状态
           isAuditCheck: '',      //检查项目审核
+          medicalTypeIds:[]
+
         },
         completeFlag: []
       },
@@ -269,9 +276,9 @@ export default {
     ...mapState(["window", "dataTransOpts", "dict", "customerOrg", "patientRegister", "doctorCheck", "sumDoctorCheck", "report"]),
     divHeight() {
       if (this.win == "doctorCheck") {
-        return 170
+        return 202
       } else {
-        return 105
+        return 137
       }
     },
     tableHeight() {
@@ -445,6 +452,7 @@ export default {
       if (this.local.query.haveImage) body.isPicture = 'Y'
       if (this.local.query.checkCompleteFlag) body.asbitemCompleteFlag = this.local.query.checkCompleteFlag
       if (this.local.query.isAuditCheck) body.asbitemIsAudit = this.local.query.isAuditCheck
+      body.medicalTypeIds = this.local.query.medicalTypeIds
 
       body.isFilterPreRegistration = 'Y' //是否需要过滤预登记数据 Y=过滤预登记数据 N=不过滤 默认为N (备注：只有CompleteFlag参数的值不为0的情况才有效，null值也有效)
       // "patientName": "string",

src/components/occDisease/OccDisease.vue

@@ -221,7 +221,7 @@ export default {
       this.dataTransOpts.tableM.patient_past_medical_history.forEach(e => {
         if(!e.diagnosisDate) e.diagnosisDate = null
       });
-      this.dataTransOpts.tableM.patient_occupational_disease.forEach(e => {
+      this.dataTransOpts.tableM.patient_occupational_medical_history.forEach(e => {
         if(!e.diagnosisDate) e.diagnosisDate = null
       });
       this.dataTransOpts.tableM.patient_occupational_history.forEach(e => {

src/components/occDisease/OccDiseaseBase.vue

@@ -248,7 +248,7 @@
         </el-col>
         <el-col :span="5">
           <el-form-item label="修改者">
-            <el-input v-model="dataTransOpts.tableS.patient_occupational_disease.creatorName" disabled
+            <el-input v-model="dataTransOpts.tableS.patient_occupational_disease.lastModifierName" disabled
               size="small"></el-input>
           </el-form-item>
         </el-col>