jiangs/lis8.0
2
0
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases Wiki Activity

主程序

Browse Source
This commit is contained in:
tangw 2025-10-22 18:52:46 +08:00
parent ad59e5e93f
commit 426be1babc
4 changed files with 98 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java
View File

@ -120,11 +120,40 @@ public class LisWorkUtils {
// } // }
return new Result("0", "审核成功！"); return new Result("0", "审核成功！");
} }
public Result saveallresult(List<LabResult> labResultList) {
if(labResultList == null || labResultList.isEmpty()) return new Result("-1", "结果集为空！");
Date jyrq0 = labResultList.get(0).getJyrq();
String yq0 = labResultList.get(0).getYq();
String ybh0 = labResultList.get(0).getYbh();
if(jyrq0==null)return new Result("-1", "主键为空！");
if(yq0==null||yq0.isEmpty())return new Result("-1", "主键为空！");
if(ybh0==null||ybh0.isEmpty())return new Result("-1", "主键为空！");
for (LabResult labResult : labResultList) {
Date jyrq = labResult.getJyrq();
String yq = labResult.getYq();
String ybh = labResult.getYbh();
String xmdh = labResult.getXmdh();
if(jyrq==null)return new Result("-1", "主键为空！");
if(yq==null||yq.isEmpty())return new Result("-1", "主键为空！");
if(ybh==null||ybh.isEmpty())return new Result("-1", "主键为空！");
if(xmdh==null||xmdh.isEmpty())return new Result("-1", "主键为空！");
}
commonUtil.delLabResultAll(jyrq0,yq0,ybh0);
for (LabResult labResult : labResultList) {
commonUtil.insertLabResult(labResult);
}
return saveallresult(labResultList);
}
public Result saveallresult(Date jyrq, String yq, String ybh) { public Result saveallresult(Date jyrq, String yq, String ybh) {
int finsh = 1;
List<LabResult> labResultList = commonUtil.getLabResultList(jyrq, yq, ybh); List<LabResult> labResultList = commonUtil.getLabResultList(jyrq, yq, ybh);
return saveresult(labResultList);
}
public Result saveresult(List<LabResult> labResultList) {
if (labResultList == null || labResultList.isEmpty()) return new Result("-1", "结果为空！"); if (labResultList == null || labResultList.isEmpty()) return new Result("-1", "结果为空！");
Date jyrq = labResultList.get(0).getJyrq();
String yq = labResultList.get(0).getYq();
String ybh = labResultList.get(0).getYbh();
int finsh = 1;
for (LabResult labResult : labResultList) { for (LabResult labResult : labResultList) {
String csjg = labResult.getCsjg(); String csjg = labResult.getCsjg();
if ("未做".equals(csjg)) { if ("未做".equals(csjg)) {
@ -154,7 +183,6 @@ public class LisWorkUtils {
commonUtil.updateLabPat(labPat); commonUtil.updateLabPat(labPat);
return new Result("0", "保存成功！"); return new Result("0", "保存成功！");
} }
/** /**
* 审核报告单全流程 * 审核报告单全流程
* *

21
liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java
View File

@ -1,13 +1,12 @@
package com.czlis.liswork.controller.work; package com.czlis.liswork.controller.work;
import cn.hutool.core.bean.BeanUtil;
import com.czlis.common.annotation.Log; import com.czlis.common.annotation.Log;
import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.controller.BaseController;
import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.Result;
import com.czlis.common.core.domain.entity.lis.LabPat; import com.czlis.common.core.domain.entity.lis.LabPat;
import com.czlis.common.core.domain.entity.lis.LabResult; import com.czlis.common.core.domain.entity.lis.LabResult;
import com.czlis.common.enums.BusinessType; import com.czlis.common.enums.BusinessType;
import com.czlis.common.utils.ServletUtils;
import com.czlis.liswork.service.LisWorkOperService; import com.czlis.liswork.service.LisWorkOperService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -15,11 +14,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
@Slf4j @Slf4j
@RestController @RestController
@ -43,12 +39,6 @@ public class LisWorkOperController extends BaseController {
return lisWorkOperService.loaddefault(jyrq, yq ,ybh); return lisWorkOperService.loaddefault(jyrq, yq ,ybh);
} }
/**
* 修改病人信息
*
* @param
* @return
*/
@Log(title = "主界面",businessType = BusinessType.UPDATE) @Log(title = "主界面",businessType = BusinessType.UPDATE)
@ApiOperation("修改病人信息") @ApiOperation("修改病人信息")
@PostMapping("/changepat") @PostMapping("/changepat")
@ -91,7 +81,12 @@ public class LisWorkOperController extends BaseController {
public Result newresult(@RequestBody LabResult labResult) { public Result newresult(@RequestBody LabResult labResult) {
return lisWorkOperService.newresult(labResult); return lisWorkOperService.newresult(labResult);
} }
@Log(title = "主界面",businessType = BusinessType.UPDATE_DETAIL)
@ApiOperation("保存病人结果")
@PostMapping("/saveresult")
public Result saveresult(@RequestBody List<LabResult> labResult) {
return lisWorkOperService.saveallresult(labResult);
}
/** /**
* 审核报告 * 审核报告
* *
@ -99,7 +94,7 @@ public class LisWorkOperController extends BaseController {
* @param yq 仪器 * @param yq 仪器
* @param ybh 样本号 * @param ybh 样本号
* @param yhdh 核对医生 * @param yhdh 核对医生
* @return * @return 返回消息
*/ */
@Log(title = "主界面",businessType = BusinessType.CHECK) @Log(title = "主界面",businessType = BusinessType.CHECK)
@ApiOperation("审核报告") @ApiOperation("审核报告")

78
liswork/src/main/java/com/czlis/liswork/service/LisWorkOperService.java
View File

@ -5,6 +5,7 @@ import com.czlis.common.core.domain.entity.lis.LabPat;
import com.czlis.common.core.domain.entity.lis.LabResult; import com.czlis.common.core.domain.entity.lis.LabResult;
import java.util.Date; import java.util.Date;
import java.util.List;
public interface LisWorkOperService { public interface LisWorkOperService {
Result newPatInfo(Date jyrq, String ybh, String sqh, String yq); Result newPatInfo(Date jyrq, String ybh, String sqh, String yq);
@ -13,90 +14,15 @@ public interface LisWorkOperService {
Result changePatColumn(Date jyrq, String yq, String ybh,String column,String value); Result changePatColumn(Date jyrq, String yq, String ybh,String column,String value);
Result changeresult(LabResult labResult); Result changeresult(LabResult labResult);
Result newresult(LabResult labResult); Result newresult(LabResult labResult);
/** Result saveallresult(List<LabResult> labResult);
* 保存所有结果的修正值,涉及:空结果清除,计算项目添加,添加单位,添加申请项目编码,参考值重新计算更新,结果标志重新计算更新,危急值标志计算更新
*
* @param jyrq
* @param yq
* @param ybh
* @return
*/
Result saveallresult(Date jyrq, String yq, String ybh);
/**
* 结果表补充申请单项目代码
*
* @param jyrq
* @param yq
* @param ybh
*/
void setItemSqxmdh(Date jyrq, String yq, String ybh);
Result loaddefault(Date jyrq, String yq, String ybh); Result loaddefault(Date jyrq, String yq, String ybh);
/**
* 审核报告
*
* @param jyrq
* @param yq
* @param ybh
* @param hdys
* @return
*/
Result confirm(Date jyrq, String yq, String ybh, String hdys); Result confirm(Date jyrq, String yq, String ybh, String hdys);
Result confirm1(Date jyrq, String yq, String ybh, String hdys); Result confirm1(Date jyrq, String yq, String ybh, String hdys);
/**
* 解除审核
*
* @param jyrq
* @param yq
* @param ybh
* @param hdys
* @return
*/
Result unconfirm(Date jyrq, String yq, String ybh, String hdys); Result unconfirm(Date jyrq, String yq, String ybh, String hdys);
Result unconfirm1(Date jyrq, String yq, String ybh, String hdys); Result unconfirm1(Date jyrq, String yq, String ybh, String hdys);
Result unconfirmlog(Date jyrq, String yq, String ybh, String hdys, String reason); Result unconfirmlog(Date jyrq, String yq, String ybh, String hdys, String reason);
/**
* 计算项目参考值结果异常标志
*
* @param jyrq
* @param yq
* @param ybh
*/
Result saverefs(Date jyrq, String yq, String ybh); Result saverefs(Date jyrq, String yq, String ybh);
/**
* 计算项目增加及重新计算
*
* @param jyrq
* @param yq
* @param ybh
*/
Result calcsample(Date jyrq, String yq, String ybh); Result calcsample(Date jyrq, String yq, String ybh);
/**
* 获取常用取值结果标志
*
* @param yq
* @param xmdh
* @param csjg
* @return
*/
String getitemlmtflag(String yq, String xmdh, String csjg); String getitemlmtflag(String yq, String xmdh, String csjg);
/**
* 登记危急值
*
* @param jyrq
* @param yq
* @param ybh
* @param yhdh
* @param qrr
* @param phone
* @param tzfs
* @return
*/
Result reglimit(Date jyrq, String yq, String ybh, String yhdh, String qrr, String phone, String tzfs); Result reglimit(Date jyrq, String yq, String ybh, String yhdh, String qrr, String phone, String tzfs);
} }

143
liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java
View File

@ -1,37 +1,18 @@
package com.czlis.liswork.service.impl; package com.czlis.liswork.service.impl;
import cn.hutool.poi.excel.cell.CellSetter;
import com.czlis.common.core.domain.entity.SysLoginParam;
import com.czlis.common.core.domain.entity.SysUser;
import com.czlis.common.core.domain.entity.lis.*; import com.czlis.common.core.domain.entity.lis.*;
import com.czlis.common.utils.*; import com.czlis.common.utils.*;
import com.czlis.common.utils.ip.IpUtils;
import com.czlis.interfaceCommon.constants.ComLogConstants;
import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants;
import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.Result;
import com.czlis.interfaceCommon.constants.LabPatConstants;
import com.czlis.interfaceCommon.constants.LabReqmainConstants;
import com.czlis.interfaceCommon.mapper.LabReqdetailMapper;
import com.czlis.interfaceCommon.mapper.LabReqmainMapper;
import com.czlis.interfaceCommon.pojo.inter.GetReqInterface;
import com.czlis.interfaceCommon.pojo.inter.SetReport;
import com.czlis.interfaceCommon.pojo.inter.SetReqStatus;
import com.czlis.interfaceCommon.utils.*; import com.czlis.interfaceCommon.utils.*;
import com.czlis.liswork.mapper.LisWorkMapper;
import com.czlis.liswork.mapper.LisWorkOperMapper;
import com.czlis.interfaceCommon.mapper.LabInstrvsreqclassMapper;
import com.czlis.liswork.service.LisWorkOperService; import com.czlis.liswork.service.LisWorkOperService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.openxmlformats.schemas.drawingml.x2006.main.CTRegularTextRun;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
@Service @Service
@Slf4j @Slf4j
@ -74,11 +55,11 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
String brdh1=labPat.getBrdh(); String brdh1=labPat.getBrdh();
if(brdh1==null)brdh1=""; if(brdh1==null)brdh1="";
//通过修改申请号触发病人信息载入 //通过修改申请号触发病人信息载入
if(!"".equals(sqh1)&&!sqh1.equals(sqh)){ if(!sqh1.isEmpty() &&!sqh1.equals(sqh)){
return lisWorkUtils.newPatInfo(jyrq, ybh, sqh1, yq, problemId); return lisWorkUtils.newPatInfo(jyrq, ybh, sqh1, yq, problemId);
} }
//通过修改住院号触发病人信息载入 //通过修改住院号触发病人信息载入
if(!"".equals(brdh1)&&!brdh1.equals(brdh)){ if(!brdh1.isEmpty() &&!brdh1.equals(brdh)){
return lisWorkUtils.newPat(jyrq, ybh, yq, brdh1,labPat.getBrly(),labPat.getYljg(), problemId); return lisWorkUtils.newPat(jyrq, ybh, yq, brdh1,labPat.getBrly(),labPat.getYljg(), problemId);
} }
commonUtil.updateLabPat(labPat); commonUtil.updateLabPat(labPat);
@ -88,27 +69,27 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
String brdh1=labPat.getBrdh(); String brdh1=labPat.getBrdh();
if(brdh1==null)brdh1=""; if(brdh1==null)brdh1="";
// 通过修改申请号触发病人信息载入 // 通过修改申请号触发病人信息载入
if(!"".equals(sqh1)){ if(!sqh1.isEmpty()){
return lisWorkUtils.newPatInfo(jyrq, ybh, sqh1, yq, problemId); return lisWorkUtils.newPatInfo(jyrq, ybh, sqh1, yq, problemId);
} }
//通过修改住院号触发病人信息载入 //通过修改住院号触发病人信息载入
if(!"".equals(brdh1)){ if(!brdh1.isEmpty()){
return lisWorkUtils.newPat(jyrq, ybh, yq, brdh1,labPat.getBrly(),labPat.getYljg(), problemId); return lisWorkUtils.newPat(jyrq, ybh, yq, brdh1,labPat.getBrly(),labPat.getYljg(), problemId);
} }
commonUtil.insertLabPat(labPat); commonUtil.insertLabPat(labPat);
} }
saveallresult(jyrq,yq,ybh); lisWorkUtils.saveallresult(jyrq,yq,ybh);
return new Result("0", "保存成功"); return new Result("0", "保存成功");
} }
/** /**
* 修改病人信息,输入病人代号需要单独处理 * 修改病人信息,输入病人代号需要单独处理
* @param jyrq * @param jyrq 检验日期
* @param yq * @param yq 仪器
* @param ybh * @param ybh 样本号
* @param column * @param column 字段名称
* @param value * @param value 修改值
* @return * @return 返回状态
*/ */
@Override @Override
public Result changePatColumn(Date jyrq,String yq, String ybh,String column,String value) { public Result changePatColumn(Date jyrq,String yq, String ybh,String column,String value) {
@ -125,8 +106,8 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
} }
/** /**
* 修改结果 * 修改结果
* @param labResult * @param labResult 一行结果
* @return * @return 返回状态
*/ */
@Override @Override
public Result changeresult(LabResult labResult){ public Result changeresult(LabResult labResult){
@ -138,10 +119,10 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
} }
/** /**
* 获取新样本默认值 * 获取新样本默认值
* @param jyrq * @param jyrq 检验日期
* @param yq * @param yq 仪器
* @param ybh * @param ybh 样本号
* @return * @return 返回
*/ */
@Override @Override
public Result loaddefault(Date jyrq, String yq, String ybh) { public Result loaddefault(Date jyrq, String yq, String ybh) {
@ -155,11 +136,11 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
/** /**
* 审核报告单全流程 * 审核报告单全流程
* *
* @param jyrq * @param jyrq 检验日期
* @param yq * @param yq 仪器
* @param ybh * @param ybh 样本号
* @param hdys * @param hdys 核对医生
* @return * @return 返回
*/ */
@Override @Override
public Result confirm(Date jyrq, String yq, String ybh, String hdys) { public Result confirm(Date jyrq, String yq, String ybh, String hdys) {
@ -174,30 +155,20 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
/** /**
* 保存所有结果的修正值,涉及:空结果清除,计算项目添加,添加单位,添加申请项目编码,参考值重新计算更新,结果标志重新计算更新,危急值标志计算更新 * 保存所有结果的修正值,涉及:空结果清除,计算项目添加,添加单位,添加申请项目编码,参考值重新计算更新,结果标志重新计算更新,危急值标志计算更新
* *
* @param jyrq * @param labResult 结果集合
* @return * @return 返回
*/ */
@Override @Override
public Result saveallresult(Date jyrq, String yq, String ybh) { public Result saveallresult(List<LabResult> labResult) {
return lisWorkUtils.saveallresult(jyrq,yq,ybh); return lisWorkUtils.saveallresult(labResult);
}
/**
* 结果表补充申请单项目代码
*
* @param jyrq
* @param yq
* @param ybh
*/
@Override
public void setItemSqxmdh(Date jyrq, String yq, String ybh) {
lisWorkUtils.setItemSqxmdh(jyrq, yq, ybh);
} }
/** /**
* 计算项目增加及重新计算 * 计算项目增加及重新计算
* *
* @param jyrq * @param jyrq 检验日期
* @param yq * @param yq 仪器
* @param ybh * @param ybh 样本号
*/ */
@Override @Override
public Result calcsample(Date jyrq, String yq, String ybh) { public Result calcsample(Date jyrq, String yq, String ybh) {
@ -206,9 +177,9 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
/** /**
* 计算项目参考值结果异常标志 * 计算项目参考值结果异常标志
* *
* @param jyrq * @param jyrq 检验日期
* @param yq * @param yq 仪器
* @param ybh * @param ybh 样本号
*/ */
@Override @Override
public Result saverefs(Date jyrq, String yq, String ybh) { public Result saverefs(Date jyrq, String yq, String ybh) {
@ -217,14 +188,14 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
/** /**
* 获取常用取值结果标志 * 获取常用取值结果标志
* *
* @param yq * @param yq 仪器
* @param xmdh * @param xmdh 项目代号
* @param csjg * @param csjg 测试结果
* @return * @return 返回
*/ */
@Override @Override
public String getitemlmtflag(String yq, String xmdh, String csjg) { public String getitemlmtflag(String yq, String xmdh, String csjg) {
String jgbz = ""; String jgbz;
if (csjg == null || csjg.isEmpty()) { if (csjg == null || csjg.isEmpty()) {
return ""; return "";
} }
@ -235,7 +206,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
csjg1 = matcher.group(1); csjg1 = matcher.group(1);
} }
int index = csjg.indexOf(","); int index = csjg.indexOf(",");
if (index == -1) csjg2 = StringUtils.substring(csjg, index + 1); if (index != -1) csjg2 = StringUtils.substring(csjg, index + 1);
jgbz = commonUtil.getXmValJgbz(yq, xmdh, csjg, csjg1, csjg2); jgbz = commonUtil.getXmValJgbz(yq, xmdh, csjg, csjg1, csjg2);
if (jgbz == null) { if (jgbz == null) {
return ""; return "";
@ -247,11 +218,11 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
/** /**
* 解除审核原因登记 * 解除审核原因登记
* *
* @param jyrq * @param jyrq 检验日期
* @param yq * @param yq 仪器
* @param ybh * @param ybh 样本号
* @param hdys * @param hdys 解除审核医生
* @return * @return 返回
*/ */
@Override @Override
public Result unconfirmlog(Date jyrq, String yq, String ybh, String hdys, String reason) { public Result unconfirmlog(Date jyrq, String yq, String ybh, String hdys, String reason) {
@ -260,11 +231,11 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
/** /**
* 撤销审核报告单全流程 * 撤销审核报告单全流程
* *
* @param jyrq * @param jyrq 检验日期
* @param yq * @param yq 仪器
* @param ybh * @param ybh 样本号
* @param yhdh * @param yhdh 撤销医生
* @return * @return 返回
*/ */
@Override @Override
public Result unconfirm(Date jyrq, String yq, String ybh, String yhdh) { public Result unconfirm(Date jyrq, String yq, String ybh, String yhdh) {
@ -276,14 +247,14 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
} }
/** /**
* 登记危急值记录 * 登记危急值记录
* @param jyrq * @param jyrq 检验日期
* @param yq * @param yq 仪器
* @param ybh * @param ybh 样本号
* @param yhdh * @param yhdh 操作人
* @param qrr * @param qrr 确认人
* @param phone * @param phone 电话
* @param tzfs * @param tzfs 通知方式
* @return * @return 返回
*/ */
@Override @Override
public Result reglimit( Date jyrq, String yq, String ybh, String yhdh,String qrr,String phone,String tzfs){ public Result reglimit( Date jyrq, String yq, String ybh, String yhdh,String qrr,String phone,String tzfs){