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

Merge remote-tracking branch 'lis8.0/master'

Browse Source
This commit is contained in:
jiangs 2025-12-02 18:13:26 +08:00
commit 546d364772
6 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabGermsheetNew.java
View File

@ -1,5 +1,6 @@
package com.czlis.common.core.domain.entity.lis;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -11,6 +12,7 @@ import java.util.Date;
public class LabGermsheetNew {
private Integer gsid;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date jyrq;
private String yq;
private String ybh;

8
liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java
View File

@ -7,6 +7,7 @@ import com.czlis.common.core.domain.entity.lis.*;
import com.czlis.common.core.page.TableDataInfo;
import com.czlis.common.core.text.Convert;
import com.czlis.common.enums.BusinessType;
import com.czlis.common.utils.JsonParamUtils;
import com.czlis.interfaceCommon.constants.SysLogConstants;
import com.czlis.liswork.mapper.LisWorkGermMapper;
import com.czlis.liswork.mapper.xtwh.XmMedMapper;
@ -172,4 +173,11 @@ public class LisWorkGermController extends BaseController {
public Result check(Date jyrq, String yq, String ybh, String yhdh, String jgbz) {
return lisWorkGermService.check(jyrq, yq, ybh, yhdh,jgbz);
}
@Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.UPDATE)
@ApiOperation("修改样本检验日期")
@GetMapping("/changepatjyrq")
public Result changepatjyrq(Date jyrq, String yq, String ybh) {
return lisWorkGermService.changepatjyrq(jyrq, yq, ybh);
}
}

4
liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java
View File

@ -26,4 +26,8 @@ public interface LisWorkGermMapper {
List<Map<String, Object>> getmedgrouplist();
List<XmMedgroup> getmedgroup(String ywzmc);
List<BactMedium> getBactMedium(String mediumno);
Date getpatjyrq(@Param("yq") String yq, @Param("ybh")String ybh);
int updatemediumjyrq(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh, @Param("jyrq1")Date jyrq1);
int changeresultjyrq(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh, @Param("jyrq1")Date jyrq1);
int changepatjyrq(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh, @Param("jyrq1")Date jyrq1);
}

2
liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java
View File

@ -17,7 +17,7 @@ public interface LisWorkGermService {
Result savemedium(List<LabGermsheetNew> labGermsheetlist);
Result insertmediumnew(LabGermsheetNew labGermsheet);
Result updatemediumnew(LabGermsheetNew labGermsheet);
Result deletemediumnew(Long gsid);
Result changepatjyrq(Date jyrq, String yq, String ybh);
Result deletemediumlist(Long[] gsids);
Result getcomlog(Date jyrq, String yq, String ybh);
Result savemedresult(LabResultMed labResultmed);

29
liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java
View File

@ -154,7 +154,27 @@ public class LisWorkGermServiceImpl implements LisWorkGermService {
private List<BactMediumgroupdet> getmediumgroup(String mediumno){
return lisWorkGermMapper.getBactMediumgroupdet(mediumno);
}
@Transactional(rollbackFor = Exception.class)
@Override
public Result changepatjyrq(Date jyrq, String yq, String ybh){
Date jyrq0 =lisWorkGermMapper.getpatjyrq(yq,ybh);
if(jyrq0==null)return new Result("-1","没发现原样本,忽略修改");
lisWorkGermMapper.changepatjyrq(jyrq0,yq,ybh,jyrq);
lisWorkGermMapper.changeresultjyrq(jyrq0,yq,ybh,jyrq);
lisWorkGermMapper.updatemediumjyrq(jyrq0,yq,ybh,jyrq);
String yq1= getFirstInstrid(yq);
if(yq1!=null){
lisWorkGermMapper.changepatjyrq(jyrq0,yq1,ybh,jyrq);
lisWorkGermMapper.changeresultjyrq(jyrq0,yq1,ybh,jyrq);
}
String yq2= getFirstInstrid(yq);
if(yq2!=null){
lisWorkGermMapper.changepatjyrq(jyrq0,yq2,ybh,jyrq);
lisWorkGermMapper.changeresultjyrq(jyrq0,yq2,ybh,jyrq);
}
return new Result("0","成功");
}
@Override
public Result insertmediumnew(LabGermsheetNew labGermsheet){
insertmedium(labGermsheet);
@ -165,10 +185,6 @@ public class LisWorkGermServiceImpl implements LisWorkGermService {
lisWorkGermMapper.insertmedium(labGermsheet);
}
@Transactional(rollbackFor = Exception.class)
public void deletemedium(Long gsid){
lisWorkGermMapper.deletemedium(gsid);
}
@Transactional(rollbackFor = Exception.class)
public void deletemediums(Long[] gsids){
lisWorkGermMapper.deletemediums(gsids);
}
@ -177,11 +193,6 @@ public class LisWorkGermServiceImpl implements LisWorkGermService {
lisWorkGermMapper.updatemedium(labGermsheet);
}
@Override
public Result deletemediumnew(Long gsid){
deletemedium(gsid);
return new Result("0","成功");
}
@Override
public Result deletemediumlist(Long[] gsids){
deletemediums(gsids);
return new Result("0","成功");

12
liswork/src/main/resources/mapper/LisWorkGermMapper.xml
View File

@ -39,6 +39,18 @@
</where>
order by yq,jyrq DESC,right(space(20) + ybh,20) DESC
</select>
<select id="getpatjyrq" resultType="Date">
select max(jyrq) from lab_pat where yq = #{yq} and ybh=#{ybh}
</select>
<update id="changepatjyrq" >
update lab_pat set jyrq = #{jyrq1} where yq = #{yq} and ybh=#{ybh} and jyrq=#{jyrq}
</update>
<update id="changeresultjyrq" >
update lab_result set jyrq = #{jyrq1} where yq = #{yq} and ybh=#{ybh} and jyrq=#{jyrq}
</update>
<update id="updatemediumjyrq">
update lab_germsheet_new set jyrq = #{jyrq1} where yq = #{yq} and ybh=#{ybh} and jyrq=#{jyrq}
</update>
<select id="getBactMedium" resultType="com.czlis.common.core.domain.entity.lis.BactMedium">
SELECT * FROM bact_medium
<where>