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

Compare commits

base: jiangs:9d62e14cbdcd732f8ebda42052066b871928b755
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test
..
compare: jiangs:e4e19f3ac892de54f2168d73446ffbfdc3ac01b4
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test

No commits in common. "9d62e14cbdcd732f8ebda42052066b871928b755" and "e4e19f3ac892de54f2168d73446ffbfdc3ac01b4" have entirely different histories.
9d62e14cbd ... e4e19f3ac8

5 changed files with 4 additions and 112 deletions
Show Stats Expand all files Collapse all files

26
lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComLog.java
View File

@ -1,26 +0,0 @@
package com.czlis.common.core.domain.entity.lis;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class ComLog {
private String yq;
private Date rzdt;
private String rzbz;
private String yhdh;
private String rznr;
private String dnmc;
private String bz;
private Date jyrq;
private String ybh;
}

8
lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComLogMapper.java
View File

@ -1,8 +0,0 @@
package com.czlis.interfaceCommon.mapper;
import com.czlis.common.core.domain.entity.lis.ComLog;
import java.util.List;
public interface ComLogMapper {
List<ComLog> getComLog(ComLog comLog);
int insertComLog(ComLog comLog);
}

4
lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java
View File

@ -50,8 +50,6 @@ public class CommonUtil {
LabReqreportPdffileMapper labReqreportPdffileMapper;
@Autowired
LabReqsteplogMapper labReqsteplogMapper;
@Autowired
ComLogMapper comLogMapper;
//====检验主表操作方法集合===
public LabPat getLabPatOne(Date jyrq, String yq, String ybh) {
@ -175,8 +173,8 @@ public class CommonUtil {
public List<XmAlarmdetail> getXmAlarmdetail(String yq, String xmdh) {
return xmAlarmdetailMapper.getXmAlarmdetail(yq, xmdh);
}
public Integer insertComLog(ComLog comLog) {return comLogMapper.insertComLog(comLog);}
;
public String getYqmc(String yq) {
return labInstrMapper.getYqmc(yq);

42
lis-interfaceCommon/src/main/resources/mapper/ComLogMapper.xml
View File

@ -1,42 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.czlis.interfaceCommon.mapper.ComLogMapper">
<select id="getComLog" resultType="com.czlis.common.core.domain.entity.lis.ComLog">
select * from com_log
<where>
<if test="yq != null ">
and yq = #{yq}
</if>
<if test="rzbz != null ">
and rzbz = #{rzbz}
</if>
<if test="jyrq != null ">
and jyrq = #{jyrq}
</if>
<if test="ybh != null ">
and ybh = #{ybh}
</if>
</where>
</select>
<insert id="insertComLog" parameterType="com.czlis.common.core.domain.entity.lis.ComLog">
insert into com_log(yq,rzdt,
<if test="rzbz != null ">rzbz,</if>
<if test="yhdh != null">yhdh,</if>
<if test="rznr != null and rznr != ''">rznr,</if>
<if test="dnmc != null and dnmc != ''">dnmc,</if>
<if test="bz != null and bz != ''">bz,</if>
<if test="jyrq != null and jyrq != ''">jyrq,</if>
<if test="ybh != null and ybh != ''">ybh</if>
)values(#{yq},#{rzdt},
<if test="rzbz != null ">#{rzbz},</if>
<if test="yhdh != null">#{yhdh},</if>
<if test="rznr != null and rznr != ''">#{rznr},</if>
<if test="dnmc != null and dnmc != ''">#{dnmc},</if>
<if test="bz != null and bz != ''">#{bz},</if>
<if test="jyrq != null and jyrq != ''">#{jyrq},</if>
<if test="ybh != null and ybh != ''">#{ybh}</if>
)
</insert>
</mapper>

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

@ -234,7 +234,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
//5:数据状态修改,异步上传接口作业创建
Result result1 = afterconfirm(labPat, problemId);
if (!"0".equals(result1.getCode())) return result1;
return new Result("3", "审核成功！");
return new Result("0", "保存成功！");
}
/**
@ -258,7 +258,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
String ybh = labPat.getYbh();
if (labPat == null) return new Result("-1", "病人信息为空禁止审核！");
String jgbz = labPat.getJgbz();
if ("2".equals(jgbz)) return new Result("1", "报告已审核！");
if ("2".equals(jgbz)) new Result("0", "保存成功！");
if ("5".equals(jgbz)) return new Result("-1", "已锁定报告禁止审核！");
if (!"1".equals(jgbz)) {
String f_check1 = commonUtil.getComOptValue(yq, "f_check1");
@ -387,9 +387,9 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
String yq = labPat.getYq();
String ybh = labPat.getYbh();
String hdys = labPat.getHdys();
String yqdl = commonUtil.getYqdl(yq);
String itemvs = commonUtil.getHISOPT("itemvs");
if ("1".equals(itemvs)) {
String yqdl = commonUtil.getYqdl(yq);
if (!"细菌仪".equals(yqdl)) {
String nullcount = lisWorkOperMapper.checkresultnosqxmdh(jyrq, yq, ybh);
if (!"".equals(nullcount) && nullcount != null)
@ -441,13 +441,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
}
if (!result.getCode().equals("0")) return result;
//最后完成
String finish=labPat.getFinish();
if (!"细菌仪".equals(yqdl) && finish !=null) labPat.setFinish("1");
labPat.setJgbz(ReportStatusConstants.CONFIRM);
Integer shcs=labPat.getShcs();
if(shcs==null)shcs=0;
shcs=shcs+1;
labPat.setShcs(shcs);
commonUtil.updateLabPat(labPat);
return new Result("0", "保存成功！");
}
@ -549,26 +543,8 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
* @return
*/
public Result saveallresult(Date jyrq, String yq, String ybh) {
int finsh=1;
List<LabResult> labResultList = commonUtil.getLabResultList(jyrq, yq, ybh);
if (labResultList == null || labResultList.size() == 0) return new Result("-1", "结果为空！");
for (LabResult labResult : labResultList) {
String csjg = labResult.getCsjg();
if ("未做".equals(csjg)) {
finsh=0;
}
if (csjg != null) {
if (csjg.contains("ERR")) finsh=0;
if (csjg.contains("需稀释")) finsh=0;
if (csjg.contains("需复做")) finsh=0;
}
}
String yqdl = commonUtil.getYqdl(yq);
//查询病人信息
LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh);
String finish=labPat.getFinish();
if (!"细菌仪".equals(yqdl) && finish !=null && finsh==1) labPat.setFinish("1");
int wjz = saveallresult(labPat);
//同步主表危急值标识
String alarmflag = labPat.getAlarmflag();
@ -596,12 +572,6 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
calcsample(labPat);
//保存最新参考值结果标志
int wjz = saverefs(labPat);
String alarmflag = labPat.getAlarmflag();
if (("1".equals(alarmflag) && wjz != 1)) {
labPat.setAlarmflag("1");
} else if (("".equals(alarmflag) || alarmflag == null) && wjz == 1) {
labPat.setAlarmflag("");
}
//补写结果表申请单项目编号
String sqh = labPat.getSqh();
if (sqh != null && !"".equals(sqh)) setItemSqxmdh(jyrq, yq, ybh, sqh);