From 39690826c97e937d066b475059ee92d040c3155f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 21 十二月 2023 17:42:58 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 5
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java | 315 ++++++++++++++++-----
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml | 514 ++++++++++++++++++++----------------
3 files changed, 523 insertions(+), 311 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index a3aaae5..a8da4ab 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -1041,6 +1041,7 @@
private void getDataSS(Map dataMap, Long id) {
ServiceFund serviceFund = serviceFundService.getById(id);
+ log.info("閫氳繃id鏌ヨ鏁版嵁鐨勭粨鏋滐細{}", serviceFund);
if (serviceFund == null) {
throw new ServiceException("涓嬭浇澶辫触锛岀敤鎴蜂俊鎭嚭閿�", HttpStatus.NO_CONTENT);
}
@@ -1141,6 +1142,7 @@
private String getDataYX(Map dataMap, Long id) {
ServiceFund serviceFund = serviceFundService.getById(id);
+ log.info("閫氳繃id鑾峰彇鍖诲銆佸姙鍏�佺哗鏁堟垚鏈殑fund淇℃伅涓猴細{}", serviceFund);
if (serviceFund == null) {
throw new ServiceException("涓嬭浇澶辫触锛岀敤鎴蜂俊鎭嚭閿�", HttpStatus.NO_CONTENT);
}
@@ -1166,7 +1168,8 @@
throw new ServiceException("涓嬭浇澶辫触锛屾病鏈夊搴斾俊鎭�", HttpStatus.NO_CONTENT);
}
- Date dt = serviceFund.getCreateTime();
+// Date dt = serviceFund.getCreateTime();
+ Date dt = serviceFund.getApplyTime();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String date = formatter.format(dt);
String time = date.substring(0, 10);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
index 127ad58..4fd181a 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
@@ -21,318 +21,467 @@
*/
@Data
@ApiModel("鎹愮尞鍩虹")
-public class ServiceDonatebaseinfo extends BaseEntity
-{
+public class ServiceDonatebaseinfo 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;
- /** 濮撳悕 */
+ /**
+ * 濮撳悕
+ */
@ApiModelProperty("濮撳悕")
@Excel(name = "濮撳悕")
private String name;
- /** 鎬у埆 */
+ /**
+ * 鎬у埆
+ */
@ApiModelProperty("鎬у埆")
private String sex;
- /** 璇佷欢绫诲瀷 */
+ /**
+ * 璇佷欢绫诲瀷
+ */
@ApiModelProperty("璇佷欢绫诲瀷")
private Long idcardtype;
- /** 璇佷欢鍙风爜 */
+ /**
+ * 璇佷欢鍙风爜
+ */
@ApiModelProperty("璇佷欢鍙风爜")
private String idcardno;
- /** 骞撮緞 */
+ /**
+ * 骞撮緞
+ */
@ApiModelProperty("骞撮緞")
private Long age;
- /** 骞撮緞鍗曚綅 */
+ /**
+ * 骞撮緞鍗曚綅
+ */
@ApiModelProperty("骞撮緞鍗曚綅")
private String ageunit;
- /** 鍑虹敓鏃ユ湡 */
+ /**
+ * 鍑虹敓鏃ユ湡
+ */
@ApiModelProperty("鍑虹敓鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date birthday;
- /** 鑱旂郴鐢佃瘽 */
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
@ApiModelProperty("鑱旂郴鐢佃瘽")
private String phone;
- /** 鐜颁綇鍦板潃 */
+ /**
+ * 鐜颁綇鍦板潃
+ */
@ApiModelProperty("鐜颁綇鍦板潃")
private String residenceaddress;
- /** 鍥界睄 */
+ /**
+ * 鍥界睄
+ */
@ApiModelProperty("鍥界睄")
private String nationality;
- /** 鐪�(鍖�/甯�) */
+ /**
+ * 鐪�(鍖�/甯�)
+ */
@ApiModelProperty("鐪�(鍖�/甯�)")
@Excel(name = "鐪�(鍖�/甯�)")
private String residenceprovince;
- /** 绫嶈疮 */
- @ApiModelProperty("绫嶈疮")
+ /**
+ * 绫嶈疮
+ */
+ @ApiModelProperty("绫嶈疮")
@Excel(name = "绫嶈疮")
private String nativeplace;
- /** 鐜颁綇鍦板潃鐪佸悕绉� */
+ /**
+ * 鐜颁綇鍦板潃鐪佸悕绉�
+ */
@ApiModelProperty("鐜颁綇鍦板潃鐪佸悕绉�")
private String residenceprovincename;
- /** 姘戞棌 */
+ /**
+ * 姘戞棌
+ */
@ApiModelProperty("姘戞棌")
private String nation;
- /** 鑱屼笟 */
+ /**
+ * 鑱屼笟
+ */
@ApiModelProperty("鑱屼笟")
private String occupation;
- /** 甯�(宸�) */
+ /**
+ * 甯�(宸�)
+ */
@ApiModelProperty("甯�(宸�)")
private String residencecity;
- /** 甯傚悕绉� */
+ /**
+ * 甯傚悕绉�
+ */
@ApiModelProperty("甯傚悕绉�")
private String residencecityname;
- /** 瀛﹀巻 */
+ /**
+ * 瀛﹀巻
+ */
@ApiModelProperty("瀛﹀巻")
private String education;
- /** 鍘匡紙甯�/鍖猴級 */
+ /**
+ * 鍘匡紙甯�/鍖猴級
+ */
@ApiModelProperty("鍘匡紙甯�/鍖猴級")
private String residencetown;
- /** 鎵�灞炶閬擄紙闀囷級鍚嶇О */
+ /**
+ * 鎵�灞炶閬擄紙闀囷級鍚嶇О
+ */
@ApiModelProperty("鎵�灞炶閬擄紙闀囷級鍚嶇О")
private String residencetownname;
- /** 绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛� */
+ /**
+ * 绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
@ApiModelProperty("绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
private String residencecommunity;
- /** 绀惧尯锛堟潙锛夊悕绉� */
+ /**
+ * 绀惧尯锛堟潙锛夊悕绉�
+ */
@ApiModelProperty("绀惧尯锛堟潙锛夊悕绉�")
private String residencecommunityname;
- /** 鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛� */
+ /**
+ * 鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
@ApiModelProperty("鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
private String residencecountycode;
- /** 鎵�灞炲尯鍩熷悕绉� */
+ /**
+ * 鎵�灞炲尯鍩熷悕绉�
+ */
@ApiModelProperty("鎵�灞炲尯鍩熷悕绉�")
private String residencecountyname;
- /** 鎴风睄鍦板潃 */
+ /**
+ * 鎴风睄鍦板潃
+ */
@ApiModelProperty("鎴风睄鍦板潃")
private String registeraddress;
- /** 鐪�(鍖�/甯�) */
+ /**
+ * 鐪�(鍖�/甯�)
+ */
@ApiModelProperty("鐪�(鍖�/甯�)")
private String registerprovince;
- /** 鎴风睄鍦板潃鐪佸悕绉� */
+ /**
+ * 鎴风睄鍦板潃鐪佸悕绉�
+ */
@ApiModelProperty("鎴风睄鍦板潃鐪佸悕绉�")
private String registerprovincename;
- /** 甯�(宸�) */
+ /**
+ * 甯�(宸�)
+ */
@ApiModelProperty("甯�(宸�)")
private String registercity;
- /** 甯傚悕绉� */
+ /**
+ * 甯傚悕绉�
+ */
@ApiModelProperty("甯傚悕绉�")
private String registercityname;
- /** 鍘匡紙甯�/鍖猴級 */
+ /**
+ * 鍘匡紙甯�/鍖猴級
+ */
@ApiModelProperty("鍘匡紙甯�/鍖猴級")
private String registertown;
- /** 鎵�灞炶閬擄紙闀囷級鍚嶇О */
+ /**
+ * 鎵�灞炶閬擄紙闀囷級鍚嶇О
+ */
@ApiModelProperty("鎵�灞炶閬擄紙闀囷級鍚嶇О")
private String registertownname;
- /** 绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛� */
+ /**
+ * 绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
@ApiModelProperty("绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
private String registercommunity;
- /** 绀惧尯锛堟潙锛夊悕绉� */
+ /**
+ * 绀惧尯锛堟潙锛夊悕绉�
+ */
@ApiModelProperty("绀惧尯锛堟潙锛夊悕绉�")
private String registercommunityname;
- /** 鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛� */
+ /**
+ * 鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
@ApiModelProperty("鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
private String registercountycode;
- /** 鎵�灞炲尯鍩熷悕绉� */
+ /**
+ * 鎵�灞炲尯鍩熷悕绉�
+ */
@ApiModelProperty("鎵�灞炲尯鍩熷悕绉�")
private String registercountyname;
- /** 璁板綍鐘舵�� */
+ /**
+ * 璁板綍鐘舵��
+ */
@ApiModelProperty("璁板綍鐘舵��")
@Excel(name = "璁板綍鐘舵��")
private String recordstate;
- /** 娌荤枟鍖婚櫌 */
+ /**
+ * 娌荤枟鍖婚櫌
+ */
@ApiModelProperty("娌荤枟鍖婚櫌")
private String treatmenthospitalno;
- /** 鎵�鍦ㄥ尰鐤楁満鏋� */
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋�
+ */
@ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋�")
@Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋�")
private String treatmenthospitalname;
- /** 绉戝 */
+ /**
+ * 绉戝
+ */
@ApiModelProperty("绉戝")
private String treatmentdeptname;
- /** 鐤剧梾璇婃柇 */
+ /**
+ * 鐤剧梾璇婃柇
+ */
@ApiModelProperty("鐤剧梾璇婃柇")
private String diagnosisno;
- /** 鐤剧梾璇婃柇鍚嶇О */
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
@ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
private String diagnosisname;
- /** 琛�鍨� */
+ /**
+ * 琛�鍨�
+ */
@ApiModelProperty("琛�鍨� ")
private String bloodtype;
- /** 浣忛櫌鍙� */
+ /**
+ * 浣忛櫌鍙�
+ */
@ApiModelProperty("浣忛櫌鍙�")
private String inpatientno;
- /** Rh闃存�� */
+ /**
+ * Rh闃存��
+ */
@ApiModelProperty("Rh闃存��")
private String rhyin;
- /** 鎹愮尞鑰呯紪鍙� */
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
@ApiModelProperty("鎹愮尞鑰呯紪鍙�")
private String donorno;
- /** 鎹愮尞绫诲埆 */
+ /**
+ * 鎹愮尞绫诲埆
+ */
@ApiModelProperty("鎹愮尞绫诲埆")
private String donationcategory;
- /** 鐥呮儏姒傚喌 */
+ /**
+ * 鐥呮儏姒傚喌
+ */
@ApiModelProperty("鐥呮儏姒傚喌")
private String illnessoverview;
- /** 鐤剧梾绫诲瀷 */
+ /**
+ * 鐤剧梾绫诲瀷
+ */
@ApiModelProperty("鐤剧梾绫诲瀷")
private String diseasetype;
- /** 浼犳煋鐥呮儏鍐� */
+ /**
+ * 浼犳煋鐥呮儏鍐�
+ */
@ApiModelProperty("浼犳煋鐥呮儏鍐�")
private String infectious;
- /** 鏈汉鎰忔効 */
+ /**
+ * 鏈汉鎰忔効
+ */
@ApiModelProperty("鏈汉鎰忔効 ")
private String selfwill;
- /** 鍏朵粬鎯呭喌 */
+ /**
+ * 鍏朵粬鎯呭喌
+ */
@ApiModelProperty("鍏朵粬鎯呭喌")
private String othercases;
- /** 浜插睘鎰忔効 */
+ /**
+ * 浜插睘鎰忔効
+ */
@ApiModelProperty("浜插睘鎰忔効")
private Long kinshipwill;
- /** 鍏朵粬 */
+ /**
+ * 鍏朵粬
+ */
@ApiModelProperty("鍏朵粬")
private String diseasetypeOther;
- /** 浜插睘鍏崇郴鐘跺喌 */
+ /**
+ * 浜插睘鍏崇郴鐘跺喌
+ */
@ApiModelProperty("浜插睘鍏崇郴鐘跺喌")
private String kinship;
- /** 淇℃伅鏉ユ簮 */
+ /**
+ * 淇℃伅鏉ユ簮
+ */
@ApiModelProperty("淇℃伅鏉ユ簮")
private String infosources;
- /** 绾㈠崄瀛椾細鏈烘瀯缂栧彿 閫夎嚜鏈烘瀯琛� */
+ /**
+ * 绾㈠崄瀛椾細鏈烘瀯缂栧彿 閫夎嚜鏈烘瀯琛�
+ */
@ApiModelProperty("绾㈠崄瀛椾細鏈烘瀯缂栧彿 閫夎嚜鏈烘瀯琛�")
private String redorganno;
- /** 绾㈠崄瀛椾細鏈烘瀯鍚嶇О */
+ /**
+ * 绾㈠崄瀛椾細鏈烘瀯鍚嶇О
+ */
@ApiModelProperty("绾㈠崄瀛椾細鏈烘瀯鍚嶇О")
private String redorganname;
- /** 绾㈠崄瀛椾細鑱旂郴浜� */
+ /**
+ * 绾㈠崄瀛椾細鑱旂郴浜�
+ */
@ApiModelProperty("绾㈠崄瀛椾細鑱旂郴浜�")
private String contactperson;
- /** 鍏朵粬 */
+ /**
+ * 鍏朵粬
+ */
@ApiModelProperty("鍏朵粬")
private String infectiousOther;
- /** 绾㈠崄瀛椾細鑱旂郴鐢佃瘽 */
+ /**
+ * 绾㈠崄瀛椾細鑱旂郴鐢佃瘽
+ */
@ApiModelProperty("绾㈠崄瀛椾細鑱旂郴鐢佃瘽")
private String contactnumber;
- /** 鎶ュ憡鑰呯紪鍙� */
+ /**
+ * 鎶ュ憡鑰呯紪鍙�
+ */
@ApiModelProperty("鎶ュ憡鑰呯紪鍙�")
private String reporterno;
- /** 鎶ュ憡鑰呭鍚� */
+ /**
+ * 鎶ュ憡鑰呭鍚�
+ */
@ApiModelProperty("鎶ュ憡鑰呭鍚�")
@Excel(name = "鎶ュ憡鑰呭鍚�")
private String reportername;
- /** 鐥呬汉鐘跺喌 */
+ /**
+ * 鐥呬汉鐘跺喌
+ */
@ApiModelProperty("鐥呬汉鐘跺喌")
private String patientstate;
- /** 鎶ュ憡鑰呰仈绯荤數璇� */
+ /**
+ * 鎶ュ憡鑰呰仈绯荤數璇�
+ */
@ApiModelProperty("鎶ュ憡鑰呰仈绯荤數璇�")
private String reporterphone;
- /** 淇℃伅鏉ユ簮鍏朵粬 */
+ /**
+ * 淇℃伅鏉ユ簮鍏朵粬
+ */
@ApiModelProperty("淇℃伅鏉ユ簮鍏朵粬")
private String infosourcesOther;
- /** 鎶ュ憡鏃堕棿 */
+ /**
+ * 鎶ュ憡鏃堕棿
+ */
@ApiModelProperty("鎶ュ憡鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鎶ュ憡鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date reporttime;
- /** 鍏朵粬 */
+ /**
+ * 鍏朵粬
+ */
@ApiModelProperty("鍏朵粬")
private String kinshipOther;
- /** 涓昏浜插睘 */
+ /**
+ * 涓昏浜插睘
+ */
@ApiModelProperty("涓昏浜插睘")
private String majorrelatives;
- /** 涓庢崘璧犺�呭叧绯� */
+ /**
+ * 涓庢崘璧犺�呭叧绯�
+ */
@ApiModelProperty("涓庢崘璧犺�呭叧绯�")
private String familyrelations;
- /** 鑾峰彇缁勭粐缂栧彿 */
+ /**
+ * 鑾峰彇缁勭粐缂栧彿
+ */
@ApiModelProperty("鑾峰彇缁勭粐缂栧彿")
private String acquisitiontissueno;
- /** 鑾峰彇缁勭粐鍚嶇О */
+ /**
+ * 鑾峰彇缁勭粐鍚嶇О
+ */
@ApiModelProperty("鑾峰彇缁勭粐鍚嶇О")
private String acquisitiontissuename;
- /** 淇℃伅鍛樺鍚� */
+ /**
+ * 淇℃伅鍛樺鍚�
+ */
@ApiModelProperty("淇℃伅鍛樺鍚�")
private String infoname;
- /** 淇℃伅鍛樿仈绯绘柟寮� */
+ /**
+ * 淇℃伅鍛樿仈绯绘柟寮�
+ */
@ApiModelProperty("淇℃伅鍛樿仈绯绘柟寮�")
private String infophone;
- /** 鑱旂郴鏃堕棿 */
+ /**
+ * 鑱旂郴鏃堕棿
+ */
@ApiModelProperty("鑱旂郴鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date contacttime;
@@ -362,7 +511,7 @@
@ApiModelProperty("缁勯暱缂栫爜")
@Excel(name = "缁勯暱缂栫爜")
private String leaderno;
-
+
@ApiModelProperty("缁勯暱鍚嶇О")
@Excel(name = "缁勯暱鍚嶇О")
private String leadername;
@@ -386,5 +535,13 @@
@Excel(name = "缁堟妗堜緥")
private Integer terminationCase;
+ @ApiModelProperty("妗堜緥鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date donatetime;
+
+ @ApiModelProperty("妗堜緥搴忓彿")
+ private String donateno;
+
}
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index d885da3..aebc9b9 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -1,103 +1,93 @@
<?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.ServiceDonatebaseinfoMapper">
-
- <resultMap type="com.ruoyi.project.domain.ServiceDonatebaseinfo" id="ServiceDonatebaseinfoResult">
- <result property="id" column="ID" />
- <result property="name" column="Name" />
- <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="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="registeraddress" column="RegisterAddress" />
- <result property="registerprovince" column="RegisterProvince" />
- <result property="registerprovincename" column="RegisterProvinceName" />
- <result property="registercity" column="RegisterCity" />
- <result property="registercityname" column="RegisterCityName" />
- <result property="registertown" column="RegisterTown" />
- <result property="registertownname" column="RegisterTownName" />
- <result property="registercommunity" column="RegisterCommunity" />
- <result property="registercommunityname" column="RegisterCommunityName" />
- <result property="registercountycode" column="RegisterCountyCode" />
- <result property="registercountyname" column="RegisterCountyName" />
- <result property="recordstate" column="RecordState" />
- <result property="treatmenthospitalno" column="TreatmentHospitalNo" />
- <result property="treatmenthospitalname" column="TreatmentHospitalName" />
-<!-- <result property="treatmentdeptno" column="TreatmentDeptNo" />-->
- <result property="treatmentdeptname" column="TreatmentDeptName" />
- <result property="diagnosisno" column="DiagnosisNo" />
- <result property="diagnosisname" column="DiagnosisName" />
- <result property="bloodtype" column="BloodType" />
- <result property="inpatientno" column="InpatientNo" />
- <result property="donorno" column="DonorNo" />
- <result property="donationcategory" column="DonationCategory" />
- <result property="illnessoverview" column="IllnessOverview" />
-<!-- <result property="malignanttumor" column="MalignantTumor" />-->
-<!-- <result property="deepcoma" column="DeepComa" />-->
-<!-- <result property="spontaneousbreathing" column="SpontaneousBreathing" />-->
-<!-- <result property="istrafficaccident" column="IsTrafficAccident" />-->
-<!-- <result property="iscriminalcase" column="IsCriminalCase" />-->
- <result property="kinship" column="Kinship" />
- <result property="selfwill" column="SelfWill" />
- <result property="kinshipwill" column="KinshipWill" />
- <result property="infosources" column="InfoSources" />
- <result property="redorganno" column="RedOrganNo" />
- <result property="redorganname" column="RedOrganName" />
- <result property="contactperson" column="ContactPerson" />
- <result property="contactnumber" column="ContactNumber" />
- <result property="contacttime" column="ContactTime" />
- <result property="reporterno" column="ReporterNo" />
- <result property="reportername" column="ReporterName" />
- <result property="reporterphone" column="ReporterPhone" />
- <result property="reporttime" column="ReportTime" />
- <result property="del_flag" column="del_flag" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="terminationCase" column="termination_case" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="nation" column="Nation" />
- <result property="occupation" column="Occupation" />
- <result property="education" column="Education" />
- <result property="nativeplace" column="NativePlace" />
-<!-- <result property="annexillnessprofile" column="AnnexIllnessProfile" />-->
-<!-- <result property="annexdiseaseassessment" column="AnnexDiseaseAssessment" />-->
-<!-- <result property="annexevaluationopinion" column="AnnexEvaluationOpinion" />-->
-<!-- <result property="annexbraindeathjudgment" column="AnnexBrainDeathJudgment" />-->
-<!-- <result property="annexeegreport" column="AnnexEEGReport" />-->
-<!-- <result property="annexshortlatencyreport" column="AnnexShortLatencyReport" />-->
-<!-- <result property="annexdopplerreportus" column="AnnexDopplerReportUS" />-->
-<!-- <result property="annexdeathriskassessment" column="AnnexDeathRiskAssessment" />-->
- <result property="infoname" column="infoName" />
- <result property="infophone" column="infoPhone" />
- <result property="deptid" column="deptid" />
- <result property="deptname" column="deptname" />
- <result property="leaderno" column="leaderno" />
- <result property="leadername" column="leadername" />
- <result property="businessarea" column="businessarea" />
- <result property="annexfiles" column="annexfiles" />
- <result property="workflow" column="workflow" />
+ <resultMap type="com.ruoyi.project.domain.ServiceDonatebaseinfo" id="ServiceDonatebaseinfoResult">
+ <result property="id" column="ID"/>
+ <result property="name" column="Name"/>
+ <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="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="registeraddress" column="RegisterAddress"/>
+ <result property="registerprovince" column="RegisterProvince"/>
+ <result property="registerprovincename" column="RegisterProvinceName"/>
+ <result property="registercity" column="RegisterCity"/>
+ <result property="registercityname" column="RegisterCityName"/>
+ <result property="registertown" column="RegisterTown"/>
+ <result property="registertownname" column="RegisterTownName"/>
+ <result property="registercommunity" column="RegisterCommunity"/>
+ <result property="registercommunityname" column="RegisterCommunityName"/>
+ <result property="registercountycode" column="RegisterCountyCode"/>
+ <result property="registercountyname" column="RegisterCountyName"/>
+ <result property="recordstate" column="RecordState"/>
+ <result property="treatmenthospitalno" column="TreatmentHospitalNo"/>
+ <result property="treatmenthospitalname" column="TreatmentHospitalName"/>
+ <result property="treatmentdeptname" column="TreatmentDeptName"/>
+ <result property="diagnosisno" column="DiagnosisNo"/>
+ <result property="diagnosisname" column="DiagnosisName"/>
+ <result property="bloodtype" column="BloodType"/>
+ <result property="inpatientno" column="InpatientNo"/>
+ <result property="donorno" column="DonorNo"/>
+ <result property="donationcategory" column="DonationCategory"/>
+ <result property="illnessoverview" column="IllnessOverview"/>
+ <result property="kinship" column="Kinship"/>
+ <result property="selfwill" column="SelfWill"/>
+ <result property="kinshipwill" column="KinshipWill"/>
+ <result property="infosources" column="InfoSources"/>
+ <result property="redorganno" column="RedOrganNo"/>
+ <result property="redorganname" column="RedOrganName"/>
+ <result property="contactperson" column="ContactPerson"/>
+ <result property="contactnumber" column="ContactNumber"/>
+ <result property="contacttime" column="ContactTime"/>
+ <result property="reporterno" column="ReporterNo"/>
+ <result property="reportername" column="ReporterName"/>
+ <result property="reporterphone" column="ReporterPhone"/>
+ <result property="reporttime" column="ReportTime"/>
+ <result property="del_flag" column="del_flag"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="terminationCase" column="termination_case"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="nation" column="Nation"/>
+ <result property="occupation" column="Occupation"/>
+ <result property="education" column="Education"/>
+ <result property="nativeplace" column="NativePlace"/>
+ <result property="infoname" column="infoName"/>
+ <result property="infophone" column="infoPhone"/>
+ <result property="deptid" column="deptid"/>
+ <result property="deptname" column="deptname"/>
+ <result property="leaderno" column="leaderno"/>
+ <result property="leadername" column="leadername"/>
+ <result property="businessarea" column="businessarea"/>
+ <result property="annexfiles" column="annexfiles"/>
+ <result property="workflow" column="workflow"/>
+ <result property="donatetime" column="donatetime"/>
+ <result property="donateno" column="donateno"/>
</resultMap>
<sql id="selectServiceDonatebaseinfoVo">
- select service_donatebaseinfo.* from service_donatebaseinfo LEFT JOIN `base_organization` ON `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
+ select service_donatebaseinfo.*
+ from service_donatebaseinfo
+ LEFT JOIN `base_organization`
+ ON `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
</sql>
<update id="updateDonateNumber">
update service_donatebaseinfo
@@ -105,90 +95,125 @@
where ID = #{id}
</update>
- <select id="selectServiceDonatebaseinfoList" parameterType="com.ruoyi.project.domain.ServiceDonatebaseinfo" resultMap="ServiceDonatebaseinfoResult">
+ <select id="selectServiceDonatebaseinfoList" parameterType="com.ruoyi.project.domain.ServiceDonatebaseinfo"
+ resultMap="ServiceDonatebaseinfoResult">
<include refid="selectServiceDonatebaseinfoVo"/>
<where>
service_donatebaseinfo.del_flag = 0
- <if test="name != null and name != ''"> and Name like concat('%', #{name}, '%')</if>
- <if test="sex != null "> and Sex = #{sex}</if>
- <if test="idcardtype != null "> and IDCardType = #{idcardtype}</if>
- <if test="idcardno != null and idcardno != ''"> and IDCardNo = #{idcardno}</if>
- <if test="age != null "> and Age = #{age}</if>
- <if test="ageunit != null and ageunit != ''"> and AgeUnit = #{ageunit}</if>
- <if test="birthday != null and birthday != ''"> and Birthday = #{birthday}</if>
- <if test="phone != null and phone != ''"> and Phone = #{phone}</if>
- <if test="residenceaddress != null and residenceaddress != ''"> and ResidenceAddress = #{residenceaddress}</if>
- <if test="residenceprovince != null and residenceprovince != ''"> and ResidenceProvince = #{residenceprovince}</if>
- <if test="residenceprovincename != null and residenceprovincename != ''"> and ResidenceProvinceName like concat('%', #{residenceprovincename}, '%')</if>
- <if test="residencecity != null and residencecity != ''"> and ResidenceCity = #{residencecity}</if>
- <if test="residencecityname != null and residencecityname != ''"> and ResidenceCityName like concat('%', #{residencecityname}, '%')</if>
- <if test="residencetown != null and residencetown != ''"> and ResidenceTown = #{residencetown}</if>
- <if test="residencetownname != null and residencetownname != ''"> and ResidenceTownName like concat('%', #{residencetownname}, '%')</if>
- <if test="residencecommunity != null and residencecommunity != ''"> and ResidenceCommunity = #{residencecommunity}</if>
- <if test="residencecommunityname != null and residencecommunityname != ''"> and ResidenceCommunityName like concat('%', #{residencecommunityname}, '%')</if>
- <if test="residencecountycode != null and residencecountycode != ''"> and ResidenceCountyCode = #{residencecountycode}</if>
- <if test="residencecountyname != null and residencecountyname != ''"> and ResidenceCountyName like concat('%', #{residencecountyname}, '%')</if>
- <if test="registeraddress != null and registeraddress != ''"> and RegisterAddress = #{registeraddress}</if>
- <if test="registerprovince != null and registerprovince != ''"> and RegisterProvince = #{registerprovince}</if>
- <if test="registerprovincename != null and registerprovincename != ''"> and RegisterProvinceName like concat('%', #{registerprovincename}, '%')</if>
- <if test="registercity != null and registercity != ''"> and RegisterCity = #{registercity}</if>
- <if test="registercityname != null and registercityname != ''"> and RegisterCityName like concat('%', #{registercityname}, '%')</if>
- <if test="registertown != null and registertown != ''"> and RegisterTown = #{registertown}</if>
- <if test="registertownname != null and registertownname != ''"> and RegisterTownName like concat('%', #{registertownname}, '%')</if>
- <if test="registercommunity != null and registercommunity != ''"> and RegisterCommunity = #{registercommunity}</if>
- <if test="registercommunityname != null and registercommunityname != ''"> and RegisterCommunityName like concat('%', #{registercommunityname}, '%')</if>
- <if test="registercountycode != null and registercountycode != ''"> and RegisterCountyCode = #{registercountycode}</if>
- <if test="registercountyname != null and registercountyname != ''"> and RegisterCountyName like concat('%', #{registercountyname}, '%')</if>
- <if test="recordstate != null and recordstate != ''"> and RecordState = #{recordstate}</if>
- <if test="treatmenthospitalno != null and treatmenthospitalno != ''"> and TreatmentHospitalNo = #{treatmenthospitalno}</if>
- <if test="treatmenthospitalname != null and treatmenthospitalname != ''"> and TreatmentHospitalName like concat('%', #{treatmenthospitalname}, '%')</if>
-<!-- <if test="treatmentdeptno != null and treatmentdeptno != ''"> and TreatmentDeptNo = #{treatmentdeptno}</if>-->
- <if test="treatmentdeptname != null and treatmentdeptname != ''"> and TreatmentDeptName like concat('%', #{treatmentdeptname}, '%')</if>
- <if test="diagnosisno != null and diagnosisno != ''"> and DiagnosisNo = #{diagnosisno}</if>
- <if test="diagnosisname != null and diagnosisname != ''"> and DiagnosisName like concat('%', #{diagnosisname}, '%')</if>
- <if test="bloodtype != null and bloodtype != ''"> and BloodType = #{bloodtype}</if>
- <if test="inpatientno != null and inpatientno != ''"> and InpatientNo = #{inpatientno}</if>
- <if test="donorno != null and donorno != ''"> and DonorNo like concat('%', #{donorno}, '%')</if>
- <if test="donationcategory != null and donationcategory != ''"> and DonationCategory = #{donationcategory}</if>
- <if test="illnessoverview != null and illnessoverview != ''"> and IllnessOverview = #{illnessoverview}</if>
-<!-- <if test="malignanttumor != null "> and MalignantTumor = #{malignanttumor}</if>-->
-<!-- <if test="deepcoma != null "> and DeepComa = #{deepcoma}</if>-->
-<!-- <if test="spontaneousbreathing != null "> and SpontaneousBreathing = #{spontaneousbreathing}</if>-->
-<!-- <if test="istrafficaccident != null "> and IsTrafficAccident = #{istrafficaccident}</if>-->
-<!-- <if test="iscriminalcase != null "> and IsCriminalCase = #{iscriminalcase}</if>-->
- <if test="kinship != null and kinship != ''"> and Kinship = #{kinship}</if>
- <if test="selfwill != null "> and SelfWill = #{selfwill}</if>
- <if test="kinshipwill != null "> and KinshipWill = #{kinshipwill}</if>
- <if test="infosources != null and infosources != ''"> and InfoSources = #{infosources}</if>
- <if test="redorganno != null and redorganno != ''"> and RedOrganNo = #{redorganno}</if>
- <if test="redorganname != null and redorganname != ''"> and RedOrganName like concat('%', #{redorganname}, '%')</if>
- <if test="contactperson != null and contactperson != ''"> and ContactPerson = #{contactperson}</if>
- <if test="contactnumber != null and contactnumber != ''"> and ContactNumber = #{contactnumber}</if>
- <if test="contacttime != null and contacttime != ''"> and ContactTime = #{contacttime}</if>
- <if test="reporterno != null and reporterno != ''"> and ReporterNo = #{reporterno}</if>
- <if test="reportername != null and reportername != ''"> and ReporterName like concat('%', #{reportername}, '%')</if>
- <if test="reporterphone != null and reporterphone != ''"> and ReporterPhone = #{reporterphone}</if>
- <if test="reporttime != null "> and ReportTime = #{reporttime}</if>
-<!-- <if test="annexillnessprofile != null and annexillnessprofile != ''"> and AnnexIllnessProfile = #{annexillnessprofile}</if>-->
-<!-- <if test="annexdiseaseassessment != null and annexdiseaseassessment != ''"> and AnnexDiseaseAssessment = #{annexdiseaseassessment}</if>-->
-<!-- <if test="annexevaluationopinion != null and annexevaluationopinion != ''"> and AnnexEvaluationOpinion = #{annexevaluationopinion}</if>-->
-<!-- <if test="annexbraindeathjudgment != null and annexbraindeathjudgment != ''"> and AnnexBrainDeathJudgment = #{annexbraindeathjudgment}</if>-->
-<!-- <if test="annexeegreport != null and annexeegreport != ''"> and AnnexEEGReport = #{annexeegreport}</if>-->
-<!-- <if test="annexshortlatencyreport != null and annexshortlatencyreport != ''"> and AnnexShortLatencyReport = #{annexshortlatencyreport}</if>-->
-<!-- <if test="annexdopplerreportus != null and annexdopplerreportus != ''"> and AnnexDopplerReportUS = #{annexdopplerreportus}</if>-->
-<!-- <if test="annexdeathriskassessment != null and annexdeathriskassessment != ''"> and AnnexDeathRiskAssessment = #{annexdeathriskassessment}</if>-->
- <if test="infoname != null "> and infoName = #{infoname}</if>
- <if test="infophone != null "> and infoPhone = #{infophone}</if>
- <if test="createBy != null "> and `service_donatebaseinfo`.create_by = #{createBy}</if>
- <if test="starttime != null "> and ReportTime >= #{starttime} </if>
- <if test="endtime != null "> and ReportTime <= #{endtime}</if>
- <if test="nativeplace != null and nativeplace != ''"> and NativePlace = #{nativeplace}</if>
- <if test="city != null and city != ''"> and `base_organization`.`City` = #{city}</if>
- <if test="deptid != null "> and deptid = #{deptid}</if>
- <if test="deptname != null "> and deptname = #{deptname}</if>
- <if test="leaderno != null "> and leaderno = #{leaderno}</if>
- <if test="leadername != null "> and leadername = #{leadername}</if>
- <if test="businessarea != null "> and businessarea = #{businessarea}</if>
+ <if test="name != null and name != ''">and Name like concat('%', #{name}, '%')</if>
+ <if test="sex != null ">and Sex = #{sex}</if>
+ <if test="idcardtype != null ">and IDCardType = #{idcardtype}</if>
+ <if test="idcardno != null and idcardno != ''">and IDCardNo = #{idcardno}</if>
+ <if test="age != null ">and Age = #{age}</if>
+ <if test="ageunit != null and ageunit != ''">and AgeUnit = #{ageunit}</if>
+ <if test="birthday != null and birthday != ''">and Birthday = #{birthday}</if>
+ <if test="phone != null and phone != ''">and Phone = #{phone}</if>
+ <if test="residenceaddress != null and residenceaddress != ''">and ResidenceAddress = #{residenceaddress}
+ </if>
+ <if test="residenceprovince != null and residenceprovince != ''">and ResidenceProvince =
+ #{residenceprovince}
+ </if>
+ <if test="residenceprovincename != null and residenceprovincename != ''">and ResidenceProvinceName like
+ concat('%', #{residenceprovincename}, '%')
+ </if>
+ <if test="residencecity != null and residencecity != ''">and ResidenceCity = #{residencecity}</if>
+ <if test="residencecityname != null and residencecityname != ''">and ResidenceCityName like concat('%',
+ #{residencecityname}, '%')
+ </if>
+ <if test="residencetown != null and residencetown != ''">and ResidenceTown = #{residencetown}</if>
+ <if test="residencetownname != null and residencetownname != ''">and ResidenceTownName like concat('%',
+ #{residencetownname}, '%')
+ </if>
+ <if test="residencecommunity != null and residencecommunity != ''">and ResidenceCommunity =
+ #{residencecommunity}
+ </if>
+ <if test="residencecommunityname != null and residencecommunityname != ''">and ResidenceCommunityName like
+ concat('%', #{residencecommunityname}, '%')
+ </if>
+ <if test="residencecountycode != null and residencecountycode != ''">and ResidenceCountyCode =
+ #{residencecountycode}
+ </if>
+ <if test="residencecountyname != null and residencecountyname != ''">and ResidenceCountyName like
+ concat('%', #{residencecountyname}, '%')
+ </if>
+ <if test="registeraddress != null and registeraddress != ''">and RegisterAddress = #{registeraddress}</if>
+ <if test="registerprovince != null and registerprovince != ''">and RegisterProvince = #{registerprovince}
+ </if>
+ <if test="registerprovincename != null and registerprovincename != ''">and RegisterProvinceName like
+ concat('%', #{registerprovincename}, '%')
+ </if>
+ <if test="registercity != null and registercity != ''">and RegisterCity = #{registercity}</if>
+ <if test="registercityname != null and registercityname != ''">and RegisterCityName like concat('%',
+ #{registercityname}, '%')
+ </if>
+ <if test="registertown != null and registertown != ''">and RegisterTown = #{registertown}</if>
+ <if test="registertownname != null and registertownname != ''">and RegisterTownName like concat('%',
+ #{registertownname}, '%')
+ </if>
+ <if test="registercommunity != null and registercommunity != ''">and RegisterCommunity =
+ #{registercommunity}
+ </if>
+ <if test="registercommunityname != null and registercommunityname != ''">and RegisterCommunityName like
+ concat('%', #{registercommunityname}, '%')
+ </if>
+ <if test="registercountycode != null and registercountycode != ''">and RegisterCountyCode =
+ #{registercountycode}
+ </if>
+ <if test="registercountyname != null and registercountyname != ''">and RegisterCountyName like concat('%',
+ #{registercountyname}, '%')
+ </if>
+ <if test="recordstate != null and recordstate != ''">and RecordState = #{recordstate}</if>
+ <if test="treatmenthospitalno != null and treatmenthospitalno != ''">and TreatmentHospitalNo =
+ #{treatmenthospitalno}
+ </if>
+ <if test="treatmenthospitalname != null and treatmenthospitalname != ''">and TreatmentHospitalName like
+ concat('%', #{treatmenthospitalname}, '%')
+ </if>
+ <!-- <if test="treatmentdeptno != null and treatmentdeptno != ''"> and TreatmentDeptNo = #{treatmentdeptno}</if>-->
+ <if test="treatmentdeptname != null and treatmentdeptname != ''">and TreatmentDeptName like concat('%',
+ #{treatmentdeptname}, '%')
+ </if>
+ <if test="diagnosisno != null and diagnosisno != ''">and DiagnosisNo = #{diagnosisno}</if>
+ <if test="diagnosisname != null and diagnosisname != ''">and DiagnosisName like concat('%',
+ #{diagnosisname}, '%')
+ </if>
+ <if test="bloodtype != null and bloodtype != ''">and BloodType = #{bloodtype}</if>
+ <if test="inpatientno != null and inpatientno != ''">and InpatientNo = #{inpatientno}</if>
+ <if test="donorno != null and donorno != ''">and DonorNo like concat('%', #{donorno}, '%')</if>
+ <if test="donationcategory != null and donationcategory != ''">and DonationCategory = #{donationcategory}
+ </if>
+ <if test="illnessoverview != null and illnessoverview != ''">and IllnessOverview = #{illnessoverview}</if>
+ <if test="kinship != null and kinship != ''">and Kinship = #{kinship}</if>
+ <if test="selfwill != null ">and SelfWill = #{selfwill}</if>
+ <if test="kinshipwill != null ">and KinshipWill = #{kinshipwill}</if>
+ <if test="infosources != null and infosources != ''">and InfoSources = #{infosources}</if>
+ <if test="redorganno != null and redorganno != ''">and RedOrganNo = #{redorganno}</if>
+ <if test="redorganname != null and redorganname != ''">and RedOrganName like concat('%', #{redorganname},
+ '%')
+ </if>
+ <if test="contactperson != null and contactperson != ''">and ContactPerson = #{contactperson}</if>
+ <if test="contactnumber != null and contactnumber != ''">and ContactNumber = #{contactnumber}</if>
+ <if test="contacttime != null and contacttime != ''">and ContactTime = #{contacttime}</if>
+ <if test="reporterno != null and reporterno != ''">and ReporterNo = #{reporterno}</if>
+ <if test="reportername != null and reportername != ''">and ReporterName like concat('%', #{reportername},
+ '%')
+ </if>
+ <if test="reporterphone != null and reporterphone != ''">and ReporterPhone = #{reporterphone}</if>
+ <if test="reporttime != null ">and ReportTime = #{reporttime}</if>
+ <if test="infoname != null ">and infoName = #{infoname}</if>
+ <if test="infophone != null ">and infoPhone = #{infophone}</if>
+ <if test="createBy != null ">and `service_donatebaseinfo`.create_by = #{createBy}</if>
+ <if test="starttime != null ">and ReportTime >= #{starttime}</if>
+ <if test="endtime != null ">and ReportTime <= #{endtime}</if>
+ <if test="nativeplace != null and nativeplace != ''">and NativePlace = #{nativeplace}</if>
+ <if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
+ <if test="deptid != null ">and deptid = #{deptid}</if>
+ <if test="deptname != null ">and deptname = #{deptname}</if>
+ <if test="leaderno != null ">and leaderno = #{leaderno}</if>
+ <if test="leadername != null ">and leadername = #{leadername}</if>
+ <if test="businessarea != null ">and businessarea = #{businessarea}</if>
+ <if test="donatetime != null ">and donatetime = #{donatetime}</if>
+ <if test="donateno != null ">and donateno = #{donateno}</if>
</where>
order by ReportTime desc
@@ -196,12 +221,14 @@
</select>
<select id="getDonateNumberById" resultType="java.lang.String">
- select DonorNo from service_donatebaseinfo
+ select DonorNo
+ from service_donatebaseinfo
where id = #{id}
</select>
<select id="getDonateCount" resultType="java.lang.Integer">
- select count(*) from service_donatebaseinfo
+ select count(*)
+ from service_donatebaseinfo
where RecordState = "9"
</select>
@@ -209,128 +236,153 @@
select count(*) from service_donatebaseinfo b
inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
<where>
- AND b.del_flag=0
- <if test="starttime != null "> and b.ReportTime >= #{starttime} </if>
- <if test="endtime != null "> and b.ReportTime <= #{endtime}</if>
- <if test="city != null and city != ''"> and o.City = #{city} </if>
- <if test="reporterno != null and reporterno != ''"> and b.ReporterNo = #{reporterno}</if>
+ AND b.del_flag=0
+ <if test="starttime != null ">and b.ReportTime >= #{starttime}</if>
+ <if test="endtime != null ">and b.ReportTime <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</where>
</select>
<select id="countNumber" resultType="java.lang.Integer">
- select count(*) from service_donatebaseinfo
- where ReportTime >= #{starttime} and ReportTime <= #{endtime}
+ select count(*)
+ from service_donatebaseinfo
+ where ReportTime >= #{starttime}
+ and ReportTime <= #{endtime}
</select>
<select id="getBloodCode" resultType="java.lang.String">
- select BloodCode from base_bloodtype
+ select BloodCode
+ from base_bloodtype
where BloodType = #{bloodtype}
</select>
<select id="countTerminatedNumber" resultType="java.lang.Integer">
- select count(*) from service_donatebaseinfo
+ select count(*)
+ from service_donatebaseinfo
where RecordState = "99"
- and ReportTime >= #{starttime} and ReportTime <= #{endtime}
+ and ReportTime >= #{starttime}
+ and ReportTime <= #{endtime}
</select>
<select id="getAllDonateBaseInfo" resultType="com.ruoyi.project.domain.ServiceDonatebaseinfo">
<include refid="selectServiceDonatebaseinfoVo"/>
</select>
<select id="getBaseInfoByHospital" resultType="com.ruoyi.project.domain.ServiceDonatebaseinfo">
- select ID, ReportTime from service_donatebaseinfo
+ select ID, ReportTime
+ from service_donatebaseinfo
where TreatmentHospitalNo = #{organizationid}
</select>
<select id="getAllDonateBaseInfoByTime" resultType="com.ruoyi.project.domain.ServiceDonatebaseinfo">
select * from service_donatebaseinfo b
inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
<where>
- <if test="starttime != null "> and b.ReportTime >= #{starttime} </if>
- <if test="endtime != null "> and b.ReportTime <= #{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 b.ReportTime >= #{starttime}</if>
+ <if test="endtime != null ">and b.ReportTime <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</where>
</select>
<select id="listForSearch" resultType="com.ruoyi.project.domain.ServiceDonatebaseinfo">
<include refid="selectServiceDonatebaseinfoVo"/>
<where>
- <if test="name != null and name != ''"> Name like concat('%', #{name}, '%')
- or idcardno like concat('%', #{name}, '%')
- or treatmenthospitalname like concat('%', #{name}, '%')
- or residenceprovincename like concat('%', #{name}, '%')
- or residencecityname like concat('%', #{name}, '%')
- or residencetownname like concat('%', #{name}, '%')
- or bloodtype like concat('%', #{name}, '%')
- or nativeplace like concat('%', #{name}, '%')
- or reportername like concat('%', #{name}, '%')</if>
+ <if test="name != null and name != ''">Name like concat('%', #{name}, '%')
+ or idcardno like concat('%', #{name}, '%')
+ or treatmenthospitalname like concat('%', #{name}, '%')
+ or residenceprovincename like concat('%', #{name}, '%')
+ or residencecityname like concat('%', #{name}, '%')
+ or residencetownname like concat('%', #{name}, '%')
+ or bloodtype like concat('%', #{name}, '%')
+ or nativeplace like concat('%', #{name}, '%')
+ or reportername like concat('%', #{name}, '%')
+ </if>
</where>
</select>
<select id="getDonorNameById" resultType="java.lang.String">
- select name from service_donatebaseinfo
+ select name
+ from service_donatebaseinfo
where id = #{infoid}
</select>
<select id="gethqzz" resultType="java.lang.String">
- select AcquisitionTissueName from service_donatebaseinfo
+ select AcquisitionTissueName
+ from service_donatebaseinfo
where id = #{infoid}
</select>
<select id="getById" resultType="com.ruoyi.project.domain.ServiceDonatebaseinfo">
- select * from service_donatebaseinfo
+ select *
+ from service_donatebaseinfo
where id = #{infoid}
</select>
<select id="countByRecordState" resultType="java.lang.Integer">
- select count(*) from service_donatebaseinfo
+ select count(*)
+ from service_donatebaseinfo
where RecordState = #{recordState}
- and ReportTime >= #{starttime} and ReportTime <= #{endtime}
+ and ReportTime >= #{starttime}
+ and ReportTime <= #{endtime}
</select>
<select id="getDistrictDonate" resultType="java.lang.String">
- select o.city from service_donatebaseinfo b
- inner join base_organization o on o.organizationid=b.treatmenthospitalno
+ select o.city
+ from service_donatebaseinfo b
+ inner join base_organization o on o.organizationid = b.treatmenthospitalno
where (b.RecordState = '0' or b.RecordState = '1' or b.RecordState = '2')
</select>
<select id="getDistrictComplete" resultType="java.lang.String">
- select o.city from service_donatebaseinfo b
- inner join service_donatecompletioninfo d on d.infoid=b.id
- inner join base_organization o on o.organizationid=b.treatmenthospitalno
+ select o.city
+ from service_donatebaseinfo b
+ inner join service_donatecompletioninfo d on d.infoid = b.id
+ inner join base_organization o on o.organizationid = b.treatmenthospitalno
where d.CompleteTime > 0
</select>
<select id="getDistrictOrgans" resultType="java.lang.String">
- select o.city from service_donatebaseinfo b
- inner join service_donateorgan d on d.infoid=b.id
- inner join base_organization o on o.organizationid=b.treatmenthospitalno
+ select o.city
+ from service_donatebaseinfo b
+ inner join service_donateorgan d on d.infoid = b.id
+ inner join base_organization o on o.organizationid = b.treatmenthospitalno
where d.OrganGetTime > 0
</select>
<select id="getDonateNameById" resultType="java.lang.String">
- select Name from service_donatebaseinfo
+ select Name
+ from service_donatebaseinfo
where id = #{infoid}
</select>
<select id="getDistrictDonateByTime" resultType="java.lang.String">
- select o.city from service_donatebaseinfo b
- inner join base_organization o on o.organizationid=b.treatmenthospitalno
+ select o.city
+ from service_donatebaseinfo b
+ inner join base_organization o on o.organizationid = b.treatmenthospitalno
where (b.RecordState = '0' or b.RecordState = '1' or b.RecordState = '2')
- and b.ReportTime >= #{starttime} and b.ReportTime <= #{endtime}
+ and b.ReportTime >= #{starttime}
+ and b.ReportTime <= #{endtime}
</select>
<select id="getDistrictCompleteByTime" resultType="java.lang.String">
- select o.city from service_donatebaseinfo b
- inner join service_donatecompletioninfo d on d.infoid=b.id
- inner join base_organization o on o.organizationid=b.treatmenthospitalno
- where d.del_flag=0 and d.CompleteTime >= #{starttime} and d.CompleteTime <= #{endtime}
+ select o.city
+ from service_donatebaseinfo b
+ inner join service_donatecompletioninfo d on d.infoid = b.id
+ inner join base_organization o on o.organizationid = b.treatmenthospitalno
+ where d.del_flag = 0
+ and d.CompleteTime >= #{starttime}
+ and d.CompleteTime <= #{endtime}
</select>
<select id="gettreatmenthospitalnoCompleteByTime" resultType="java.lang.String">
select b.treatmenthospitalno from service_donatebaseinfo b
- inner join service_donatecompletioninfo d on d.infoid=b.id
- inner join base_organization o on o.organizationid=b.treatmenthospitalno
+ inner join service_donatecompletioninfo d on d.infoid=b.id
+ inner join base_organization o on o.organizationid=b.treatmenthospitalno
<where>
d.del_flag=0
- <if test="starttime != null "> and d.CompleteTime >= #{starttime} </if>
- <if test="endtime != null "> and d.CompleteTime <= #{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.CompleteTime >= #{starttime}</if>
+ <if test="endtime != null ">and d.CompleteTime <= #{endtime}</if>
+ <if test="city != null and city != ''">and o.City = #{city}</if>
+ <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</where>
</select>
<select id="getDistrictOrgansByTime" resultType="java.lang.String">
- select o.city from service_donatebaseinfo b
- inner join service_donateorgan d on d.infoid=b.id
- inner join base_organization o on o.organizationid=b.treatmenthospitalno
- WHERE d.del_flag=0 AND d.OrganGetTime IS NOT NULL AND d.OrganGetTime >= #{starttime} AND d.OrganGetTime <= #{endtime}
+ select o.city
+ from service_donatebaseinfo b
+ inner join service_donateorgan d on d.infoid = b.id
+ inner join base_organization o on o.organizationid = b.treatmenthospitalno
+ WHERE d.del_flag = 0
+ AND d.OrganGetTime IS NOT NULL
+ AND d.OrganGetTime >= #{starttime}
+ AND d.OrganGetTime <= #{endtime}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3