From 98739187cf9351e01f7673e9690e96930562b723 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 07 七月 2025 18:09:52 +0800
Subject: [PATCH] zjh20250707
---
ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java | 13 +++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
index 247df6f..adefd63 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
@@ -124,7 +124,6 @@
private String firmName;
-
/**
* 閮ㄩ棬鍚�
*/
@@ -251,7 +250,7 @@
*/
@TableField(exist = false)
@ApiModelProperty(value = "浣撴璁板綍涓殑瀹㈡埛鎬у埆")
- @Excel(name = "鎬у埆", readConverterExp = "0=鐢�,1=濂�")
+ @Excel(name = "鎬у埆", readConverterExp = "0=鐢�,1=濂�")
private Long tjCustomerSex;
/**
@@ -504,6 +503,16 @@
private String zhiyeJg;
+ private String rjJy;
+ private String riJyr;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date rjJysj;
+
+ private String sjJy;
+ private String sjJyr;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date sjJysj;
+
private String zhiyeGz;
private String zhiyeZgln;
private String zhiyeZgly;
diff --git a/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
index 5daa217..9a891c5 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
@@ -238,7 +238,7 @@
<if test="nr != null ">and (pro_name like concat('%', #{nr}, '%')
or pro_eng_name like concat('%', #{nr}, '%'))</if>
<if test="null !=xb and xb !='' ">
- and pro_sex=#{xb} and isnull(pro_sex) </if>
+ and (pro_sex=#{xb} or isnull(pro_sex)) </if>
</where>
--
Gitblit v1.8.0