主界面功能

lis-common/pom.xml

@@ -148,12 +148,6 @@
             <artifactId>pinyin4j</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.czlis</groupId>
-            <artifactId>lis-interfaceCommon</artifactId>
-            <version>8.0.0</version>
-        </dependency>
-
     </dependencies>
 
 </project>

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

@@ -0,0 +1,17 @@
+package com.czlis.common.core.domain.entity;
+
+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 xxqz;
+    private String bz;
+
+}

lis-interfaceCommon/pom.xml

@@ -11,6 +11,13 @@
 
     <artifactId>lis-interfaceCommon</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.czlis</groupId>
+            <artifactId>lis-common</artifactId>
+        </dependency>
+    </dependencies>
+
 
 
 </project>

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

@@ -0,0 +1,9 @@
+package com.czlis.interfaceCommon.mapper;
+
+import com.czlis.common.core.domain.entity.ComOpt;
+
+public interface ComOptMapper {
+    ComOpt getComOptOne(String yq,String xxdh);
+    String getComOptValue(String yq,String xxdh);
+
+}

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

@@ -0,0 +1,4 @@
+package com.czlis.interfaceCommon.mapper;
+
+public interface CommonMapper {
+}

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

@@ -0,0 +1,11 @@
+package com.czlis.interfaceCommon.mapper;
+
+import com.czlis.common.core.domain.entity.LabPat;
+
+import java.util.Date;
+import java.util.List;
+
+public interface LabPatMapper {
+    List<LabPat>  getLabPatList();
+    LabPat getLabPatOne(Date jyrq, String yq,String ybh);
+}

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

@@ -0,0 +1,4 @@
+package com.czlis.interfaceCommon.mapper;
+
+public interface LabReqdetailMapper {
+}

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

@@ -0,0 +1,4 @@
+package com.czlis.interfaceCommon.mapper;
+
+public interface LabReqmainMapper {
+}

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

