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

Compare commits

base: jiangs:163bfe89bac5589fd65c2fcb381f53fd114f82fc
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test
..
compare: jiangs:fb67c661dff72fd4401a766da4fe53c1c36c0660
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test

No commits in common. "163bfe89bac5589fd65c2fcb381f53fd114f82fc" and "fb67c661dff72fd4401a766da4fe53c1c36c0660" have entirely different histories.
163bfe89ba ... fb67c661df

7 changed files with 5 additions and 103 deletions
Show Stats Expand all files Collapse all files

2
lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReqdetailMapper.java
View File

@ -8,6 +8,4 @@ public interface LabReqdetailMapper {
List<LabReqdetail> getLabReqdetailList(String sqh);
int getCountByKey(String sqh);
void insert(LabReqdetail labReqdetail);
void update(LabReqdetail labReqdetail);
LabReqdetail getLabReqdetailOne(String sqh,Integer xh);
}

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

@ -683,7 +683,7 @@ public class CommonUtil {
}
@Transactional(rollbackFor = Exception.class)
@Transactional
public void saveReqInfo(List<LabReqmain> labReqmainList,List<LabReqdetail> labReqdetailList){
for (LabReqmain labReqmain : labReqmainList) {
insertLabReqmain(labReqmain);
@ -693,26 +693,4 @@ public class CommonUtil {
}
}
@Transactional(rollbackFor = Exception.class)
public void updateReqInfo(List<LabReqmain> labReqmainList,List<LabReqdetail> labReqdetailList){
for (LabReqmain labReqmain : labReqmainList) {
LabReqmain labReqmainOne = getLabReqmainOne(labReqmain.getSqh());
if(labReqmainOne != null){
labReqmainMapper.updateLabReqmain(labReqmain);
}else{
insertLabReqmain(labReqmain);
}
}
for (LabReqdetail labReqdetail : labReqdetailList) {
LabReqdetail labReqdetailOne = labReqdetailMapper.getLabReqdetailOne(labReqdetail.getSqh(), labReqdetail.getXh());
if(labReqdetailOne != null){
labReqdetailMapper.update(labReqdetail);
}else{
insertLabReqdetail(labReqdetail);
}
}
}
}

17
lis-interfaceCommon/src/main/resources/mapper/LabReqdetailMapper.xml
View File

@ -31,21 +31,4 @@
)
</insert>
<update id="update">
update lab_reqdetail set sqh = #{sqh}
<if test="xh != null">xh = #{xh},</if>
<if test="sqxmdh != null">sqxmdh = #{sqxmdh},</if>
<if test="sqxmmc != null">sqxmmc = #{sqxmmc},</if>
<if test="sl != null">sl = #{sl},</if>
<if test="dj != null">dj = #{dj}</if>
<if test="zt != null and zt != ''">zt = #{zt}</if>
<if test="jjzt != null and jjzt != ''">jjzt = #{jjzt}</if>
<if test="bz1 != null and bz1 != ''">bz1 = #{bz1}</if>
<if test="bz2 != null and bz2 != ''">bz2 = #{bz2}</if>
</update>
<select id="getLabReqdetailOne" resultType="com.czlis.common.core.domain.entity.lis.LabReqdetail">
select * from lab_reqdetail where sqh = #{sqh} and xh = #{xh}
</select>
</mapper>

18
mzcx/src/main/java/com/czlis/mzcx/controller/ReqInputLisWorkController.java
View File

@ -1,12 +1,10 @@
package com.czlis.mzcx.controller;
import cn.hutool.core.bean.BeanUtil;
import com.czlis.common.annotation.Log;
import com.czlis.common.core.controller.BaseController;
import com.czlis.common.core.domain.Result;
import com.czlis.common.core.domain.entity.SysLoginParam;
import com.czlis.common.core.domain.entity.lis.ComPat;
import com.czlis.common.core.domain.entity.lis.LabReqdetail;
import com.czlis.common.core.domain.entity.lis.LabReqmain;
import com.czlis.common.core.domain.entity.lis.XmFeeInstr;
import com.czlis.common.enums.BusinessType;
@ -20,7 +18,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
@Api(tags = "科内开单")
@ -88,20 +85,5 @@ public class ReqInputLisWorkController extends BaseController {
return reqInputLisWorkService.saveCanCreaeReqList(xmFeeInstrList);
}
@Log(title = SysLogConstants.REQINPUT,businessType = BusinessType.UPDATE)
@ApiOperation("修改申请单信息")
@PostMapping("/updateReqInfo")
public Result updateReqInfo(@RequestBody ReqInputLisWorkReqInfoDTO reqInputLisWorkReqInfoDTO){
LabReqmain labReqmain = reqInputLisWorkReqInfoDTO.getLabReqmain();
List<ReqInputLisWorkVO> reqInputLisWorkVOList = reqInputLisWorkReqInfoDTO.getReqInputLisWorkVOList();
List<LabReqdetail> labReqdetailList = new ArrayList<>();
for (ReqInputLisWorkVO reqInputLisWorkVO : reqInputLisWorkVOList) {
LabReqdetail labReqdetail = new LabReqdetail();
BeanUtil.copyProperties(reqInputLisWorkVO,labReqdetail);
labReqdetailList.add(labReqdetail);
}
return reqInputLisWorkService.updateReqInfo(labReqmain,labReqdetailList);
}
}

6
mzcx/src/main/java/com/czlis/mzcx/pojo/vo/ReqInputLisWorkVO.java
View File

