diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml
index e796316..030adb7 100644
--- a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml
+++ b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml
@@ -52,7 +52,76 @@
ORDER BY lab_pat.jyrq DESC,right(replicate(' ',20) + lab_pat.ybh,20) DESC
-
+
insert into lab_pat (jyrq, yq, ybh,
diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml
index ab20cce..e4ee1c9 100644
--- a/lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml
+++ b/lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml
@@ -58,10 +58,23 @@
delete from lab_result
- where jyrq = #{jyrq}
- and yq = #{yq,jdbcType=CHAR}
- and ybh = #{ybh,jdbcType=VARCHAR}
- and xmdh = #{xmdh,jdbcType=VARCHAR}
+
+
+ and lab_result.jyrq = #{jyrq}
+
+
+ and lab_result.yq = #{yq}
+
+
+ and lab_result.ybh = #{ybh}
+
+
+ and lab_result.xmdh = #{xmdh}
+
+
+ and lab_result.csjg = #{csjg}
+
+
delete from lab_result
diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java
index 87d0660..d6ca226 100644
--- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java
+++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java
@@ -136,7 +136,13 @@ public class LisWorkController extends BaseController {
}
@ApiOperation("双工流水线")
@GetMapping("/datalink")
- public Result datalink(Date jyrq, String yq, String ybh) {
- return lisWorkService.datalink(jyrq,yq,ybh);
+ public Result datalink(Date jyrq, String yq) {
+ return lisWorkService.datalink(jyrq,yq);
}
+ @ApiOperation("清除所有未做项目")
+ @GetMapping("/clearnotcomplete")
+ public Result clearnotcomplete(Date jyrq, String yq,String ybh) {
+ return lisWorkService.clearnotcomplete(jyrq,yq,ybh);
+ }
+
}
diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java
index 5400442..804854f 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java
@@ -25,5 +25,6 @@ public interface LisWorkService {
Result getresultchangelog(Date jyrq, String yq, String ybh,String xmdh);
Result allpatquery(Date jyrq, String yq, String ybh);
Result emrquery(Date jyrq, String yq, String ybh);
- Result datalink(Date jyrq, String yq, String ybh);
+ Result datalink(Date jyrq, String yq);
+ Result clearnotcomplete(Date jyrq, String yq,String ybh);
}
diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java
index 2a94107..02d3cf0 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java
@@ -601,7 +601,23 @@ public class LisWorkServiceImpl implements LisWorkService {
return lisWorkUtils.setDayMessage(LisinterfaceNameConstants.DAYMESSAGE_ALLPAT,val);
}
@Override
- public Result datalink(Date jyrq, String yq, String ybh) {
- return new Result("0", "获取成功！");
+ public Result datalink(Date jyrq, String yq) {
+ LabPat labPat=new LabPat();
+ labPat.setJyrq(jyrq);
+ labPat.setYq(yq);
+ labPat.setJgbz("0");
+ List labPatlist=commonUtil.getLabPatList(labPat);
+ List labPatlist0=labPatlist.stream().filter(st->!"".equals(st.getSqh())||st.getSqh()!=null).collect(Collectors.toList());
+ return new Result("0", "成功！",labPatlist0);
+ }
+ @Override
+ public Result clearnotcomplete(Date jyrq, String yq,String ybh){
+ LabResult labResult=new LabResult();
+ labResult.setJyrq(jyrq);
+ labResult.setYq(yq);
+ labResult.setYbh(ybh);
+ labResult.setCsjg("未做");
+ commonUtil.delLabResult(labResult);
+ return new Result("0", "成功！");
}
}