From 48d56c0780ddcd28a19f306064e1dd21f0c425c0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 11 三月 2024 18:23:23 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml |   71 +++++++++++++++++++++++------------
 1 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
index 507efb9..6bb212e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -22,6 +22,7 @@
         <result property="reallocationreason" column="ReallocationReason"/>
         <result property="transplantdoct" column="TransplantDoct"/>
         <result property="transplanttime" column="TransplantTime"/>
+        <result property="estimatedtime" column="EstimatedTime"/>
         <result property="isbiopsybefore" column="IsBiopsyBefore"/>
         <result property="isbiopsyafter" column="IsBiopsyAfter"/>
         <result property="ismarginalorgan" column="IsMarginalOrgan"/>
@@ -33,33 +34,42 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
-        <result property="applicantUserID" column="ApplicantUserID"/>
-        <result property="applicantUserName" column="ApplicantUserName"/>
-        <result property="applicantTime" column="ApplicantTime"/>
-        <result property="checkUserID" column="CheckUserID"/>
-        <result property="checkUserName" column="CheckUserName"/>
-        <result property="checkTime" column="CheckTime"/>
-        <result property="checkSuggestion" column="CheckSuggestion"/>
-        <result property="allocationStatus" column="AllocationStatus"/>
+        <result property="applicantuserid" column="ApplicantUserID"/>
+        <result property="applicantusername" column="ApplicantUserName"/>
+        <result property="applicanttime" column="ApplicantTime"/>
+        <result property="checkuserid" column="CheckUserID"/>
+        <result property="caseno" column="CaseNo"/>
+        <result property="checkusername" column="CheckUserName"/>
+        <result property="checktime" column="CheckTime"/>
+        <result property="checksuggestion" column="CheckSuggestion"/>
+        <result property="allocationstatus" column="AllocationStatus"/>
         <result property="name" column="Name"/>
-        <result property="sexOMMENT" column="SexOMMENT"/>
-        <result property="idCardType" column="IDCardType"/>
-        <result property="idCardNo" column="IDCardNo"/>
+        <result property="sex" column="Sex"/>
+        <result property="idcardtype" column="IDCardType"/>
+        <result property="idcardno" column="IDCardNo"/>
         <result property="age" column="Age"/>
-        <result property="ageUnit" column="AgeUnit"/>
+        <result property="ageunit" column="AgeUnit"/>
         <result property="birthday" column="Birthday"/>
         <result property="phone" column="Phone"/>
-        <result property="residenceAddress" column="ResidenceAddress"/>
-        <result property="residenceProvince" column="ResidenceProvince"/>
-        <result property="residenceProvinceName" column="ResidenceProvinceName"/>
-        <result property="residenceCity" column="ResidenceCity"/>
-        <result property="residenceCityName" column="ResidenceCityName"/>
-        <result property="residenceTown" column="ResidenceTown"/>
-        <result property="residenceTownName" column="ResidenceTownName"/>
-        <result property="residenceCommunity" column="ResidenceCommunity"/>
-        <result property="residenceCommunityName" column="ResidenceCommunityName"/>
-        <result property="residenceCountyCode" column="ResidenceCountyCode"/>
-        <result property="residenceCountyName" column="ResidenceCountyName"/>
+        <result property="residenceaddress" column="ResidenceAddress"/>
+        <result property="residenceprovince" column="ResidenceProvince"/>
+        <result property="residenceprovincename" column="ResidenceProvinceName"/>
+        <result property="residencecity" column="ResidenceCity"/>
+        <result property="residencecityname" column="ResidenceCityName"/>
+        <result property="residencetown" column="ResidenceTown"/>
+        <result property="residencetownname" column="ResidenceTownName"/>
+        <result property="residencecommunity" column="ResidenceCommunity"/>
+        <result property="residencecommunityname" column="ResidenceCommunityName"/>
+        <result property="residencecountycode" column="ResidenceCountyCode"/>
+        <result property="residencecountyname" column="ResidenceCountyName"/>
+        <result property="organcharge" column="organcharge"/>
+        <result property="organchargeoperator" column="organchargeoperator"/>
+        <result property="organchargedate" column="organchargedate"/>
+        <result property="organamount" column="organamount"/>
+        <result property="chargestate" column="chargestate"/>
+        <result property="organchargedesc" column="organchargedesc"/>
+        <result property="notgetreason" column="notgetreason"/>
+        <result property="transplantstate" column="transplantstate"/>
     </resultMap>
 
     <sql id="selectServiceDonateorganVo">
@@ -71,6 +81,7 @@
                OrganState,
                OrganNumber,
                OrganGetTime,
+               CaseNo,
                OrganGetDoct,
                GainHospitalNo,
                GainHospitalName,
@@ -102,8 +113,9 @@
                CheckTime,
                CheckSuggestion,
                AllocationStatus,
+               EstimatedTime,
                Name,
-               SexOMMENT,
+               Sex,
                IDCardType,
                IDCardNo,
                Age,
@@ -120,7 +132,15 @@
                ResidenceCommunity,
                ResidenceCommunityName,
                ResidenceCountyCode,
-               ResidenceCountyName
+               ResidenceCountyName,
+               organcharge,
+               organchargeoperator,
+               organchargedate,
+               organamount,
+               chargestate,
+               organchargedesc,
+               notgetreason,
+               transplantstate
         from service_donateorgan
     </sql>
 
@@ -135,6 +155,7 @@
             <if test="organstate != null ">and OrganState = #{organstate}</if>
             <if test="organnumber != null  and organnumber != ''">and OrganNumber = #{organnumber}</if>
             <if test="organgettime != null ">and OrganGetTime = #{organgettime}</if>
+            <if test="estimatedtime != null ">and EstimatedTime = #{estimatedtime}</if>
             <if test="organgetdoct != null  and organgetdoct != ''">and OrganGetDoct = #{organgetdoct}</if>
             <if test="gainhospitalno != null  and gainhospitalno != ''">and GainHospitalNo = #{gainhospitalno}</if>
             <if test="gainhospitalname != null  and gainhospitalname != ''">and GainHospitalName like concat('%',

--
Gitblit v1.9.3