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-10-13 17:45:07 +08:00
commit 86e9978e7c
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,8 @@ public class LisWorkUtils {
LoginConfigParamUtil loginConfigParamUtil; LoginConfigParamUtil loginConfigParamUtil;
@Autowired @Autowired
CommonUtil commonUtil; CommonUtil commonUtil;
@Autowired
LisWorkUtils lisWorkUtils;
/** /**
* 初步审核 * 初步审核
* *
@ -1750,12 +1751,10 @@ public class LisWorkUtils {
String yq = labPat.getYq(); String yq = labPat.getYq();
String ybh = labPat.getYbh(); String ybh = labPat.getYbh();
String userId = labPat.getYhdh(); String userId = labPat.getYhdh();
Date sjsj=commonUtil.getCurrentTime();
//修改状态和时间 //修改状态和时间
updateLabReqmainZT(userId, sqh); updateLabReqmainZT(userId, sqh);
//保存lab_pat表信息 //保存lab_pat表信息
labPat.setJyrq(commonUtil.getCurrentTime());
labPat.setYq(yq);
labPat.setYbh(ybh);
labPat.setYblx(commonUtil.getComDictIdByName("BT", labReqmain.getYblx())); labPat.setYblx(commonUtil.getComDictIdByName("BT", labReqmain.getYblx()));
labPat.setKsdh(commonUtil.getComDictIdByName("DP", labReqmain.getKsdh())); labPat.setKsdh(commonUtil.getComDictIdByName("DP", labReqmain.getKsdh()));
labPat.setSjys(userId); labPat.setSjys(userId);
@ -1770,13 +1769,13 @@ public class LisWorkUtils {
labPat.setNl(Integer.parseInt(age)); labPat.setNl(Integer.parseInt(age));
labPat.setNldw(unit); labPat.setNldw(unit);
labPat.setSqh(sqh); labPat.setSqh(sqh);
labPat.setSqsj(commonUtil.getCurrentTime()); labPat.setSqsj(sjsj);
labPat.setJgbz(LabPatConstants.DEFAULT); labPat.setJgbz(LabPatConstants.DEFAULT);
labPat.setZd(labReqmain.getZd()); labPat.setZd(labReqmain.getZd());
labPat.setCyrq(labReqmain.getCysj()); labPat.setCyrq(labReqmain.getCysj());
labPat.setJymd(LisUtil.substringByGbkWidth(labReqmain.getJymd(), 0, 50)); labPat.setJymd(LisUtil.substringByGbkWidth(labReqmain.getJymd(), 0, 50));
labPat.setLastuser(userId); labPat.setLastuser(userId);
labPat.setLastdt(commonUtil.getCurrentTime()); labPat.setLastdt(sjsj);
labPat.setShcs(0); labPat.setShcs(0);
labPat.setYljg(labReqmain.getYljg()); labPat.setYljg(labReqmain.getYljg());
labPat.setSfzh(labReqmain.getSfzh()); labPat.setSfzh(labReqmain.getSfzh());
@ -1862,7 +1861,8 @@ public class LisWorkUtils {
if (!result3.getCode().equals("0")) return result3; if (!result3.getCode().equals("0")) return result3;
//6.写日志 //6.写日志
lisWorkUtils.setComLog(jyrq,yq,ybh,yhdh,ComLogConstants.LG_SJ,sqh);
if(sqh!=null||"".equals(sqh))lisWorkUtils.setlabReqsteplog(sqh,LabReqmainConstants.START,yhdh);
return new Result("0", ""); return new Result("0", "");
} }

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

@ -36,6 +36,12 @@ public class LisWorkOperController extends BaseController {
public Result newPatInfo(Date jyrq, String sqh, String yq, String ybh) { public Result newPatInfo(Date jyrq, String sqh, String yq, String ybh) {
return lisWorkOperService.newPatInfo(jyrq, ybh, sqh, yq); return lisWorkOperService.newPatInfo(jyrq, ybh, sqh, yq);
} }
@Log(title = "主界面",businessType = BusinessType.INSERT)
@ApiOperation(("新增空白新样本"))
@GetMapping("/loaddefault")
public Result loaddefault(Date jyrq, String yq, String ybh) {
return lisWorkOperService.loaddefault(jyrq, yq ,ybh);
}
/** /**
* 修改病人信息 * 修改病人信息