pacs

src/components/doctorCheck/CheckItemList.vue

@@ -29,7 +29,8 @@
       </el-table-column>
       <el-table-column prop="criticalFlag" label="危急" width="40" align="center">
         <template slot-scope="scope">
-          <el-checkbox v-model="scope.row.criticalFlag" size="small" true-label="Y" false-label="N" @change="dialogWin.FollowCriticalCheck = true"/>
+          <el-checkbox v-model="scope.row.criticalFlag" size="small" true-label="Y" false-label="N"
+            @change="dialogWin.FollowCriticalCheck = true" />
         </template>
       </el-table-column>
     </el-table>
@@ -84,8 +85,8 @@
       </el-dialog>
 
       <!--Pacs结果录入模版-->
-      <el-dialog title="Pacs结果录入模版" :visible.sync="dialogWin.PacsTemplate" fullscreen :close-on-click-modal="false">
-        <PacsTemplate />
+      <el-dialog :title="'Pacs结果录入模版 -- ' + doctorCheck.asbitemName" :visible.sync="dialogWin.PacsTemplate" fullscreen :close-on-click-modal="false">
+        <PacsTemplate :refParams="pacsParams" :refFuncOther="handlePacsResult" />
       </el-dialog>
     </div>
   </div>
@@ -142,6 +143,10 @@ export default {
       symbols: [], //特殊符号
       splitSymbols: ['；', '、'],  // 分隔符
       userId: '',
+
+      // pacs 结果录入
+      pacsParams: {},
+
     };
   },
 
