主业务添加代码

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

@@ -9,7 +9,7 @@ import java.util.Map;
 
 public interface XmValMapper {
     List<XmVal>  getXmValList(String yq);
-    XmVal getXmVal(@Param("yq")String yq, @Param("xmdh")String xmdh);
+    List<XmVal> getXmVal(@Param("yq")String yq, @Param("xmdh")String xmdh);
     XmVal  getXmValValue(@Param("yq")String yq, @Param("xmdh")String xmdh,@Param("csjg")String csjg);
     String  getXmValJgbz(@Param("yq")String yq, @Param("xmdh")String xmdh,@Param("csjg")String csjg,@Param("csjg1")String csjg1,@Param("csjg2")String csjg2);
 }

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

@@ -79,7 +79,12 @@ public class CommonUtil {
     public List<LabPat> getLabPatList(LabPat labPat) {
         return labPatMapper.getLabPat(labPat);
     }
-
+    public List<LabPat> getsamplelist(Date jyrq, String yq){
+        return labPatMapper.getSampleList(jyrq,yq);
+    }
+    public List<LabPat> getSampleListday(String yq, Long days){
+        return labPatMapper.getSampleListday(yq,days);
+    }
     @Transactional(rollbackFor = Exception.class)
     public int insertLabPat(LabPat labPat) {
         return labPatMapper.updateLabPat(labPat);
@@ -239,10 +244,12 @@ public class CommonUtil {
         return xmRefMapper.getXmRefValue(yq, xmdh, bbtype, sex, age, zd, slzq);
     }
 
-    public String getXmRefJgbz(String yq, String xmdh, String csjg, String csjg1, String csjg2) {
+    public String getXmValJgbz(String yq, String xmdh, String csjg, String csjg1, String csjg2) {
         return xmValMapper.getXmValJgbz(yq, xmdh, csjg, csjg1, csjg2);
     }
-
+    public List<XmVal> getXmVal(String yq,String xmdh) {
+        return xmValMapper.getXmVal(yq,xmdh);
+    }
     public List<XmAlarmdetail> getXmAlarmdetail(String yq, String xmdh) {
         return xmAlarmdetailMapper.getXmAlarmdetail(yq, xmdh);
     }

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

@@ -5,6 +5,7 @@ import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.LabPat;
 import com.czlis.common.core.domain.entity.lis.LabResult;
 import com.czlis.common.core.page.TableDataInfo;
+import com.czlis.liswork.mapper.LisWorkMapper;
 import com.czlis.liswork.service.LabPatService;
 import com.czlis.liswork.service.LabResultService;
 import com.czlis.liswork.service.LisWorkService;
@@ -33,7 +34,6 @@ public class LisWorkController extends BaseController {
     private LabPatService labPatService;
     @Autowired
     private LabResultService labResultService;
-
     /**
      * 可操作仪器查询
      *
@@ -72,7 +72,7 @@ public class LisWorkController extends BaseController {
     // }
     public TableDataInfo getsamplelist(Date jyrq, String yq, Long days) {
         startPage();
-        List<LabPat> labPatList = labPatService.getSampleList(jyrq, yq, days);
+        List<LabPat> labPatList = lisWorkService.getSampleList(jyrq, yq, days);
         return getDataTable(labPatList);
     }
 
@@ -88,9 +88,18 @@ public class LisWorkController extends BaseController {
     @GetMapping("/sampleinfo")
     public Result sampleInfo(Date jyrq, String yq, String ybh) {
 
-        return labPatService.getLabPat(jyrq, yq, ybh);
+        return lisWorkService.getLabPat(jyrq, yq, ybh);
+    }
+    @ApiOperation("获取检验项目字典信息")
+    @GetMapping("/queryxminfo")
+    public Result queryxminfo(String yq) {
+        return lisWorkService.getXmInfo(yq);
+    }
+    @ApiOperation("获取检验项目常用取值信息")
+    @GetMapping("/queryxmval")
+    public Result queryxmval(String yq,String xmdh) {
+        return lisWorkService.getXmVal(yq,xmdh);
     }
-
     /**
      * 获取微生物样本信息
      *

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

@@ -1,17 +1,22 @@
 package com.czlis.liswork.service;
 
 import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.lis.LabPat;
+import com.czlis.common.core.domain.entity.lis.LabResult;
 
 
 import java.util.Date;
+import java.util.List;
 
 
 public interface LisWorkService {
     Result getInstrdList(Long userId);
     Result getGroupInstrdList(Long userId,String groupId);
     Result getInstrdConfig(String yq);
-    Result getSampleList(Date jyrq, String yq, Long days);
+    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);
+    Result getXmInfo(String yq);
+    Result getXmVal(String yq,String xmdh);
 }

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

@@ -123,6 +123,16 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
         saveallresult(labPat.getJyrq(),labPat.getYq(),labPat.getYbh());
         return new Result("0", "保存成功");
     }
+
+    /**
+     * 修改病人信息
+     * @param jyrq
+     * @param yq
+     * @param ybh
+     * @param column
+     * @param value
+     * @return
+     */
     @Override
     public Result changePatColumn(Date jyrq,String yq, String ybh,String column,String value) {
         String jgbz=commonUtil.getLabPatJgbz(jyrq,yq,ybh);
@@ -158,12 +168,21 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
         setComLog(jyrq, yq, ybh,SecurityUtils.getLoginUser().getUsername(),ComLogConstants.LG_M,column+":"+value);
         return new Result("0", "保存成功");
     }
+
+    /**
+     * 修改结果
+     * @param labResult
+     * @return
+     */
     @Override
     public Result changeresult(LabResult labResult){
         String yq=labResult.getYq();
         Date jyrq=labResult.getJyrq();
         String ybh=labResult.getYbh();
         LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh);
+        if("2".equals(labPat.getJgbz())) return new Result("-1", "结果已审核禁止修改!");
+        if("5".equals(labPat.getJgbz())) return new Result("-1", "结果已锁定禁止修改!");
+        if("1".equals(labPat.getJgbz())) return new Result("-1", "结果已初审禁止修改!");
         boolean nowjz=checknowjz(labPat);
         changeresultf(labPat, labResult, nowjz);
         return new Result("0", "保存成功");
@@ -1284,7 +1303,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
         }
         int index = csjg.indexOf(",");
         if (index == -1) csjg2 = StringUtils.substring(csjg, index + 1);
-        jgbz = commonUtil.getXmRefJgbz(yq, xmdh, csjg, csjg1, csjg2);
+        jgbz = commonUtil.getXmValJgbz(yq, xmdh, csjg, csjg1, csjg2);
         if (jgbz == null) {
             return "";
         }

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

@@ -2,20 +2,17 @@ package com.czlis.liswork.service.impl;
 
 import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.*;
-import com.czlis.common.core.domain.entity.lis.ComOpt;
+import com.czlis.common.core.domain.entity.lis.*;
-import com.czlis.common.core.domain.entity.lis.LabPat;
-import com.czlis.common.core.domain.entity.lis.LabResult;
-import com.czlis.common.core.domain.entity.lis.LabResultMed;
 import com.czlis.common.enums.UserStatus;
 import com.czlis.common.exception.ServiceException;
 import com.czlis.common.utils.MessageUtils;
 import com.czlis.common.utils.SecurityUtils;
 import com.czlis.common.utils.StringUtils;
+import com.czlis.interfaceCommon.utils.CommonUtil;
 import com.czlis.liswork.mapper.LisWorkMapper;
 
 
 import com.czlis.liswork.mapper.xtwh.InstrMapper;
-import com.czlis.common.core.domain.entity.lis.LabInstr;
 import com.czlis.liswork.service.LisWorkService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,10 +26,21 @@ public class LisWorkServiceImpl implements LisWorkService {
 
     @Autowired
     private LisWorkMapper lisWorkMapper;
-
+    @Autowired
+    CommonUtil commonUtil;
     @Autowired
     private InstrMapper instrMapper;
     @Override
+    public Result getXmInfo(String yq) {
+        List<XmInfo> xmInfoList =commonUtil.getXmInfoList(yq);
+        return new Result("0","获取成功！",xmInfoList);
+    }
+    @Override
+    public Result getXmVal(String yq,String xmdh) {
+        List<XmVal> xmInfoList =commonUtil.getXmVal(yq,xmdh);
+        return new Result("0","获取成功！",xmInfoList);
+    }
+    @Override
     public Result getInstrdList(Long userId) {
         List<Map<String,Object>> comUsrpowerList = lisWorkMapper.getInstrdList(String.valueOf(userId));
         return new Result("0","获取仪器列表成功！",comUsrpowerList);
@@ -56,13 +64,13 @@ public class LisWorkServiceImpl implements LisWorkService {
     }
 
     @Override
-    public Result getSampleList(Date jyrq, String yq, Long days) {
+    public List<LabPat> getSampleList(Date jyrq, String yq, Long days) {
         if(days>1) {
-            List<LabPat> labPatListday = lisWorkMapper.getSampleListday(yq, days);
+            List<LabPat> labPatListday = commonUtil.getSampleListday(yq, days);
-            return new Result("0", "获取该样本数据成功！", labPatListday);
+            return labPatListday;
         }else {
-            List<LabPat> labPatListday = lisWorkMapper.getSampleList(jyrq, yq);
+            List<LabPat> labPatListday = commonUtil.getsamplelist(jyrq, yq);
-            return new Result("0", "获取该样本数据成功！", labPatListday);
+            return labPatListday;
         }
     }
     @Override
@@ -113,5 +121,4 @@ public class LisWorkServiceImpl implements LisWorkService {
         }
     }
 
-
 }