@ -24,10 +24,4 @@ public class ReqInputLisWorkVO {
private String yblx;
private String sampletips;
private String xh;
private String sqh;
private String bz1;
private String bz2;
private BigDecimal sl;
private String zt;
private String jjzt;
}

3
mzcx/src/main/java/com/czlis/mzcx/service/ReqInputLisWorkService.java
View File

@ -2,7 +2,6 @@ package com.czlis.mzcx.service;
import com.czlis.common.core.domain.Result;
import com.czlis.common.core.domain.entity.lis.ComPat;
import com.czlis.common.core.domain.entity.lis.LabReqdetail;
import com.czlis.common.core.domain.entity.lis.LabReqmain;
import com.czlis.common.core.domain.entity.lis.XmFeeInstr;
import com.czlis.mzcx.pojo.dto.ReqInputLisWorkDTO;
@ -26,6 +25,4 @@ public interface ReqInputLisWorkService {
Result saveCanCreaeReqList(List<XmFeeInstr> xmFeeInstrList);
Result queryPatDetail(String sqh);
Result updateReqInfo(LabReqmain labReqmain, List<LabReqdetail> labReqdetailList);
}

38
mzcx/src/main/java/com/czlis/mzcx/service/impl/ReqInputLisWorkServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.czlis.mzcx.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.czlis.common.core.domain.Result;
import com.czlis.common.core.domain.entity.lis.ComPat;
@ -15,7 +14,6 @@ import com.czlis.interfaceCommon.utils.LisInterfaceUtil;
import com.czlis.interfaceCommon.utils.LisUtil;
import com.czlis.mzcx.mapper.ReqInputLisWorkMapper;
import com.czlis.mzcx.pojo.dto.ReqInputLisWorkDTO;
import com.czlis.mzcx.pojo.dto.ReqInputLisWorkReqInfoDTO;
import com.czlis.mzcx.pojo.vo.ReqInputCreateReqListDTO;
import com.czlis.mzcx.pojo.vo.ReqInputLisWorkVO;
import com.czlis.mzcx.service.ReqInputLisWorkService;
@ -88,15 +86,6 @@ public class ReqInputLisWorkServiceImpl implements ReqInputLisWorkService {
if(labReqmain.getYblx() == null || labReqmain.getYblx().equals("")) return new Result("-1","样本类型不能为空！");
if(labReqmain.getBrdh() == null || labReqmain.getBrdh().equals("")) return new Result("-1","病人代号不能为空！");
if(labReqmain.getBrxb() == null || labReqmain.getBrxb().equals("")) return new Result("-1","病人性别不能为空！");
String zt = labReqmain.getZt().trim();
if(zt != null && !zt.equals("")) return new Result("0","申请单状态不是新开，不能保存数据！");
if(zt.equals("1")){
//修改申请单数据
saveReqInfo(labReqmain,reqInputLisWorkVOList);
}
List<Map<String,Object>> reqInfoList = new ArrayList<>();
for (ReqInputLisWorkVO reqInputLisWorkVO : reqInputLisWorkVOList) {
String sfxmmc = reqInputLisWorkVO.getSfxmmc();
@ -184,18 +173,10 @@ public class ReqInputLisWorkServiceImpl implements ReqInputLisWorkService {
public Result queryPatDetail(String sqh) {
LabReqmain labReqmainOne = commonUtil.getLabReqmainOne(sqh);
List<LabReqdetail> labReqdetailList = commonUtil.getLabReqdetailList(sqh);
List<ReqInputLisWorkVO> reqInputLisWorkVOList = reqInputLisWorkMapper.queryXmInfoList();
List<ReqInputLisWorkVO> reqInputLisWorkVOListResult = new ArrayList<>();
for (LabReqdetail labReqdetail : labReqdetailList) {
List<ReqInputLisWorkVO> collect = reqInputLisWorkVOList.stream().filter(reqInputLisWorkVO -> reqInputLisWorkVO.getSfxmdh().equals(labReqdetail.getSqxmdh())).collect(Collectors.toList());
if(collect.size() > 0) {
BeanUtil.copyProperties(labReqdetail,collect.get(0));
reqInputLisWorkVOListResult.add(collect.get(0));
}
}
ReqInputLisWorkReqInfoDTO reqInputLisWorkReqInfoDTO = new ReqInputLisWorkReqInfoDTO(labReqmainOne,reqInputLisWorkVOListResult);
return new Result("0","获取数据成功！",reqInputLisWorkReqInfoDTO);
Map<String,Object> map = new HashMap<>();
map.put("labReqmain",labReqmainOne);
map.put("labReqdetailList",labReqdetailList);
return new Result("0","获取数据成功！",map);
}
@ -320,15 +301,4 @@ public class ReqInputLisWorkServiceImpl implements ReqInputLisWorkService {
}
public Result updateReqInfo(LabReqmain labReqmain, List<LabReqdetail> labReqdetailList){
String zt = labReqmain.getZt().trim();
if(zt == null || zt.equals("")) return new Result("-1","状态没有，不允许修改！");
if(Integer.parseInt(zt) > 1) return new Result("-1","状态不是新开，不能修改数据！");
List<LabReqmain> labReqmainList = new ArrayList<>();
labReqmainList.add(labReqmain);
commonUtil.updateReqInfo(labReqmainList,labReqdetailList);
return new Result("0","修改成功！");
}
}