主界面功能

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;
+    }
+
 
 
 

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<ComUsrpower> getInstrdList(String userId);
+    List<Map<String,Object>> getInstrdList(String userId);
     List<ComOpt> getInstrdConfig(String yq);
     List<LabPat> getSampleList(Date jyrq, String yq, String days);
     List<LabPat> sampleInfo(Date jyrq, String yq, String ybh);

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

@@ -16,6 +16,6 @@ public interface LisWorkPageInfoMapper {
     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>> getReqdetail(String sqh);
     List<Map<String, Object>> getOtherinstr(Date dayStart, DateTime dayEnd, String brdh, String brxm);
 }

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<LabReqdetail> labReqdetailList = lisWorkPageInfoMapper.getReqdetail(sqh);
+        List<Map<String,Object>> 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();

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<ComUsrpower> comUsrpowerList = lisWorkMapper.getInstrdList(String.valueOf(userId));
+        List<Map<String,Object>> comUsrpowerList = lisWorkMapper.getInstrdList(String.valueOf(userId));
         return new Result("0","获取权限列表成功！",comUsrpowerList);
     }
 

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

@@ -3,7 +3,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.czlis.liswork.mapper.xtwh.InstrMapper">
 
-    <select id="query">
+    <select id="query" resultType="com.czlis.liswork.pojo.LabInstr">
         select * from lab_instr
         <where>
             <if test="yq != null and yq != ''">and yq = #{yq}</if>

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

@@ -3,23 +3,23 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.czlis.liswork.mapper.LisWorkMapper">
 
-    <select id="getInstrdList" parameterType="string">
+    <select id="getInstrdList" parameterType="string" resultType="map">
         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>
 
-    <select id="getInstrdConfig">
+    <select id="getInstrdConfig" resultType="com.czlis.common.core.domain.entity.ComOpt">
         select * from com_opt where yq = #{yq}
     </select>
 
-    <select id="getLabResult">
+    <select id="getLabResult" resultType="com.czlis.common.core.domain.entity.LabResult">
         select * from lab_Result where jyrq = #{jyrq} and yq = #{yq}
         <if test="ybh != null and ybh !=''">and ybh = #{ybh}</if>
         <if test="xmdh != null and xmdh !=''">and xmdh = #{xmdh}</if>
     </select>
 
-    <select id="getLabPatList">
+    <select id="getLabPatList" resultType="com.czlis.common.core.domain.entity.LabPat">
         select * from lab_pat
         <where>
             <if test="jyrq != null">and jyrq = #{jyrq}</if>
@@ -28,12 +28,12 @@
         </where>
     </select>
 
-    <select id="getLabPatInfo">
+    <select id="getLabPatInfo" resultType="com.czlis.liswork.pojo.LabPatInfo">
         select * from lab_patinfo where jyrq = #{jyrq} and yq = #{yq}
         <if test="ybh != null and ybh !=''">and ybh = #{ybh}</if>
     </select>
 
-    <select id="getLabResultMedInfo">
+    <select id="getLabResultMedInfo" resultType="com.czlis.common.core.domain.entity.LabResultMed">
         select * from lab_resultmed where jyrq = #{jyrq} and yq = #{yq}
         <if test="ybh != null and ybh !=''">and ybh = #{ybh}</if>
         <if test="xmdh != null and xmdh !=''">and xmdh = #{xmdh}</if>
@@ -41,7 +41,7 @@
         <if test="ywdh != null and ywdh != ''">and ywdh = #{ywdh}</if>
     </select>
 
-    <select id="getSysUser">
+    <select id="getSysUser" resultType="com.czlis.common.core.domain.entity.SysUser">
         select * from sys_user where user_id = #{userId} and password = #{mm}
     </select>
 

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

@@ -3,29 +3,29 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.czlis.liswork.mapper.LisWorkPageInfoMapper">
 
-    <select id="getLabGraphList">
+    <select id="getLabGraphList" resultType="com.czlis.liswork.pojo.LabGraph">
         select * from lab_graph where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
     </select>
 
-    <select id="getLabOldGraphList">
+    <select id="getLabOldGraphList" resultType="com.czlis.liswork.pojo.LabOldGraph">
         select * from lab_oldgraph where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
     </select>
 
-    <select id="getLabGraphUnitList">
+    <select id="getLabGraphUnitList" resultType="com.czlis.liswork.pojo.LabGraphUnit">
         select * from lab_graphunit where yq = #{yq}
         <if test="txmc != null and txmc != ''"> and txmc = #{txmc}</if>
     </select>
 
-    <select id="getRedo">
+    <select id="getRedo" resultType="com.czlis.liswork.pojo.LabResultRe">
         select * from lab_result_re where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
     </select>
 
-    <select id="getReqdetail">
+    <select id="getReqdetail" resultType="map">
         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">
+    <select id="getOtherinstr" resultType="map">
         <![CDATA[
         SELECT lab_pat.jyrq,
         lab_pat.yq,