From 3c922c9b8f58ca5a00c557911efcb31f437ee0d2 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Wed, 4 Mar 2026 18:07:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=86=85=E5=BC=80=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constants/SysLogConstants.java | 1 + .../controller/ReqInputLisWorkController.java | 10 +++++ .../impl/ReqInputLisWorkServiceImpl.java | 38 +++++++++++++++---- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/SysLogConstants.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/SysLogConstants.java index f6ab157..55103c0 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/SysLogConstants.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/SysLogConstants.java @@ -31,4 +31,5 @@ public class SysLogConstants { public static final String XMKNOWLEDGE_LOG = "知识库"; public static final String LABCHECKRULES_LOG = "高级审核条件"; public static final String QCRULES_LOG = "质控设置"; + public static final String REQINPUT = "科内开单"; } diff --git a/mzcx/src/main/java/com/czlis/mzcx/controller/ReqInputLisWorkController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/ReqInputLisWorkController.java index ed7cc31..990ac05 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/ReqInputLisWorkController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/ReqInputLisWorkController.java @@ -1,9 +1,13 @@ package com.czlis.mzcx.controller; +import com.czlis.common.annotation.Log; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.SysLoginParam; import com.czlis.common.core.domain.entity.lis.ComPat; import com.czlis.common.core.domain.entity.lis.LabReqmain; +import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.mzcx.pojo.dto.ReqInputLisWorkDTO; import com.czlis.mzcx.pojo.dto.ReqInputLisWorkReqInfoDTO; import com.czlis.mzcx.pojo.vo.ReqInputLisWorkVO; @@ -26,6 +30,8 @@ public class ReqInputLisWorkController extends BaseController { @ApiOperation("查询病人信息") @GetMapping("/queryPatInfo") public Result getPatientInfo(ComPat comPat){ + SysLoginParam sysLoginParam = getLoginUser().getSysLoginParam(); + comPat.setYljg(sysLoginParam.getLoginYLJG()); return reqInputLisWorkService.getPatientInfo(comPat); } @@ -35,16 +41,20 @@ public class ReqInputLisWorkController extends BaseController { return reqInputLisWorkService.queryPatList(reqInputLisWorkDTO); } + @Log(title = SysLogConstants.REQINPUT,businessType = BusinessType.INSERT) @ApiOperation("保存病人信息") @PostMapping("/saveReqInfo") public Result saveReqInfo(@RequestBody ReqInputLisWorkReqInfoDTO reqInputLisWorkReqInfoDTO){ LabReqmain labReqmain = reqInputLisWorkReqInfoDTO.getLabReqmain(); List reqInputLisWorkVOList = reqInputLisWorkReqInfoDTO.getReqInputLisWorkVOList(); + labReqmain.setSqys(getUsername()); labReqmain.setZxys(getUsername()); + labReqmain.setYljg(getLoginUser().getSysLoginParam().getLoginYLJG()); return reqInputLisWorkService.saveReqInfo(labReqmain,reqInputLisWorkVOList); } + @ApiOperation("获取项目信息") @GetMapping("/queryXmInfoList") public Result queryXmInfoList(){ diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/impl/ReqInputLisWorkServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/ReqInputLisWorkServiceImpl.java index d828f6e..e1ff333 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/impl/ReqInputLisWorkServiceImpl.java +++ b/mzcx/src/main/java/com/czlis/mzcx/service/impl/ReqInputLisWorkServiceImpl.java @@ -40,6 +40,7 @@ public class ReqInputLisWorkServiceImpl implements ReqInputLisWorkService { DayMessage dayMessage = new DayMessage(); dayMessage.setMsgid("222"); dayMessage.setMsg(comPat.getBrdh()); + dayMessage.setYljg(comPat.getYljg()); lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.DAYMESSAGE,dayMessage); List comPatList = commonUtil.getComPat(comPat.getBrdh(), comPat.getYljg()); @@ -58,6 +59,17 @@ public class ReqInputLisWorkServiceImpl implements ReqInputLisWorkService { //开始时间和结束时间不能间隔一个月 if(Math.abs(begdate.getTime() - enddate.getTime()) > 30L * 24 * 60 * 60 * 1000) return new Result("-1","开始时间和结束时间不能超过一个月！"); List> mapList = reqInputLisWorkMapper.queryPatList(reqInputLisWorkDTO); + for (Map stringObjectMap : mapList) { + String bank = LisUtil.isBank(stringObjectMap.get("brsr")); + if(bank.equals("")) continue; + String brsr = DateUtil.format(DateUtil.parse(stringObjectMap.get("brsr").toString(), "yyyy-MM-dd"), "yyyy-MM-dd"); + if(brsr != null){ + Map ageFromBirthDay = LisUtil.getAgeFromBirthDay(brsr); + stringObjectMap.put("nl",LisUtil.isBank(ageFromBirthDay.get("age"))); + stringObjectMap.put("nldw",LisUtil.isBank(ageFromBirthDay.get("unit"))); + } + + } return new Result("0","查询数据成功！",mapList); } @@ -65,11 +77,22 @@ public class ReqInputLisWorkServiceImpl implements ReqInputLisWorkService { public Result saveReqInfo(LabReqmain labReqmain,List reqInputLisWorkVOList) { String brxm = labReqmain.getBrxm(); if(brxm == null || "".equals(brxm)) return new Result("-1","病人姓名不能为空！"); + if(labReqmain.getYblx() == null || labReqmain.getYblx().equals("")) return new Result("-1","样本类型不能为空！"); + if(labReqmain.getBrdh() == null || labReqmain.getBrdh().equals("")) return new Result("-1","病人代号不能为空！"); + if(labReqmain.getBrxb() == null || labReqmain.getBrxb().equals("")) return new Result("-1","病人性别不能为空！"); List> reqInfoList = new ArrayList<>(); for (ReqInputLisWorkVO reqInputLisWorkVO : reqInputLisWorkVOList) { String sfxmmc = reqInputLisWorkVO.getSfxmmc(); String sflbdh = reqInputLisWorkVO.getSflbdh(); if(sflbdh == null || "".equals(sflbdh)) return new Result("-1",sfxmmc+"：没有分类，请先进行分类！"); + Date brsr = labReqmain.getBrsr(); + if(brsr == null) { + Integer nl = labReqmain.getNl(); + String nldw = labReqmain.getNldw(); + if(nl == null || nldw == null || nldw.isEmpty() || " ".equals(nldw)) return new Result("-1",sfxmmc+"：没有年龄，请先填写年龄！"); + Date birthDayFromAge = LisUtil.getBirthDayFromAge(nl, nldw); + labReqmain.setBrsr(birthDayFromAge); + } Map reqInfoMap = new HashMap<>(); reqInfoMap.put("lab_reqmain_yblx",labReqmain.getYblx()); reqInfoMap.put("lab_reqmain_brxm",labReqmain.getBrxm()); @@ -79,13 +102,13 @@ public class ReqInputLisWorkServiceImpl implements ReqInputLisWorkService { reqInfoMap.put("lab_reqmain_brsr",DateUtil.format(labReqmain.getBrsr(),"yyyy-MM-dd HH:mm:ss")); reqInfoMap.put("lab_reqmain_ksdh",labReqmain.getKsdh()); reqInfoMap.put("lab_reqmain_sqys",labReqmain.getSqys()); - reqInfoMap.put("lab_reqmain_sqsj",DateUtil.format(labReqmain.getSqsj(),"yyyy-MM-dd HH:mm:ss")); + reqInfoMap.put("lab_reqmain_sqsj",DateUtil.format(commonUtil.getCurrentTime(),"yyyy-MM-dd HH:mm:ss")); reqInfoMap.put("lab_reqmain_ch",labReqmain.getCh()); String value = commonUtil.getComOptValue("HISOPT", "sp_knkdbrly"); if(value == null || "".equals(value)) value = "1"; reqInfoMap.put("lab_reqmain_brly",value); reqInfoMap.put("lab_reqmain_zt","1"); - reqInfoMap.put("lab_reqmain_yljg","1"); + reqInfoMap.put("lab_reqmain_yljg",labReqmain.getYljg()); reqInfoMap.put("lab_reqmain_zxys",labReqmain.getZxys()); reqInfoMap.put("lab_reqmain_jjzt","0"); @@ -101,7 +124,6 @@ public class ReqInputLisWorkServiceImpl implements ReqInputLisWorkService { reqInfoList.add(reqInfoMap); } - //给默认值 createReqInfo(reqInfoList); return new Result("0","保存数据成功！"); } @@ -198,19 +220,19 @@ public class ReqInputLisWorkServiceImpl implements ReqInputLisWorkService { k++; labReqmain.setJzbz(stringObjectMap.get("lab_reqmain_jzbz").toString()); labReqmain.setYblx(stringObjectMap.get("lab_reqmain_yblx").toString()); - labReqmain.setKsdh( stringObjectMap.get("lab_reqmain_ksdh").toString()); + labReqmain.setKsdh( LisUtil.isBank(stringObjectMap.get("lab_reqmain_ksdh"))); labReqmain.setSqys( LisUtil.isBank(stringObjectMap.get("lab_reqmain_sqys"))); labReqmain.setBrdh( (String)stringObjectMap.get("lab_reqmain_brdh")); labReqmain.setBrxm( (String)stringObjectMap.get("lab_reqmain_brxm")); labReqmain.setBrxb( (String)stringObjectMap.get("lab_reqmain_brxb")); - String brsr = stringObjectMap.get("lab_reqmain_brsr").toString(); + String brsr = LisUtil.isBank(stringObjectMap.get("lab_reqmain_brsr")); labReqmain.setBrsr(DateUtil.parse(brsr,"yyyy-MM-dd HH:mm:ss")); labReqmain.setSqsj(DateUtil.parse(stringObjectMap.get("lab_reqmain_sqsj").toString(),"yyyy-MM-dd HH:mm:ss")); labReqmain.setBgddh((String) stringObjectMap.get("sflbdh")); - labReqmain.setYljg(stringObjectMap.get("lab_reqmain_yljg").toString()); - labReqmain.setZxys(stringObjectMap.get("lab_reqmain_zxys").toString()); + labReqmain.setYljg(LisUtil.isBank(stringObjectMap.get("lab_reqmain_yljg"))); + labReqmain.setZxys(LisUtil.isBank(stringObjectMap.get("lab_reqmain_zxys"))); labReqmain.setZxsj(commonUtil.getCurrentTime()); - labReqmain.setCh((String) stringObjectMap.get("lab_reqmain_ch")); + labReqmain.setCh(LisUtil.isBank(stringObjectMap.get("lab_reqmain_ch"))); labReqmain.setSqh(sqh); // String brzd = (String)stringObjectMap.get("lab_reqmain_zd"); // if(brzd == null) brzd = "";