From 8d263a96d0a93fed52783134bc1a31d8873f524f Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Tue, 1 Jul 2025 11:52:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/entity/LabPat.java | 2 + .../constants}/LisinterfaceNameConstants.java | 4 +- .../mapper}/ComDictMapper.java | 6 +- .../interfaceCommon/mapper/CommonMapper.java | 3 + .../interfaceCommon/mapper/LabPatMapper.java | 3 +- .../mapper/LabReqmainMapper.java | 4 + .../pojo/{ => inter}/DayMessage.java | 2 +- .../pojo/{ => inter}/GetReqInterface.java | 2 +- .../pojo/{ => inter}/SetDict.java | 2 +- .../pojo/{ => inter}/SetReport.java | 2 +- .../pojo/{ => inter}/SetReqStatus.java | 2 +- .../interfaceCommon/utils/CommonUtil.java | 44 ++++- .../utils/LisInterfaceUtil.java | 2 +- .../main/resources/mapper/ComDictMapper.xml | 6 +- .../main/resources/mapper/CommonMapper.xml | 14 ++ .../main/resources/mapper/LabPatMapper.xml | 158 ++++++++++++++++++ .../resources/mapper/LabReqmainMapper.xml | 6 + .../work/LisWorkOperController.java | 22 ++- .../liswork/mapper/LisWorkOperMapper.java | 1 + .../mapper/dict/LabInstrvsreqclassMapper.java | 9 + .../liswork/pojo/LabInstrvsreqclass.java | 16 ++ .../liswork/service/LisWorkOperService.java | 6 +- .../service/impl/ComDictServiceImpl.java | 5 +- .../service/impl/LisWorkOperServiceImpl.java | 142 +++++++++++++++- .../com/czlis/liswork/utils/LisWorkUtil.java | 61 +++++++ .../mapper/LabInstrvsreqclassMapper.xml | 16 ++ .../resources/mapper/LisWorkOperMapper.xml | 13 ++ 27 files changed, 522 insertions(+), 31 deletions(-) rename {lis-common/src/main/java/com/czlis/common/constant => lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants}/LisinterfaceNameConstants.java (77%) rename {liswork/src/main/java/com/czlis/liswork/mapper/dict => lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper}/ComDictMapper.java (73%) rename lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/{ => inter}/DayMessage.java (86%) rename lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/{ => inter}/GetReqInterface.java (89%) rename lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/{ => inter}/SetDict.java (84%) rename lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/{ => inter}/SetReport.java (87%) rename lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/{ => inter}/SetReqStatus.java (85%) rename {liswork => lis-interfaceCommon}/src/main/resources/mapper/ComDictMapper.xml (94%) create mode 100644 lis-interfaceCommon/src/main/resources/mapper/CommonMapper.xml create mode 100644 liswork/src/main/java/com/czlis/liswork/mapper/dict/LabInstrvsreqclassMapper.java create mode 100644 liswork/src/main/java/com/czlis/liswork/pojo/LabInstrvsreqclass.java create mode 100644 liswork/src/main/resources/mapper/LabInstrvsreqclassMapper.xml create mode 100644 liswork/src/main/resources/mapper/LisWorkOperMapper.xml diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabPat.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabPat.java index de4fcf9..904784d 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabPat.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabPat.java @@ -69,6 +69,8 @@ public class LabPat extends BaseEntity { private String zjlx; private String upload; private String wyh; + private Integer shcs; + private String lstd; diff --git a/lis-common/src/main/java/com/czlis/common/constant/LisinterfaceNameConstants.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/LisinterfaceNameConstants.java similarity index 77% rename from lis-common/src/main/java/com/czlis/common/constant/LisinterfaceNameConstants.java rename to lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/LisinterfaceNameConstants.java index 8768e29..f2d4c3c 100644 --- a/lis-common/src/main/java/com/czlis/common/constant/LisinterfaceNameConstants.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/LisinterfaceNameConstants.java @@ -1,4 +1,4 @@ -package com.czlis.common.constant; +package com.czlis.interfaceCommon.constants; /** * 接口名称常量类 @@ -9,4 +9,6 @@ public class LisinterfaceNameConstants { public static final String SETREPORT = "setreport"; public static final String SETREQSTATUS = "setreqstatus"; public static final String DAYMESSAGE = "daymessage"; + + public static final String DAYMESSAGE_GETPATIENT = "204"; } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/dict/ComDictMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComDictMapper.java similarity index 73% rename from liswork/src/main/java/com/czlis/liswork/mapper/dict/ComDictMapper.java rename to lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComDictMapper.java index 69febd6..467d9f6 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/dict/ComDictMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComDictMapper.java @@ -1,4 +1,4 @@ -package com.czlis.liswork.mapper.dict; +package com.czlis.interfaceCommon.mapper; import com.czlis.common.core.domain.entity.ComDict; @@ -16,7 +16,7 @@ public interface ComDictMapper { //根据主键判断是否存在数据 int getCountById(String zdlb, String zddh) ; //根据编号查名称 - String getNameById(String zdlb,String zdmc); + String getComDictNameById(String zdlb,String zddh); //根据名称查编号 - String getIdByName(String zdlb,String zdmc); + String getComDictIdByName(String zdlb,String zdmc); } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/CommonMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/CommonMapper.java index d35ed1e..fada2c0 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/CommonMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/CommonMapper.java @@ -1,4 +1,7 @@ package com.czlis.interfaceCommon.mapper; +import java.util.Date; + public interface CommonMapper { + Date getCurrentTime(); } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatMapper.java index 6da6110..2646bd4 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatMapper.java @@ -6,6 +6,7 @@ import java.util.Date; import java.util.List; public interface LabPatMapper { - List getLabPatList(); + List getLabPatList(String sqh); LabPat getLabPatOne(Date jyrq, String yq,String ybh); + void insertLabPat(LabPat labPat); } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReqmainMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReqmainMapper.java index 5853ab1..67e54c2 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReqmainMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReqmainMapper.java @@ -2,6 +2,10 @@ package com.czlis.interfaceCommon.mapper; import com.czlis.common.core.domain.entity.LabReqmain; +import java.util.Map; + public interface LabReqmainMapper { LabReqmain getLabReqmainOne(String sqh); + void updateLabReqmain(LabReqmain labReqmain); + void updateLabReqmainZT(Map map); } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/DayMessage.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/DayMessage.java similarity index 86% rename from lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/DayMessage.java rename to lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/DayMessage.java index 9413e16..996e2c6 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/DayMessage.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/DayMessage.java @@ -1,4 +1,4 @@ -package com.czlis.interfaceCommon.pojo; +package com.czlis.interfaceCommon.pojo.inter; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/GetReqInterface.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/GetReqInterface.java similarity index 89% rename from lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/GetReqInterface.java rename to lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/GetReqInterface.java index 0bf9e07..a65757a 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/GetReqInterface.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/GetReqInterface.java @@ -1,4 +1,4 @@ -package com.czlis.interfaceCommon.pojo; +package com.czlis.interfaceCommon.pojo.inter; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/SetDict.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetDict.java similarity index 84% rename from lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/SetDict.java rename to lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetDict.java index 7db2deb..40ea33e 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/SetDict.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetDict.java @@ -1,4 +1,4 @@ -package com.czlis.interfaceCommon.pojo; +package com.czlis.interfaceCommon.pojo.inter; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/SetReport.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetReport.java similarity index 87% rename from lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/SetReport.java rename to lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetReport.java index fdaf8ec..3ab8940 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/SetReport.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetReport.java @@ -1,4 +1,4 @@ -package com.czlis.interfaceCommon.pojo; +package com.czlis.interfaceCommon.pojo.inter; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/SetReqStatus.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetReqStatus.java similarity index 85% rename from lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/SetReqStatus.java rename to lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetReqStatus.java index 8cd7d39..6280a0e 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/SetReqStatus.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetReqStatus.java @@ -1,4 +1,4 @@ -package com.czlis.interfaceCommon.pojo; +package com.czlis.interfaceCommon.pojo.inter; import lombok.AllArgsConstructor; import lombok.Data; 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 e0e8e04..03d30ea 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 @@ -2,13 +2,12 @@ package com.czlis.interfaceCommon.utils; import com.czlis.common.core.domain.entity.LabPat; import com.czlis.common.core.domain.entity.LabReqmain; -import com.czlis.interfaceCommon.mapper.ComOptMapper; -import com.czlis.interfaceCommon.mapper.LabPatMapper; -import com.czlis.interfaceCommon.mapper.LabReqmainMapper; +import com.czlis.interfaceCommon.mapper.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; -import java.util.Date; +import java.util.*; @Component public class CommonUtil { @@ -19,6 +18,11 @@ public class CommonUtil { ComOptMapper comOptMapper; @Autowired LabReqmainMapper labReqmainMapper; + @Autowired + CommonMapper commonMapper; + @Autowired + ComDictMapper comDictMapper; + public LabPat getLabPatOne(Date jyrq, String yq, String ybh){ return labPatMapper.getLabPatOne(jyrq, yq, ybh); @@ -31,4 +35,36 @@ public class CommonUtil { public LabReqmain getLabReqmainOne(String sqh){ return labReqmainMapper.getLabReqmainOne(sqh); } + + public List getLabPatList(String sqh){ + return labPatMapper.getLabPatList(sqh); + } + + + @Transactional(rollbackFor = Exception.class) + public void insertLabPat(LabPat labPat){ + labPatMapper.insertLabPat(labPat); + } + + public Date getCurrentTime(){ + return commonMapper.getCurrentTime(); + } + + public String getComDictNameById(String zdlb,String xxdh){ + String zdmc = comDictMapper.getComDictNameById(zdlb,xxdh); + if(zdmc == null || zdmc.equals("")){ + return xxdh; + }else{ + return zdmc; + } + } + + public String getComDictIdByName(String zdlb,String zdmc){ + String zddh = comDictMapper.getComDictIdByName(zdlb,zdmc); + if(zddh == null || zddh.equals("")){ + return zdmc; + }else{ + return zddh; + } + } } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java index bfea642..aac3cc4 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java @@ -6,7 +6,7 @@ import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.czlis.common.config.RuoYiConfig; -import com.czlis.common.constant.LisinterfaceNameConstants; +import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants; import com.czlis.common.core.domain.Result; import com.czlis.interfaceCommon.mapper.LisInterfaceMapper; import lombok.extern.slf4j.Slf4j; diff --git a/liswork/src/main/resources/mapper/ComDictMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/ComDictMapper.xml similarity index 94% rename from liswork/src/main/resources/mapper/ComDictMapper.xml rename to lis-interfaceCommon/src/main/resources/mapper/ComDictMapper.xml index cf583a1..a7643da 100644 --- a/liswork/src/main/resources/mapper/ComDictMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/ComDictMapper.xml @@ -1,7 +1,7 @@ - + select zdlb,zddh,zdmc,zjf,zdbz,bz,yljg,userflag from com_dict @@ -27,10 +27,10 @@ - select zdmc from com_dict where zdlb = #{zdlb} and zddh = #{zddh} - select zddh from com_dict where zdlb = #{zdlb} and zdmc = #{zdmc} diff --git a/lis-interfaceCommon/src/main/resources/mapper/CommonMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/CommonMapper.xml new file mode 100644 index 0000000..c5678f3 --- /dev/null +++ b/lis-interfaceCommon/src/main/resources/mapper/CommonMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml index fa79d49..16b168c 100644 --- a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml @@ -6,6 +6,164 @@ select * from lab_pat where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh} + + + + insert into lab_pat ( + wyh, + yblx, + fb, + ksdh, + sjys, + hdys, + yhdh, + brdh, + brxm, + brxb, + brly, + ch, + nl, + nldw, + sqh, + sqsj, + dysj, + dybz, + jgbz, + bbbz, + zd, + bz, + bz1, + zjf, + zjf, + cyrq, + bq, + czybh, + cjbw, + jymd, + lastuser, + lastdt, + confirmer, + confirmdt, + mzdy, + txtval, + fslx, + ybzt, + instrid, + jzbz, + sbbr, + qrr, + qrsj, + alarmflag, + alarmconfirm, + alarmconfirmdt, + shcs, + sn_tss, + sn_result, + mzh, + yljg, + finish, + send_flag, + sfzh, + phone, + phone1, + addr, + faultman, + fault, + faults, + faultdt, + lstd, + zjlx, + slzq, + uploaddate, + lastupdatetime, + ylfw, + upload, + checker, + lisptsc, + autojgbz, + crbsj, + testName, + jyrq,yq,ybh + ) + values( + #{wyh}, + #{yblx}, + #{fb}, + #{ksdh}, + #{sjys}, + #{hdys}, + #{yhdh}, + #{brdh}, + #{brxm}, + #{brxb}, + #{brly}, + #{ch}, + #{nl}, + #{nldw}, + #{sqh}, + #{sqsj}, + #{dysj}, + #{dybz}, + #{jgbz}, + #{bbbz}, + #{zd}, + #{bz}, + #{bz1}, + #{zjf}, + #{cyrq}, + #{bq}, + #{czybh}, + #{cjbw}, + #{jymd}, + #{lastuser}, + #{lastdt}, + #{confirmer}, + #{confirmdt}, + #{mzdy}, + #{txtval}, + #{fslx}, + #{ybzt}, + #{instrid}, + #{jzbz}, + #{sbbr}, + #{qrr}, + #{qrsj}, + #{alarmflag}, + #{alarmconfirm}, + #{alarmconfirmdt}, + #{shcs}, + #{sn_tss}, + #{sn_result}, + #{mzh}, + #{yljg}, + #{finish}, + #{send_flag}, + #{sfzh}, + #{phone}, + #{phone1}, + #{addr}, + #{faultman}, + #{fault}, + #{faults}, + #{faultdt}, + #{lstd}, + #{zjlx}, + #{slzq}, + #{uploaddate}, + #{lastupdatetime}, + #{ylfw}, + #{upload}, + #{checker}, + #{lisptsc}, + #{autojgbz}, + #{crbsj}, + #{testName}, + #{jyrq},#{yq},#{ybh} + ) + + diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabReqmainMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabReqmainMapper.xml index 00aeb49..8e4e570 100644 --- a/lis-interfaceCommon/src/main/resources/mapper/LabReqmainMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/LabReqmainMapper.xml @@ -6,6 +6,12 @@ select * from lab_reqmain where sqh = #{sqh} + + + + diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java index 912777d..5169292 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java @@ -1,16 +1,21 @@ package com.czlis.liswork.controller.work; +import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.LabPat; import com.czlis.liswork.service.LisWorkOperService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Date; + @RestController @RequestMapping("/lisworkoper") -public class LisWorkOperController { +public class LisWorkOperController extends BaseController { @Autowired private LisWorkOperService lisWorkOperService; @@ -18,7 +23,18 @@ public class LisWorkOperController { @ApiOperation(("新增病人信息")) @GetMapping("/newpat") - public Result newPatInfo(String sqh){ - return lisWorkOperService.newPatInfo(sqh); + public Result newPatInfo(Date jyrq, String sqh, String yq, String ybh){ + return lisWorkOperService.newPatInfo(jyrq,ybh,sqh,yq,getUserId()); + } + + /** + * 修改病人信息 + * @param labPat + * @return + */ + @ApiOperation("修改病人信息") + @PostMapping("/changepat") + public Result changePat(LabPat labPat){ + return lisWorkOperService.changePat(labPat); } } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkOperMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkOperMapper.java index fdc8842..a7e852c 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkOperMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkOperMapper.java @@ -1,4 +1,5 @@ package com.czlis.liswork.mapper; public interface LisWorkOperMapper { + Long checkReqClass(String sqh,String yq); } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/dict/LabInstrvsreqclassMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/dict/LabInstrvsreqclassMapper.java new file mode 100644 index 0000000..2b26ac2 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/mapper/dict/LabInstrvsreqclassMapper.java @@ -0,0 +1,9 @@ +package com.czlis.liswork.mapper.dict; + +import com.czlis.liswork.pojo.LabInstrvsreqclass; + +import java.util.List; + +public interface LabInstrvsreqclassMapper { + List getLabInstrvsreqclassList(LabInstrvsreqclass labInstrvsreqclass); +} diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/LabInstrvsreqclass.java b/liswork/src/main/java/com/czlis/liswork/pojo/LabInstrvsreqclass.java new file mode 100644 index 0000000..c585411 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/pojo/LabInstrvsreqclass.java @@ -0,0 +1,16 @@ +package com.czlis.liswork.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LabInstrvsreqclass { + private String yq; + private String bgddh; + private Integer seq; + private String brly; + private String bk; +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkOperService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkOperService.java index f7f54e3..f313643 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkOperService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkOperService.java @@ -1,7 +1,11 @@ package com.czlis.liswork.service; import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.LabPat; + +import java.util.Date; public interface LisWorkOperService { - Result newPatInfo(String sqh); + Result newPatInfo(Date jyrq,String ybh, String sqh, String yq, Long userId); + Result changePat(LabPat labPat); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/ComDictServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/ComDictServiceImpl.java index 5dc5540..01f0953 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/ComDictServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/ComDictServiceImpl.java @@ -2,16 +2,13 @@ package com.czlis.liswork.service.impl; import cn.hutool.extra.pinyin.PinyinUtil; -import com.czlis.common.constant.HttpStatus; import com.czlis.common.core.domain.Result; -import com.czlis.common.exception.ServiceException; import com.czlis.common.utils.ComDictUtils; import com.czlis.common.utils.StringUtils; -import com.czlis.liswork.mapper.dict.ComDictMapper; +import com.czlis.interfaceCommon.mapper.ComDictMapper; import com.czlis.common.core.domain.entity.ComDict; import com.czlis.liswork.service.ComDictService; import lombok.extern.slf4j.Slf4j; -import org.hibernate.validator.constraints.ru.INN; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; 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 ea80a62..20f6fd3 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 @@ -1,17 +1,29 @@ package com.czlis.liswork.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONUtil; -import com.czlis.common.constant.LisinterfaceNameConstants; +import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants; import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.LabPat; import com.czlis.common.core.domain.entity.LabReqmain; -import com.czlis.interfaceCommon.pojo.GetReqInterface; +import com.czlis.interfaceCommon.mapper.LabReqmainMapper; +import com.czlis.interfaceCommon.pojo.inter.DayMessage; +import com.czlis.interfaceCommon.pojo.inter.GetReqInterface; +import com.czlis.interfaceCommon.pojo.inter.SetReqStatus; import com.czlis.interfaceCommon.utils.CommonUtil; import com.czlis.interfaceCommon.utils.LisInterfaceUtil; import com.czlis.liswork.mapper.LisWorkOperMapper; +import com.czlis.liswork.mapper.dict.LabInstrvsreqclassMapper; +import com.czlis.liswork.pojo.LabInstrvsreqclass; import com.czlis.liswork.service.LisWorkOperService; +import com.czlis.liswork.utils.LisWorkUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import java.util.stream.Collectors; @Service @Slf4j @@ -23,9 +35,13 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { LisInterfaceUtil lisInterfaceUtil; @Autowired CommonUtil commonUtil; + @Autowired + LabInstrvsreqclassMapper labInstrvsreqclassMapper; + @Autowired + LabReqmainMapper labReqmainMapper; @Override - public Result newPatInfo(String sqh) { + public Result newPatInfo(Date jyrq,String ybh, String sqh, String yq, Long userId) { LabReqmain labReqmainOne = commonUtil.getLabReqmainOne(sqh); if (labReqmainOne == null) { @@ -44,19 +60,135 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { } if(labReqmainOne == null) return new Result("-1","没有获取到申请单信息！"); String zt = labReqmainOne.getZt().trim(); + //2.校验信息 + //校验状态信息 + Result result1 = checkZT(sqh, yq, zt); + if(!result1.getCode().equals("0")) return result1; + //校验条码类别 + Result result2 = checkReqClass(sqh, yq, labReqmainOne.getBgddh()); + if(!result2.getCode().equals("0")) return result2; + + //3.调用his上机接口， + SetReqStatus setReqStatus = new SetReqStatus(); + setReqStatus.setIp(""); + setReqStatus.setSqh(sqh); + setReqStatus.setUserid(userId.toString()); + setReqStatus.setStatus("2"); + String jsonStr = JSONUtil.toJsonStr(setReqStatus); + Result result = lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.SETREQSTATUS, jsonStr); + if(!result.getCode().equals("0")) return result; + + //4.获取病人信息 + DayMessage dayMessage = new DayMessage(); + dayMessage.setIp(""); + dayMessage.setYljg("1"); + dayMessage.setUserid(userId.toString()); + dayMessage.setMsgid(LisinterfaceNameConstants.DAYMESSAGE_GETPATIENT); + String val = labReqmainOne.getBrdh()+"|"+labReqmainOne.getBrly()+"|"; //这里有个医疗机构的，没有传，要考虑 + dayMessage.setMsg(val); + + //5.保存数据 + Result result3 = saveReqInfo(userId.toString(), sqh, labReqmainOne, yq, jyrq, ybh); + if (!result3.getCode().equals("0")) return result3; + + //6.写日志 + + + return new Result("0",""); + } + + @Override + public Result changePat(LabPat labPat) { + return null; + } + + private Result checkZT(String sqh,String yq,String zt){ if(zt.equals("9")) return new Result("-1","当前条码已经作废，不允许上机！"); String SP_GETTOWREQOK = commonUtil.getComOptValue("HISOPT", "SP_GETTOWREQOK"); //申请单禁止重复上机 String SP_GETTOWREQOKYQ = commonUtil.getComOptValue("HISOPT", "SP_GETTOWREQOKYQ");//申请单禁止同仪器重复上机 if(zt.equals("2")){ if(SP_GETTOWREQOK.equals("1")) return new Result("-1","当前条码已经上机！"); if(SP_GETTOWREQOKYQ.equals("1")){ - //仪器代码取值要考虑 + List labPatList = commonUtil.getLabPatList(sqh); + for (LabPat labPat : labPatList) { + String yq1 = labPat.getYq(); + if(yq.equals(yq1)) return new Result("-1","该条码已经在当前仪器上机,不允许重复上机！"); + } + } } + return new Result("0","校验成功！"); + } + + private Result checkReqClass(String sqh,String yq,String bgddh){ + String value = commonUtil.getComOptValue(yq, "chkreqclass"); + if(!value.equals("1")) return new Result("0",""); + LabInstrvsreqclass labInstrvsreqclass = new LabInstrvsreqclass(); + labInstrvsreqclass.setYq(yq); + List labInstrvsreqclassList = labInstrvsreqclassMapper.getLabInstrvsreqclassList(labInstrvsreqclass); + if(labInstrvsreqclassList.size() > 0){ + List collect = labInstrvsreqclassList.stream().filter(labInstrvsreqclass1 -> labInstrvsreqclass1.getBgddh().equals(bgddh)).collect(Collectors.toList()); + List collect1 = labInstrvsreqclassList.stream().filter(labInstrvsreqclass1 -> labInstrvsreqclass1.getBgddh().equals("MZ_" + bgddh)).collect(Collectors.toList()); + if(collect.size() > 0) return new Result("0",""); + if(collect1.size() > 0) return new Result("0",""); + } + + Long count = lisWorkOperMapper.checkReqClass(sqh, yq); + if(count > 0) { + return new Result("0",""); + }else{ + return new Result("1",""); + } + + } + @Transactional(rollbackFor = Exception.class) + public Result saveReqInfo(String userId,String sqh,LabReqmain labReqmain,String yq,Date jyrq,String ybh){ + //修改状态和时间 + updateLabReqmainZT(userId,sqh); + //保存lab_pat表信息 + LabPat labPat = new LabPat(); + labPat.setJyrq(commonUtil.getCurrentTime()); + labPat.setYq(yq); + labPat.setYbh(ybh); + labPat.setYblx(commonUtil.getComDictIdByName("BT",labReqmain.getYblx())); + labPat.setKsdh(commonUtil.getComDictIdByName("DP",labReqmain.getKsdh())); + labPat.setSjys(userId); + labPat.setBrdh(labReqmain.getBrdh()); + labPat.setBrxm(labReqmain.getBrxm()); + labPat.setBrxb(labReqmain.getBrxb()); + labPat.setBrly(labReqmain.getBrly()); + labPat.setCh(labReqmain.getCh()); + Map ageFromBirthDay = LisWorkUtil.getAgeFromBirthDay(DateUtil.format(labReqmain.getBrsr(), "yyyy-MM-dd")); + String age = ageFromBirthDay.get("age"); + String unit = ageFromBirthDay.get("unit"); + labPat.setNl(Integer.parseInt(age)); + labPat.setNldw(unit); + labPat.setSqh(sqh); + labPat.setSqsj(labReqmain.getSqsj()); + labPat.setJgbz("0"); + labPat.setZd(labReqmain.getZd()); + labPat.setCyrq(labReqmain.getCysj()); + labPat.setJymd(labReqmain.getJymd()); + labPat.setLastuser(userId); + labPat.setLastdt(commonUtil.getCurrentTime()); + labPat.setShcs(0); + labPat.setYljg(labReqmain.getYljg()); + labPat.setSfzh(labReqmain.getSfzh()); + labPat.setPhone(labReqmain.getPhone()); + labPat.setAddr(labReqmain.getAddr()); + labPat.setLstd(labReqmain.getLstd()); + commonUtil.insertLabPat(labPat); + return new Result("0","保存成功！"); + } - return null; + + public void updateLabReqmainZT(String userId,String sqh){ + Map map = new HashMap<>(); + map.put("userId",userId); + map.put("sqh",sqh); + labReqmainMapper.updateLabReqmainZT(map); } diff --git a/liswork/src/main/java/com/czlis/liswork/utils/LisWorkUtil.java b/liswork/src/main/java/com/czlis/liswork/utils/LisWorkUtil.java index 71e184e..62ea36d 100644 --- a/liswork/src/main/java/com/czlis/liswork/utils/LisWorkUtil.java +++ b/liswork/src/main/java/com/czlis/liswork/utils/LisWorkUtil.java @@ -1,9 +1,70 @@ package com.czlis.liswork.utils; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; import org.springframework.stereotype.Component; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + @Component public class LisWorkUtil { + /** + * 生日格式为：yyyy-MM-dd + * 根据出生日期计算年龄 + * @param birthday + * @return + */ + public static Map getAgeFromBirthDay(String birthday){ + Map map = new HashMap<>(); + int age = DateUtil.ageOfNow(birthday); + if(age > 0){ + map.put("age",String.valueOf(age)); + map.put("unit","岁"); + }else if(age == 0){ + //不足一年的 + long between = DateUtil.between(DateUtil.parse(birthday, "yyyy-MM-dd"), DateUtil.parse(DateUtil.today(), "yyyy-MM-dd"), DateUnit.DAY,true); + if(between/30 > 0){ + long month = between/30; + map.put("age",String.valueOf(month)); + map.put("unit","月"); + }else if( between/30 == 0){ + //不足一月的 + map.put("age",String.valueOf(between)); + map.put("unit","天"); + }else{ + + } + }else{ + + } + return map; + } + + /** + * 根据年龄获取出生日期 + * @param nl + * @return + */ + public static Date getBirthDayFromAge(int nl, String nldw){ + Calendar cal = Calendar.getInstance(); + cal.setTime(DateUtil.date()); + switch (nldw){ + case "岁": + cal.add(Calendar.YEAR,-nl); + case "月": + cal.add(Calendar.MONTH,-nl); + case "天": + cal.add(Calendar.DATE,-nl); + } + Date BirthDay = cal.getTime(); + SimpleDateFormat df=new SimpleDateFormat("yyyy-MM-dd"); + String format = df.format(BirthDay); + return DateUtil.parse(format,"yyyy-MM-dd"); + } } diff --git a/liswork/src/main/resources/mapper/LabInstrvsreqclassMapper.xml b/liswork/src/main/resources/mapper/LabInstrvsreqclassMapper.xml new file mode 100644 index 0000000..c7a17d8 --- /dev/null +++ b/liswork/src/main/resources/mapper/LabInstrvsreqclassMapper.xml @@ -0,0 +1,16 @@ + + + + + + + diff --git a/liswork/src/main/resources/mapper/LisWorkOperMapper.xml b/liswork/src/main/resources/mapper/LisWorkOperMapper.xml new file mode 100644 index 0000000..f36530b --- /dev/null +++ b/liswork/src/main/resources/mapper/LisWorkOperMapper.xml @@ -0,0 +1,13 @@ + + + + + + + +