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

Compare commits

base: jiangs:a50f54ebe93f8c4b4572786a47d52d0c9c76c37e
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test
..
compare: jiangs:b2e3055ae43c95fac4800ce1e4161d6b1a2fc3a7
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test

No commits in common. "a50f54ebe93f8c4b4572786a47d52d0c9c76c37e" and "b2e3055ae43c95fac4800ce1e4161d6b1a2fc3a7" have entirely different histories.
a50f54ebe9 ... b2e3055ae4

3 changed files with 5 additions and 59 deletions
Show Stats Expand all files Collapse all files

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

@ -1729,13 +1729,6 @@ public class LisWorkUtils {
String xmdh = labResult.getXmdh();
if ("".equals(xmdh) || xmdh == null) return new Result("-1", "项目代号不能为空!");
LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh);
if(labPat==null){
labPat=new LabPat();
labPat.setJyrq(jyrq);
labPat.setYbh(ybh);
labPat.setYq(yq);
labPat.setJgbz("0");
}
if ("2".equals(labPat.getJgbz())) return new Result("-1", "结果已审核禁止修改!");
if ("5".equals(labPat.getJgbz())) return new Result("-1", "结果已锁定禁止修改!");
if ("1".equals(labPat.getJgbz())) return new Result("-1", "结果已初审禁止修改!");

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

@ -84,7 +84,11 @@ public class LisWorkController extends BaseController {
public Result queryxmval(String yq,String xmdh) {
return lisWorkService.getXmVal(yq,xmdh);
}
@ApiOperation("获取微生物样本信息")
@GetMapping("/sampleMedInfo")
public Result sampleMedInfo(Date jyrq, String yq, String ybh) {
return lisWorkService.sampleMedInfo(jyrq, yq, ybh);
}
@ApiOperation("工号密码验证")
@GetMapping("/checkuserid")
public Result checkUser(String yhdh, String mm) {

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

@ -1,51 +0,0 @@
package com.czlis.liswork.controller.work;
import com.czlis.common.core.controller.BaseController;
import com.czlis.common.core.domain.Result;
import com.czlis.common.core.domain.entity.lis.LabPat;
import com.czlis.common.core.page.TableDataInfo;
import com.czlis.liswork.service.LabResultService;
import com.czlis.liswork.service.LisWorkService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
import java.util.List;
@RestController
@RequestMapping("/lisworkgerm")
@Slf4j
@Api(tags = "主界面-微生物报告输入")
public class LisWorkGermController extends BaseController {
@Autowired
private LisWorkService lisWorkService;
@Autowired
private LabResultService labResultService;
@ApiOperation("获取微生物样本信息")
@GetMapping("/sampleMedInfo")
public Result sampleMedInfo(Date jyrq, String yq, String ybh) {
return lisWorkService.sampleMedInfo(jyrq, yq, ybh);
}
@ApiOperation("获取样本列表")
@GetMapping("/samplelist")
public Result getSampleList(Date jyrq,String yq,Long days){
return new Result("0", "获取样本数据成功！",lisWorkService.getSampleList(jyrq,yq,days));
}
@ApiOperation("获取样本列表")
@GetMapping("/samplelistpage")
public TableDataInfo samplelistpage(Date jyrq, String yq, Long days) {
try {
startPage();
startOrderBy();
List<LabPat> labPatList = lisWorkService.getSampleList(jyrq, yq, days);
return getDataTable(labPatList);
} finally {
clearPage();
}
}
}