feat: 代码保存

dev_20240306
chenhc 1 year ago
parent 394ee7e585
commit 79c5ac8ef4

@ -0,0 +1,50 @@
package com.glxp.api.controller.inout;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.basic.BasicSkSickerEntity;
import com.glxp.api.req.inout.FilterSkSiackerListRequest;
import com.glxp.api.res.inout.IoOrderResponse;
import com.glxp.api.service.inout.IoDepartmentOrderService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
@RestController
public class IoDepartmentOrderController extends BaseController {
@Resource
IoDepartmentOrderService ioDepartmentOrderService;
/**
*
*
* @param
* @return
*/
@PostMapping("/udiwms/inout/ioDepartmentOrder/getSkSickerList")
public BaseResponse getSkSickerList(@RequestBody FilterSkSiackerListRequest filterSkSiackerListRequest) {
List<BasicSkSickerEntity> list = ioDepartmentOrderService.getSkSickerList(filterSkSiackerListRequest);
PageInfo<BasicSkSickerEntity> pageInfo = new PageInfo<>(list);
return ResultVOUtils.page(pageInfo);
}
/**
* code 稿
*
* @param
* @return
*/
@GetMapping("/udiwms/inout/ioDepartmentOrder/getOrderListbyCode")
public BaseResponse getOrderListbyCode(String adNum) {
List<IoOrderResponse>list = ioDepartmentOrderService.getOrderListbyCode(adNum);
return ResultVOUtils.success(list);
}
}

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.basic.BasicSkSickerEntity;
import com.glxp.api.req.basic.BasicSkSickerRequest;
import com.glxp.api.req.inout.FilterSkSiackerListRequest;
import com.glxp.api.res.basic.BasicSkSickerResponse;
import org.apache.ibatis.annotations.Mapper;
@ -16,6 +17,7 @@ public interface BasicSkSickerMapper extends BaseMapperPlus<BasicSkSickerMapper,
List<BasicSkSickerResponse> filterNoList(BasicSkSickerRequest basicSkSickerRequest);
List<BasicSkSickerEntity> getSkSickerList(FilterSkSiackerListRequest filterSkSiackerListRequest);
}

@ -291,5 +291,10 @@ public class IoOrderEntity {
@TableField(value = "sickerAdNum")
private String sickerAdNum;
/**
* code
*/
@TableField(value = "fromPatientCode")
private String fromPatientCode;
}

@ -210,4 +210,6 @@ public class FilterOrderRequest extends ListPageRequest {
*/
private Integer deptNoInvType;
private Integer inPreInBack;
private String fromPatientCode;
}

@ -0,0 +1,13 @@
package com.glxp.api.req.inout;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
@Data
public class FilterSkSiackerListRequest extends ListPageRequest {
/**
* /
*/
private String name;
}

@ -253,6 +253,11 @@ public class IoOrderResponse {
*/
private String sickerAdNum;
/**
* code
*/
private String fromPatientCode;
private String fromSpmsOrders; //自助单据号

@ -0,0 +1,18 @@
package com.glxp.api.service.inout;
import com.glxp.api.entity.basic.BasicSkSickerEntity;
import com.glxp.api.req.inout.FilterSkSiackerListRequest;
import com.glxp.api.res.inout.IoOrderResponse;
import java.util.List;
public interface IoDepartmentOrderService {
/**
*
* @param filterSkSiackerListRequest
* @return
*/
List<BasicSkSickerEntity> getSkSickerList(FilterSkSiackerListRequest filterSkSiackerListRequest);
List<IoOrderResponse> getOrderListbyCode(String adNum);
}

@ -0,0 +1,53 @@
package com.glxp.api.service.inout.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.dao.basic.BasicSkSickerMapper;
import com.glxp.api.dao.inout.IoOrderDao;
import com.glxp.api.entity.basic.BasicSkSickerEntity;
import com.glxp.api.req.inout.FilterOrderRequest;
import com.glxp.api.req.inout.FilterSkSiackerListRequest;
import com.glxp.api.res.basic.BasicSkSickerResponse;
import com.glxp.api.res.inout.IoOrderResponse;
import com.glxp.api.service.inout.IoDepartmentOrderService;
import com.glxp.api.util.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Service
public class IoDepartmentOrderServiceImpl implements IoDepartmentOrderService {
@Resource
BasicSkSickerMapper skSickerMapper;
@Resource
IoOrderDao ioOrderDao;
@Override
public List<BasicSkSickerEntity> getSkSickerList(FilterSkSiackerListRequest filterSkSiackerListRequest) {
if (filterSkSiackerListRequest == null) {
return Collections.emptyList();
}
if (filterSkSiackerListRequest.getPage() != null) {
int offset = (filterSkSiackerListRequest.getPage() - 1) * filterSkSiackerListRequest.getLimit();
PageHelper.offsetPage(offset, filterSkSiackerListRequest.getLimit());
}
List<BasicSkSickerEntity> data = skSickerMapper.getSkSickerList(filterSkSiackerListRequest);
return data;
}
@Override
public List<IoOrderResponse> getOrderListbyCode(String adNum) {
if (StringUtils.isEmpty(adNum)) {
return Collections.emptyList();
}
FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
filterOrderRequest.setFromPatientCode(adNum);
filterOrderRequest.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
return ioOrderDao.filterList(filterOrderRequest);
}
}

@ -78,4 +78,17 @@
</where>
limit 0,10
</select>
<select id="getSkSickerList" parameterType="com.glxp.api.req.inout.FilterSkSiackerListRequest"
resultType="com.glxp.api.entity.basic.BasicSkSickerEntity">
SELECT *
FROM basic_sk_sicker
<where>
<if test="name != '' and name != null">
basic_sk_sicker.name LIKE concat('%', #{name}, '%')
OR basic_sk_sicker.adNum LIKE concat('%', #{name}, '%')
</if>
</where>
</select>
</mapper>

@ -142,6 +142,9 @@
<if test="orderType != null">
AND io.orderType = #{orderType}
</if>
<if test="fromPatientCode != null">
AND io.fromPatientCode = #{fromPatientCode}
</if>
<if test="supInoivceSearch != null">
<if test="invoiceActions1 != null and invoiceActions2 == null">

@ -633,3 +633,6 @@ VALUES (98, '高耗出入库明细下载', 'invGhOrderUrl', '', 1, '1', '', 'thi
INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`)
VALUES (99, '高耗出入库明细下载', 'invGhOrderUrl', '', 1, '1', '', 'thirdId4', 1, 3, NULL, NULL);
CALL Pro_Temp_ColumnWork('io_order', 'fromPatientCode',' varchar(30) NULL DEFAULT NULL COMMENT ''往来患者code'' AFTER `sickerAdNum`', 1);

Loading…
Cancel
Save