修正查询样本列表

lis-common/src/main/java/com/czlis/common/core/domain/entity/LocalConfigParam.java

@@ -0,0 +1,38 @@
+package com.czlis.common.core.domain.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 本地选项设置,定位到客户电脑的配置信息,代替cooke职能,避免清除,同时实现可配置化本地默认值
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LocalConfigParam {
+    /**
+     * 默认上一次的登录用户
+     */
+    private String default_yhdh;
+    /**
+     * 默认上一次医疗机构
+     */
+    private String default_yljg;
+    /**
+     * 默认仪器
+     */
+    private String default_instr;
+    /**
+     * 进入系统后自动进入标本录入作业
+     */
+    private String  sys_autowork;
+    /**
+     *进入系统后自动进入病区查询模式
+     */
+    private String sys_deptquerymode;
+    /**
+     *进入系统后自动进入体检查询模式
+     */
+    private String sys_tjque;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/SysLoginParam.java

@@ -16,8 +16,14 @@ public class SysLoginParam {
      * 登录的医疗机构
      */
     private String loginYLJG;
+    /**
+     * 客户端唯一标识
+     */
+    private String localid;
     /**
      * 默认仪器
      */
-    private String yq;
+    private String default_instr;
+
+
 }

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComLocalconfig.java

@@ -0,0 +1,19 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ComLocalconfig {
+
+  private long sid;
+  private String smac;
+  private String sip;
+  private String sname;
+  private String configvalue;
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/model/LoginParam.java

@@ -9,4 +9,5 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class LoginParam {
     private String loginYLJG;
+    private String localid;
 }

lis-common/src/main/java/com/czlis/common/core/page/TableDataInfo.java

@@ -10,7 +10,7 @@ import java.util.List;
  */
 public class TableDataInfo implements Serializable {
     private static final long serialVersionUID = 1L;
-
+    private Object data;
     /**
      * 总记录数
      */
@@ -56,6 +56,14 @@ public class TableDataInfo implements Serializable {
         this.total = total;
     }
 
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+
     public List<?> getRows() {
         return rows;
     }

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComLocalconfigMapper.java

@@ -0,0 +1,5 @@
+package com.czlis.interfaceCommon.mapper;
+
+public interface ComLocalconfigMapper {
+    String getLocalconfig(String smac);
+}

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java

@@ -73,6 +73,8 @@ public class CommonUtil {
     LabReportvsitemMapper labReportvsitemMapper;
     @Autowired
     LabInputcolMapper labInputcolMapper;
+    @Autowired
+    ComLocalconfigMapper comLocalconfigMapper;
     //====检验主表操作方法集合===
     public LabPat getLabPatOne(Date jyrq, String yq, String ybh) {
         return labPatMapper.getLabPatOne(jyrq, yq, ybh);
@@ -468,4 +470,7 @@ public class CommonUtil {
     public int deleteLabReqreportPdffile(Date jyrq, String yq, String ybh) {
         return labReqreportPdffileMapper.deleteLabReqreportPdffile(jyrq, yq, ybh);
     }
+    public String getLocalconfig(String smac) {
+        return comLocalconfigMapper.getLocalconfig(smac);
+    }
 }

lis-interfaceCommon/src/main/resources/mapper/ComLocalconfigMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.czlis.interfaceCommon.mapper.ComLocalconfigMapper">
+    <select id="getLocalconfig" resultType="String">
+        select configvalue from com_localconfig where smac = #{smac}
+    </select>
+</mapper>

lis-system/src/main/java/com/czlis/system/web/controller/system/SysLoginController.java

@@ -107,4 +107,16 @@ public class SysLoginController {
         return ajax;
     }
 
+    /**
+     * 获取客户端本地配置
+     * @param localid
+     * @return
+     */
+    @GetMapping("/getLocalconfig")
+    public AjaxResult getLocalconfig(String localid) {
+        AjaxResult ajax = AjaxResult.success();
+        String data=loginService.getLocalconfig(localid);
+        ajax.put("data", data);
+        return ajax;
+    }
 }

lis-system/src/main/java/com/czlis/system/web/service/SysLoginService.java

@@ -60,6 +60,9 @@ public class SysLoginService {
     @Autowired
     private SysUserMapper userMapper;
 
+    public String getLocalconfig(String smac){
+        return commonUtil.getLocalconfig(smac);
+    }
     /**
      * 登录验证
      * @return 结果
@@ -70,10 +73,12 @@ public class SysLoginService {
         String code = "";
         String uuid = "";
         String loginYLJG = "";
+        String localid = "";
         try{
             code = loginBody.getCode();
             uuid = loginBody.getUuid();
             loginYLJG = loginBody.getLoginParam().getLoginYLJG(); //登录的医疗机构
+            localid=loginBody.getLoginParam().getLocalid();
         }catch (Exception e){
             e.printStackTrace();
             log.error("获取登录信息失败：",e);
@@ -106,6 +111,7 @@ public class SysLoginService {
          //设置登录的参数到缓存
         SysLoginParam sysLoginParam = new SysLoginParam();
         sysLoginParam.setLoginYLJG(loginYLJG);
+        sysLoginParam.setLocalid(localid);
         loginUser.setSysLoginParam(sysLoginParam);
         // 生成token
         return tokenService.createToken(loginUser);

liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java

@@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -75,13 +76,20 @@ public class LisWorkController extends BaseController {
      */
     @ApiOperation("获取样本列表")
     @GetMapping("/samplelist")
-    // public Result getSampleList(Date jyrq,String yq,Long days){
+     public Result getSampleList(Date jyrq,String yq,Long days){
-    //    return lisWorkService.getSampleList(jyrq,yq,days);
+       return new Result("0", "获取样本数据成功！",lisWorkService.getSampleList(jyrq,yq,days));
-   //  }
+     }
-    public TableDataInfo getsamplelist(Date jyrq, String yq, Long days) {
+    @ApiOperation("获取样本列表")
-        startPage();
+    @GetMapping("/samplelistpage")
-        List<LabPat> labPatList = lisWorkService.getSampleList(jyrq, yq, days);
+    public TableDataInfo samplelistpage(Date jyrq, String yq, Long days) {
-        return getDataTable(labPatList);
+        try {
+            startPage();
+            startOrderBy();
+            List<LabPat> labPatList = lisWorkService.getSampleList(jyrq, yq, days);
+            return getDataTable(labPatList);
+        } finally {
+            clearPage();
+        }
     }
 
     /**

liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java

@@ -14,6 +14,7 @@ public interface LisWorkService {
     Result getGroupInstrdList(Long userId,String groupId);
     Result getInstrdConfig(String yq);
     List<LabPat> getSampleList(Date jyrq, String yq, Long days);
+
     Result getLabPat(Date jyrq, String yq, String ybh);
     Result sampleMedInfo(Date jyrq, String yq, String ybh);
     Result checkUser(String yhdh, String mm);

liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java

@@ -1,6 +1,7 @@
 package com.czlis.liswork.service.impl;
 
 
+import com.czlis.common.core.domain.entity.SysLoginParam;
 import com.czlis.common.core.domain.entity.SysUser;
 import com.czlis.common.core.domain.entity.lis.*;
 import com.czlis.common.utils.DateUtils;
@@ -56,7 +57,8 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
     LabReqdetailMapper labReqdetailMapper;
     @Autowired
     CheckResultUtils checkResultUtils;
-
+    @Autowired
+    LoginConfigParamUtil loginConfigParamUtil;
     @Override
     public Result newPatInfo(Date jyrq, String ybh, String sqh, String yq, Long userId) {
 
@@ -337,6 +339,8 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
         LabPat labPat=new LabPat();
         labPat.setSqsj(commonUtil.getCurrentTime());
         String yljg=commonUtil.getLabInstr(yq).getYljg();
+         SysLoginParam loginConfigParam = loginConfigParamUtil.getLoginConfigParam();
+       // loginConfigParam.getLoginYLJG();
         labPat.setYljg(yljg);
         List<LabInputcol> labInputcolList= commonUtil.getLabInputcol(yq);
          for (LabInputcol labInputcol : labInputcolList) {