From 30fb9dd9d6ffadf567db99f12a3595c49002146d Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Wed, 25 Jun 2025 17:41:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/work/LisWorkPageInfoController.java | 5 +++++ .../com/czlis/liswork/mapper/LisWorkMapper.java | 3 ++- .../liswork/mapper/LisWorkPageInfoMapper.java | 2 +- .../service/impl/LisWorkPageInfoServiceImpl.java | 6 ++++-- .../liswork/service/impl/LisWorkServiceImpl.java | 2 +- liswork/src/main/resources/mapper/InstrMapper.xml | 2 +- .../src/main/resources/mapper/LisWorkMapper.xml | 14 +++++++------- .../resources/mapper/LisWorkPageInfoMapper.xml | 12 ++++++------ 8 files changed, 27 insertions(+), 19 deletions(-) diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java index 582a9a0..f1139d2 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java @@ -49,6 +49,11 @@ public class LisWorkPageInfoController { return lisWorkPageInfoService.getReqdetail(jyrq,yq,ybh); } + @GetMapping("/reqinfo") + public Result getReqInfo(Date jyrq,String yq,String ybh){ + return null; + } + diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java index 34abfb1..5ff571c 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java @@ -6,9 +6,10 @@ import com.czlis.liswork.pojo.LabPatInfo; import java.util.Date; import java.util.List; +import java.util.Map; public interface LisWorkMapper { - List getInstrdList(String userId); + List> getInstrdList(String userId); List getInstrdConfig(String yq); List getSampleList(Date jyrq, String yq, String days); List sampleInfo(Date jyrq, String yq, String ybh); diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java index ae51d06..ec71dac 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java @@ -16,6 +16,6 @@ public interface LisWorkPageInfoMapper { List getLabOldGraphList(Date jyrq,String yq,String ybh); List getLabGraphUnitList(String yq,String txmc); List getRedo(Date jyrq, String yq, String ybh); - List getReqdetail(String sqh); + List> getReqdetail(String sqh); List> getOtherinstr(Date dayStart, DateTime dayEnd, String brdh, String brxm); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java index 11c4558..b155ac1 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java @@ -57,13 +57,15 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { LabPat labPatOne = commonUtil.getLabPatOne(jyrq, yq, ybh); if(labPatOne == null) return new Result("-1","没有查到对应的上机记录！"); String sqh = labPatOne.getSqh(); - List labReqdetailList = lisWorkPageInfoMapper.getReqdetail(sqh); + List> labReqdetailList = lisWorkPageInfoMapper.getReqdetail(sqh); return new Result("0","获取数据成功！",labReqdetailList); } @Override public Result getOtherinstr(Date jyrq, String yq, String ybh) { - String value = commonUtil.getComOptValue(yq, "COMPAREDA"); + //String value = commonUtil.getComOptValue(yq, "COMPAREDA"); + //先固定一个30天 + String value = "30"; DateTime dayEnd = DateUtil.offsetDay(DateUtil.date(), Integer.parseInt(value)); LabPat labPatOne = commonUtil.getLabPatOne(jyrq, yq, ybh); String brdh = labPatOne.getBrdh(); diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java index 5d24eb2..a4f6fba 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java @@ -22,7 +22,7 @@ public class LisWorkServiceImpl implements LisWorkService { @Override public Result getInstrdList(Long userId) { - List comUsrpowerList = lisWorkMapper.getInstrdList(String.valueOf(userId)); + List> comUsrpowerList = lisWorkMapper.getInstrdList(String.valueOf(userId)); return new Result("0","获取权限列表成功！",comUsrpowerList); } diff --git a/liswork/src/main/resources/mapper/InstrMapper.xml b/liswork/src/main/resources/mapper/InstrMapper.xml index 11dcb50..647170d 100644 --- a/liswork/src/main/resources/mapper/InstrMapper.xml +++ b/liswork/src/main/resources/mapper/InstrMapper.xml @@ -3,7 +3,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > - select * from lab_instr and yq = #{yq} diff --git a/liswork/src/main/resources/mapper/LisWorkMapper.xml b/liswork/src/main/resources/mapper/LisWorkMapper.xml index 4ca0a6f..8c88ee3 100644 --- a/liswork/src/main/resources/mapper/LisWorkMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkMapper.xml @@ -3,23 +3,23 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > - SELECT com_usrpower.yhdh,com_usrpower.yq ,com_usrpower.xtdh ,com_usrpower.yhqx , lab_instr.yqmc ,lab_instr.instrid FROM com_usrpower , lab_instr WHERE ( com_usrpower.yq = lab_instr.yq ) and ( ( com_usrpower.yhdh = #{userId} ) and ( com_usrpower.xtdh = 'LIS' ) ) and lab_instr.useflag = '0' - select * from com_opt where yq = #{yq} - select * from lab_Result where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh} and xmdh = #{xmdh} - select * from lab_pat and jyrq = #{jyrq} @@ -28,12 +28,12 @@ - select * from lab_patinfo where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh} - select * from lab_resultmed where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh} and xmdh = #{xmdh} @@ -41,7 +41,7 @@ and ywdh = #{ywdh} - select * from sys_user where user_id = #{userId} and password = #{mm} diff --git a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml index 5056a9b..4fa2842 100644 --- a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml @@ -3,29 +3,29 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > - select * from lab_graph where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh} - select * from lab_oldgraph where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh} - select * from lab_graphunit where yq = #{yq} and txmc = #{txmc} - select * from lab_result_re where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh} - SELECT lab_reqdetail.sqh , lab_reqdetail.xh , lab_reqdetail.sqxmdh , lab_reqdetail.sqxmmc , lab_reqdetail.sl , lab_reqdetail.dj , lab_reqdetail.zt , lab_reqdetail.jjzt , lab_reqdetail.bz1 , lab_reqdetail.bz2 , lab_reqmain.ksdh , lab_reqmain.sqys , lab_reqmain.sqsj , lab_reqmain.jsys , lab_reqmain.jssj , lab_reqmain.brly , lab_reqmain.brdh , lab_reqmain.brxm , lab_reqdetail.numbk1 , lab_reqdetail.numbk2 FROM lab_reqdetail , lab_reqmain WHERE ( lab_reqdetail.sqh = lab_reqmain.sqh ) and ( ( lab_reqmain.sqh = #{sqh} ) ) -