diff --git a/src/components/occDisease/OccDiseaseConclusion.vue b/src/components/occDisease/OccDiseaseConclusion.vue
index e7ad8e8..1311a4b 100644
--- a/src/components/occDisease/OccDiseaseConclusion.vue
+++ b/src/components/occDisease/OccDiseaseConclusion.vue
@@ -9,10 +9,20 @@
         <td width="50%">建议：</td>
       </tr>
       <tr>
-        <td><el-input type="textarea" v-model="dataTransOpts.tableS.patient_occupational_disease.occupationalAbnormal"
-            size="small" :autosize="{ minRows: 8, maxRows: 8 }" :disabled="!checkPagePriv(pagePriv.privs, '职业健康检查结论') || isOccSummary"></el-input></td>
-        <td><el-input type="textarea" v-model="dataTransOpts.tableS.patient_occupational_disease.occupationalAbSuggestion"
-            size="small" :autosize="{ minRows: 8, maxRows: 8 }" :disabled="!checkPagePriv(pagePriv.privs, '职业健康检查结论') || isOccSummary"></el-input></td>
+        <td>
+          <!--
+          <el-input type="textarea" v-model="dataTransOpts.tableS.patient_occupational_disease.occupationalAbnormal"
+            size="small" :autosize="{ minRows: 7, maxRows: 7 }"
+            :disabled="!checkPagePriv(pagePriv.privs, '职业健康检查结论') || isOccSummary"></el-input>
+          -->
+          <el-autocomplete class="inline-input" v-model="dataTransOpts.tableS.patient_occupational_disease.occupationalAbnormal" 
+            :fetch-suggestions="querySearch" placeholder="请输入职业健康检查结论"
+            @select="handleSelect" :disabled="!checkPagePriv(pagePriv.privs, '职业健康检查结论') || isOccSummary"></el-autocomplete>
+        </td>
+        <td><el-input type="textarea"
+            v-model="dataTransOpts.tableS.patient_occupational_disease.occupationalAbSuggestion" size="small"
+            :autosize="{ minRows: 7, maxRows: 7 }"
+            :disabled="!checkPagePriv(pagePriv.privs, '职业健康检查结论') || isOccSummary"></el-input></td>
       </tr>
       <!--
       <tr>
@@ -29,8 +39,9 @@
     </table>
     <div>处理意见：</div>
     <div>
-      <el-input type="textarea" v-model="dataTransOpts.tableS.patient_occupational_disease.handleSuggestion" size="small"
-        :autosize="{ minRows: 2, maxRows: 2 }" :disabled="!checkPagePriv(pagePriv.privs, '职业健康检查结论')"></el-input>
+      <el-input type="textarea" v-model="dataTransOpts.tableS.patient_occupational_disease.handleSuggestion"
+        size="small" :autosize="{ minRows: 2, maxRows: 2 }"
+        :disabled="!checkPagePriv(pagePriv.privs, '职业健康检查结论')"></el-input>
     </div>
   </div>
 </template>
@@ -40,6 +51,7 @@ import { mapState } from "vuex";
 import OccDiseasePoison from "./OccDiseasePoison.vue";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { getPagePriv, checkPagePriv, objCopy, deepCopy, arrayExistObj } from "../../utlis/proFunc";
+import OccCheckConclusion from "@/views/basic-dictionary/occCheckConclusion.vue";
 export default {
   components: { OccDiseasePoison },
   props: ["refFunc"],
@@ -49,7 +61,7 @@ export default {
         routeUrlorPageName: 'OccDisease', //当前页面归属路由或归属页面权限名称
         privs: [] // 页面权限
       },
-
+      OccConclusion: [], // 职业病结论
     };
   },
 
@@ -57,6 +69,7 @@ export default {
     //获取用户当前页面的权限
     let userPriv = window.sessionStorage.getItem('userPriv')
     if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
+    this.init()
   },
 
   //挂载完成