@@ -0,0 +1,27 @@
+package com.czlis.interfaceCommon.utils;
+
+import com.czlis.common.core.domain.entity.LabPat;
+import com.czlis.interfaceCommon.mapper.ComOptMapper;
+import com.czlis.interfaceCommon.mapper.LabPatMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+@Component
+public class CommonUtil {
+
+    @Autowired
+    LabPatMapper labPatMapper;
+    @Autowired
+    ComOptMapper comOptMapper;
+
+
+    public LabPat getLabPatOne(Date jyrq, String yq, String ybh){
+        return labPatMapper.getLabPatOne(jyrq, yq, ybh);
+    }
+
+    public String getComOptValue(String yq,String xxdh){
+        return comOptMapper.getComOptValue(yq,xxdh);
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.czlis.common.utils.lisinterface;
+package com.czlis.interfaceCommon.utils;
 
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;

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

@@ -0,0 +1,16 @@
+<?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.ComOptMapper">
+    <select id="getComOptOne">
+        select * from com_opt where yq = #{yq} and xxdh = #{xxdh}
+    </select>
+
+    <select id="getComOptValue">
+        select xxqz from com_opt where  yq = #{yq} and xxdh = #{xxdh}
+    </select>
+
+
+
+
+</mapper>

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

@@ -0,0 +1,12 @@
+<?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.LabPatMapper">
+    <select id="getLabPatOne">
+        select * from lab_pat where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
+    </select>
+
+
+
+
+</mapper>

liswork/pom.xml

@@ -19,7 +19,13 @@
     <dependencies>
         <dependency>
             <groupId>com.czlis</groupId>
-            <artifactId>lis-common</artifactId>
+            <artifactId>lis-interfaceCommon</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

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

@@ -9,6 +9,8 @@ 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;
+
 @Api(tags = "获取检验tab页面信息")
 @RestController
 @RequestMapping("/lisworkpageinfo")
@@ -19,9 +21,35 @@ public class LisWorkPageInfoController {
 
     @ApiOperation("获取检验结果图片信息")
     @GetMapping("/resultgraph")
-    public Result resultGraph(){
+    public Result resultGraph(Date jyrq,String yq,String ybh){
-        return null;
+        return lisWorkPageInfoService.resultGraph(jyrq,yq,ybh);
+    }
+
+    @ApiOperation("获取复查结果")
+    @GetMapping("/redo")
+    public Result getRedo(Date jyrq,String yq,String ybh){
+        return lisWorkPageInfoService.getRedo(jyrq,yq,ybh);
+    }
+
+    @ApiOperation("获取历史结果")
+    @GetMapping("/history")
+    public Result getHistory(Date jyrq,String yq,String ybh){
+        return lisWorkPageInfoService.getHistory(jyrq,yq,ybh);
+    }
+
+    @ApiOperation("获取其他仪器结果")
+    @GetMapping("/otherinstr")
+    public Result getOtherinstr(Date jyrq,String yq,String ybh){
+        return lisWorkPageInfoService.getOtherinstr(jyrq,yq,ybh);
+    }
+
+    @ApiOperation("获取收费信息")
+    @GetMapping("/reqdetail")
+    public Result getReqdetail(Date jyrq,String yq,String ybh){
+        return lisWorkPageInfoService.getReqdetail(jyrq,yq,ybh);
     }
 
 
+
+
 }

liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java

@@ -3,6 +3,7 @@ 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.common.core.domain.entity.SysUser;
 import com.czlis.liswork.pojo.ComOpt;
 import com.czlis.liswork.pojo.ComUsrpower;
 import com.czlis.liswork.pojo.LabPatInfo;
@@ -19,5 +20,5 @@ public interface LisWorkMapper {
     List<LabResult> getLabResult(LabResult labResult);
     List<LabPatInfo> getLabPatInfo(LabPatInfo labPatInfo);
     List<LabResultMed> getLabResultMedInfo(LabResultMed labResultMed);
-
+    SysUser getSysUser(String userId, String mm);
 }

liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java

@@ -0,0 +1,21 @@
+package com.czlis.liswork.mapper;
+
+import cn.hutool.core.date.DateTime;
+import com.czlis.common.core.domain.entity.LabReqdetail;
+import com.czlis.liswork.pojo.LabGraph;
+import com.czlis.liswork.pojo.LabGraphUnit;
+import com.czlis.liswork.pojo.LabOldGraph;
+import com.czlis.liswork.pojo.LabResultRe;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public interface LisWorkPageInfoMapper {
+    List<LabGraph> getLabGraphList(Date jyrq,String yq,String ybh);
+    List<LabOldGraph> getLabOldGraphList(Date jyrq,String yq,String ybh);
+    List<LabGraphUnit> getLabGraphUnitList(String yq,String txmc);
+    List<LabResultRe> getRedo(Date jyrq, String yq, String ybh);
+    List<LabReqdetail> getReqdetail(String sqh);
+    List<Map<String, Object>> getOtherinstr(Date dayStart, DateTime dayEnd, String brdh, String brxm);
+}

liswork/src/main/java/com/czlis/liswork/pojo/LabResultRe.java

@@ -0,0 +1,25 @@
+package com.czlis.liswork.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabResultRe {
+    private String wyh;
+    private Date jyrq;
+    private String yq;
+    private String ybh;
+    private String xmdh;
+    private String csjg;
+    private String od;
+    private String cutoff;
+    private String jgbz;
+    private String bz1;
+    private String bz2;
+    private String yhdh;
+}

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

@@ -1,4 +1,13 @@
 package com.czlis.liswork.service;
 
+import com.czlis.common.core.domain.Result;
+
+import java.util.Date;
+
 public interface LisWorkPageInfoService {
+    Result resultGraph(Date jyrq, String yq, String ybh);
+    Result getRedo(Date jyrq, String yq, String ybh);
+    Result getHistory(Date jyrq, String yq, String ybh);
+    Result getReqdetail(Date jyrq, String yq, String ybh);
+    Result getOtherinstr(Date jyrq, String yq, String ybh);
 }

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

@@ -1,10 +1,76 @@
 package com.czlis.liswork.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.LabPat;
+import com.czlis.common.core.domain.entity.LabReqdetail;
+import com.czlis.liswork.mapper.LisWorkPageInfoMapper;
+import com.czlis.liswork.pojo.LabGraph;
+import com.czlis.liswork.pojo.LabGraphUnit;
+import com.czlis.liswork.pojo.LabOldGraph;
+import com.czlis.liswork.pojo.LabResultRe;
 import com.czlis.liswork.service.LisWorkPageInfoService;
+import com.czlis.interfaceCommon.utils.CommonUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.*;
+
 @Service
 @Slf4j
 public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService {
+
+    @Autowired
+    LisWorkPageInfoMapper lisWorkPageInfoMapper;
+    @Autowired
+    CommonUtil commonUtil;
+
+    @Override
+    public Result resultGraph(Date jyrq, String yq, String ybh) {
+        List<LabGraph> labGraphList = lisWorkPageInfoMapper.getLabGraphList(jyrq,yq,ybh);
+        List<LabGraphUnit> labGraphUnitList = lisWorkPageInfoMapper.getLabGraphUnitList(yq,"");
+        List<LabOldGraph> labOldGraphList = lisWorkPageInfoMapper.getLabOldGraphList(jyrq, yq, ybh);
+        List<Map<String,Object>> queryList = new ArrayList<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("labGraphList",labGraphList);
+        map.put("labGraphUnitList",labGraphUnitList);
+        map.put("labOldGraphList",labOldGraphList);
+        queryList.add(map);
+        return new Result("0","获取数据成功！",queryList);
+    }
+
+    @Override
+    public Result getRedo(Date jyrq, String yq, String ybh) {
+        List<LabResultRe> labResultReList = lisWorkPageInfoMapper.getRedo(jyrq,yq,ybh);
+        return new Result("0","获取数据成功！",labResultReList);
+    }
+
+    @Override
+    public Result getHistory(Date jyrq, String yq, String ybh) {
+        return null;
+    }
+
+    @Override
+    public Result getReqdetail(Date jyrq, String yq, String ybh) {
+        LabPat labPatOne = commonUtil.getLabPatOne(jyrq, yq, ybh);
+        if(labPatOne == null) return new Result("-1","没有查到对应的上机记录！");
+        String sqh = labPatOne.getSqh();
+        List<LabReqdetail> 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");
+        DateTime dayEnd = DateUtil.offsetDay(DateUtil.date(), Integer.parseInt(value));
+        LabPat labPatOne = commonUtil.getLabPatOne(jyrq, yq, ybh);
+        String brdh = labPatOne.getBrdh();
+        String brxm = labPatOne.getBrxm();
+        List<Map<String,Object>> queryList = lisWorkPageInfoMapper.getOtherinstr(jyrq,dayEnd,brdh,brxm);
+        return new Result("0","查询数据成功！",queryList);
+    }
+
+
 }

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

@@ -4,6 +4,7 @@ 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.common.core.domain.entity.SysUser;
 import com.czlis.liswork.mapper.LisWorkMapper;
 import com.czlis.liswork.pojo.ComOpt;
 import com.czlis.liswork.pojo.ComUsrpower;
@@ -86,8 +87,12 @@ public class LisWorkServiceImpl implements LisWorkService {
     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
+        SysUser sysUser = lisWorkMapper.getSysUser(yhdh, mm);
-        return null;
+        if(sysUser != null){
+            return new Result("0","登录成功！");
+        }else{
+            return new Result("-1","登录失败，账户密码不正确！");
+        }
     }
 
 }

liswork/src/main/resources/mapper/LisWorkMapper.xml

@@ -41,4 +41,8 @@
         <if test="ywdh != null and ywdh != ''">and ywdh = #{ywdh}</if>
     </select>
 
+    <select id="getSysUser">
+        select * from sys_user where user_id = #{userId} and password = #{mm}
+    </select>
+
 </mapper>

liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml

@@ -0,0 +1,42 @@
+<?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.liswork.mapper.LisWorkPageInfoMapper">
+
+    <select id="getLabGraphList">
+        select * from lab_graph where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
+    </select>
+
+    <select id="getLabOldGraphList">
+        select * from lab_oldgraph where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
+    </select>
+
+    <select id="getLabGraphUnitList">
+        select * from lab_graphunit where yq = #{yq}
+        <if test="txmc != null and txmc != ''"> and txmc = #{txmc}</if>
+    </select>
+
+    <select id="getRedo">
+        select * from lab_result_re where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
+    </select>
+
+    <select id="getReqdetail">
+        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} ) )
+    </select>
+
+
+    <select id="getOtherinstr">
+        <![CDATA[
+        SELECT lab_pat.jyrq,
+        lab_pat.yq,
+        lab_pat.ybh,
+        lab_instr.yqmc,
+        lab_instr.yljg,(select bz from com_dict where zdlb='HOS' and zddh=lab_instr.yljg) as gjmc
+        FROM lab_pat,
+        lab_instr
+        WHERE ( lab_pat.yq = lab_instr.yq )
+        AND ( lab_pat.brdh = #{brdh} AND lab_pat.brxm = #{brxm} AND lab_pat.jyrq >= #{dayStart} AND lab_pat.jyrq <= #{dayEnd})
+        ]]>
+
+    </select>
+</mapper>

mzcx/pom.xml

@@ -18,7 +18,7 @@
     <dependencies>
         <dependency>
             <groupId>com.czlis</groupId>
-            <artifactId>lis-common</artifactId>
+            <artifactId>lis-interfaceCommon</artifactId>
         </dependency>
 
     </dependencies>

pom.xml

@@ -110,6 +110,13 @@
                 <version>${tomcat.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-test</artifactId>
+                <version>${spring-boot.version}</version>
+                <scope>test</scope>
+            </dependency>
+
             <!-- 阿里数据库连接池 -->
             <dependency>
                 <groupId>com.alibaba</groupId>

zybgcx/pom.xml

@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>com.czlis</groupId>
-            <artifactId>lis-common</artifactId>
+            <artifactId>lis-interfaceCommon</artifactId>
         </dependency>
     </dependencies>
 

zycx/pom.xml

@@ -18,7 +18,7 @@
     <dependencies>
         <dependency>
             <groupId>com.czlis</groupId>
-            <artifactId>lis-common</artifactId>
+            <artifactId>lis-interfaceCommon</artifactId>
         </dependency>
 
     </dependencies>

zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java

@@ -4,14 +4,12 @@ import com.czlis.common.core.controller.BaseController;
 import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.LabReqmain;
 import com.czlis.common.core.page.TableDataInfo;
-import com.czlis.common.utils.lisinterface.LisInterfaceUtil;
+import com.czlis.interfaceCommon.utils.LisInterfaceUtil;
-import com.czlis.zycx.pojo.Web_getBarcode;
 import com.czlis.zycx.service.ZycxService;
 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.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;