jiangs/lis8.0
2
0
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: jiangs:f242b8c8af0126a0b1ce6cf27f770c89070ce43d
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test
..
compare: jiangs:d6fb8cb4f6802436757cd5eda88089b705a9fdce
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test

No commits in common. "f242b8c8af0126a0b1ce6cf27f770c89070ce43d" and "d6fb8cb4f6802436757cd5eda88089b705a9fdce" have entirely different histories.
f242b8c8af ... d6fb8cb4f6

11 changed files with 13 additions and 64 deletions
Show Stats Expand all files Collapse all files

4
lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabRptgetRule.java
View File

@ -1,6 +1,5 @@
package com.czlis.common.core.domain.entity.lis;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -9,10 +8,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
public class LabRptgetRule {
@ApiModelProperty("报告领取规则代码")
private Integer bglqdh;
@ApiModelProperty("报告领取规则名称")
private String bglqmc;
@ApiModelProperty("备注")
private String bz;
}

10
lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabRptgetRuleDetail.java
View File

@ -1,6 +1,5 @@
package com.czlis.common.core.domain.entity.lis;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -9,22 +8,13 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
public class LabRptgetRuleDetail {
@ApiModelProperty("报告领取规则代码")
private Integer bglqdh;
@ApiModelProperty("序号")
private Integer xh;
@ApiModelProperty("开始时间")
private String kssj;
@ApiModelProperty("结束时间")
private String jssj;
@ApiModelProperty("所需小时数")
private Integer bgxss;
@ApiModelProperty("报告领取说明")
private String bglqsm;
@ApiModelProperty("备注")
private String bz;
@ApiModelProperty("起始日期")
private String weekday;
@ApiModelProperty("截止日期")
private String weekday1;
}

4
lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFee.java
View File