@@ -73,6 +86,30 @@ export default {
 
   methods: {
     moment, checkPagePriv,
+
+    init() {
+      postapi('/api/app/OccupationalAbnormal/GetList')
+        .then(res => {
+          if (res.code > - 1){
+            //displayName": "本次检查未见异常",
+            this.OccConclusion = res.data
+            this.OccConclusion.forEach(e => {
+              e.value = e.displayName
+            });
+          }
+          
+        })
+    },
+
+    querySearch(queryString, cb) {      
+      let restaurants = this.OccConclusion;
+      let results = queryString ? restaurants.filter(e => { return e.value.indexOf(queryString) > -1}) : restaurants;
+      // 调用 callback 返回建议列表的数据      
+      cb(results);
+    },
+
+
+
   },
 
   watch: {
@@ -96,4 +133,5 @@ export default {
 
 .btnClass {
   width: 110px;
-}</style>
+}
+</style>
diff --git a/src/components/occDisease/OccDiseasePoison.vue b/src/components/occDisease/OccDiseasePoison.vue
index 70a2648..3e63925 100644
--- a/src/components/occDisease/OccDiseasePoison.vue
+++ b/src/components/occDisease/OccDiseasePoison.vue
@@ -21,10 +21,10 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="lastModifierName" label="修改人员" min-width="80" align="center" />
-        <el-table-column prop="lastModificationTime" label="修改时间" min-width="150" align="center" />
-        <el-table-column prop="creatorName" label="创建人员" min-width="80" align="center" />
-        <el-table-column prop="creationTime" label="创建时间" min-width="150" align="center" />
+        <el-table-column prop="lastModifierName" label="修改人员" min-width="75" align="center" />
+        <el-table-column prop="lastModificationTime" label="修改时间" min-width="135" align="center" />
+        <el-table-column prop="creatorName" label="创建人员" min-width="75" align="center" />
+        <el-table-column prop="creationTime" label="创建时间" min-width="135" align="center" />
         <el-table-column fixed="right" width="30" align="center">
           <template slot="header">
             <div style="display: flex;justify-content:space-between;">
diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue
index 502a461..280a943 100644
--- a/src/components/report/BtnReport.vue
+++ b/src/components/report/BtnReport.vue
@@ -439,10 +439,12 @@ export default {
         },
 
         async report2pdf(path) {
+            if(this.dataTransOpts.tableM.patient_register.length < 1) return
             this.elProgress.display = true;
             this.elProgress.percentage = 0;
 
             let ReportCode = '0005';
+            if (this.dataTransOpts.tableM.patient_register[0].isPatientOccupationalDisease == 'Y') ReportCode = '0006'
             let token = window.sessionStorage.getItem('token');
             let user = window.sessionStorage.getItem('user');
             let toOutShell = {
@@ -457,12 +459,13 @@ export default {
                     { Name: "firstPage", Value: "pic/peisReportFirstPage.jpg" },
                     { Name: "pageHeader", Value: "pic/peisReportPageHeader.jpg" },
                     { Name: "pageFooter", Value: "pic/peisReportPageFooter.jpg" },
-                    { Name: "orgSign", Value: "pic/orgSign.png" },
+                    { Name: "orgSign",  Value: this.dataTransOpts.tableM.patient_register[0].isPatientOccupationalDisease == 'Y' ? "pic/orgSignOcc.png" : "pic/orgSign.png" },
                     { Name: 'picExtOne', Value: 'pic/hisLog.jpg' },
+                    { Name: 'resultSign', Value: 'pic/resultSign.png' },
                 ],
                 IsHealthReport: 'Y'
             };
-
+            
             for (let i = 0; i < this.dataTransOpts.tableM.patient_register.length; i++) {
 
                 let e = this.dataTransOpts.tableM.patient_register[i];
diff --git a/src/views/diagnosis/diagnosis.vue b/src/views/diagnosis/diagnosis.vue
index 55ce961..d1ced5b 100644
--- a/src/views/diagnosis/diagnosis.vue
+++ b/src/views/diagnosis/diagnosis.vue
@@ -310,7 +310,7 @@ export default {
   },
 
   methods: {
-    moment,dddw,
+    moment,dddw,deepCopy,
 
     init(){
       this.formInit = Object.assign({},this.form)
@@ -570,7 +570,7 @@ export default {
         diagnosisLevelId: this.form.diagnosisLevelId,
         isActive:this.form.isActive,
       }
-
+      // console.log('this.form',this.form)
       if(this.form.id){
         postapi(`/api/app/diagnosis/updatediagnosis?id=${this.form.id}`,body).then(res =>{
           if(res.code != -1){