diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 06f064211..746cee7d4 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -986,7 +986,7 @@ public class IoCodeTempController extends BaseController { } - if (addOrderRequest.getFromCorp() == null || StrUtil.isNotEmpty(addOrderRequest.getSickerAdNum())) { + if (addOrderRequest.getFromCorp() == null || StrUtil.isNotEmpty(addOrderRequest.getSickerAdNum())) { String fromCorp = ioAddInoutService.updateCorp(bussinessTypeEntity, addOrderRequest.getFromCorp(), addOrderRequest.getSickerAdNum()); addOrderRequest.setFromCorp(fromCorp); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java index 6072e7bc9..5d4492550 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java @@ -118,7 +118,7 @@ public class IoSplitController extends BaseController { BasicSkPrescribeService basicSkPrescribeService; /** - * 器械拆零处方赋码 + * 器械拆零处方赋码(手动赋码) * * @return */ diff --git a/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemCodeMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemCodeMapper.java new file mode 100644 index 000000000..1db90ec42 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemCodeMapper.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.basic; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.basic.BasicSkPrescribeItemCode; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BasicSkPrescribeItemCodeMapper extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemCode.java b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemCode.java new file mode 100644 index 000000000..03a5cf894 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemCode.java @@ -0,0 +1,109 @@ +package com.glxp.api.entity.basic; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 处方手动赋码表 + */ +@ApiModel(value="com-glxp-api-entity-basic-BasicSkPrescribeItemCode") +@Data +@TableName(value = "basic_sk_prescribe_item_code") +public class BasicSkPrescribeItemCode implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value="") + private Integer id; + + /** + * 绑定UDI码 + */ + @TableField(value = "udiCode") + @ApiModelProperty(value="绑定UDI码") + private String udiCode; + + /** + * 收费项目编码 + */ + @TableField(value = "itemCode") + @ApiModelProperty(value="收费项目编码") + private String itemCode; + + /** + * 收费项目名称 + */ + @TableField(value = "itemName") + @ApiModelProperty(value="收费项目名称") + private String itemName; + + /** + * 物资字典ID + */ + @TableField(value = "relId") + @ApiModelProperty(value="物资字典ID") + private Long relId; + + /** + * 最小销售产品标识 + */ + @TableField(value = "nameCode") + @ApiModelProperty(value="最小销售产品标识") + private String nameCode; + + /** + * 患者编码 + */ + @TableField(value = "sickerCode") + @ApiModelProperty(value="患者编码") + private String sickerCode; + + /** + * 处方编码 + */ + @TableField(value = "prescribeCode") + @ApiModelProperty(value="处方编码") + private String prescribeCode; + + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value="备注") + private String remark; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + @ApiModelProperty(value="创建时间") + private Date createTime; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + @ApiModelProperty(value="创建人") + private String createUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + @ApiModelProperty(value="更新时间") + private Date updateTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + @ApiModelProperty(value="更新人") + private String updateUser; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeItemCodeService.java b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeItemCodeService.java new file mode 100644 index 000000000..9968bf389 --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeItemCodeService.java @@ -0,0 +1,12 @@ +package com.glxp.api.service.basic; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.entity.basic.BasicSkPrescribeItemCode; +import com.glxp.api.dao.basic.BasicSkPrescribeItemCodeMapper; +@Service +public class BasicSkPrescribeItemCodeService extends ServiceImpl { + +} diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 9414ef1fa..03ddef9ec 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -894,6 +894,7 @@ public class IoAddInoutService { ioOrderDetailCodeEntity.setMeasname(udiRelevanceResponse.getMeasname()); ioOrderDetailCodeEntity.setSpec(udiRelevanceResponse.getGgxh()); ioOrderDetailCodeEntity.setSupId(codeTempEntity.getSupId()); + ioOrderDetailCodeEntity.setProductType(codeTempEntity.getProductType()); if (codeTempEntity.getPrice() == null) { ioOrderDetailCodeEntity.setPrice(udiRelevanceResponse.getPrice()); codeTempEntity.setPrice(udiRelevanceResponse.getPrice()); diff --git a/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeItemCodeMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeItemCodeMapper.xml new file mode 100644 index 000000000..36b414777 --- /dev/null +++ b/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeItemCodeMapper.xml @@ -0,0 +1,4 @@ + + + +