@ -1,6 +1,5 @@
package com.czlis.common.core.domain.entity.lis;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -17,11 +16,8 @@ public class XmFee {
private String xmlb;
private BigDecimal dj;
private String zjf;
@ApiModelProperty("备注")
private String bz;
@ApiModelProperty("报告领取规则代码")
private Integer bglqdh;
@ApiModelProperty("规格")
private String spec;
private String yljg;
private String lisgroup;

2
liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java
View File

@ -8,7 +8,6 @@ import com.czlis.common.core.page.TableDataInfo;
import com.czlis.liswork.service.LabPatService;
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;
@ -24,7 +23,6 @@ import java.util.List;
@RestController
@RequestMapping("/liswork")
@Slf4j
@Api(tags = "主界面-报告输入")
public class LisWorkController extends BaseController {
@Autowired

2
liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java
View File

@ -5,7 +5,6 @@ import com.czlis.common.core.domain.Result;
import com.czlis.common.core.domain.entity.lis.LabPat;
import com.czlis.common.utils.ServletUtils;
import com.czlis.liswork.service.LisWorkOperService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@ -18,7 +17,6 @@ import java.util.Map;
@Slf4j
@RestController
@RequestMapping("/lisworkoper")
@Api(tags = "主界面-操作相关")
public class LisWorkOperController extends BaseController {
@Autowired

2
liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java
View File

@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
@Api(tags = "主界面-获取检验tab页面信息")
@Api(tags = "获取检验tab页面信息")
@RestController
@RequestMapping("/lisworkpageinfo")
public class LisWorkPageInfoController {

5
mzcx/src/main/java/com/czlis/mzcx/controller/RptgetRuleController.java
View File

@ -1,6 +1,5 @@
package com.czlis.mzcx.controller;
import com.czlis.common.annotation.Anonymous;
import com.czlis.common.core.controller.BaseController;
import com.czlis.common.core.domain.Result;
import com.czlis.common.core.page.TableDataInfo;
@ -10,7 +9,6 @@ import com.czlis.common.core.domain.entity.lis.LabRptgetRuleDetail;
import com.czlis.mzcx.service.RptgetRuleService;
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.*;
@ -23,7 +21,6 @@ import java.util.List;
@Api(tags = "报告领取规则")
@RestController
@RequestMapping("/rptgetrule")
@Slf4j
public class RptgetRuleController extends BaseController {
@Autowired
@ -48,9 +45,7 @@ public class RptgetRuleController extends BaseController {
@ApiOperation("新增报告领取规则")
@PostMapping("/add")
@Anonymous
public Result add(@RequestBody LabRptgetRuleDTO labRptgetRuleDTO) {
log.info("新增报告领取规则：{}",labRptgetRuleDTO);
return rptgetRuleService.add(labRptgetRuleDTO);
}

5
mzcx/src/main/java/com/czlis/mzcx/mapper/RptgetRuleMapper.java
View File

@ -2,19 +2,18 @@ package com.czlis.mzcx.mapper;
import com.czlis.common.core.domain.entity.lis.LabRptgetRule;
import com.czlis.common.core.domain.entity.lis.LabRptgetRuleDetail;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface RptgetRuleMapper {
List<LabRptgetRule> query(LabRptgetRule rule);
List<LabRptgetRuleDetail> queryDetail(@Param("bglqdh")String bglqdh,@Param("xh")Integer xh);
List<LabRptgetRuleDetail> queryDetail(String bglqdh);
void insert(LabRptgetRule rule);
void insertDetail(LabRptgetRuleDetail ruleDetail);
void update(LabRptgetRule rule);
void updateDetail(LabRptgetRuleDetail ruleDetail);
void delete(String bglqdh);
void deleteDetail(@Param("bglqdh") String bglqdh,@Param("xh") Integer xh);
void deleteDetail(String bglqdh, Integer xh);
Long getLabRptgetRuleDetailCount(String bglqdh);
Integer getMaxNo();
}

8
mzcx/src/main/java/com/czlis/mzcx/pojo/XmFeeDTO.java
View File

@ -1,6 +1,5 @@
package com.czlis.mzcx.pojo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -11,19 +10,12 @@ import java.math.BigDecimal;
@AllArgsConstructor
@NoArgsConstructor
public class XmFeeDTO {
@ApiModelProperty("收费项目代码")
private String sfxmdh;
@ApiModelProperty("收费项目名称")
private String sfxmmc;
@ApiModelProperty("项目类别")
private String xmlb;
@ApiModelProperty("单价")
private BigDecimal dj;
@ApiModelProperty("助记符")
private String zjf;
@ApiModelProperty("备注")
private String bz;
@ApiModelProperty("报告领取规则代码")
private Integer bglqdh;
private String spec;
private String yljg;

28
mzcx/src/main/java/com/czlis/mzcx/service/impl/RptgetRuleServiceImpl.java
View File

@ -30,7 +30,7 @@ public class RptgetRuleServiceImpl implements RptgetRuleService {
@Override
public List<LabRptgetRuleDetail> queryDetail(String bglqdh) {
return rptgetRuleMapper.queryDetail(bglqdh,null);
return rptgetRuleMapper.queryDetail(bglqdh);
}
@Transactional(rollbackFor = Exception.class)
@ -38,19 +38,16 @@ public class RptgetRuleServiceImpl implements RptgetRuleService {
@Log(title = "报告领取规则",businessType = BusinessType.INSERT)
public Result add(LabRptgetRuleDTO labRptgetRuleDTO) {
List<LabRptgetRule> ruleList = labRptgetRuleDTO.getRuleList();
//Integer maxNo = rptgetRuleMapper.getMaxNo();
Integer maxNo = rptgetRuleMapper.getMaxNo();
for (LabRptgetRule labRptgetRule : ruleList) {
// Integer bglqdh = maxNo + 1;
// labRptgetRule.setBglqdh(bglqdh);
Integer bglqdh = labRptgetRule.getBglqdh();
if(bglqdh == null || bglqdh == 0) return new Result("-1","报告明细表中的报告领取代码不可以为空！");
Integer bglqdh = maxNo++;
labRptgetRule.setBglqdh(bglqdh);
if(bglqdh == null || bglqdh == 0) return new Result("-1","报告列表中的报告领取代码不可以为空！");
rptgetRuleMapper.insert(labRptgetRule);
}
List<LabRptgetRuleDetail> ruleDetailList = labRptgetRuleDTO.getRuleDetailList();
for (LabRptgetRuleDetail labRptgetRuleDetail : ruleDetailList) {
//labRptgetRuleDetail.setBglqdh(bglqdh);
Integer bglqdh = labRptgetRuleDetail.getBglqdh();
if(bglqdh == null || bglqdh == 0) return new Result("-1","报告明细表中的报告领取代码不可以为空！");
rptgetRuleMapper.insertDetail(labRptgetRuleDetail);
@ -75,28 +72,17 @@ public class RptgetRuleServiceImpl implements RptgetRuleService {
for (LabRptgetRuleDetail labRptgetRuleDetail : ruleDetailList) {
Integer bglqdh = labRptgetRuleDetail.getBglqdh();
if(bglqdh == null || bglqdh == 0) return new Result("-1","报告明细表中的报告领取代码不可以为空！");
List<LabRptgetRuleDetail> labRptgetRuleDetailList = rptgetRuleMapper.queryDetail(bglqdh.toString(), labRptgetRuleDetail.getXh());
if(labRptgetRuleDetailList.size() <= 0){
rptgetRuleMapper.insertDetail(labRptgetRuleDetail);
}else{
rptgetRuleMapper.updateDetail(labRptgetRuleDetail);
}
}
return new Result("0","修改成功！");
}
@Override
@Log(title = "报告领取规则",businessType = BusinessType.DELETE)
public Result delete(String bglqdh) {
// Long labRptgetRuleDetailCount = rptgetRuleMapper.getLabRptgetRuleDetailCount(bglqdh);
// if(labRptgetRuleDetailCount > 0) return new Result("-1","存在报告领取规则明细数据，请先删除明细数据再删除列表数据！");
Long labRptgetRuleDetailCount = rptgetRuleMapper.getLabRptgetRuleDetailCount(bglqdh);
if(labRptgetRuleDetailCount > 0) return new Result("-1","存在报告领取规则明细数据，请先删除明细数据再删除列表数据！");
rptgetRuleMapper.delete(bglqdh);
List<LabRptgetRuleDetail> labRptgetRuleDetailList = rptgetRuleMapper.queryDetail(bglqdh,null);
for (LabRptgetRuleDetail labRptgetRuleDetail : labRptgetRuleDetailList) {
Integer xh = labRptgetRuleDetail.getXh();
rptgetRuleMapper.deleteDetail(bglqdh,xh);
}
return new Result("0","删除报告领取规则列表成功！");
}

5
mzcx/src/main/resources/mapper/RptgetRuleMapper.xml
View File

@ -15,7 +15,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="queryDetail" resultType="com.czlis.common.core.domain.entity.lis.LabRptgetRuleDetail">
select * from lab_rptgetruledetail where bglqdh = #{bglqdh}
<if test="xh != null"> and xh = #{xh}</if>
</select>
<insert id="insert">
@ -59,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<set>
<if test="bglqmc != null and bglqmc != ''">bglqmc = #{bglqmc},</if>
<if test="bz != null and bz != ''">bz = #{bz},</if>
bglqdh = #{bglqdh}
#{bglqdh}
</set>
where bglqdh = #{bglqdh}
</update>
@ -74,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bz != null and bz != ''">bz = #{bz},</if>
<if test="weekday != null and weekday != '' ">weekday = #{weekday},</if>
<if test="weekday1 != null and weekday1 != ''">weekday1 = #{weekday1},</if>
bglqdh = #{bglqdh}
#{bglqdh}
</set>
where bglqdh = #{bglqdh} and xh = #{xh}
</update>