Compare commits
No commits in common. "7eecf4d987c76ffc86bc29ffa6ada5ff63f67a17" and "ad111df84ecade7e81c271b881aed50688ccb133" have entirely different histories.
7eecf4d987
...
ad111df84e
@ -32,6 +32,7 @@ public class ReportItemController extends BaseController {
|
|||||||
|
|
||||||
@ApiOperation("查询检验项目列表")
|
@ApiOperation("查询检验项目列表")
|
||||||
@GetMapping("/query")
|
@GetMapping("/query")
|
||||||
|
@Anonymous
|
||||||
public TableDataInfo query(XmInfoNew xmInfoNew) {
|
public TableDataInfo query(XmInfoNew xmInfoNew) {
|
||||||
startPage();
|
startPage();
|
||||||
List<XmInfoNew> xmInfoNewList = reportItemService.query(xmInfoNew);
|
List<XmInfoNew> xmInfoNewList = reportItemService.query(xmInfoNew);
|
||||||
@ -41,6 +42,7 @@ public class ReportItemController extends BaseController {
|
|||||||
|
|
||||||
@ApiOperation("查询检验项目明细")
|
@ApiOperation("查询检验项目明细")
|
||||||
@GetMapping("/queryDetail")
|
@GetMapping("/queryDetail")
|
||||||
|
@Anonymous
|
||||||
public Result queryDetail(String xmid,String yq,String xmdh){
|
public Result queryDetail(String xmid,String yq,String xmdh){
|
||||||
XmInfoNewDTO xmInfoNewDTO = reportItemService.queryDetail(xmid,yq,xmdh);
|
XmInfoNewDTO xmInfoNewDTO = reportItemService.queryDetail(xmid,yq,xmdh);
|
||||||
return new Result("0","查询成功!",xmInfoNewDTO);
|
return new Result("0","查询成功!",xmInfoNewDTO);
|
||||||
|
|||||||
@ -20,5 +20,4 @@ public class HistoryResultDTO {
|
|||||||
private List<HistoryResult> seven;
|
private List<HistoryResult> seven;
|
||||||
private List<HistoryResult> eight;
|
private List<HistoryResult> eight;
|
||||||
private List<HistoryResult> nine;
|
private List<HistoryResult> nine;
|
||||||
private List<HistoryResult> first;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -23,8 +23,6 @@ public class HistoryResult {
|
|||||||
private String brxm;
|
private String brxm;
|
||||||
private String result_flag;
|
private String result_flag;
|
||||||
private String yljg;
|
private String yljg;
|
||||||
private String cksx;
|
|
||||||
private String ckxx;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -103,8 +103,6 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService {
|
|||||||
Date jyrqTemp = null;
|
Date jyrqTemp = null;
|
||||||
int i = 0;
|
int i = 0;
|
||||||
HistoryResultDTO historyResultDTO = new HistoryResultDTO();
|
HistoryResultDTO historyResultDTO = new HistoryResultDTO();
|
||||||
//本次结果
|
|
||||||
historyResultDTO.setFirst(hisResultThisList);
|
|
||||||
List<Date> jyrqList = new ArrayList<>();
|
List<Date> jyrqList = new ArrayList<>();
|
||||||
for (HistoryResult historyResult : hisResultList) {
|
for (HistoryResult historyResult : hisResultList) {
|
||||||
Date jyrq1 = historyResult.getJyrq();
|
Date jyrq1 = historyResult.getJyrq();
|
||||||
|
|||||||
@ -85,7 +85,6 @@
|
|||||||
<select id="getHisResult" resultType="com.czlis.liswork.pojo.HistoryResult">
|
<select id="getHisResult" resultType="com.czlis.liswork.pojo.HistoryResult">
|
||||||
select b.jyrq,c.xmdh, c.xmmc,b.csjg,b.ybh,b.yq,d.yqdl,a.brdh,
|
select b.jyrq,c.xmdh, c.xmmc,b.csjg,b.ybh,b.yq,d.yqdl,a.brdh,
|
||||||
(case a.brxb when '1' then '男' when '2' then '女' end) as brxb ,
|
(case a.brxb when '1' then '男' when '2' then '女' end) as brxb ,
|
||||||
c.cksx,c.ckxx,
|
|
||||||
a.nl+a.nldw as nl,a.brxm as brxm,b.result_flag,(select top 1 zdmc from com_dict where zdlb = 'HOS' and zddh = a.yljg) as yljg
|
a.nl+a.nldw as nl,a.brxm as brxm,b.result_flag,(select top 1 zdmc from com_dict where zdlb = 'HOS' and zddh = a.yljg) as yljg
|
||||||
from lab_pat a, lab_result b,xm_info c,lab_instr d
|
from lab_pat a, lab_result b,xm_info c,lab_instr d
|
||||||
where a.jyrq = b.jyrq and a.yq = b.yq and a.ybh = b.ybh and a.jgbz = '2'
|
where a.jyrq = b.jyrq and a.yq = b.yq and a.ybh = b.ybh and a.jgbz = '2'
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user