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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
tangw 2025-11-27 19:08:06 +08:00
commit 805d9a2ffa
3 changed files with 141 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ public class LisWorkUtils extends LisWorkconfirm{
/**
* 通用调用医院定制接口
*
* @param msgid
* @param content
* @return
@ -34,6 +35,7 @@ public class LisWorkUtils extends LisWorkconfirm{
dayMessage.setMsg(content);
return lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.DAYMESSAGE, dayMessage);
}
public LastLabPatParam getLastLabPatParam(LabPat labPat) {
LastLabPatParam nullret = new LastLabPatParam();
Date jyrq = labPat.getJyrq();

25
liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java
View File

@ -62,6 +62,7 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService {
List<LabResultRe> labResultReList = lisWorkPageInfoMapper.getRedo(jyrq, yq, ybh);
return new Result("0", "获取数据成功！", labResultReList);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result swapRedo(LabResultRe labResultRe) {
@ -90,6 +91,7 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService {
lisWorkPageInfoMapper.updateLabResultRe(labResultRe);
return new Result("0", "交换数据成功！", labResultRe);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result saveRedo(LabResultRe labResultRe) {
@ -105,18 +107,25 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService {
}
return new Result("0", "保存成功！", labResultRe);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result deleteRedo(LabResultRe labResultRe) {
lisWorkPageInfoMapper.deleteRedo(labResultRe);
return new Result("0", "成功！");
}
@Override
public Result getHistory(Date jyrq, String yq, String ybh) {
LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh);
LastLabPatParam lastLabPatParam = lisWorkUtils.getLastLabPatParam(labPat);
if(lastLabPatParam==null){return new Result("-1","缺少查询条件！");}
if (lastLabPatParam == null) {
return new Result("-1", "缺少查询条件！");
}
Map<String, Object> map = BeanUtil.beanToMap(lastLabPatParam);
if(map == null || map.size() <= 0){
return new Result("-1","查询条件转换错误！");
}
Result historyResult = getHistoryResult(jyrq, yq, ybh, map);
if ("0".equals(historyResult.getCode())) {
return new Result("0", "获取成功！", historyResult.getData());
@ -126,6 +135,7 @@ public Result deleteRedo(LabResultRe labResultRe){
/**
* 获取收费信息
*
* @param jyrq
* @param yq
* @param ybh
@ -164,7 +174,9 @@ public Result deleteRedo(LabResultRe labResultRe){
public Result getOtherinstrDetail(String brdh, String yq, Date jyrq, String ybh) {
LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh);
LastLabPatParam lastLabPatParam = lisWorkUtils.getLastLabPatParam(labPat);
if(lastLabPatParam==null){return new Result("-1","缺少查询条件！");}
if (lastLabPatParam == null) {
return new Result("-1", "缺少查询条件！");
}
Map<String, Object> map = BeanUtil.beanToMap(lastLabPatParam);
Result historyResult = getHistoryResult(jyrq, yq, ybh, map);
return new Result("0", "获取成功！", historyResult.getData());
@ -172,6 +184,7 @@ public Result deleteRedo(LabResultRe labResultRe){
/**
* 申请项目明细
*
* @param yq
* @param sqxmdh
* @return
@ -191,12 +204,16 @@ public Result deleteRedo(LabResultRe labResultRe){
public Result getHistoryResult(Date jyrq, String yq, String ybh, Map<String, Object> map) {
List<HistoryResult> hisResultList0 = lisWorkPageInfoMapper.getHisResult(map);
if(hisResultList0.isEmpty()){return new Result("-1","无历史数据！");}
if (hisResultList0.isEmpty()) {
return new Result("-1", "无历史数据！");
}
List<HistoryResult> hisResultThisList = hisResultList0.stream().filter(st -> jyrq.equals(st.getJyrq()) && yq.trim().equals(st.getYq().trim()) && ybh.equals(st.getYbh())).collect(Collectors.toList());
HistoryResultDTO historyResultDTO = new HistoryResultDTO();
historyResultDTO.setFirst(hisResultThisList);
List<HistoryResult> hisResultList = hisResultList0.stream().filter(st -> !(jyrq.equals(st.getJyrq()) && yq.trim().equals(st.getYq().trim()) && ybh.equals(st.getYbh()))).collect(Collectors.toList());
if(hisResultList.isEmpty()){return new Result("-1","无历史数据！",historyResultDTO);}
if (hisResultList.isEmpty()) {
return new Result("-1", "无历史数据！", historyResultDTO);
}
// 依据 jyrq,yq,ybh 去重（自定义去重字段）
List<HistoryResult> distinctList = hisResultList.stream()

3
liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml
View File

@ -162,7 +162,7 @@
where a.jyrq = b.jyrq and a.yq = b.yq and a.ybh = b.ybh and a.jgbz = '2'
and c.yq = b.yq and c.xmdh = b.xmdh and d.yq = a.yq
<if test="startda != null">and a.jyrq >= #{startda}</if>
<if test="endda != null">and #{endda} >= a.jyrq </if>
<if test="endda != null"><![CDATA[and a.jyrq <= #{endda}]]> </if>
<if test="yqdl != null and yqdl != ''"> and d.yqdl = #{yqdl}</if>
<if test="brdh != null and brdh != ''"> and a.brdh = #{brdh}</if>
<if test="brxm != null and brxm !=''">and a.brxm = #{brxm}</if>
@ -173,6 +173,7 @@
<if test="yq != null and yq != ''"> and a.yq = #{yq}</if>
<if test="ybh != null and ybh != ''"> and a.ybh = #{ybh}</if>
order by c.dyxh asc
</select>