diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index dc95fd5..7bf290a 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -85,7 +85,8 @@
       </el-dialog>
 
       <!--Pacs结果录入模版-->
-      <el-dialog :title="'Pacs结果录入模版 -- ' + doctorCheck.asbitemName" :visible.sync="dialogWin.PacsTemplate" fullscreen :close-on-click-modal="false">
+      <el-dialog :title="'Pacs结果录入模版 -- ' + doctorCheck.asbitemName" :visible.sync="dialogWin.PacsTemplate" fullscreen
+        :close-on-click-modal="false">
         <PacsTemplate :refParams="pacsParams" :refFuncOther="handlePacsResult" />
       </el-dialog>
     </div>
@@ -145,7 +146,12 @@ export default {
       userId: '',
 
       // pacs 结果录入
-      pacsParams: {},
+      pacsParams: {
+        row: {},
+        index: 0,
+        result: '',
+        summary: ''
+      },
 
     };
   },
@@ -416,17 +422,19 @@ export default {
 
     // pacs结果模板
     btnPacsResult(row, index) {
+
+      let result = row.result
       let summary = ''
 
-      this.doctorCheck.checkSummaryList.forEach((e,i) => {
+      this.doctorCheck.checkSummaryList.forEach((e, i) => {
         summary += e.summary
       });
 
-      // console.log('row, index,summary', row, index,summary)
-
       this.pacsParams = {
-        row,index,summary
+        row, index, result, summary
       }
+      console.log('this.pacsParams ', this.pacsParams )
+      
       this.dialogWin.PacsTemplate = true
     },
 
diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue
index bd7a35d..98d35e7 100644
--- a/src/components/doctorCheck/CheckPicture.vue
+++ b/src/components/doctorCheck/CheckPicture.vue
@@ -71,15 +71,43 @@
         :closePicUpload="closePicUpload" />
     </el-dialog>
 
-    <el-dialog title="Dcm查看" :visible.sync="dialogDcm" :close-on-click-modal="false" fullscreen>
+    <el-dialog title="Dcm查看" :visible.sync="dialogDcm" :close-on-click-modal="false" fullscreen @close="iframeSrc = ''">
       <div style="display: flex;">
         <div>
-          <iframe :src="iframeSrc" height="600" width="800"></iframe>
+          <iframe :src="iframeSrc" :height="window.pageHeight - 85" :width="window.pageWidth - 260"></iframe>
+        </div>
+        <div style="width: 240px;margin-left: 2px;">
+          <div style="margin-top: 5px;">
+            <span style="color: #232748;">检查结果：</span>
+            <el-input style="width: 100%;border: 1px solid #232748;" type="textarea" v-model="pacsParams.result"
+              :disabled="doctorBtnDisabled('save')" placeholder="请输入描述"
+              :autosize="{ minRows: Math.floor((window.pageHeight - 350) / 24), maxRows: 20 }" />
+          </div>
+          <div style="margin-top: 5px;">
+            <span style="color: #232748;">检查结论：</span>
+            <el-input style="width: 100%;border: 1px solid #232748;" type="textarea" v-model="pacsParams.summary"
+              :disabled="doctorBtnDisabled('save')" placeholder="请输入结论" :autosize="{ minRows: 8, maxRows: 8 }" />
+          </div>
+          <div style="display: flex;justify-content: space-between;margin-top: 10px;">
+            <div></div>
+            <div>
+              <!--
+          <el-button type="primary" @click="btnTest" class="commonbutton">测试</el-button>
+            -->
+              <el-button type="primary" @click="btnChooseBigtext" :disabled="doctorBtnDisabled('save')"
+                class="commonbutton">选择描述</el-button>
+              <el-button type="primary" @click="btnOkBigtext" :disabled="doctorBtnDisabled('save')"
+                class="commonbutton">保存结果</el-button>
+            </div>
+          </div>
         </div>
-        <div></div>
       </div>
     </el-dialog>
-
+    <!--Pacs结果录入模版-->
+    <el-dialog :title="'Pacs结果录入模版 -- ' + doctorCheck.asbitemName" :visible.sync="dialogWin.PacsTemplate" fullscreen
+      :close-on-click-modal="false">
+      <PacsTemplate :refParams="pacsParams" :refFuncOther="handlePacsResult" />
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -90,12 +118,13 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { getPagePriv, checkPagePriv, deepCopy, arrayExistObj } from "../../utlis/proFunc";
 import { hadoopGet, hadoopPost, hadoopPut, hadoopDel } from "../../api/hadoopApi"
 import CheckPictureUpload from "./CheckPictureUpload.vue";
+import PacsTemplate from "./PacsTemplate.vue";
 
 export default {
   components: {
-    CheckPictureUpload,
+    CheckPictureUpload, PacsTemplate
   },
-  props: ["doctorBtnDisabled"],
+  props: ["doctorBtnDisabled", "save"],
   data() {
     return {
       sysConfig: {}, //
@@ -105,6 +134,14 @@ export default {
       },
       dialogDcm: false,
       iframeSrc: '',
+      pacsParams: {
+        row: {},
+        index: 0,
+        result: '',
+        summary: ''
+      },
+
+
       checkPictures: [
         // {
         //   id: "1",
@@ -146,6 +183,7 @@ export default {
     ...mapState([
       "window",
       "dict",
+      "dialogWin",
       "dataTransOpts",
       "doctorCheck",
       "patientRegister",
@@ -303,10 +341,47 @@ export default {
 
     // 浏览Dcm文件
     btnBrowseDcm() {
-      
-      this.iframeSrc = `${this.sysConfig.dcmViewers}/?mrn=24071610696`
+      this.pacsParams.result = this.doctorCheck.checkItemList[0].result
+      let summary = ''
+      this.doctorCheck.checkSummaryList.forEach(e => {
+        summary += e.summary
+      });
+      this.pacsParams.summary = summary
+      this.pacsParams.row = deepCopy(this.doctorCheck.checkItemList[0])
+      this.pacsParams.index = 0
+
+      console.log('pacsParams', this.pacsParams)
+
+      this.iframeSrc = `${this.sysConfig.dcmViewers}/?mrn=${this.doctorCheck.checkRequestNo}`
       this.dialogDcm = true
+
+    },
+
+    // 选择描述与结论
+    btnChooseBigtext() {
+      console.log('this.pacsParams', this.pacsParams)
+      this.dialogWin.PacsTemplate = true
+    },
+
+    // 确定描述与结论
+    btnOkBigtext() {
+      console.log('this.pacsParams', this.pacsParams)
+      this.doctorCheck.checkItemList[0].result = this.pacsParams.result
+      this.doctorCheck.checkSummaryList = [{
+        id: Math.random(),
+        registerCheckId: this.doctorCheck.RegisterCheckEdit.id,
+        summary: this.pacsParams.summary,
+        summaryFlag: 'N',
+      }]
+
+      this.save()
       
+      this.dialogDcm = false
+    },
+
+    // 处理 pacs 结果录入的情况
+    handlePacsResult(row, index, pacsResult) {
+      Object.assign(this.pacsParams, pacsResult)
     },
 
     // 浏览Dcm文件
diff --git a/src/components/doctorCheck/PacsTemplate.vue b/src/components/doctorCheck/PacsTemplate.vue
index 9eba5a1..8b45cd3 100644
--- a/src/components/doctorCheck/PacsTemplate.vue
+++ b/src/components/doctorCheck/PacsTemplate.vue
@@ -102,7 +102,7 @@ export default {
     ...mapState(["window", "dialogWin"]),
 
     mainHeight() {
-      return this.window.pageHeight - 78;
+      return this.window.pageHeight - 118;
     },
 
     tableHeight() {
@@ -127,7 +127,7 @@ export default {
     init() {      
       this.btnClear()
       this.description = []
-      this.result = this.refParams.row.result
+      this.result = this.refParams.result || ''
       this.summary = this.refParams.summary || ''
     },
 
@@ -326,6 +326,20 @@ export default {
     "refParams.row.itemId"(newVal, oldVal) {
       if (newVal != oldVal) this.init();
     },
+
+    "refParams.result"(newVal, oldVal) {
+      if (newVal != oldVal){
+        console.log("refParams.result",newVal, oldVal)
+        this.result = newVal
+      }
+    },
+
+    "refParams.summary"(newVal, oldVal) {
+      if (newVal != oldVal){
+        console.log("refParams.summary",newVal, oldVal)
+        this.summary = newVal
+      }
+    },
   },
 };
 </script>
diff --git a/src/views/common-settings/BigtextResultType.vue b/src/views/common-settings/BigtextResultType.vue
index 8b34f5c..fb2725a 100644
--- a/src/views/common-settings/BigtextResultType.vue
+++ b/src/views/common-settings/BigtextResultType.vue
@@ -102,7 +102,7 @@
           <el-col :span="24">
             <el-form-item label="项目类别" prop="itemTypeId">
               <el-cascader ref="depref" @change="itemTypeIdchang" :show-all-levels="false"
-                v-model="form.itemTypeId" :options="itemtypes" :props="{
+                v-model="form.itemTypeId" :options="itemtypes" filterable :props="{
                   checkStrictly: true,
                   children: 'treeChildren',
                   label: 'displayName',
@@ -430,6 +430,8 @@ export default {
       // Object.assign(this.$data.form, this.$options.data().form);
       this.form = this.$options.data().form;
       this.form.parentId = this.row.bigtextResultTypeId;
+      this.form.itemTypeId = this.row.itemTypeId;
+
       this.dialogVisible = true;
       if (this.$refs.ruleForm !== undefined) {
         this.$refs.ruleForm.resetFields();
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index b3fbe00..df07bd7 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -38,7 +38,7 @@
               </div>
               <div v-if="isCheckPicture" class="demo-image__preview"
                 :style="'margin-top: 2px;margin-left: 2px;height:110px;width:' + (window.pageWidth - 200 - 110 - 45 - 2) + 'px;'">                
-                <CheckPicture :doctorBtnDisabled="doctorBtnDisabled" />                
+                <CheckPicture :doctorBtnDisabled="doctorBtnDisabled" :save="save"/>                
               </div>
               <div :style="'margin-top: 2px;margin-left: 2px;width:' + (window.pageWidth - 200 - 110 - 15 - 2) + 'px;'">
                 
diff --git a/src/views/fee-settings/ResultSetting.vue b/src/views/fee-settings/ResultSetting.vue
index 5269717..bf5c888 100644
--- a/src/views/fee-settings/ResultSetting.vue
+++ b/src/views/fee-settings/ResultSetting.vue
@@ -266,7 +266,7 @@
           <el-col :span="24">
             <el-form-item label="词条模板" prop="bigtextResultTemplateId">
               <el-cascader v-model="formCon.bigtextResultTemplateId" :options="pacsTemplateTree" popper-class="example"
-                ref="bigtextResultTemplateIds" @change="changeTemplate" :props="{
+                ref="bigtextResultTemplateIds" @change="changeTemplateCon" :props="{
                   value: 'id',
                   label: 'displayName',
                   children: 'children',
@@ -653,6 +653,14 @@ export default {
       }
     },
 
+    changeTemplateCon(v) {
+      if (v) {
+        this.formCon.bigtextResultTemplateId = v[v.length - 1]
+      } else {
+        this.formCon.bigtextResultTemplateId = null
+      }
+    },
+
     bindidclose() {
       this.form = this.$options.data().form;
     },