Merge remote-tracking branch 'origin/master'

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

@@ -1729,6 +1729,13 @@ public class LisWorkUtils {
         String xmdh = labResult.getXmdh();
         if ("".equals(xmdh) || xmdh == null) return new Result("-1", "项目代号不能为空!");
         LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh);
+        if(labPat==null){
+            labPat=new LabPat();
+            labPat.setJyrq(jyrq);
+            labPat.setYbh(ybh);
+            labPat.setYq(yq);
+            labPat.setJgbz("0");
+        }
         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", "结果已初审禁止修改!");

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

@@ -84,11 +84,7 @@ public class LisWorkController extends BaseController {
     public Result queryxmval(String yq,String xmdh) {
         return lisWorkService.getXmVal(yq,xmdh);
     }
-    @ApiOperation("获取微生物样本信息")
+
-    @GetMapping("/sampleMedInfo")
-    public Result sampleMedInfo(Date jyrq, String yq, String ybh) {
-        return lisWorkService.sampleMedInfo(jyrq, yq, ybh);
-    }
     @ApiOperation("工号密码验证")
     @GetMapping("/checkuserid")
     public Result checkUser(String yhdh, String mm) {

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

@@ -0,0 +1,51 @@
+package com.czlis.liswork.controller.work;
+
+import com.czlis.common.core.controller.BaseController;
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.lis.LabPat;
+import com.czlis.common.core.page.TableDataInfo;
+import com.czlis.liswork.service.LabResultService;
+import com.czlis.liswork.service.LisWorkService;
+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.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+
+@RestController
+@RequestMapping("/lisworkgerm")
+@Slf4j
+@Api(tags = "主界面-微生物报告输入")
+public class LisWorkGermController extends BaseController {
+    @Autowired
+    private LisWorkService lisWorkService;
+    @Autowired
+    private LabResultService labResultService;
+    @ApiOperation("获取微生物样本信息")
+    @GetMapping("/sampleMedInfo")
+    public Result sampleMedInfo(Date jyrq, String yq, String ybh) {
+        return lisWorkService.sampleMedInfo(jyrq, yq, ybh);
+    }
+    @ApiOperation("获取样本列表")
+    @GetMapping("/samplelist")
+    public Result getSampleList(Date jyrq,String yq,Long days){
+        return new Result("0", "获取样本数据成功！",lisWorkService.getSampleList(jyrq,yq,days));
+    }
+    @ApiOperation("获取样本列表")
+    @GetMapping("/samplelistpage")
+    public TableDataInfo samplelistpage(Date jyrq, String yq, Long days) {
+        try {
+            startPage();
+            startOrderBy();
+            List<LabPat> labPatList = lisWorkService.getSampleList(jyrq, yq, days);
+            return getDataTable(labPatList);
+        } finally {
+            clearPage();
+        }
+    }
+}