diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabResultMed.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabResultMed.java new file mode 100644 index 0000000..6edd7a1 --- /dev/null +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabResultMed.java @@ -0,0 +1,25 @@ +package com.czlis.common.core.domain.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LabResultMed { + private Date jyrq; + private String yq; + private String ybh; + private String xmdh; + private String xh; + private String ywdh; + private String mic; + private String rad; + private String csjg; + private String jgbz; + private String bz; + private String txtresult; +} diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java new file mode 100644 index 0000000..e632087 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java @@ -0,0 +1,93 @@ +package com.czlis.liswork.controller.work; + +import com.czlis.common.core.controller.BaseController; +import com.czlis.common.core.domain.Result; +import com.czlis.liswork.service.LisWorkService; +import io.swagger.annotations.ApiOperation; +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; + + +/** + * lis主界面，报告输入 + */ +@RestController +@RequestMapping("/liswork") +public class LisWorkController extends BaseController { + + @Autowired + private LisWorkService lisWorkService; + + /** + * 可操作仪器查询 + * @return + */ + @ApiOperation("可操作仪器查询") + @GetMapping("/instrdlist") + public Result getInstrdList(){ + return lisWorkService.getInstrdList(getUserId()); + } + + /** + * 切换仪器，查询仪器参数 + * @param yq + * @return + */ + @ApiOperation("切换仪器，查询仪器参数") + @GetMapping("/instrdconfig") + public Result getInstrdConfig(String yq){ + return lisWorkService.getInstrdConfig(yq); + } + + /** + * 获取样本列表 + * @param jyrq + * @param yq + * @param days + * @return + */ + @ApiOperation("获取样本列表") + @GetMapping("/samplelist") + public Result getSampleList(Date jyrq,String yq,String days){ + return lisWorkService.getSampleList(jyrq,yq,days); + } + + + /** + * 获取普通样本信息 + * @param jyrq + * @param yq + * @param ybh + * @return + */ + @ApiOperation("获取普通样本信息") + @GetMapping("/sampleinfo") + public Result sampleInfo(Date jyrq,String yq,String ybh){ + return lisWorkService.sampleInfo(jyrq,yq,ybh); + } + + /** + * 获取微生物样本信息 + * @param jyrq + * @param yq + * @param ybh + * @return + */ + @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){ + return lisWorkService.checkUser(yhdh,mm); + } + + +} 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 new file mode 100644 index 0000000..2596d8d --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java @@ -0,0 +1,27 @@ +package com.czlis.liswork.controller.work; + +import com.czlis.common.core.domain.Result; +import com.czlis.liswork.service.LisWorkPageInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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; + +@Api(tags = "获取检验tab页面信息") +@RestController +@RequestMapping("/lisworkpageinfo") +public class LisWorkPageInfoController { + + @Autowired + private LisWorkPageInfoService lisWorkPageInfoService; + + @ApiOperation("获取检验结果图片信息") + @GetMapping("/resultgraph") + public Result resultGraph(){ + 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 new file mode 100644 index 0000000..3b7bcd1 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java @@ -0,0 +1,23 @@ +package com.czlis.liswork.mapper; + +import com.czlis.common.core.domain.entity.LabPat; +import com.czlis.common.core.domain.entity.LabResult; +import com.czlis.common.core.domain.entity.LabResultMed; +import com.czlis.liswork.pojo.ComOpt; +import com.czlis.liswork.pojo.ComUsrpower; +import com.czlis.liswork.pojo.LabPatInfo; + +import java.util.Date; +import java.util.List; + +public interface LisWorkMapper { + List getInstrdList(String userId); + List getInstrdConfig(String yq); + List getSampleList(Date jyrq, String yq, String days); + List sampleInfo(Date jyrq, String yq, String ybh); + List getLabPatList(LabPat labPat); + List getLabResult(LabResult labResult); + List getLabPatInfo(LabPatInfo labPatInfo); + List getLabResultMedInfo(LabResultMed labResultMed); + +} diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/ComOpt.java b/liswork/src/main/java/com/czlis/liswork/pojo/ComOpt.java new file mode 100644 index 0000000..405b57e --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/pojo/ComOpt.java @@ -0,0 +1,16 @@ +package com.czlis.liswork.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ComOpt { + private String yq; + private String xxdh; + private String xxlb; + private String yxxqzq; + private String bz; +} diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/ComUsrpower.java b/liswork/src/main/java/com/czlis/liswork/pojo/ComUsrpower.java new file mode 100644 index 0000000..571c993 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/pojo/ComUsrpower.java @@ -0,0 +1,15 @@ +package com.czlis.liswork.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ComUsrpower { + private String yhdh; + private String yq; + private String xtdh; + private String yhqx; +} diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/LabGraph.java b/liswork/src/main/java/com/czlis/liswork/pojo/LabGraph.java new file mode 100644 index 0000000..727bda2 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/pojo/LabGraph.java @@ -0,0 +1,22 @@ +package com.czlis.liswork.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.sql.Blob; +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LabGraph { + private String yq; + private Date jyrq; + private String ybh; + private String txmc; + private String txlb; + private Blob txnr; + private String bz1; + private String bz2; +} diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/LabGraphUnit.java b/liswork/src/main/java/com/czlis/liswork/pojo/LabGraphUnit.java new file mode 100644 index 0000000..ce568ba --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/pojo/LabGraphUnit.java @@ -0,0 +1,21 @@ +package com.czlis.liswork.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LabGraphUnit { + private String yq; + private String txmc; + private BigDecimal x; + private BigDecimal y; + private BigDecimal wd; + private BigDecimal hg; + private BigDecimal numbz; + private String strbz; +} diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/LabOldGraph.java b/liswork/src/main/java/com/czlis/liswork/pojo/LabOldGraph.java new file mode 100644 index 0000000..8fed476 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/pojo/LabOldGraph.java @@ -0,0 +1,34 @@ +package com.czlis.liswork.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LabOldGraph { + private Date jyrq; + private String yq; + private String ybh; + private Integer hglen1; + private Integer hglen2; + private Integer hglen3; + private Integer hglen4; + private Integer hglen5; + private String hg1; + private String hg2; + private String hg3; + private String hg4; + private String hg5; + private Integer ln1; + private Integer ln2; + private Integer ln3; + private Integer ln4; + private Integer ln5; + private String scatter; + private Integer lp; + private String bk1; +} diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/LabPatInfo.java b/liswork/src/main/java/com/czlis/liswork/pojo/LabPatInfo.java new file mode 100644 index 0000000..0cef01f --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/pojo/LabPatInfo.java @@ -0,0 +1,21 @@ +package com.czlis.liswork.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LabPatInfo { + private Date jyrq; + private String yq; + private String ybh; + private String xxlb; + private String val1; + private String val2; + private String val3; + private String textinfo; +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java new file mode 100644 index 0000000..6e2ce55 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java @@ -0,0 +1,4 @@ +package com.czlis.liswork.service; + +public interface LisWorkPageInfoService { +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java new file mode 100644 index 0000000..0e0734b --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java @@ -0,0 +1,16 @@ +package com.czlis.liswork.service; + +import com.czlis.common.core.domain.Result; + + +import java.util.Date; + + +public interface LisWorkService { + Result getInstrdList(Long userId); + Result getInstrdConfig(String yq); + Result getSampleList(Date jyrq, String yq, String days); + Result sampleInfo(Date jyrq, String yq, String ybh); + Result sampleMedInfo(Date jyrq, String yq, String ybh); + Result checkUser(String yhdh, String mm); +} 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 new file mode 100644 index 0000000..e00420d --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java @@ -0,0 +1,10 @@ +package com.czlis.liswork.service.impl; + +import com.czlis.liswork.service.LisWorkPageInfoService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { +} 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 new file mode 100644 index 0000000..9ebc210 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java @@ -0,0 +1,93 @@ +package com.czlis.liswork.service.impl; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.LabPat; +import com.czlis.common.core.domain.entity.LabResult; +import com.czlis.common.core.domain.entity.LabResultMed; +import com.czlis.liswork.mapper.LisWorkMapper; +import com.czlis.liswork.pojo.ComOpt; +import com.czlis.liswork.pojo.ComUsrpower; +import com.czlis.liswork.pojo.LabPatInfo; +import com.czlis.liswork.service.LisWorkService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; + +@Service +@Slf4j +public class LisWorkServiceImpl implements LisWorkService { + + @Autowired + private LisWorkMapper lisWorkMapper; + + @Override + public Result getInstrdList(Long userId) { + List comUsrpowerList = lisWorkMapper.getInstrdList(String.valueOf(userId)); + return new Result("0","获取权限列表成功！",comUsrpowerList); + } + + @Override + public Result getInstrdConfig(String yq) { + List instrdConfig = lisWorkMapper.getInstrdConfig(yq); + return new Result("0","获取仪器参数成功！",instrdConfig); + } + + @Override + public Result getSampleList(Date jyrq, String yq, String days) { + LabPat labPat = new LabPat(); + labPat.setJyrq(jyrq); + labPat.setYq(yq); + List labPatList = lisWorkMapper.getLabPatList(labPat); + LabPatInfo labPatInfo = new LabPatInfo(); + labPatInfo.setJyrq(jyrq); + labPatInfo.setYq(yq); + List labPatInfoList = lisWorkMapper.getLabPatInfo(labPatInfo); + List> queryList = new ArrayList<>(); + Map map = new HashMap<>(); + map.put("labPatInfoList",labPatInfoList); + map.put("labPatList",labPatList); + queryList.add(map); + return new Result("0","获取样本数据成功！",queryList); + } + + @Override + public Result sampleInfo(Date jyrq, String yq, String ybh) { + LabResult labResult = new LabResult(); + labResult.setJyrq(jyrq); + labResult.setYq(yq); + labResult.setYbh(ybh); + List labResultList = lisWorkMapper.getLabResult(labResult); + return new Result("0","获取该样本数据成功！",labResultList); + } + + @Override + public Result sampleMedInfo(Date jyrq, String yq, String ybh) { + LabResult labResult = new LabResult(); + labResult.setJyrq(jyrq); + labResult.setYq(yq); + labResult.setYbh(ybh); + List labResultList = lisWorkMapper.getLabResult(labResult); + LabResultMed labResultMed = new LabResultMed(); + labResultMed.setJyrq(jyrq); + labResultMed.setYq(yq); + labResultMed.setYbh(ybh); + List labResultMedInfoList = lisWorkMapper.getLabResultMedInfo(labResultMed); + List> queryList = new ArrayList<>(); + Map map = new HashMap<>(); + map.put("labResultList",labResultList); + map.put("labResultMedInfoList",labResultMedInfoList); + queryList.add(map); + return new Result("0","获取微生物数据成功！",queryList); + } + + @Override + public Result checkUser(String yhdh, String mm) { + if(yhdh == null || yhdh.equals("")) return new Result("-1","用户名不能为空！"); + if(mm == null || mm.equals("")) return new Result("-1","密码不能为空！"); + //lisWorkMapper.get + return null; + } + +} diff --git a/liswork/src/main/resources/mapper/LisWorkMapper.xml b/liswork/src/main/resources/mapper/LisWorkMapper.xml new file mode 100644 index 0000000..5f39b66 --- /dev/null +++ b/liswork/src/main/resources/mapper/LisWorkMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + +