diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index 07aef5b..44b3dc9 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -44,7 +44,7 @@
 
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { arrayExistObj } from "../../utlis/proFunc";
+import { arrayExistObj,parseID } from "../../utlis/proFunc";
 
 import PatientRegisterList from "../doctorCheck/PatientRegisterList.vue";
 export default {
@@ -264,8 +264,9 @@ export default {
             this.sumDoctorCheck.suggestionList.push(pojo);
         },
 
-        //体检报告
+        //复查
         reCheck() {
+            console.log("parseID('123456198007240000')",parseID('123456198007240000'))
             let ret = this.optGrant('reCheck')
             if (ret) {
                 alert(ret)
diff --git a/src/components/sumDoctorCheck/CheckDetails.vue b/src/components/sumDoctorCheck/CheckDetails.vue
index 54ca6ef..c865e2d 100644
--- a/src/components/sumDoctorCheck/CheckDetails.vue
+++ b/src/components/sumDoctorCheck/CheckDetails.vue
@@ -72,9 +72,9 @@ export default {
 
   methods: {
     //获取结果明细
-    CheckDetails(RegisterId) {   
-      console.log(`/api/app/sum-summary-report/detailed-results-list/${RegisterId}`)
-      getapi(`/api/app/sum-summary-report/detailed-results-list/${RegisterId}`)
+    CheckDetails(RegisterId) { 
+      console.log(`/api/app/sumsummaryreport/getdetailedresultslist?PatientRegisterId=${RegisterId}`)
+      getapi(`/api/app/sumsummaryreport/getdetailedresultslist?PatientRegisterId=${RegisterId}`)
         .then((res) => {
           console.log("获取结果明细 CheckDetails", res.data);
           if (res.code != -1) {
diff --git a/src/components/sumDoctorCheck/SumHistory.vue b/src/components/sumDoctorCheck/SumHistory.vue
index 1dcef81..3e65782 100644
--- a/src/components/sumDoctorCheck/SumHistory.vue
+++ b/src/components/sumDoctorCheck/SumHistory.vue
@@ -9,14 +9,14 @@
         </tr>
         <tr height="40">
           <td width="200">检查综述：</td>
-          <td colspan="2">{{ item.sumSummarys }}</td>
+          <td colspan="2" v-html="item.sumSummarys"></td>
         </tr>
         <tr height="40">
           <td width="200">医生建议：</td>
-          <td colspan="2">{{ item.sumSuggestions }}</td>
+          <td colspan="2" v-html="item.sumSuggestions"></td>
         </tr>
       </tbody>
-    </table>    
+    </table>
   </div>
 </template>
 <script lang="ts">
@@ -53,8 +53,8 @@ export default {
     //   "sumSuggestions": "*  乙肝两对半：\n(01)接种疫苗\n*  身高体重：\n(01)减肥、锻炼\n*  血常规：\n(01)注意休息\n*  心电图：\n(01)护眼及注意用眼卫生\n"
     // },    
     SumHistory(patientId) {   
-      console.log(`/api/app/sum-summary-report/historical-review-list/${patientId}`)
-      getapi(`/api/app/sum-summary-report/historical-review-list/${patientId}`)
+      console.log(`/api/app/sumsummaryreport/gethistoricalreviewlist?PatientId=${patientId}`)
+      getapi(`/api/app/sumsummaryreport/gethistoricalreviewlist?PatientId=${patientId}`)
         .then((res) => {
           console.log("获取历次综述 SumHistory", res.data);
           if (res.code != -1) {
@@ -66,6 +66,9 @@ export default {
         });
     },
 
+    lreplaceAll(str){
+      return str.replaceAll('*',"<br/>")
+    },
 
   },
 
diff --git a/src/components/sumDoctorCheck/SumItems.vue b/src/components/sumDoctorCheck/SumItems.vue
index 7e318fe..4dfd2ee 100644
--- a/src/components/sumDoctorCheck/SumItems.vue
+++ b/src/components/sumDoctorCheck/SumItems.vue
@@ -1,10 +1,20 @@
 <template>
   <div style="display: flex;width:100%;">
-    <el-table :data="tableData" width="1000px" height="680" border :row-style="{ height: '40px' }" >
-      <el-table-column prop="itemTypeName" label="项目" width="150"/>
-      <el-table-column v-for="(item,index) of tableCols" :label="item" :prop="item" :key="index" width="200">
-      </el-table-column>
-    </el-table>
+    <div style="display: flex;width:180;">
+      <el-table :data="RegisterCheckList" width="180" height="680" border highlight-current-row
+        :row-style="{ height: '40px' }" :row-class-name="tableRowClassName" @row-click="rowClick">
+        <el-table-column prop="asbitemName" label="组合项目" width="180" />
+      </el-table>
+    </div>
+    <div style="display: flex;width:90%;">
+      <el-table :data="tableData" width="1000px" height="680" border :row-style="{ height: '40px' }">
+        <el-table-column prop="itemName" label="项目" width="150" />
+        <el-table-column prop="unitName" label="单位" width="90" />
+        <el-table-column prop="referenceRangeValue" label="参考范围" width="120" />
+        <el-table-column v-for="(item, index) of tableCols" :label="item" :prop="item" :key="index" width="150">
+        </el-table-column>
+      </el-table>
+    </div>
   </div>
 </template>
 <script lang="ts">
@@ -16,17 +26,17 @@ export default {
   components: {},
   data() {
     return {
-      orgData:[],     //原始的数据，
-      tableData:[],   //显示数据
-      tableRows:[],   //动态行
-      tableCols:[],   //动态列
+      RegisterCheckList: [],
+      tableData: [],   //显示数据
+      tableRows: [],   //动态行
+      tableCols: [],   //动态列
     };
   },
 
   created() { },
 
   //挂载完成
-  mounted() { 
+  mounted() {
 
   },
 
@@ -35,15 +45,54 @@ export default {
   },
 
   methods: {
+    //组合项目颜色标识
+    tableRowClassName({ row, rowIndex }) {
+      //console.log('tableRowClassName',rowIndex,row)
+      if (row.completeFlag === '0') {
+        return 'warning-row'; //未检
+      } else if (row.completeFlag === '2') {
+        return 'refuse-row'; //弃检
+      }
+      return '';      
+    },
+
+    //获取检查组合项目
+    registerCheckList(patientId) {
+      console.log(`/api/app/sumsummaryreport/gethorizontalcomparisonasbitemlist?PatientId=${patientId}`)
+      getapi(`/api/app/sumsummaryreport/gethorizontalcomparisonasbitemlist?PatientId=${patientId}`)
+        .then((res) => {
+          console.log("获取项目对比 SumItems", res.data);
+          if (res.code != -1) {
+            this.RegisterCheckList = res.data;
+            if (res.data.length > 0) this.rowClick(res.data[0])
+          }
+        })
+        .catch((err) => {
+          this.$message({ type: "error", message: `操作失败，原因：${err}` });
+        });
+
+    },
+
+    rowClick(row) {
+      //console.log('row',row) //asbitemId
+      this.SumItems(this.sumDoctorCheck.sumPREdit.patientId, row.asbitemId)
+    },
+
+
+
     //获取结果明细 3a0c6589-9989-4d7f-ba54-61e5b0138220
-    SumItems(patientId) {   
-      console.log(`/api/app/sum-summary-report/item-type-contrast-list/${patientId}`)
-      getapi(`/api/app/sum-summary-report/item-type-contrast-list/${patientId}`)
+    // "itemName": "乙肝表面抗原(HBsAg)",
+    // "unitName": "次/分",
+    // "referenceRangeValue": "",
+    // "checkDate": "2023-07-14",
+    // "resultValue": "阴性"
+    SumItems(patientId, asbitemId) {
+      console.log(`/api/app/sumsummaryreport/gethorizontalcomparisonlist?PatientId=${patientId}&AsbitemId=${asbitemId}`)
+      getapi(`/api/app/sumsummaryreport/gethorizontalcomparisonlist?PatientId=${patientId}&AsbitemId=${asbitemId}`)
         .then((res) => {
           console.log("获取项目对比 SumItems", res.data);
           if (res.code != -1) {
-            this.orgData = res.data;
-            this.crossTable(this.orgData);
+            this.crossTable(res.data);
           }
         })
         .catch((err) => {
@@ -52,41 +101,45 @@ export default {
     },
 
     //交叉报表
-    // "itemTypeName": "一般检查",
-    // "registerDate": "2023-07-14",
-    // "summarys": "身高体重:重度肥胖"
-    crossTable(tableData){
-      this.tableData=[]   //显示数据
-      this.tableRows=[]   //动态行
-      this.tableCols=[]   //动态列
-
-      console.log('tableData',tableData)
+
+    crossTable(tableData) {
+      this.tableData = []   //显示数据
+      this.tableRows = []   //动态行
+      this.tableCols = []   //动态列
+
+      console.log('tableData', tableData)
       tableData.forEach(e => {
-        if(this.tableRows.indexOf(e.itemTypeName) == - 1) this.tableRows.push(e.itemTypeName)
-        if(this.tableCols.indexOf(e.registerDate) == - 1) this.tableCols.push(e.registerDate)
+        if (this.tableRows.indexOf(e.itemName) == - 1) this.tableRows.push(e.itemName)
+        if (this.tableCols.indexOf(e.checkDate) == - 1) this.tableCols.push(e.checkDate)
       });
       this.tableCols.sort();
 
       this.tableRows.forEach(r => {
         let item = {}
-        let summarys = ''
-        item['itemTypeName'] = r
+        let resultValue = ''
+        item['itemName'] = r
         this.tableCols.forEach(c => {
-          for(let i=0;i<tableData.length;i++){
-            if(tableData[i].itemTypeName == r && tableData[i].registerDate == c){
-              summarys = tableData[i].summarys
+          for (let i = 0; i < tableData.length; i++) {
+            if (tableData[i].itemName == r) {
+              item['unitName'] = tableData[i].unitName
+              item['referenceRangeValue'] = tableData[i].referenceRangeValue
+            }
+            if (tableData[i].itemName == r && tableData[i].checkDate == c) {
+              resultValue = tableData[i].resultValue
               break;
             }
           }
-          item[c] = summarys
+          item[c] = resultValue
         });
         this.tableData.push(item)
       });
-      console.log('this.tableRows',this.tableRows)
-      console.log('this.tableCols',this.tableCols)
-      console.log('this.tableData',this.tableData)
-    }
-    
+      console.log('this.tableRows', this.tableRows)
+      console.log('this.tableCols', this.tableCols)
+      console.log('this.tableData', this.tableData)
+    },
+
+
+
   },
 
   //监听事件
@@ -95,7 +148,7 @@ export default {
     "sumDoctorCheck.sumPREdit.patientId"(newVal, oldVal) {
       console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal);
       if (newVal != oldVal && newVal != '') {
-        this.SumItems(newVal)        
+        this.registerCheckList(newVal)
       }
     },
   },
diff --git a/src/components/sumDoctorCheck/SumItemsType.vue b/src/components/sumDoctorCheck/SumItemsType.vue
new file mode 100644
index 0000000..917c799
--- /dev/null
+++ b/src/components/sumDoctorCheck/SumItemsType.vue
@@ -0,0 +1,110 @@
+<template>
+  <div style="display: flex;width:100%;">
+    <el-table :data="tableData" width="1000px" height="680" border :row-style="{ height: '40px' }" >
+      <el-table-column prop="itemTypeName" label="项目" width="150"/>
+      <el-table-column v-for="(item,index) of tableCols" :label="item" :prop="item" :key="index" width="200">
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script lang="ts">
+import { mapState } from 'vuex';
+import Sortable from "sortablejs";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { arrayExistObj } from '@/utlis/proFunc';
+export default {
+  components: {},
+  data() {
+    return {
+      orgData:[],     //原始的数据，
+      tableData:[],   //显示数据
+      tableRows:[],   //动态行
+      tableCols:[],   //动态列
+    };
+  },
+
+  created() { },
+
+  //挂载完成
+  mounted() { 
+
+  },
+
+  computed: {
+    ...mapState(['dict', 'doctorCheck', 'sumDoctorCheck']),
+  },
+
+  methods: {
+    //获取结果明细 3a0c6589-9989-4d7f-ba54-61e5b0138220
+    SumItems(patientId) {  
+      console.log(`/api/app/sumsummaryreport/getitemtypecontrastlist?PatientId=${patientId}`)
+      getapi(`/api/app/sumsummaryreport/getitemtypecontrastlist?PatientId=${patientId}`)
+        .then((res) => {
+          console.log("获取项目对比 SumItems", res.data);
+          if (res.code != -1) {
+            this.orgData = res.data;
+            this.crossTable(this.orgData);
+          }
+        })
+        .catch((err) => {
+          this.$message({ type: "error", message: `操作失败，原因：${err}` });
+        });
+    },
+
+    //交叉报表
+    // "itemTypeName": "一般检查",
+    // "registerDate": "2023-07-14",
+    // "summarys": "身高体重:重度肥胖"
+    crossTable(tableData){
+      this.tableData=[]   //显示数据
+      this.tableRows=[]   //动态行
+      this.tableCols=[]   //动态列
+
+      console.log('tableData',tableData)
+      tableData.forEach(e => {
+        if(this.tableRows.indexOf(e.itemTypeName) == - 1) this.tableRows.push(e.itemTypeName)
+        if(this.tableCols.indexOf(e.registerDate) == - 1) this.tableCols.push(e.registerDate)
+      });
+      this.tableCols.sort();
+
+      this.tableRows.forEach(r => {
+        let item = {}
+        let summarys = ''
+        item['itemTypeName'] = r
+        this.tableCols.forEach(c => {
+          for(let i=0;i<tableData.length;i++){
+            if(tableData[i].itemTypeName == r && tableData[i].registerDate == c){
+              summarys = tableData[i].summarys
+              break;
+            }
+          }
+          item[c] = summarys
+        });
+        this.tableData.push(item)
+      });
+      console.log('this.tableRows',this.tableRows)
+      console.log('this.tableCols',this.tableCols)
+      console.log('this.tableData',this.tableData)
+    }
+    
+  },
+
+  //监听事件
+  watch: {
+    //检查项目切换
+    "sumDoctorCheck.sumPREdit.patientId"(newVal, oldVal) {
+      console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal);
+      if (newVal != oldVal && newVal != '') {
+        this.SumItems(newVal)        
+      }
+    },
+  },
+};
+</script>
+<style scoped>
+::v-deep .el-table td.el-table__cell,
+.el-table th.el-table__cell.is-leaf {
+  padding: 0;
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/utlis/proFunc.js b/src/utlis/proFunc.js
index 6744b28..e5c6f78 100644
--- a/src/utlis/proFunc.js
+++ b/src/utlis/proFunc.js
@@ -120,3 +120,38 @@ exports.arrayExistObj = function (arr, key, value) {
   return ret
 }
 
+//根据身份证号判断出生日期（yyyy-MM-DD），当前年龄与性别 粗犷式，不精确判断闰年平年
+exports.parseID = function (id) {
+  let yearInMs = 1000 * 60 * 60 * 24 * 365.2425;
+  let ret = {
+    birthday:'',
+    age:-1,
+    sex:'U',
+  }
+  if(!id || id.length != 18) return ret
+  if(id.substring(10,12).parseInt > 12 || id.substring(10,12).parseInt == 0) return ret
+  if(id.substring(12,14).parseInt > 31 || id.substring(12,14).parseInt == 0) return ret
+
+  //出生日期
+  ret.birthday = id.substring(6,10) + '-' + id.substring(10,12) + '-' + id.substring(12,14)
+
+  //年龄
+  ret.age = Math.floor((new Date().getTime() - new Date(ret.birthday).getTime())/yearInMs)
+
+  //奇数 男， 偶数 女
+  if(id.substring(16,17)%2 == 0){
+    ret.sex = 'F'
+  }else{
+    ret.sex = 'M'
+  }
+ 
+  return ret
+}
+
+//根据出生日期，计算当前年龄 粗犷式，不精确判断闰年平年
+exports.birthdayToAge = function (birthday)  {
+  let yearInMs = 1000 * 60 * 60 * 24 * 365.2425;
+  //年龄
+  return Math.floor((new Date().getTime() - new Date(birthday).getTime())/yearInMs) 
+}
+
diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue
index d1d9fa8..c056ffc 100644
--- a/src/views/doctorCheck/sumDoctorCheck.vue
+++ b/src/views/doctorCheck/sumDoctorCheck.vue
@@ -25,10 +25,10 @@
                       
                   </el-tab-pane>
                   <el-tab-pane label="项目对比" name="4">
-                      <SumItems/>
+                      <SumItemsType/>
                   </el-tab-pane>
                   <el-tab-pane label="横向对比" name="5">
-                      
+                    <SumItems/>
                   </el-tab-pane>
                   <el-tab-pane label="历次综述" name="6">
                       <SumHistory/>
@@ -50,6 +50,7 @@ import ButtonList from "../../components/sumDoctorCheck/ButtonList.vue";
 import SumSug from "../../components/sumDoctorCheck/SumSug.vue";
 import SumPREdit from "../../components/sumDoctorCheck/SumPREdit.vue";
 import CheckDetails from "../../components/sumDoctorCheck/CheckDetails.vue";
+import SumItemsType from "../../components/sumDoctorCheck/SumItemsType.vue";
 import SumItems from "../../components/sumDoctorCheck/SumItems.vue";
 import SumHistory from "../../components/sumDoctorCheck/SumHistory.vue";
 export default {
@@ -59,6 +60,7 @@ export default {
     SumSug,
     SumPREdit,
     CheckDetails,
+    SumItemsType,
     SumItems,
     SumHistory,
   },