From 785310c565529336e3f23418655ab445038e57f8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 22 九月 2023 17:08:15 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java | 186 ++++++++++++++--
ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java | 2
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml | 419 ++++++++++++++++++++++++-------------
3 files changed, 429 insertions(+), 178 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java
index 1669734..846a0a0 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java
@@ -12,7 +12,7 @@
import java.util.List;
/**
- * 鍔冲姟鎶ラ叕涓◣璁＄畻瑙勫垯 (鍙兘涓嶇瓟鍏叡鐢ㄦ硶锛岀敤鍓嶅厛鐪嬬湅鏄惁閫傚悎)
+ * 鍔冲姟鎶ラ叕涓◣璁＄畻瑙勫垯 (鍙兘涓嶉�傚悎鍏叡鐢ㄦ硶锛岀敤鍓嶅厛鐪嬬湅鏄惁閫傚悎)
*
* @author ls
*/
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
index 21cbdad..7cc1686 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
@@ -1,146 +1,274 @@
package com.ruoyi.project.domain;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+
/**
* 鎹愮尞鍣ㄥ畼绠＄悊瀵硅薄 service_donateorgan
- *
+ *
* @author ruoyi
* @date 2021-11-10
*/
@Data
@ApiModel("鎹愮尞鍣ㄥ畼绠＄悊")
-public class ServiceDonateorgan extends BaseEntity
-{
+public class ServiceDonateorgan extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 鍏宠仈service_donatebaseinfo琛ㄧ殑ID */
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
@ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
private Long infoid;
- /** 鎹愮尞鑰呯紪鍙� */
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
@ApiModelProperty("鎹愮尞鑰呯紪鍙�")
@Excel(name = "鎹愮尞鑰呯紪鍙�")
private String donorno;
- /** 鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ */
- @ApiModelProperty("鍣ㄥ畼绫诲埆")
+ /**
+ * 鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ
+ */
+ @ApiModelProperty("鍣ㄥ畼绫诲埆")
@Excel(name = "鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ")
private String organno;
- /** 鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ */
+ /**
+ * 鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ
+ */
@ApiModelProperty("鍣ㄥ畼绫诲埆鍚嶇О")
@Excel(name = "鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ")
private String organname;
- /** 鍣ㄥ畼鐘舵�� 1锛氶鐧昏 2锛氬凡鑾峰彇 3锛氬垎閰嶇櫥璁� 4锛氬垎閰嶅鏍革紙宸插垎閰嶏級 4锛氳繍杈撲腑 5锛氬凡绉绘 */
+ /**
+ * 鍣ㄥ畼鐘舵�� 1锛氶鐧昏 2锛氬凡鑾峰彇 3锛氬垎閰嶇櫥璁� 4锛氬垎閰嶅鏍革紙宸插垎閰嶏級 4锛氳繍杈撲腑 5锛氬凡绉绘
+ */
@Excel(name = "鍣ㄥ畼鐘舵�� 1锛氶鐧昏 2锛氬凡鑾峰彇 3锛氬垎閰嶇櫥璁� 4锛氬垎閰嶅鏍�", readConverterExp = "宸插垎閰�")
@ApiModelProperty("鍣ㄥ畼鐘舵��")
private String organstate;
- /** 鍣ㄥ畼缂栧彿 瑙佽瘉鐧昏鍚庣敓鎴� */
+ /**
+ * 鍣ㄥ畼缂栧彿 瑙佽瘉鐧昏鍚庣敓鎴�
+ */
@ApiModelProperty("鍣ㄥ畼缂栧彿")
@Excel(name = "鍣ㄥ畼缂栧彿 瑙佽瘉鐧昏鍚庣敓鎴�")
private String organnumber;
- /** 鍣ㄥ畼鑾峰彇鏃堕棿 */
+ /**
+ * 鍣ㄥ畼鑾峰彇鏃堕棿
+ */
@ApiModelProperty("鍣ㄥ畼鑾峰彇鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鍣ㄥ畼鑾峰彇鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date organgettime;
- /** 鍖荤敓濮撳悕 */
+ /**
+ * 鍖荤敓濮撳悕
+ */
@ApiModelProperty("鍖荤敓濮撳悕")
@Excel(name = "鍖荤敓濮撳悕")
private String organgetdoct;
- /** 鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛� */
+ /**
+ * 鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�
+ */
@ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿")
@Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
private String gainhospitalno;
- /** 鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛� */
+ /**
+ * 鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�
+ */
@ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О")
@Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
private String gainhospitalname;
- /** 鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛� */
+ /**
+ * 鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�
+ */
@ApiModelProperty("鍣ㄥ畼绉绘鏈烘瀯缂栧彿")
@Excel(name = "鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
private String transplanthospitalno;
- /** 鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛� */
+ /**
+ * 鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�
+ */
@ApiModelProperty("鍣ㄥ畼绉绘鏈烘瀯鍚嶇О")
@Excel(name = "鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
private String transplanthospitalname;
- /** 绉绘鍖荤敓 */
+ /**
+ * 绉绘鍖荤敓
+ */
@ApiModelProperty("绉绘鍖荤敓")
@Excel(name = "绉绘鍖荤敓")
private String transplantdoct;
- /** 绉绘鏃堕棿 */
+ /**
+ * 绉绘鏃堕棿
+ */
@ApiModelProperty("绉绘鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "绉绘鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date transplanttime;
- /** 鏄惁鑾峰彇鍓嶆椿妫� */
+ /**
+ * 鏄惁鑾峰彇鍓嶆椿妫�
+ */
@ApiModelProperty("鏄惁鑾峰彇鍓嶆椿妫�")
@Excel(name = "鏄惁鑾峰彇鍓嶆椿妫�")
private String isbiopsybefore;
- /** 鏄惁鑾峰彇鍚庢椿妫� */
+ /**
+ * 鏄惁鑾峰彇鍚庢椿妫�
+ */
@ApiModelProperty("鏄惁鑾峰彇鍚庢椿妫�")
@Excel(name = "鏄惁鑾峰彇鍚庢椿妫�")
private String isbiopsyafter;
- /** 鏄惁杈圭紭鍣ㄥ畼 */
+ /**
+ * 鏄惁杈圭紭鍣ㄥ畼
+ */
@ApiModelProperty("鏄惁杈圭紭鍣ㄥ畼")
@Excel(name = "鏄惁杈圭紭鍣ㄥ畼")
private String ismarginalorgan;
- /** 鏄惁鐥呭師鑿岄槼鎬� */
+ /**
+ * 鏄惁鐥呭師鑿岄槼鎬�
+ */
@ApiModelProperty("鏄惁鐥呭師鑿岄槼鎬�")
@Excel(name = "鏄惁鐥呭師鑿岄槼鎬�")
private String ispathogenpositive;
- /** 鏄惁鍘熷彂鎬ф棤鍔熻兘 */
+ /**
+ * 鏄惁鍘熷彂鎬ф棤鍔熻兘
+ */
@ApiModelProperty("鏄惁鍘熷彂鎬ф棤鍔熻兘")
@Excel(name = "鏄惁鍘熷彂鎬ф棤鍔熻兘")
private String ispnf;
- /** 鏄惁鍔熻兘寤惰繜鎬ф仮澶� */
+ /**
+ * 鏄惁鍔熻兘寤惰繜鎬ф仮澶�
+ */
@ApiModelProperty("鏄惁鍔熻兘寤惰繜鎬ф仮澶�")
@Excel(name = "鏄惁鍔熻兘寤惰繜鎬ф仮澶�")
private String isdgf;
- /** 寮冪敤鍘熷洜 */
+ /**
+ * 寮冪敤鍘熷洜
+ */
@ApiModelProperty("寮冪敤鍘熷洜")
@Excel(name = "寮冪敤鍘熷洜")
private String abandonreason;
- /** 閲嶆柊鍒嗛厤鍘熷洜 */
+ /**
+ * 閲嶆柊鍒嗛厤鍘熷洜
+ */
@ApiModelProperty("閲嶆柊鍒嗛厤鍘熷洜")
@Excel(name = "閲嶆柊鍒嗛厤鍘熷洜")
private String reallocationreason;
+ @ApiModelProperty("鐢宠浜虹紪鍙�")
+ private String applicantUserID;
+
+ @ApiModelProperty("鐢宠浜哄鍚�")
+ private String applicantUserName;
+
+ @ApiModelProperty("鐢宠鏃堕棿")
+ private Date applicantTime;
+
+ @ApiModelProperty("瀹℃牳浜虹紪鍙�")
+ private String checkUserID;
+
+ @ApiModelProperty("瀹℃牳浜哄鍚�")
+ private String checkUserName;
+
+ @ApiModelProperty("瀹℃牳鏃堕棿")
+ private Date checkTime;
+
+ @ApiModelProperty("瀹℃牳鎰忚")
+ private String checkSuggestion;
+
+
+ @ApiModelProperty("0:鎻愪氦鍒嗛厤锛�1锛氬鏍搁�氳繃锛�2锛氬鏍告嫆缁�")
+ private Integer allocationStatus;
+
+ @ApiModelProperty("绉绘浜哄鍚�")
+ private String name;
+
+ @ApiModelProperty("绉绘浜烘�у埆 鏍规嵁瀛楀吀sys_user_sex")
+ private Integer sexOMMENT;
+
+ @ApiModelProperty("绉绘浜鸿瘉浠剁被鍨� 鏍规嵁瀛楀吀sys_IDType")
+ private Integer idCardType;
+
+ @ApiModelProperty("绉绘浜鸿瘉浠跺彿鐮�")
+ private String idCardNo;
+
+ @ApiModelProperty("绉绘浜哄勾榫�")
+ private Integer age;
+
+ @ApiModelProperty("绉绘浜哄勾榫勫崟浣� 鏍规嵁瀛楀吀sys_AgeUnit")
+ private String ageUnit;
+
+ @ApiModelProperty("绉绘浜哄嚭鐢熸棩鏈�")
+ private String birthday;
+
+ @ApiModelProperty("绉绘浜鸿仈绯荤數璇�")
+ private String phone;
+
+ @ApiModelProperty("绉绘浜虹幇浣忓湴鍧�")
+ private String residenceAddress;
+
+ @ApiModelProperty("绉绘浜虹幇浣忓湴鍧�鐪佷唬鐮�")
+ private String residenceProvince;
+
+ @ApiModelProperty("绉绘浜虹幇浣忓湴鍧�鐪佸悕绉�")
+ private String residenceProvinceName;
+
+ @ApiModelProperty("绉绘浜哄競缂栧彿 鏍规嵁琛屾斂鍖哄垝琛�")
+ private String residenceCity;
+
+ @ApiModelProperty("绉绘浜哄競鍚嶇О")
+ private String residenceCityName;
+
+ @ApiModelProperty("绉绘浜烘墍灞炶閬擄紙闀囷級鏍规嵁琛屾斂鍖哄垝琛�")
+ private String residenceTown;
+
+ @ApiModelProperty("绉绘浜烘墍灞炶閬擄紙闀囷級鍚嶇О")
+ private String residenceTownName;
+
+ @ApiModelProperty("绉绘浜虹ぞ鍖猴紙鏉戯級缂栧彿 鏍规嵁琛屾斂鍖哄垝琛�")
+ private String residenceCommunity;
+
+ @ApiModelProperty("绉绘浜虹ぞ鍖猴紙鏉戯級鍚嶇О")
+ private String residenceCommunityName;
+
+ @ApiModelProperty("绉绘浜烘墍灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
+ private String residenceCountyCode;
+
+ @ApiModelProperty("绉绘浜烘墍灞炲尯鍩熷悕绉�")
+ private String residenceCountyName;
+
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
index b903c57..507efb9 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -1,69 +1,161 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDonateorganMapper">
-
+
<resultMap type="com.ruoyi.project.domain.ServiceDonateorgan" id="ServiceDonateorganResult">
- <result property="id" column="ID" />
- <result property="infoid" column="InfoID" />
- <result property="donorno" column="DonorNo" />
- <result property="organno" column="OrganNo" />
- <result property="organname" column="OrganName" />
- <result property="organstate" column="OrganState" />
- <result property="organnumber" column="OrganNumber" />
- <result property="organgettime" column="OrganGetTime" />
- <result property="organgetdoct" column="OrganGetDoct" />
- <result property="gainhospitalno" column="GainHospitalNo" />
- <result property="gainhospitalname" column="GainHospitalName" />
- <result property="transplanthospitalno" column="TransplantHospitalNo" />
- <result property="transplanthospitalname" column="TransplantHospitalName" />
- <result property="abandonreason" column="AbandonReason" />
- <result property="reallocationreason" column="ReallocationReason" />
- <result property="transplantdoct" column="TransplantDoct" />
- <result property="transplanttime" column="TransplantTime" />
- <result property="isbiopsybefore" column="IsBiopsyBefore" />
- <result property="isbiopsyafter" column="IsBiopsyAfter" />
- <result property="ismarginalorgan" column="IsMarginalOrgan" />
- <result property="ispathogenpositive" column="IsPathogenPositive" />
- <result property="ispnf" column="IsPNF" />
- <result property="isdgf" column="IsDGF" />
- <result property="del_flag" column="del_flag" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
+ <result property="id" column="ID"/>
+ <result property="infoid" column="InfoID"/>
+ <result property="donorno" column="DonorNo"/>
+ <result property="organno" column="OrganNo"/>
+ <result property="organname" column="OrganName"/>
+ <result property="organstate" column="OrganState"/>
+ <result property="organnumber" column="OrganNumber"/>
+ <result property="organgettime" column="OrganGetTime"/>
+ <result property="organgetdoct" column="OrganGetDoct"/>
+ <result property="gainhospitalno" column="GainHospitalNo"/>
+ <result property="gainhospitalname" column="GainHospitalName"/>
+ <result property="transplanthospitalno" column="TransplantHospitalNo"/>
+ <result property="transplanthospitalname" column="TransplantHospitalName"/>
+ <result property="abandonreason" column="AbandonReason"/>
+ <result property="reallocationreason" column="ReallocationReason"/>
+ <result property="transplantdoct" column="TransplantDoct"/>
+ <result property="transplanttime" column="TransplantTime"/>
+ <result property="isbiopsybefore" column="IsBiopsyBefore"/>
+ <result property="isbiopsyafter" column="IsBiopsyAfter"/>
+ <result property="ismarginalorgan" column="IsMarginalOrgan"/>
+ <result property="ispathogenpositive" column="IsPathogenPositive"/>
+ <result property="ispnf" column="IsPNF"/>
+ <result property="isdgf" column="IsDGF"/>
+ <result property="del_flag" column="del_flag"/>
+ <result property="createBy" column="create_by"/>
+ <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="name" column="Name"/>
+ <result property="sexOMMENT" column="SexOMMENT"/>
+ <result property="idCardType" column="IDCardType"/>
+ <result property="idCardNo" column="IDCardNo"/>
+ <result property="age" column="Age"/>
+ <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"/>
</resultMap>
<sql id="selectServiceDonateorganVo">
- select ID, InfoID, DonorNo, OrganNo, OrganName, OrganState, OrganNumber, OrganGetTime, OrganGetDoct, GainHospitalNo, GainHospitalName, TransplantHospitalNo, TransplantHospitalName, TransplantDoct, TransplantTime, AbandonReason, ReallocationReason, IsBiopsyBefore, IsBiopsyAfter, IsMarginalOrgan, IsPathogenPositive, IsPNF, IsDGF, del_flag, create_by, create_time, update_by, update_time from service_donateorgan
+ select ID,
+ InfoID,
+ DonorNo,
+ OrganNo,
+ OrganName,
+ OrganState,
+ OrganNumber,
+ OrganGetTime,
+ OrganGetDoct,
+ GainHospitalNo,
+ GainHospitalName,
+ TransplantHospitalNo,
+ TransplantHospitalName,
+ TransplantDoct,
+ TransplantTime,
+ AbandonReason,
+ ReallocationReason,
+ IsBiopsyBefore,
+ IsBiopsyAfter,
+ IsMarginalOrgan,
+ IsPathogenPositive,
+ IsPNF,
+ IsDGF,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ ApplicantUserID,
+ ApplicantUserName,
+ ApplicantTime,
+ CheckUserID,
+ ApplicantUserName,
+ ApplicantTime,
+ CheckUserID,
+ CheckUserName,
+ CheckTime,
+ CheckSuggestion,
+ AllocationStatus,
+ Name,
+ SexOMMENT,
+ IDCardType,
+ IDCardNo,
+ Age,
+ AgeUnit,
+ Birthday,
+ Phone,
+ ResidenceAddress,
+ ResidenceProvince,
+ ResidenceProvinceName,
+ ResidenceCity,
+ ResidenceCityName,
+ ResidenceTown,
+ ResidenceTownName,
+ ResidenceCommunity,
+ ResidenceCommunityName,
+ ResidenceCountyCode,
+ ResidenceCountyName
+ from service_donateorgan
</sql>
- <select id="selectServiceDonateorganList" parameterType="com.ruoyi.project.domain.ServiceDonateorgan" resultMap="ServiceDonateorganResult">
+ <select id="selectServiceDonateorganList" parameterType="com.ruoyi.project.domain.ServiceDonateorgan"
+ resultMap="ServiceDonateorganResult">
<include refid="selectServiceDonateorganVo"/>
<where>
- <if test="infoid != null "> and InfoID = #{infoid}</if>
- <if test="donorno != null and donorno != ''"> and DonorNo = #{donorno}</if>
- <if test="organno != null and organno != ''"> and OrganNo = #{organno}</if>
- <if test="organname != null and organname != ''"> and OrganName like concat('%', #{organname}, '%')</if>
- <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="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('%', #{gainhospitalname}, '%')</if>
- <if test="transplanthospitalno != null and transplanthospitalno != ''"> and TransplantHospitalNo = #{transplanthospitalno}</if>
- <if test="transplanthospitalname != null and transplanthospitalname != ''"> and TransplantHospitalName like concat('%', #{transplanthospitalname}, '%')</if>
- <if test="transplantdoct != null and transplantdoct != ''"> and TransplantDoct = #{transplantdoct}</if>
- <if test="transplanttime != null "> and TransplantTime = #{transplanttime}</if>
- <if test="abandonreason != null "> and AbandonReason = #{abandonreason}</if>
- <if test="reallocationreason != null "> and ReallocationReason = #{reallocationreason}</if>
- <if test="isbiopsybefore != null "> and IsBiopsyBefore = #{isbiopsybefore}</if>
- <if test="isbiopsyafter != null "> and IsBiopsyAfter = #{isbiopsyafter}</if>
- <if test="ismarginalorgan != null "> and IsMarginalOrgan = #{ismarginalorgan}</if>
- <if test="ispathogenpositive != null "> and IsPathogenPositive = #{ispathogenpositive}</if>
- <if test="ispnf != null "> and IsPNF = #{ispnf}</if>
- <if test="isdgf != null "> and isDGF = #{isdgf}</if>
+ <if test="infoid != null ">and InfoID = #{infoid}</if>
+ <if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
+ <if test="organno != null and organno != ''">and OrganNo = #{organno}</if>
+ <if test="organname != null and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>
+ <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="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('%',
+ #{gainhospitalname}, '%')
+ </if>
+ <if test="transplanthospitalno != null and transplanthospitalno != ''">and TransplantHospitalNo =
+ #{transplanthospitalno}
+ </if>
+ <if test="transplanthospitalname != null and transplanthospitalname != ''">and TransplantHospitalName like
+ concat('%', #{transplanthospitalname}, '%')
+ </if>
+ <if test="transplantdoct != null and transplantdoct != ''">and TransplantDoct = #{transplantdoct}</if>
+ <if test="transplanttime != null ">and TransplantTime = #{transplanttime}</if>
+ <if test="abandonreason != null ">and AbandonReason = #{abandonreason}</if>
+ <if test="reallocationreason != null ">and ReallocationReason = #{reallocationreason}</if>
+ <if test="isbiopsybefore != null ">and IsBiopsyBefore = #{isbiopsybefore}</if>
+ <if test="isbiopsyafter != null ">and IsBiopsyAfter = #{isbiopsyafter}</if>
+ <if test="ismarginalorgan != null ">and IsMarginalOrgan = #{ismarginalorgan}</if>
+ <if test="ispathogenpositive != null ">and IsPathogenPositive = #{ispathogenpositive}</if>
+ <if test="ispnf != null ">and IsPNF = #{ispnf}</if>
+ <if test="isdgf != null ">and isDGF = #{isdgf}</if>
</where>
</select>
@@ -76,30 +168,30 @@
inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
where OrganState = "3"
- <if test="starttime != null "> and d.create_time >= #{starttime} </if>
- <if test="endtime != null "> and d.create_time <= #{endtime}</if>
- <if test="city != null and city != ''"> and o.City = #{city} </if>
- <if test="reporterno != null and reporterno != ''"> and b.ReporterNo = #{reporterno}</if>
+ <if test="starttime != null ">and d.create_time >= #{starttime}</if>
+ <if test="endtime != null ">and d.create_time <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</select>
<select id="getAllFinishedOrgans" resultType="java.lang.Integer">
select count(*) from service_donateorgan d
inner join service_donatebaseinfo b on b.id = d.InfoID
inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
where OrganState = "6" AND d.del_flag=0 AND d.OrganGetTime IS NOT NULL AND d.OrganNo != 'C00'
- <if test="starttime != null "> and d.OrganGetTime >= #{starttime} </if>
- <if test="endtime != null "> and d.OrganGetTime <= #{endtime}</if>
- <if test="city != null and city != ''"> and o.City = #{city} </if>
- <if test="reporterno != null and reporterno != ''"> and b.ReporterNo = #{reporterno}</if>
+ <if test="starttime != null ">and d.OrganGetTime >= #{starttime}</if>
+ <if test="endtime != null ">and d.OrganGetTime <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</select>
<select id="getOrganNo" resultType="java.lang.Integer">
select count(*) from service_donateorgan d
inner join service_donatebaseinfo b on b.id = d.InfoID
inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
where d.del_flag=0 AND d.OrganGetTime IS NOT NULL AND d.OrganNo != 'C00' and d.OrganNo = #{organno}
- <if test="starttime != null "> and d.OrganGetTime >= #{starttime} </if>
- <if test="endtime != null "> and d.OrganGetTime <= #{endtime}</if>
- <if test="city != null and city != ''"> and o.City = #{city} </if>
- <if test="reporterno != null and reporterno != ''"> and b.ReporterNo = #{reporterno}</if>
+ <if test="starttime != null ">and d.OrganGetTime >= #{starttime}</if>
+ <if test="endtime != null ">and d.OrganGetTime <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</select>
<select id="getAllFinishedOrgansThisYear" resultType="java.lang.Integer">
select count(*) from service_donateorgan d
@@ -109,10 +201,10 @@
where OrganState = "6" AND d.del_flag=0 AND d.OrganGetTime IS NOT NULL AND d.OrganNo != 'C00'
AND d.OrganNo != 'C69L'
AND d.OrganNo != 'C69R'
- <if test="starttime != null"> and d.OrganGetTime >= #{starttime} </if>
- <if test="endtime != null "> and d.OrganGetTime <= #{endtime}</if>
- <if test="city != null and city != ''"> and o.City = #{city} </if>
- <if test="reporterno != null and reporterno != ''"> and b.ReporterNo = #{reporterno}</if>
+ <if test="starttime != null">and d.OrganGetTime >= #{starttime}</if>
+ <if test="endtime != null ">and d.OrganGetTime <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</select>
<select id="getOrganNumberThisYear" resultType="java.lang.Integer">
select count(*) from service_donateorgan d
@@ -124,10 +216,10 @@
AND d.OrganNo != 'C69L'
AND d.OrganNo != 'C69R'
AND d.del_flag=0
- <if test="starttime != null "> and d.OrganGetTime >= #{starttime} </if>
- <if test="endtime != null "> and d.OrganGetTime <= #{endtime}</if>
- <if test="city != null and city != ''"> and o.City = #{city} </if>
- <if test="reporterno != null and reporterno != ''"> and b.ReporterNo = #{reporterno}</if>
+ <if test="starttime != null ">and d.OrganGetTime >= #{starttime}</if>
+ <if test="endtime != null ">and d.OrganGetTime <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</select>
<select id="getbiopsyBeforeNumberThisYear" resultType="java.lang.Integer">
select count(*) from service_donateorgan d
@@ -140,10 +232,10 @@
AND d.OrganNo != 'C69L'
AND d.OrganNo != 'C69R'
AND d.del_flag=0
- <if test="starttime != null"> and d.OrganGetTime >= #{starttime} </if>
- <if test="endtime != null "> and d.OrganGetTime <= #{endtime}</if>
- <if test="city != null and city != ''"> and o.City = #{city} </if>
- <if test="reporterno != null and reporterno != ''"> and b.ReporterNo = #{reporterno}</if>
+ <if test="starttime != null">and d.OrganGetTime >= #{starttime}</if>
+ <if test="endtime != null ">and d.OrganGetTime <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</select>
<select id="getbiopsyAfterNumberThisYear" resultType="java.lang.Integer">
select count(*) from service_donateorgan d
@@ -156,25 +248,25 @@
AND d.OrganNo != 'C69L'
AND d.OrganNo != 'C69R'
AND d.del_flag=0
- <if test="starttime != null "> and d.OrganGetTime >= #{starttime} </if>
- <if test="endtime != null "> and d.OrganGetTime <= #{endtime}</if>
- <if test="city != null and city != ''"> and o.City = #{city} </if>
- <if test="reporterno != null and reporterno != ''"> and b.ReporterNo = #{reporterno}</if>
+ <if test="starttime != null ">and d.OrganGetTime >= #{starttime}</if>
+ <if test="endtime != null ">and d.OrganGetTime <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</select>
<select id="getmarginalOrgansNumberThisYear" resultType="java.lang.Integer">
- select count(*) from service_donateorgan d
+ select count(*) from service_donateorgan d
inner join service_donatebaseinfo b on b.id = d.InfoID
inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
- where IsMarginalOrgan = "1" AND
+ where IsMarginalOrgan = "1" AND
d.OrganGetTime IS NOT NULL AND d.OrganNo != 'C00'
AND d.OrganNo != 'C69L'
AND d.OrganNo != 'C69R'
AND d.del_flag=0
- <if test="starttime != null "> and d.OrganGetTime >= #{starttime} </if>
- <if test="endtime != null"> and d.OrganGetTime <= #{endtime}</if>
- <if test="city != null and city != ''"> and o.City = #{city} </if>
- <if test="reporterno != null and reporterno != ''"> and b.ReporterNo = #{reporterno}</if>
+ <if test="starttime != null ">and d.OrganGetTime >= #{starttime}</if>
+ <if test="endtime != null">and d.OrganGetTime <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</select>
<select id="getPathogenPositiveNumberThisYear" resultType="java.lang.Integer">
select count(*) from service_donateorgan d
@@ -187,10 +279,10 @@
AND d.OrganNo != 'C69L'
AND d.OrganNo != 'C69R'
AND d.del_flag=0
- <if test="starttime != null "> and d.OrganGetTime >= #{starttime} </if>
- <if test="endtime != null "> and d.OrganGetTime <= #{endtime}</if>
- <if test="city != null and city != ''"> and o.City = #{city} </if>
- <if test="reporterno != null and reporterno != ''"> and b.ReporterNo = #{reporterno}</if>
+ <if test="starttime != null ">and d.OrganGetTime >= #{starttime}</if>
+ <if test="endtime != null ">and d.OrganGetTime <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</select>
<select id="getPNFNumberThisYear" resultType="java.lang.Integer">
select count(*) from service_donateorgan d
@@ -198,20 +290,20 @@
inner join service_donatebaseinfo b on b.id = d.InfoID
inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
where IsPNF = "1"
- <if test="starttime != null "> and d.OrganGetTime >= #{starttime} </if>
- <if test="endtime != null"> and d.OrganGetTime <= #{endtime}</if>
- <if test="city != null and city != ''"> and o.City = #{city} </if>
- <if test="reporterno != null and reporterno != ''"> and b.ReporterNo = #{reporterno}</if>
+ <if test="starttime != null ">and d.OrganGetTime >= #{starttime}</if>
+ <if test="endtime != null">and d.OrganGetTime <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</select>
<select id="getDGFNumberThisYear" resultType="java.lang.Integer">
select count(*) from service_donateorgan d
inner join service_donatebaseinfo b on b.id = d.InfoID
inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
where IsDGF = "1"
- <if test="starttime != null "> and d.OrganGetTime >= #{starttime} </if>
- <if test="endtime != null "> and d.OrganGetTime <= #{endtime}</if>
- <if test="city != null and city != ''"> and o.City = #{city} </if>
- <if test="reporterno != null and reporterno != ''"> and b.ReporterNo = #{reporterno}</if>
+ <if test="starttime != null ">and d.OrganGetTime >= #{starttime}</if>
+ <if test="endtime != null ">and d.OrganGetTime <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</select>
<select id="selectPNFOrganThisYear" resultType="com.ruoyi.project.domain.ServiceDonateorgan">
select * from service_donateorgan d
@@ -223,10 +315,10 @@
AND d.OrganNo != 'C69L'
AND d.OrganNo != 'C69R'
AND d.del_flag=0
- <if test="starttime != null "> and d.OrganGetTime >= #{starttime} </if>
- <if test="endtime != null "> and d.OrganGetTime <= #{endtime}</if>
- <if test="city != null and city != ''"> and o.City = #{city} </if>
- <if test="reporterno != null and reporterno != ''"> and b.ReporterNo = #{reporterno}</if>
+ <if test="starttime != null ">and d.OrganGetTime >= #{starttime}</if>
+ <if test="endtime != null ">and d.OrganGetTime <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</select>
<select id="selectDGFOrganThisYear" resultType="com.ruoyi.project.domain.ServiceDonateorgan">
@@ -239,13 +331,13 @@
AND d.OrganNo != 'C69L'
AND d.OrganNo != 'C69R'
AND d.del_flag=0
- <if test="starttime != null "> and d.OrganGetTime >= #{starttime} </if>
- <if test="endtime != null "> and d.OrganGetTime <= #{endtime}</if>
- <if test="city != null and city != ''"> and o.City = #{city} </if>
- <if test="reporterno != null and reporterno != ''"> and b.ReporterNo = #{reporterno}</if>
+ <if test="starttime != null ">and d.OrganGetTime >= #{starttime}</if>
+ <if test="endtime != null ">and d.OrganGetTime <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</select>
<select id="selectVOList" resultType="com.ruoyi.project.domain.vo.DonateOrganVO">
- SELECT
+ SELECT
`service_donatebaseinfo`.`ID` AS `ID`,
`service_donatebaseinfo`.`Name` AS `Name`,
`service_donatebaseinfo`.`Sex` AS `Sex`,
@@ -301,54 +393,81 @@
`service_donatebaseinfo`.`leadername` AS `leadername`,
`service_donatebaseinfo`.`leaderno` AS `leaderno`,
`service_donatebaseinfo`.`businessarea` AS `businessarea`
- FROM
+ FROM
(
- `service_donatebaseinfo`
- JOIN `service_donateorgan` ON ((
- `service_donatebaseinfo`.`ID` = `service_donateorgan`.`InfoID`
+ `service_donatebaseinfo`
+ JOIN `service_donateorgan` ON ((
+ `service_donatebaseinfo`.`ID` = `service_donateorgan`.`InfoID`
)))
<where>
- <if test="donorno != null and donorno != ''"> and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
- <if test="name != null and name != ''"> and `service_donatebaseinfo`.`Name` = #{name}</if>
- <if test="idcardno != null and idcardno != ''"> and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
- <if test="treatmenthospitalno != null and treatmenthospitalno != ''"> and `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}</if>
- <if test="recordstate != null and recordstate != ''"> and `service_donatebaseinfo`.`RecordState` = #{recordstate}</if>
+ <if test="donorno != null and donorno != ''">and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
+ <if test="name != null and name != ''">and `service_donatebaseinfo`.`Name` = #{name}</if>
+ <if test="idcardno != null and idcardno != ''">and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
+ <if test="treatmenthospitalno != null and treatmenthospitalno != ''">and
+ `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}
+ </if>
+ <if test="recordstate != null and recordstate != ''">and `service_donatebaseinfo`.`RecordState` =
+ #{recordstate}
+ </if>
- <if test="organno != null and organno != ''"> and `service_donateorgan`.`OrganNo` = #{organno}</if>
- <if test="organname != null and organname != ''"> and `service_donateorgan`.`OrganName` = #{organname}</if>
- <if test="transplanthospitalno != null and transplanthospitalno != ''"> and `service_donateorgan`.`TransplantHospitalNo` = #{transplanthospitalno}</if>
- <if test="transplanthospitalname != null and transplanthospitalname != ''"> and `service_donateorgan`.`TransplantHospitalName` = #{transplanthospitalname}</if>
- <if test="organstate != null and organstate != ''"> and `service_donateorgan`.`OrganState` = #{organstate}</if>
- <if test="reportername != null and reportername != ''"> and `service_donatebaseinfo`.`ReporterName` = #{reportername}</if>
- <if test="leadername != null and leadername != ''"> and `service_donatebaseinfo`.`leadername` = #{leadername}</if>
- <if test="leaderno != null and leaderno != ''"> and `service_donatebaseinfo`.`leaderno` = #{leaderno}</if>
- <if test="businessarea != null and businessarea != ''"> and `service_donatebaseinfo`.`businessarea` = #{businessarea}</if>
- <if test="gainHospitalname != null and gainHospitalname != ''"> and `service_donateorgan`.`GainHospitalName` = #{gainHospitalname}</if>
- <if test="treatmenthospitalname != null and treatmenthospitalname != ''"> and `service_donatebaseinfo`.`TreatmentHospitalName` = #{treatmenthospitalname}</if>
- <if test="startorgangettime != null and endorgangettime != null "> and `service_donateorgan`.`OrganGetTime` >= #{startorgangettime} and `service_donateorgan`.`OrganGetTime` <= #{endorgangettime} </if>
- <if test="starttransplanttime != null and endtransplanttime != null "> and `service_donateorgan`.`TransplantTime` >= #{starttransplanttime} and `service_donateorgan`.`TransplantTime` <= #{endtransplanttime}</if>
+ <if test="organno != null and organno != ''">and `service_donateorgan`.`OrganNo` = #{organno}</if>
+ <if test="organname != null and organname != ''">and `service_donateorgan`.`OrganName` = #{organname}</if>
+ <if test="transplanthospitalno != null and transplanthospitalno != ''">and
+ `service_donateorgan`.`TransplantHospitalNo` = #{transplanthospitalno}
+ </if>
+ <if test="transplanthospitalname != null and transplanthospitalname != ''">and
+ `service_donateorgan`.`TransplantHospitalName` = #{transplanthospitalname}
+ </if>
+ <if test="organstate != null and organstate != ''">and `service_donateorgan`.`OrganState` = #{organstate}
+ </if>
+ <if test="reportername != null and reportername != ''">and `service_donatebaseinfo`.`ReporterName` =
+ #{reportername}
+ </if>
+ <if test="leadername != null and leadername != ''">and `service_donatebaseinfo`.`leadername` =
+ #{leadername}
+ </if>
+ <if test="leaderno != null and leaderno != ''">and `service_donatebaseinfo`.`leaderno` = #{leaderno}</if>
+ <if test="businessarea != null and businessarea != ''">and `service_donatebaseinfo`.`businessarea` =
+ #{businessarea}
+ </if>
+ <if test="gainHospitalname != null and gainHospitalname != ''">and `service_donateorgan`.`GainHospitalName`
+ = #{gainHospitalname}
+ </if>
+ <if test="treatmenthospitalname != null and treatmenthospitalname != ''">and
+ `service_donatebaseinfo`.`TreatmentHospitalName` = #{treatmenthospitalname}
+ </if>
+ <if test="startorgangettime != null and endorgangettime != null ">and `service_donateorgan`.`OrganGetTime`
+ >= #{startorgangettime} and `service_donateorgan`.`OrganGetTime` <= #{endorgangettime}
+ </if>
+ <if test="starttransplanttime != null and endtransplanttime != null ">and
+ `service_donateorgan`.`TransplantTime` >= #{starttransplanttime} and
+ `service_donateorgan`.`TransplantTime` <= #{endtransplanttime}
+ </if>
</where>
</select>
<select id="countNumber" resultType="java.lang.Integer">
- select count(*) from service_donateorgan
- where
- OrganGetTime >= #{starttime} and OrganGetTime <= #{endtime}
- -- (OrganState = "3" or OrganState = "4" or OrganState = "5" or OrganState = "6")
+ select count(*)
+ from service_donateorgan
+ where OrganGetTime >= #{starttime}
+ and OrganGetTime <= #{endtime}
+ -- (OrganState = "3" or OrganState = "4" or OrganState = "5" or OrganState = "6")
AND OrganGetTime IS NOT NULL
-AND OrganNo != 'C00'
+ AND OrganNo != 'C00'
AND del_flag=0
</select>
<select id="countPeople" resultType="java.lang.Integer">
- select count(distinct(InfoID)) from service_donateorgan
- where create_time >= #{starttime} and create_time <= #{endtime}
+ select count(distinct (InfoID))
+ from service_donateorgan
+ where create_time >= #{starttime}
+ and create_time <= #{endtime}
</select>
<select id="getAllDonateOrgansByTime" resultType="com.ruoyi.project.domain.ServiceDonateorgan">
<include refid="selectServiceDonateorganVo"/>
where OrganGetTime >= #{starttime} and OrganGetTime <= #{endtime}
AND OrganGetTime IS NOT NULL
- -- AND (OrganState = "3" or OrganState = "4" or OrganState = "5" or OrganState = "6")
+ -- AND (OrganState = "3" or OrganState = "4" or OrganState = "5" or OrganState = "6")
AND OrganNo != 'C00'
AND del_flag=0
</select>
@@ -358,9 +477,12 @@
</select>
<select id="getOrgansCount" resultType="java.lang.Integer">
- select count(*) from service_donateorgan
- where TransplantHospitalNo = #{organizationid} and del_flag = 0
- and OrganGetTime >= #{starttime} and OrganGetTime <= #{endtime}
+ select count(*)
+ from service_donateorgan
+ where TransplantHospitalNo = #{organizationid}
+ and del_flag = 0
+ and OrganGetTime >= #{starttime}
+ and OrganGetTime <= #{endtime}
</select>
<select id="getDistinctOrgansCount" resultType="java.lang.Integer">
select count(*) from service_donateorgan d
@@ -370,13 +492,14 @@
-- and (OrganState = "3" or OrganState = "4" or OrganState = "5" or OrganState = "6")
and d.del_flag=0
and d.OrganGetTime IS NOT NULL
- <if test="starttime != null "> and d.OrganGetTime >= #{starttime} </if>
- <if test="endtime != null "> and d.OrganGetTime <= #{endtime}</if>
- <if test="city != null and city != ''"> and o.City = #{city} </if>
- <if test="reporterno != null and reporterno != ''"> and b.ReporterNo = #{reporterno}</if>
+ <if test="starttime != null ">and d.OrganGetTime >= #{starttime}</if>
+ <if test="endtime != null ">and d.OrganGetTime <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</select>
<select id="getOrganNameByNo" resultType="java.lang.String">
- select distinct OrganName from service_donateorgan
+ select distinct OrganName
+ from service_donateorgan
where OrganNo = #{organno}
</select>
<select id="selectAll" resultType="com.ruoyi.project.domain.ServiceDonateorgan">
--
Gitblit v1.9.3