From ed9b3f8eb1b1b83c854d39d4025ecf07257ef6ec Mon Sep 17 00:00:00 2001 From: tangw Date: Thu, 28 Aug 2025 09:35:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E4=B8=9A=E5=8A=A1=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/lis/LabRefused.java | 25 +++++++++ .../com/czlis/common/utils/DateUtils.java | 6 +- .../mapper/LabRefusedMapper.java | 13 +++++ .../interfaceCommon/utils/CommonUtil.java | 11 +++- .../main/resources/mapper/LabPatMapper.xml | 2 +- .../resources/mapper/LabRefusedMapper.xml | 55 +++++++++++++++++++ .../service/impl/LisWorkOperServiceImpl.java | 24 ++++++++ 7 files changed, 131 insertions(+), 5 deletions(-) create mode 100644 lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabRefused.java create mode 100644 lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabRefusedMapper.java create mode 100644 lis-interfaceCommon/src/main/resources/mapper/LabRefusedMapper.xml diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabRefused.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabRefused.java new file mode 100644 index 0000000..4dec1d8 --- /dev/null +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabRefused.java @@ -0,0 +1,25 @@ +package com.czlis.common.core.domain.entity.lis; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LabRefused { + + private String sqh; + private Date refusedtime; + private String refuseder; + private String ksdh; + private String bz; + private String refusetext; + private String jsr; + private Date jssj; + private String bz1; + + +} diff --git a/lis-common/src/main/java/com/czlis/common/utils/DateUtils.java b/lis-common/src/main/java/com/czlis/common/utils/DateUtils.java index 2442180..abe617d 100644 --- a/lis-common/src/main/java/com/czlis/common/utils/DateUtils.java +++ b/lis-common/src/main/java/com/czlis/common/utils/DateUtils.java @@ -177,16 +177,16 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { return localDate.getDayOfWeek().getValue(); } /** - * 根据 Date 对象获取周几（中文） + * 根据 Date 对象获取星期几（中文） * @param date 目标日期 - * @return 中文周几（如 "周一"、"周日"） + * @return 中文周几（如 "星期一"、"星期日"） */ public static String getWeekDayName(Date date) { // Date 转 LocalDate（默认系统时区） LocalDate localDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); // 获取周索引：Monday=1，Sunday=7（更符合日常认知） int weekIndex= localDate.getDayOfWeek().getValue(); - String[] weekDays = {"", "周一", "周二", "周三", "周四", "周五", "周六", "周日"}; + String[] weekDays = {"", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"}; return weekDays[weekIndex]; } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabRefusedMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabRefusedMapper.java new file mode 100644 index 0000000..9f8c5ca --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabRefusedMapper.java @@ -0,0 +1,13 @@ +package com.czlis.interfaceCommon.mapper; + +import com.czlis.common.core.domain.entity.lis.LabRefused; + +import java.util.List; + +public interface LabRefusedMapper { + List getLabRefusedList(LabRefused labRefused); + LabRefused getLabRefusedOne(String sqh); + int delLabRefused(String sqh); + int insertLabRefused(LabRefused labRefused); + int updateLabRefused(LabRefused labRefused); +} diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java index bde6f96..a93d3fb 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java @@ -5,6 +5,7 @@ import com.czlis.common.core.domain.entity.lis.*; import com.czlis.common.utils.ComDictUtils; import com.czlis.common.utils.ComOptionUtils; import com.czlis.interfaceCommon.mapper.*; +import com.sun.org.apache.bcel.internal.generic.RETURN; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; @@ -52,7 +53,8 @@ public class CommonUtil { LabReqsteplogMapper labReqsteplogMapper; @Autowired ComLogMapper comLogMapper; - + @Autowired + LabRefusedMapper labRefusedMapper; //====检验主表操作方法集合=== public LabPat getLabPatOne(Date jyrq, String yq, String ybh) { return labPatMapper.getLabPatOne(jyrq, yq, ybh); @@ -109,6 +111,13 @@ public class CommonUtil { public List getLabReqsteplog(String sqh) { return labReqsteplogMapper.getLabReqsteplog(sqh); } + public List getLabRefusedList(LabRefused labRefused){ + return labRefusedMapper.getLabRefusedList(labRefused); + } + public int insertLabRefused(LabRefused labRefused){ + return labRefusedMapper.insertLabRefused(labRefused); + } + //申请单明细表集合 //====检验结果表操作方法集合=== diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml index 1aab89c..434af8b 100644 --- a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml @@ -7,7 +7,7 @@ select jyrq,yq,ybh,jzbz,jgbz,dybz,brly,brdh,brxm,brxb,nl,nldw,ksdh,jymd,yljg from lab_pat diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabRefusedMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabRefusedMapper.xml new file mode 100644 index 0000000..bf2d883 --- /dev/null +++ b/lis-interfaceCommon/src/main/resources/mapper/LabRefusedMapper.xml @@ -0,0 +1,55 @@ + + + + + + + delete from lab_refused where sqh = #{sqh} + + + insert into lab_refused( + refusedtime, + refuseder, + ksdh, + bz, + refusetext, + bz1, + sqh + )values( + #{refusedtime}, + #{refuseder}, + #{ksdh}, + #{bz}, + #{refusetext}, + #{bz1}, + #{sqh} + ) + + + update lab_refused + + refusedtime= #{refusedtime}, + refuseder = #{refuseder}, + ksdh = #{ksdh}, + bz = #{bz}, + refusetext = #{refusetext}, + bz1 = #{bz1}, + sqh = #{sqh} + + where sqh = #{sqh} + + \ No newline at end of file diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java index 0956585..150a939 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java @@ -1054,4 +1054,28 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { } return 0; } + private int checkxpywrgjz(LabPat labPat){ + String ls_bz=labPat.getBz(); + String ls_sqh=labPat.getSqh(); + String yq=labPat.getYq(); + if(ls_sqh==null || ls_sqh.isEmpty()) return 0; + if(ls_bz==null || ls_bz.isEmpty()) return 0; + String ls_xpywr=commonUtil.getComOptValue(yq,"xpywrgjz"); + if(ls_xpywr==null || ls_xpywr.isEmpty()) return 0; + if(ls_bz.contains(ls_xpywr)){ + String ls_yblx=labPat.getYblx(); + if(ls_yblx==null || ls_yblx.isEmpty()) return 0; + String ls_yblxmc=commonUtil.getComDictNameById("BT",ls_yblx); + if(ls_yblxmc==null || ls_yblxmc.isEmpty()) return 0; + if(ls_yblxmc.contains("血")||ls_yblx.contains("血")){ + String ls_xpywrdh=commonUtil.getComOptValue(yq,"xpywrdh"); + if(ls_xpywrdh==null || ls_xpywrdh.isEmpty()) return 0; + String ls_hdys=labPat.getHdys(); + if(ls_hdys==null || ls_hdys.isEmpty())ls_hdys=labPat.getYhdh(); + + } + } + return 0; + } + }