diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComConfigDict.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComConfigDict.java new file mode 100644 index 0000000..176d498 --- /dev/null +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComConfigDict.java @@ -0,0 +1,31 @@ +package com.czlis.common.core.domain.entity.lis; + + + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ComConfigDict { + + private Long configId; + private String configType; + private String configCode; + private String configName; + private String configOptiontype; + private String configDefvalue; + private Long configSort; + private String status; + private String createBy; + private Date createTime; + private String updateBy; + private Date updateTime; + private String remark; + + + +} diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComLocalconfig.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComLocalconfig.java index 4a69a5a..610a132 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComLocalconfig.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComLocalconfig.java @@ -4,16 +4,21 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; + @Data @NoArgsConstructor @AllArgsConstructor public class ComLocalconfig { - private long sid; + private Long sid; private String smac; private String sip; private String sname; private String configvalue; - + private String create_by; + private Date create_time; + private String update_by; + private Date update_time; } diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmTextResult.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmTextResult.java index f1ae35d..7d79b80 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmTextResult.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmTextResult.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class XmTextResult { - private Integer xmid; + private String yq; private String xmdh; private Integer xh; private String textresult; 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 index 0fb8d47..1daadab 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java @@ -44,10 +44,16 @@ public class LisWorkController extends BaseController { return lisWorkService.getInstrdList(); } - @ApiOperation("仪器组可操作仪器查询") + @ApiOperation(value = "仪器组可操作仪器查询", + notes="powerbit为操作场景\n1:报告查询\n"+"2:报告录入\n"+ + "3:统计\n"+"6:检验项目维护\n"+"7:系统,报告单设定优化\n"+ + "8:质控录入,查询\n"+"9:系统日志,修改记录查询\n"+"20:抽查报告") @GetMapping("/getGroupInstrdList") - public Result getGroupInstrdList(String lisgroup) { - return lisWorkService.getGroupInstrdList(lisgroup); + public Result getGroupInstrdList( + @RequestParam(value = "lisgroup", required = false,defaultValue = "ALL") String lisgroup, + @RequestParam(value = "powerbit", required = false,defaultValue = "2") String powerbit + ) { + return lisWorkService.getGroupInstrdList(lisgroup,powerbit); } @ApiOperation("切换仪器，查询仪器参数") diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java index eff9751..9a8d1ad 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java @@ -32,6 +32,11 @@ public class LisWorkGermController extends BaseController { LisWorkGermMapper lisWorkGermMapper; @Autowired LisWorkGermService lisWorkGermService; + @ApiOperation("获取微生物样本信息") + @GetMapping("/germsampleinfo") + public Result germsampleinfo(Date jyrq, String yq, String ybh) { + return lisWorkGermService.germsampleinfo(jyrq, yq, ybh); + } @ApiOperation("获取药敏字典") @GetMapping("/getmeddict") public Result getmeddict() { @@ -180,4 +185,10 @@ public class LisWorkGermController extends BaseController { public Result changepatjyrq(Date jyrq, String yq, String ybh) { return lisWorkGermService.changepatjyrq(jyrq, yq, ybh); } + @ApiOperation("获取专家评语字典") + @GetMapping("/getgermtextdict") + public Result getGermTextDict(){ + return new Result("0", "成功！",lisWorkGermMapper.getGermTextDict()); + } + } diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComConfigDictController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComConfigDictController.java new file mode 100644 index 0000000..c507205 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComConfigDictController.java @@ -0,0 +1,108 @@ +package com.czlis.liswork.controller.xtwh; + +import com.czlis.common.annotation.Log; +import com.czlis.common.core.controller.BaseController; +import com.czlis.common.core.domain.AjaxResult; +import com.czlis.common.core.page.TableDataInfo; +import com.czlis.common.enums.BusinessType; +import com.czlis.common.utils.poi.ExcelUtil; +import com.czlis.common.core.domain.entity.lis.ComConfigDict; +import com.czlis.liswork.service.ComConfigDictService; +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.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Api(tags = "参数模板设置") +@RestController +@RequestMapping("/configdict") +@Slf4j +public class ComConfigDictController extends BaseController { + @Autowired + private ComConfigDictService ComConfigDictService; + /** + * 获取字典列表 + */ + @ApiOperation("获取字典列表") + @GetMapping("/list") + public AjaxResult list(ComConfigDict post) { + // startPage(); + List list = ComConfigDictService.selectComConfigDictList(post); + return success(list); + } + @ApiOperation("字典导出") + @Log(title = "字典导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ComConfigDict post) { + List list = ComConfigDictService.selectComConfigDictList(post); + ExcelUtil util = new ExcelUtil<>(ComConfigDict.class); + util.exportExcel(response, list, "字典数据"); + } + + /** + * 根据字典编号获取详细信息 + */ + @ApiOperation("获取详细信息") + @GetMapping(value = "/{dictId}") + public AjaxResult getInfo(@PathVariable Long dictId) { + return success(ComConfigDictService.selectComConfigDictById(dictId)); + } + + /** + * 新增字典 + */ + @ApiOperation("新增字典") + @Log(title = "字典管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody ComConfigDict post) { + log.info("post:{}",post); + + if (!ComConfigDictService.checkDictNameUnique(post)) { + return error("新增字典'" + post.getConfigName() + "'失败，字典名称已存在"); + } else if (!ComConfigDictService.checkDictCodeUnique(post)) { + return error("新增字典'" + post.getConfigName() + "'失败，字典编码已存在"); + } + post.setCreateBy(getUsername()); + return toAjax(ComConfigDictService.insertDict(post)); + } + + /** + * 修改字典 + */ + @ApiOperation("修改字典") + @Log(title = "字典管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody ComConfigDict post) { + if (!ComConfigDictService.checkDictNameUnique(post)) { + return error("修改字典'" + post.getConfigName() + "'失败，字典名称已存在"); + } else if (!ComConfigDictService.checkDictCodeUnique(post)) { + return error("修改字典'" + post.getConfigName() + "'失败，字典编码已存在"); + } + post.setUpdateBy(getUsername()); + return toAjax(ComConfigDictService.updateDict(post)); + } + + /** + * 删除字典 + */ + @ApiOperation("删除字典") + @Log(title = "字典管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{dictIds}") + public AjaxResult remove(@PathVariable Long[] dictIds) { + return toAjax(ComConfigDictService.deleteDictByIds(dictIds)); + } + + /** + * 获取字典选择框列表 + */ + @ApiOperation("获取字典选择框列表") + @GetMapping("/optionselect") + public AjaxResult optionselect() { + List posts = ComConfigDictService.selectComConfigDictAll(); + return success(posts); + } +} diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComLocalconfigController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComLocalconfigController.java new file mode 100644 index 0000000..060ef68 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComLocalconfigController.java @@ -0,0 +1,74 @@ +package com.czlis.liswork.controller.xtwh; + +import com.czlis.common.annotation.Log; +import com.czlis.common.core.controller.BaseController; +import com.czlis.common.core.domain.AjaxResult; +import com.czlis.common.core.domain.entity.lis.ComConfigDict; +import com.czlis.common.enums.BusinessType; +import com.czlis.common.utils.SecurityUtils; +import com.czlis.common.utils.poi.ExcelUtil; +import com.czlis.liswork.service.ComConfigDictService; +import com.czlis.liswork.service.ComLocalconfigService; +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.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Api(tags = "参数模板设置") +@RestController +@RequestMapping("/localconfig") +@Slf4j +public class ComLocalconfigController extends BaseController { + @Autowired + ComConfigDictService ComConfigDictService; + ComLocalconfigService ComLocalconfigService; + /** + * 获取字典列表 + */ + @ApiOperation("获取参数列表") + @GetMapping("/list") + public AjaxResult list() { + String localid= SecurityUtils.getLoginUser().getSysLoginParam().getLocalid(); + ComLocalconfigService.getComLocalconfigList(localid); + return success(ComLocalconfigService.getComLocalconfigList(localid)); + } + /** + * 根据字典编号获取详细信息 + */ + @ApiOperation("获取详细信息") + @GetMapping(value = "/{dictId}") + public AjaxResult getInfo(@PathVariable Long dictId) { + return success(ComConfigDictService.selectComConfigDictById(dictId)); + } + + /** + * 修改字典 + */ + @ApiOperation("修改字典") + @Log(title = "字典管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody ComConfigDict post) { + if (!ComConfigDictService.checkDictNameUnique(post)) { + return error("修改字典'" + post.getConfigName() + "'失败，字典名称已存在"); + } else if (!ComConfigDictService.checkDictCodeUnique(post)) { + return error("修改字典'" + post.getConfigName() + "'失败，字典编码已存在"); + } + post.setUpdateBy(getUsername()); + return toAjax(ComConfigDictService.updateDict(post)); + } + + /** + * 获取字典选择框列表 + */ + @ApiOperation("获取字典选择框列表") + @GetMapping("/optionselect/{dictId}") + public AjaxResult optionselect() { + List posts = ComConfigDictService.selectComConfigDictAll(); + return success(posts); + } +} diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java index f4d901f..e8c5f5a 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java @@ -30,4 +30,6 @@ public interface LisWorkGermMapper { int updatemediumjyrq(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh, @Param("jyrq1")Date jyrq1); int changeresultjyrq(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh, @Param("jyrq1")Date jyrq1); int changepatjyrq(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh, @Param("jyrq1")Date jyrq1); + List getGermTextDict(); + LabPat getLabPat(@Param("yq")String yq,@Param("ybh") String ybh); } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComConfigDictMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComConfigDictMapper.java new file mode 100644 index 0000000..4afb0c1 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComConfigDictMapper.java @@ -0,0 +1,86 @@ +package com.czlis.liswork.mapper.xtwh; + +import com.czlis.common.core.domain.entity.lis.ComConfigDict; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface ComConfigDictMapper { + Long getCountById(Long configId); + List selectComConfigDictByType(String configType); + + /** + * 查询字典数据集合 + * + * @param Dict 字典信息 + * @return 字典数据集合 + */ + List selectComConfigDictList(ComConfigDict Dict); + + /** + * 查询所有字典 + * + * @return 字典列表 + */ + List selectComConfigDictAll(); + + /** + * 通过字典ID查询字典信息 + * + * @param configId 字典ID + * @return 角色对象信息 + */ + ComConfigDict selectComConfigDictById(Long configId); + + + /** + * 删除字典信息 + * + * @param configId 字典ID + * @return 结果 + */ + int delComConfigDictById(Long configId); + + /** + * 批量删除字典信息 + * + * @param DictIds 需要删除的字典ID + * @return 结果 + */ + int delComConfigDictByIds(Long[] DictIds); + + /** + * 修改字典信息 + * + * @param Dict 字典信息 + * @return 结果 + */ + int updateComConfigDict(ComConfigDict Dict); + + /** + * 新增字典信息 + * + * @param Dict 字典信息 + * @return 结果 + */ + int insertComConfigDict(ComConfigDict Dict); + + /** + * 校验字典名称 + * + * @param configName 字典名称 + * @param configType 类别 + * @return 结果 + */ + ComConfigDict checkDictNameUnique(@Param("configName") String configName,@Param("configType") String configType); + + /** + * 校验字典编码 + * + * @param configCode 字典编码 + * @return 结果 + */ + ComConfigDict checkDictCodeUnique(@Param("configCode") String configCode,@Param("configType") String configType); + + +} diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/LocalconfigMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/LocalconfigMapper.java new file mode 100644 index 0000000..a7b78be --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/LocalconfigMapper.java @@ -0,0 +1,19 @@ +package com.czlis.liswork.mapper.xtwh; + +import com.czlis.common.core.domain.entity.lis.ComLocalconfig; + +import java.util.List; + +public interface LocalconfigMapper { + + List selectComLocalconfigList(ComLocalconfig comLocalconfig); + Long getCountById(Long sid); + Long getCountBymic(String smac); + Long getsid(String smac); + List selectComLocalconfigAll(); + int insertComLocalconfig(ComLocalconfig comLocalconfig); + int delComLocalconfigById(Long sid); + int delComLocalconfigBymac(String smac); + int delComLocalconfigByIds(Long[] sids); + int updateComLocalconfig(ComLocalconfig comLocalconfig); +} diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java b/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java index cbb6c33..3dd64cb 100644 --- a/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java +++ b/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java @@ -26,6 +26,7 @@ public class HistoryResult { private String cksx; private String ckxx; private String yqmc; + private String yblx; } diff --git a/liswork/src/main/java/com/czlis/liswork/service/ComConfigDictService.java b/liswork/src/main/java/com/czlis/liswork/service/ComConfigDictService.java new file mode 100644 index 0000000..b66d282 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/ComConfigDictService.java @@ -0,0 +1,90 @@ +package com.czlis.liswork.service; + +import com.czlis.common.constant.UserConstants; +import com.czlis.common.core.domain.entity.lis.ComConfigDict; +import com.czlis.common.exception.ServiceException; +import com.czlis.common.utils.StringUtils; + +import java.util.List; + +public interface ComConfigDictService { + /** + * 查询字典信息集合 + * + * @param Dict 字典信息 + * @return 字典信息集合 + */ + List selectComConfigDictList(ComConfigDict Dict); + + /** + * 查询所有字典 + * + * @return 字典列表 + */ + List selectComConfigDictAll(); + + /** + * 通过字典ID查询字典信息 + * + * @param DictId 字典ID + * @return 角色对象信息 + */ + ComConfigDict selectComConfigDictById(Long DictId); + + + /** + * 校验字典名称是否唯一 + * + * @param Dict 字典信息 + * @return 结果 + */ + boolean checkDictNameUnique(ComConfigDict Dict); + + /** + * 校验字典编码是否唯一 + * + * @param Dict 字典信息 + * @return 结果 + */ + boolean checkDictCodeUnique(ComConfigDict Dict); + + /** + * 通过字典ID查询字典使用数量 + * + * @param DictId 字典ID + * @return 结果 + */ + int countUserDictById(Long DictId); + + /** + * 删除字典信息 + * + * @param DictId 字典ID + * @return 结果 + */ + int deleteDictById(Long DictId); + + /** + * 批量删除字典信息 + * + * @param DictIds 需要删除的字典ID + * @return 结果 + */ + int deleteDictByIds(Long[] DictIds); + + /** + * 新增保存字典信息 + * + * @param Dict 字典信息 + * @return 结果 + */ + int insertDict(ComConfigDict Dict); + + /** + * 修改保存字典信息 + * + * @param Dict 字典信息 + * @return 结果 + */ + int updateDict(ComConfigDict Dict); +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/ComLocalconfigService.java b/liswork/src/main/java/com/czlis/liswork/service/ComLocalconfigService.java new file mode 100644 index 0000000..bee1725 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/ComLocalconfigService.java @@ -0,0 +1,19 @@ +package com.czlis.liswork.service; + +import com.czlis.common.core.domain.entity.lis.ComConfigDict; +import com.czlis.common.core.domain.entity.lis.ComLocalconfig; + +import java.util.List; + +public interface ComLocalconfigService { + List getComLocalconfigList(String smac); + Long getCountById(Long sid); + Long getCountBymic(String smac); + Long getsid(String smac); + List selectComLocalconfigAll(); + int insertComLocalconfig(ComLocalconfig comLocalconfig); + int delComLocalconfigById(Long sid); + int delComLocalconfigBymac(String smac); + int delComLocalconfigByIds(Long[] sids); + int updateComLocalconfig(ComLocalconfig comLocalconfig); +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java index 7080d99..84657d8 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java @@ -29,4 +29,5 @@ public interface LisWorkGermService { Result newresult(LabResult labResult); Result saveallresult(List labResult); Result check(Date jyrq, String yq, String ybh, String hdys,String type); + Result germsampleinfo(Date jyrq, String yq, String ybh); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java index ac47c27..a2e247f 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java @@ -11,7 +11,7 @@ import java.util.List; public interface LisWorkService { Result getInstrdList(); - Result getGroupInstrdList(String groupId); + Result getGroupInstrdList(String groupId,String powerbit); Result getInstrdConfig(String yq); List getSampleList(Date jyrq, String yq, Long days); Result getresultinfo(Date jyrq, String yq, String ybh); diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java index e299ed3..9dc24dd 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java @@ -39,6 +39,10 @@ public class LisWorkGermServiceImpl implements LisWorkGermService { @Autowired LisWorkGermMapper lisWorkGermMapper; @Override + public Result germsampleinfo(Date jyrq, String yq, String ybh){ + return new Result("0", "成功！", lisWorkGermMapper.getLabPat(yq,ybh)); + } + @Override public Result getresultinfo(Date jyrq, String yq, String ybh){ List labResultList = commonUtil.getLabResultList(jyrq, yq, ybh); return new Result("0", "成功！", labResultList); 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 8fe0433..0df0c26 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 @@ -126,10 +126,15 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { if(map == null || map.size() <= 0){ return new Result("-1","查询条件转换错误！"); } - Result historyResult = getHistoryResult(jyrq, yq, ybh, map); - if ("0".equals(historyResult.getCode())) { - return new Result("0", "获取成功！", historyResult.getData()); - } + if("细菌仪".equals( commonUtil.getYqdl(yq))){ + return getHistoryResultGerm(jyrq, yq, ybh, map); + }else{ + Result historyResult = getHistoryResult(jyrq, yq, ybh, map); + if ("0".equals(historyResult.getCode())) { + return new Result("0", "获取成功！", historyResult.getData()); + } + } + return new Result("-1", "无历史数据！"); } @@ -178,8 +183,12 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { return new Result("-1", "缺少查询条件！"); } Map map = BeanUtil.beanToMap(lastLabPatParam); - Result historyResult = getHistoryResult(jyrq, yq, ybh, map); - return new Result("0", "获取成功！", historyResult.getData()); + if("细菌仪".equals( commonUtil.getYqdl(yq))){ + return getHistoryResultGerm(jyrq, yq, ybh, map); + }else { + Result historyResult = getHistoryResult(jyrq, yq, ybh, map); + return new Result("0", "获取成功！", historyResult.getData()); + } } /** @@ -201,7 +210,6 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { return new Result("0", "获取数据成功！", labInputmdlList); } - public Result getHistoryResult(Date jyrq, String yq, String ybh, Map map) { List hisResultList0 = lisWorkPageInfoMapper.getHisResult(map); if (hisResultList0.isEmpty()) { @@ -286,6 +294,21 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { } return new Result("0", "获取成功！", historyResultDTO); } + public Result getHistoryResultGerm(Date jyrq, String yq, String ybh, Map map) { + List hisResultList0 = lisWorkPageInfoMapper.getHisResult(map); + if (hisResultList0.isEmpty()) { + return new Result("-1", "无历史数据！"); + } + List hisResultList1 = hisResultList0.stream().filter(st -> !"细菌仪".equals(st.getYbh())).collect(Collectors.toList()); + if (hisResultList1.isEmpty()) { + return new Result("-1", "无历史数据！", hisResultList1); + } + List hisResultList = hisResultList1.stream().filter(st -> !(jyrq.equals(st.getJyrq()) && yq.trim().equals(st.getYq().trim()) && ybh.equals(st.getYbh()))).collect(Collectors.toList()); + if (hisResultList.isEmpty()) { + return new Result("-1", "无历史数据！", hisResultList); + } + return new Result("0", "获取成功！", hisResultList); + } @Override public Result getclinicref(String yq, String xmdh) { 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 eba2c80..7d64fb4 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 @@ -86,7 +86,7 @@ public class LisWorkServiceImpl implements LisWorkService { } @Override - public Result getGroupInstrdList(String groupId) { + public Result getGroupInstrdList(String groupId,String powerbit) { if ("ALL".equals(groupId)) groupId = ""; String yhdh = SecurityUtils.getLoginUser().getUsername(); SysLoginParam loginConfigParam = loginConfigParamUtil.getLoginConfigParam(); @@ -96,7 +96,7 @@ public class LisWorkServiceImpl implements LisWorkService { if ("admin".equals(yhdh) || "lis".equals(yhdh)) { labInstr = commonUtil.querybylisgroup(groupId, yljg, "0"); } else { - labInstr = commonUtil.getInstrdList(groupId, yljg, "0", yhdh, "2"); + labInstr = commonUtil.getInstrdList(groupId, yljg, "0", yhdh, powerbit); } return new Result("0", "获取分组仪器列表成功！", labInstr); diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComConfigDictServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComConfigDictServiceImpl.java new file mode 100644 index 0000000..4341cb5 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComConfigDictServiceImpl.java @@ -0,0 +1,149 @@ +package com.czlis.liswork.service.impl.xtwh; + +import com.czlis.common.constant.UserConstants; +import com.czlis.common.core.domain.entity.lis.ComConfigDict; +import com.czlis.common.exception.ServiceException; +import com.czlis.common.utils.StringUtils; +import com.czlis.liswork.mapper.xtwh.ComConfigDictMapper; +import com.czlis.liswork.service.ComConfigDictService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +/** + * 配置参数字典,系统配置菜单依据本字典自动创建配置档 + */ +@Service +@Slf4j +public class ComConfigDictServiceImpl implements ComConfigDictService { + + @Autowired + ComConfigDictMapper comConfigDictMapper; + /** + * 查询字典信息集合 + * + * @param Dict 字典信息 + * @return 字典信息集合 + */ + @Override + public List selectComConfigDictList(ComConfigDict Dict) { + return comConfigDictMapper.selectComConfigDictList(Dict); + } + + /** + * 查询所有字典 + * + * @return 字典列表 + */ + @Override + public List selectComConfigDictAll() { + return comConfigDictMapper.selectComConfigDictAll(); + } + + /** + * 通过字典ID查询字典信息 + * + * @param DictId 字典ID + * @return 角色对象信息 + */ + @Override + public ComConfigDict selectComConfigDictById(Long DictId) { + return comConfigDictMapper.selectComConfigDictById(DictId); + } + + + /** + * 校验字典名称是否唯一 + * + * @param Dict 字典信息 + * @return 结果 + */ + @Override + public boolean checkDictNameUnique(ComConfigDict Dict) { + Long DictId = StringUtils.isNull(Dict.getConfigId()) ? -1L : Dict.getConfigId(); + ComConfigDict info = comConfigDictMapper.checkDictNameUnique(Dict.getConfigName(),Dict.getConfigType()); + if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != DictId.longValue()) { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验字典编码是否唯一 + * + * @param Dict 字典信息 + * @return 结果 + */ + @Override + public boolean checkDictCodeUnique(ComConfigDict Dict) { + Long DictId = StringUtils.isNull(Dict.getConfigId()) ? -1L : Dict.getConfigId(); + ComConfigDict info = comConfigDictMapper.checkDictCodeUnique(Dict.getConfigCode(),Dict.getConfigType()); + if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != DictId.longValue()) { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 通过字典ID查询字典使用数量 + * + * @param DictId 字典ID + * @return 结果 + */ + @Override + public int countUserDictById(Long DictId) { + return 0;//comConfigDictMapper.countUserDictById(DictId); + } + + /** + * 删除字典信息 + * + * @param DictId 字典ID + * @return 结果 + */ + @Override + public int deleteDictById(Long DictId) { + return comConfigDictMapper.delComConfigDictById(DictId); + } + + /** + * 批量删除字典信息 + * + * @param DictIds 需要删除的字典ID + * @return 结果 + */ + @Override + public int deleteDictByIds(Long[] DictIds) { + for (Long DictId : DictIds) { + ComConfigDict Dict = selectComConfigDictById(DictId); + if (countUserDictById(DictId) > 0) { + throw new ServiceException(String.format("%1$s已分配,不能删除", Dict.getConfigName())); + } + } + return comConfigDictMapper.delComConfigDictByIds(DictIds); + } + + /** + * 新增保存字典信息 + * + * @param Dict 字典信息 + * @return 结果 + */ + @Override + public int insertDict(ComConfigDict Dict) { + return comConfigDictMapper.insertComConfigDict(Dict); + } + + /** + * 修改保存字典信息 + * + * @param Dict 字典信息 + * @return 结果 + */ + @Override + public int updateDict(ComConfigDict Dict) { + return comConfigDictMapper.updateComConfigDict(Dict); + } + +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComLocalconfigServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComLocalconfigServiceImpl.java new file mode 100644 index 0000000..6badf6c --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComLocalconfigServiceImpl.java @@ -0,0 +1,73 @@ +package com.czlis.liswork.service.impl.xtwh; + +import com.czlis.common.core.domain.entity.lis.ComConfigDict; +import com.czlis.common.core.domain.entity.lis.ComLocalconfig; +import com.czlis.liswork.mapper.xtwh.LocalconfigMapper; +import com.czlis.liswork.service.ComConfigDictService; +import com.czlis.liswork.service.ComLocalconfigService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +@Service +@Slf4j +public class ComLocalconfigServiceImpl implements ComLocalconfigService { + @Autowired + ComConfigDictService ComConfigDictService; + @Autowired + LocalconfigMapper localconfigMapper; + @Override + public List getComLocalconfigList(String smac){ + ComConfigDict post=new ComConfigDict(); + post.setConfigType("LOCAL"); + post.setStatus("0"); + List list = ComConfigDictService.selectComConfigDictList(post); + if(list.isEmpty())return null; + ComLocalconfig comLocalconfig=new ComLocalconfig(); + comLocalconfig.setSmac(smac); + List comLocalconfiglist=localconfigMapper.selectComLocalconfigList(comLocalconfig); + if(comLocalconfiglist.size()>0){ + comLocalconfig= comLocalconfiglist.get(0); + String configvalue=comLocalconfig.getConfigvalue(); + } + return null; + } + @Override + public Long getCountById(Long sid){ + return null; + } + @Override + public Long getCountBymic(String smac){ + return null; + } + @Override + public Long getsid(String smac){ + return null; + } + @Override + public List selectComLocalconfigAll(){ + return null; + } + @Override + public int insertComLocalconfig(ComLocalconfig comLocalconfig){ + return 0; + } + @Override + public int delComLocalconfigById(Long sid){ + return 0; + } + @Override + public int delComLocalconfigBymac(String smac){ + return 0; + } + @Override + public int delComLocalconfigByIds(Long[] sids){ + return 0; + } + @Override + public int updateComLocalconfig(ComLocalconfig comLocalconfig){ + return 0; + } + +} diff --git a/liswork/src/main/resources/mapper/ComConfigDictMapper.xml b/liswork/src/main/resources/mapper/ComConfigDictMapper.xml new file mode 100644 index 0000000..bd8f0e1 --- /dev/null +++ b/liswork/src/main/resources/mapper/ComConfigDictMapper.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + select config_id,config_type,config_code,config_name,config_optiontype,config_defvalue,config_sort, + status,create_by,create_time,update_by,update_time,remark from com_config_dict + + + + + + + + + + + + + + insert into com_config_dict( + config_id, + config_type, + config_code, + config_name, + config_optiontype, + config_defvalue, + config_sort, + status, + remark, + create_by, + create_time + )values( + #{configId}, + #{configType}, + #{configCode}, + #{configName}, + #{configOptiontype}, + #{configDefvalue}, + #{configSort}, + #{status}, + #{remark}, + #{createBy}, + getdate() + ) + + + + delete from com_config_dict where config_id = #{configId} + + + + delete from com_config_dict where config_id in + + #{configId} + + + + + update com_config_dict + + config_type = #{configType}, + config_code = #{configCode}, + config_name = #{configName}, + config_optiontype = #{configOptiontype}, + config_defvalue = #{configDefvalue}, + config_sort = #{configSort}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = getdate() + + where config_id = #{configId} + + + + \ No newline at end of file diff --git a/liswork/src/main/resources/mapper/ComLocalconfigMapper.xml b/liswork/src/main/resources/mapper/ComLocalconfigMapper.xml new file mode 100644 index 0000000..33d48a5 --- /dev/null +++ b/liswork/src/main/resources/mapper/ComLocalconfigMapper.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + insert into com_localconfig( + sid, + smac, + sip, + sname, + configvalue, + create_by, + create_time + )values( + #{sid}, + #{smac}, + #{sip}, + #{sname}, + #{configvalue}, + #{create_by}, + getdate() + ) + + + + delete from com_localconfig where sid = #{sid} + + + delete from com_localconfig where smac = #{smac} + + + delete from com_localconfig where sid in + + #{sid} + + + + + update com_localconfig + + config_type = #{smac}, + sip = #{sip}, + sname = #{sname}, + configvalue = #{configvalue}, + update_by = #{update_by}, + update_time = getdate() + + where sid = #{sid} + + + + \ No newline at end of file diff --git a/liswork/src/main/resources/mapper/LisWorkGermMapper.xml b/liswork/src/main/resources/mapper/LisWorkGermMapper.xml index 49b5bad..e5de4b3 100644 --- a/liswork/src/main/resources/mapper/LisWorkGermMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkGermMapper.xml @@ -158,4 +158,11 @@ order by xm_medgroup.xh + + \ No newline at end of file diff --git a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml index 2808bd0..70d0eb7 100644 --- a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml @@ -153,7 +153,7 @@