@@ -411,7 +416,17 @@ export default {
 
     // pacs结果模板
     btnPacsResult(row, index) {
-      console.log('row, index',row, index)
+      let summary = ''
+
+      this.doctorCheck.checkSummaryList.forEach((e,i) => {
+        summary += e.summary
+      });
+
+      // console.log('row, index,summary', row, index,summary)
+
+      this.pacsParams = {
+        row,index,summary
+      }
       this.dialogWin.PacsTemplate = true
     },
 
@@ -455,6 +470,20 @@ export default {
       this.dialogWinMoreResult = false
     },
 
+    // 处理 pacs 结果录入的情况
+    handlePacsResult(row, index, pacsResult) {
+      // console.log('row,index,pacsResult', row, index, pacsResult)
+      this.doctorCheck.checkItemList[index].result = pacsResult.result
+      this.doctorCheck.checkSummaryList = [{
+        id: Math.random(),
+        registerCheckId: this.doctorCheck.RegisterCheckEdit.id,
+        summary: pacsResult.summary,
+        summaryFlag: 'N',
+      }]
+    },
+
+
+
     //选择项目
     rowClick(row) {
       this.doctorCheck.checkItem = row;

src/components/doctorCheck/PacsTemplate.vue

@@ -54,7 +54,9 @@
       <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="btnClear" class="commonbutton">清除</el-button>
           <el-button type="primary" @click="btnDefault" class="commonbutton">默认结果</el-button>
           <el-button type="primary" @click="btnOk" class="commonbutton">确定</el-button>
@@ -73,7 +75,7 @@ import { getTreePids, getTreeAllChildIdsById, madeTree } from "../../utlis/tree"
 
 export default {
   components: {},
-  props: ["useCustomerOrg", "initDateType", "isUnit"],
+  props: ["refParams", "refFuncOther"],
   data() {
     return {
       filterText: '',
@@ -97,7 +99,7 @@ export default {
   },
   //<el-tree :data="$store.state.customerOrg.ref_tree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
   computed: {
-    ...mapState(["dict", "window", "customerOrg", "patientRegister", "report", "diagnosis", "project"]),
+    ...mapState(["window", "dialogWin"]),
 
     mainHeight() {
       return this.window.pageHeight - 78;
@@ -117,9 +119,17 @@ export default {
   mounted() {
     //获取体检单位列表树信息
     this.getPacsTemplateTree();
+    this.init()
   },
 
   methods: {
+    // 初始化数据
+    init() {      
+      this.btnClear()
+      this.description = []
+      this.result = this.refParams.row.result
+      this.summary = this.refParams.summary || ''
+    },
 
     //树过滤
     filterNode(value, data) {
@@ -156,7 +166,8 @@ export default {
       let ids = getTreeAllChildIdsById(this.pacsTemplateTree, "children", "id", data.id)
       ids.unshift(data.id) // 加入自身节点
 
-      hadoopPost('pacsApi','/api/app/BigtextResultTemplate/GetBigtextResultTemplateDetail', { bigtextResultTemplateIds: ids })
+      // hadoopPost('pacsApi', '/api/app/BigtextResultTemplate/GetBigtextResultTemplateDetail', { bigtextResultTemplateIds: ids })
+      postapi('/api/app/BigtextResultTemplate/GetBigtextResultTemplateDetail', { bigtextResultTemplateIds: ids })
         .then(res => {
           if (res.code > -1) {
             this.newQuery = 0
@@ -183,7 +194,6 @@ export default {
                 })
               }
             });
-
           }
         })
 
@@ -296,18 +306,26 @@ export default {
 
     // 默认结果
     btnDefault() {
-
+      this.btnClear()
+      this.result = this.refParams.row.defaultResult
+      this.summary = '未见异常'
     },
 
     // 确定
     btnOk() {
+      this.refFuncOther(this.refParams.row, this.refParams.index, { result: this.result, summary: this.summary })
       this.dialogWin.PacsTemplate = false
     },
   },
+
   watch: {
     "filterText"(newVal, oldVal) {
       if (newVal != oldVal) this.$refs['ref_tree'].filter(newVal);
-    }
+    },
+
+    "refParams.row.itemId"(newVal, oldVal) {
+      if (newVal != oldVal) this.init();
+    },
   },
 };
 </script>

src/components/doctorCheck/PatientRegisterBase.vue

@@ -182,6 +182,7 @@ export default {
       //触发检查医生诊台相关刷新
       this.dataTransOpts.refresh.register_check.M++
       
+
       //触发总检医生诊台相关刷新
       // console.log('afterFind',rd)
       this.dataTransOpts.refresh.sumDoctor.M++

src/components/doctorCheck/RegisterCheckList.vue

@@ -3,9 +3,8 @@
     <div :style="`overflow-y: scroll;height: ${tableHeight}px;`">
       <el-collapse v-model="activeNames">
         <el-collapse-item v-if="registerCheckList0.length > 0" title="普通检查" name="0">
-          <el-table :data="registerCheckList0" style="width: 100%;" border
-            highlight-current-row @row-click="rowClick" :show-header="false"
-            :row-style="{ height: '28px' }">
+          <el-table :data="registerCheckList0" style="width: 100%;" border highlight-current-row @row-click="rowClick"
+            :show-header="false" :row-style="{ height: '28px' }">
             <el-table-column prop="asbitemName" label="组合项目" width="184">
               <template slot-scope="scope">
                 <div :style="`padding: 0 5px;color: ${setCheckStatusColor(scope.row.completeFlag)};`">
@@ -16,9 +15,8 @@
           </el-table>
         </el-collapse-item>
         <el-collapse-item v-if="registerCheckList1.length > 0" title="检验" name="1">
-          <el-table :data="registerCheckList1" style="width: 100%;" border
-            highlight-current-row @row-click="rowClick" :show-header="false"
-            :row-style="{ height: '28px' }">
+          <el-table :data="registerCheckList1" style="width: 100%;" border highlight-current-row @row-click="rowClick"
+            :show-header="false" :row-style="{ height: '28px' }">
             <el-table-column prop="asbitemName" label="组合项目" width="184">
               <template slot-scope="scope">
                 <div :style="`padding: 0 5px;color: ${setCheckStatusColor(scope.row.completeFlag)};`">
@@ -29,9 +27,8 @@
           </el-table>
         </el-collapse-item>
         <el-collapse-item v-if="registerCheckList2.length > 0" title="特检" name="2">
-          <el-table :data="registerCheckList2" style="width: 100%;" border
-            highlight-current-row @row-click="rowClick" :show-header="false"
-            :row-style="{ height: '28px' }">
+          <el-table :data="registerCheckList2" style="width: 100%;" border highlight-current-row @row-click="rowClick"
+            :show-header="false" :row-style="{ height: '28px' }">
             <el-table-column prop="asbitemName" label="组合项目" width="184">
               <template slot-scope="scope">
                 <div :style="`padding: 0 5px;color: ${setCheckStatusColor(scope.row.completeFlag)};`">
@@ -42,9 +39,8 @@
           </el-table>
         </el-collapse-item>
         <el-collapse-item v-if="registerCheckList3.length > 0" title="放射" name="3">
-          <el-table :data="registerCheckList3" style="width: 100%;" border
-            highlight-current-row @row-click="rowClick" :show-header="false"
-            :row-style="{ height: '28px' }">
+          <el-table :data="registerCheckList3" style="width: 100%;" border highlight-current-row @row-click="rowClick"
+            :show-header="false" :row-style="{ height: '28px' }">
             <el-table-column prop="asbitemName" label="组合项目" width="184">
               <template slot-scope="scope">
                 <div :style="`padding: 0 5px;color: ${setCheckStatusColor(scope.row.completeFlag)};`">
@@ -116,7 +112,7 @@ export default {
 
     //选择组合项目
     rowClick(row) {
-      console.log('rowClick')
+      // console.log('rowClick')
       this.doctorCheck.RegisterCheckId = row.id
       this.doctorCheck.asbitemName = row.asbitemName
       this.doctorCheck.checkRequestNo = row.checkRequestNo
@@ -151,12 +147,17 @@ export default {
               this.doctorCheck.RegisterCheckId = res.data[0].id
               this.dataTransOpts.tableS.register_check.id = res.data[0].id
               
+              this.doctorCheck.asbitemName = res.data[0].asbitemName
+              this.doctorCheck.checkRequestNo = res.data[0].checkRequestNo
+              
               // this.doctorCheck.RegisterCheckEdit = res.data[0]
 
               // this.$refs['doctorCheck_RegisterCheckList'].setCurrentRow(res.data[0])
 
             } else {
               this.dataTransOpts.tableS.register_check.id = ''              
+              this.doctorCheck.asbitemName = ""
+              this.doctorCheck.checkRequestNo = ""
             }
 
             this.dataTransOpts.refresh.register_check.S++   //刷新检查医生
@@ -202,4 +203,3 @@ export default {
   padding: 0 0 0 50px;
 }
 </style>
-  

src/components/occDisease/OccDiseaseConclusion.vue

@@ -5,8 +5,8 @@
     </div>
     <table width="100%">
       <tr>
-        <td width="50%">职业健康检查总结论：</td>
-        <td width="50%">职业健康检查建议：</td>
+        <td width="50%">结论：</td>
+        <td width="50%">建议：</td>
       </tr>
       <tr>
         <td><el-input type="textarea" v-model="dataTransOpts.tableS.patient_occupational_disease.occupationalAbnormal"