添加患者相关操作类,打印问题修改,项目、定数包相关修改

test
anthonywj 1 year ago
parent 00c2995717
commit 4b0d54ba71

@ -9,23 +9,18 @@ import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicSkProjectEntity;
import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.purchase.PurApplyDetailEntity;
import com.glxp.api.entity.thrsys.ThrProductsEntity;
import com.glxp.api.exception.JsonException; import com.glxp.api.exception.JsonException;
import com.glxp.api.req.basic.BasicDestinyRelRequest; import com.glxp.api.req.basic.*;
import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest;
import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.BasicSkProjectResponse;
import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.auth.AuthAdminService;
import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.basic.BasicDestinyRelService; import com.glxp.api.service.basic.BasicSkProjectService;
import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.service.basic.impl.BasicDestinyRelService;
import com.glxp.api.util.BeanCopyUtils; import com.glxp.api.util.BeanCopyUtils;
import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.FilterUdiUtils;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
@ -39,16 +34,15 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
@RestController @RestController
public class BasicDestinyRelController { public class BasicDestinyRelController {
@Resource @Resource
private ThrProductsService thrProductsService; BasicSkProjectService basicSkProjectService;
@Resource @Resource
private CustomerService customerService; private CustomerService customerService;
@Resource @Resource
@ -58,49 +52,48 @@ public class BasicDestinyRelController {
@Resource @Resource
private BasicDestinyRelService basicDestinyRelService; private BasicDestinyRelService basicDestinyRelService;
@GetMapping("/udiwms/basic/destiny/model/filter") @GetMapping("/udiwms/basic/destiny/model/filter")
public BaseResponse filterModeldestiny(FilterThrProductsRequest filterThrProductsRequest, BindingResult bindingResult) { public BaseResponse filterModeldestiny(BasicSkProjectRequest basicSkProjectRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProducts(filterThrProductsRequest); List<BasicSkProjectResponse> basicSkProjectResponses = basicSkProjectService.filterThrProducts(basicSkProjectRequest);
PageInfo<ThrProductsEntity> pageInfo = new PageInfo<>(thrProductsEntities); PageInfo<BasicSkProjectResponse> pageInfo = new PageInfo<>(basicSkProjectResponses);
PageSimpleResponse<ThrProductsEntity> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<BasicSkProjectResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrProductsEntities); pageSimpleResponse.setList(basicSkProjectResponses);
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
@PostMapping("/udiwms/basic/destiny/model/addModeldestiny") @PostMapping("/udiwms/basic/destiny/model/addModeldestiny")
public BaseResponse addModeldestiny(@RequestBody ThrProductsEntity thrProductsEntity) { public BaseResponse addModeldestiny(@RequestBody BasicSkProjectEntity basicSkProjectEntity) {
//判断名字和编号不能重复 //判断名字和编号不能重复
QueryWrapper<ThrProductsEntity> ew = new QueryWrapper<>(); QueryWrapper<BasicSkProjectEntity> ew = new QueryWrapper<>();
ew.eq("name", thrProductsEntity.getName()); ew.eq("name", basicSkProjectEntity.getName());
ew.eq("type", 2); // ew.eq("type", 2);
long count = thrProductsService.count(ew); long count = basicSkProjectService.count(ew);
if (count > 0) { if (count > 0) {
return ResultVOUtils.error(999, "名称已存在!"); return ResultVOUtils.error(999, "名称已存在!");
} }
ew.clear(); ew.clear();
ew.eq("code", thrProductsEntity.getCode()); ew.eq("code", basicSkProjectEntity.getCode());
ew.eq("type", 2); // ew.eq("type", 2);
count = thrProductsService.count(ew); count = basicSkProjectService.count(ew);
if (count > 0) { if (count > 0) {
return ResultVOUtils.error(999, "编号已存在!"); return ResultVOUtils.error(999, "编号已存在!");
} }
AuthAdmin authAdmin = customerService.getUserBean(); AuthAdmin authAdmin = customerService.getUserBean();
thrProductsEntity.setId(IdUtil.getSnowflakeNextId()); basicSkProjectEntity.setId(IdUtil.getSnowflakeNextId());
thrProductsEntity.setType(2); basicSkProjectEntity.setCreateTime(new Date());
thrProductsEntity.setCreateTime(new Date()); basicSkProjectEntity.setUpdateTime(new Date());
thrProductsEntity.setUpdateTime(new Date()); basicSkProjectEntity.setCreateUser(authAdmin.getId() + "");
thrProductsEntity.setCreateUser(authAdmin.getId() + ""); basicSkProjectEntity.setUpdateUser(authAdmin.getId() + "");
thrProductsEntity.setUpdateUser(authAdmin.getId() + "");
Boolean falg = basicSkProjectService.save(basicSkProjectEntity);
Boolean falg = thrProductsService.insertThrProducts(thrProductsEntity);
if (!falg) { if (!falg) {
return ResultVOUtils.error(999, "新增失败!"); return ResultVOUtils.error(999, "新增失败!");
} }
@ -108,29 +101,29 @@ public class BasicDestinyRelController {
} }
@PostMapping("/udiwms/basic/destiny/model/editModeldestiny") @PostMapping("/udiwms/basic/destiny/model/editModeldestiny")
public BaseResponse editModeldestiny(@RequestBody ThrProductsEntity thrProductsEntity) { public BaseResponse editModeldestiny(@RequestBody BasicSkProjectEntity basicSkProjectEntity) {
//判断名字和编号不能重复 //判断名字和编号不能重复
QueryWrapper<ThrProductsEntity> ew = new QueryWrapper<>(); QueryWrapper<BasicSkProjectEntity> ew = new QueryWrapper<>();
ew.eq("name", thrProductsEntity.getName()); ew.eq("name", basicSkProjectEntity.getName());
ew.eq("type", 2); // ew.eq("type", 2);
ThrProductsEntity thrProductsEntity1 = thrProductsService.getOne(ew); BasicSkProjectEntity thrProductsEntity1 = basicSkProjectService.getOne(ew);
if (thrProductsEntity1 != null && !thrProductsEntity1.getId().equals(thrProductsEntity.getId())) { if (thrProductsEntity1 != null && !thrProductsEntity1.getId().equals(basicSkProjectEntity.getId())) {
return ResultVOUtils.error(999, "名称已存在!"); return ResultVOUtils.error(999, "名称已存在!");
} }
ew.clear(); ew.clear();
ew.eq("code", thrProductsEntity.getCode()); ew.eq("code", basicSkProjectEntity.getCode());
ew.eq("type", 2); // ew.eq("type", 2);
thrProductsEntity1 = thrProductsService.getOne(ew); thrProductsEntity1 = basicSkProjectService.getOne(ew);
if (thrProductsEntity1 != null && !thrProductsEntity1.getId().equals(thrProductsEntity.getId())) { if (thrProductsEntity1 != null && !thrProductsEntity1.getId().equals(basicSkProjectEntity.getId())) {
return ResultVOUtils.error(999, "编号已存在!"); return ResultVOUtils.error(999, "编号已存在!");
} }
AuthAdmin authAdmin = customerService.getUserBean(); AuthAdmin authAdmin = customerService.getUserBean();
thrProductsEntity.setUpdateTime(new Date()); basicSkProjectEntity.setUpdateTime(new Date());
thrProductsEntity.setUpdateUser(authAdmin.getId() + ""); basicSkProjectEntity.setUpdateUser(authAdmin.getId() + "");
Boolean falg = thrProductsService.updateById(thrProductsEntity); Boolean falg = basicSkProjectService.updateById(basicSkProjectEntity);
if (!falg) { if (!falg) {
return ResultVOUtils.error(999, "编辑失败!"); return ResultVOUtils.error(999, "编辑失败!");
} }
@ -138,9 +131,9 @@ public class BasicDestinyRelController {
} }
@PostMapping("/udiwms/basic/destiny/model/delectModeldestiny") @PostMapping("/udiwms/basic/destiny/model/delectModeldestiny")
public BaseResponse delectModeldestiny(@RequestBody ThrProductsEntity thrProductsEntity) { public BaseResponse delectModeldestiny(@RequestBody BasicSkProjectEntity basicSkProjectEntity) {
Boolean falg = thrProductsService.deleteById(thrProductsEntity.getId() + ""); Boolean falg = basicSkProjectService.removeById(basicSkProjectEntity.getId() + "");
if (!falg) { if (!falg) {
return ResultVOUtils.error(999, "删除失败!"); return ResultVOUtils.error(999, "删除失败!");
} }
@ -234,11 +227,11 @@ public class BasicDestinyRelController {
//查询详情id过滤 //查询详情id过滤
List<Long> idList = basicDestinyRelService.filterDestinyRelIds(Long.valueOf(filterUdiRelRequest.getId())); List<Long> idList = basicDestinyRelService.filterDestinyRelIds(Long.valueOf(filterUdiRelRequest.getId()));
if (idList != null && idList.size() > 0) { if (idList != null && idList.size() > 0) {
filterUdiRelRequest.setDestinyId(filterUdiRelRequest.getId()+""); filterUdiRelRequest.setDestinyId(filterUdiRelRequest.getId() + "");
filterUdiRelRequest.setIds(idList); filterUdiRelRequest.setIds(idList);
filterUdiRelRequest.setDiType(1); filterUdiRelRequest.setDiType(1);
thrProductsEntities = basicDestinyRelService.filterDestinyProducts(filterUdiRelRequest); thrProductsEntities = basicDestinyRelService.filterDestinyProducts(filterUdiRelRequest);
int i=0; int i = 0;
for (UdiRelevanceResponse thrProductsEntity : thrProductsEntities) { for (UdiRelevanceResponse thrProductsEntity : thrProductsEntities) {
thrProductsEntity.setIndex(i); thrProductsEntity.setIndex(i);
i++; i++;
@ -275,5 +268,4 @@ public class BasicDestinyRelController {
} }
} }

@ -14,9 +14,11 @@ import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity;
import com.glxp.api.req.basic.FilterOrderPrintRequest; import com.glxp.api.req.basic.FilterOrderPrintRequest;
import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inout.FilterOrderRequest;
import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inout.IoOrderResponse;
import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.basic.IBasicBussinessTypeService;
import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.basic.UdiProductService;
import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderDetailBizService;
import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inout.IoOrderService;
import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inout.impl.IoCodeService;
@ -60,7 +62,10 @@ public class BasicOrderPrintController {
@Value("${file_path}") @Value("${file_path}")
private String filePath; private String filePath;
@Resource @Resource
UdiRelevanceService udiRelevanceService;
@Resource
SystemPDFTemplateRelevanceCodeService systemPDFTemplateRelevanceCodeService; SystemPDFTemplateRelevanceCodeService systemPDFTemplateRelevanceCodeService;
//校验模板是否正确 //校验模板是否正确
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/pdf/template/inspection/order/file") @PostMapping("/udiwms/pdf/template/inspection/order/file")
@ -171,7 +176,7 @@ public class BasicOrderPrintController {
} }
} }
//查询产品表 //查询产品表
UdiProductEntity udiProductEntity = udiProductService.findByUuid(ioOrderDetailBizEntity.getUuidFk()); UdiRelevanceResponse udiProductEntity = udiRelevanceService.selectByRelId(ioOrderDetailBizEntity.getBindRlFk() + "");
// List<IoOrderInvoiceResponse> ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(ioOrderDetailBizEntity.getOrderIdFk()); // List<IoOrderInvoiceResponse> ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(ioOrderDetailBizEntity.getOrderIdFk());
//组装数据 //组装数据
Map<String, Object> bizData = new HashMap<>(); Map<String, Object> bizData = new HashMap<>();
@ -182,7 +187,10 @@ public class BasicOrderPrintController {
bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime())); bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime()));
bizData.put("remark1", sysPdfTemplateRelevanceCodeEntity.getRemark1() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark1()); bizData.put("remark1", sysPdfTemplateRelevanceCodeEntity.getRemark1() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark1());
bizData.put("remark2", sysPdfTemplateRelevanceCodeEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark2()); bizData.put("remark2", sysPdfTemplateRelevanceCodeEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark2());
bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms()); if (udiProductEntity != null) {
bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms());
bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
}
bizData.put("spmc", ioOrderDetailBizEntity.getCoName() == null ? ' ' : ioOrderDetailBizEntity.getCoName()); bizData.put("spmc", ioOrderDetailBizEntity.getCoName() == null ? ' ' : ioOrderDetailBizEntity.getCoName());
bizData.put("spec", ioOrderDetailBizEntity.getSpec() == null ? ' ' : ioOrderDetailBizEntity.getSpec()); bizData.put("spec", ioOrderDetailBizEntity.getSpec() == null ? ' ' : ioOrderDetailBizEntity.getSpec());
bizData.put("count", ioOrderDetailBizEntity.getCount()); bizData.put("count", ioOrderDetailBizEntity.getCount());
@ -194,7 +202,7 @@ public class BasicOrderPrintController {
bizData.put("expireDate", ioOrderDetailBizEntity.getExpireDate()); bizData.put("expireDate", ioOrderDetailBizEntity.getExpireDate());
bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer()); bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer());
bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode()); bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode());
bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
bizData.put("fromSpmsOrders", ioOrderResponse.getFromSpmsOrders() == null ? ' ' : ioOrderResponse.getFromSpmsOrders()); bizData.put("fromSpmsOrders", ioOrderResponse.getFromSpmsOrders() == null ? ' ' : ioOrderResponse.getFromSpmsOrders());
// bizData.put("cplb", udiProductEntity.getCplb() == null ? ' ' : udiProductEntity.getCplb()); // bizData.put("cplb", udiProductEntity.getCplb() == null ? ' ' : udiProductEntity.getCplb());
// if(ioOrderInvoiceResponses != null && ioOrderInvoiceResponses.size()>0){ // if(ioOrderInvoiceResponses != null && ioOrderInvoiceResponses.size()>0){
@ -288,7 +296,7 @@ public class BasicOrderPrintController {
bizData.put("index", i); bizData.put("index", i);
bizData.put("nameCode", obj.getNameCode() == null ? ' ' : obj.getNameCode()); bizData.put("nameCode", obj.getNameCode() == null ? ' ' : obj.getNameCode());
String udiCode = "#" + obj.getNameCode() + "#" + obj.getProduceDate() + "#" + obj.getExpireDate() + String udiCode = "#" + obj.getNameCode() + "#" + obj.getProduceDate() + "#" + obj.getExpireDate() +
"#" + obj.getBatchNo() + "#" + obj.getSerialNo() + "#" + "#" ; "#" + obj.getBatchNo() + "#" + obj.getSerialNo() + "#" + "#";
udiCode = udiCode.replaceAll("#null", "#"); udiCode = udiCode.replaceAll("#null", "#");
bizData.put("udiCode", udiCode); bizData.put("udiCode", udiCode);
bizData.put("cpmctymc", udiProductEntity.getCpmctymc() == null ? ' ' : udiProductEntity.getCpmctymc()); bizData.put("cpmctymc", udiProductEntity.getCpmctymc() == null ? ' ' : udiProductEntity.getCpmctymc());

@ -9,9 +9,8 @@ import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.req.inout.IodestinyProcessRequest; import com.glxp.api.req.inout.IodestinyProcessRequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.inout.IoCodeRelResponse;
import com.glxp.api.res.inout.IodestinyProcessResponse; import com.glxp.api.res.inout.IodestinyProcessResponse;
import com.glxp.api.service.basic.BasicDestinyRelService; import com.glxp.api.service.basic.impl.BasicDestinyRelService;
import com.glxp.api.service.inout.IoDestinyProcessCodeService; import com.glxp.api.service.inout.IoDestinyProcessCodeService;
import com.glxp.api.service.inout.IoDestinyProcessDetailService; import com.glxp.api.service.inout.IoDestinyProcessDetailService;
import com.glxp.api.service.inout.IoDestinyProcessService; import com.glxp.api.service.inout.IoDestinyProcessService;
@ -22,7 +21,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@RestController @RestController

@ -1,9 +1,7 @@
package com.glxp.api.dao.basic; package com.glxp.api.dao.basic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicSkProjectDetailEntity;
import com.glxp.api.entity.basic.BasicDestinyRelEntity;
import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRelevanceResponse;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -11,11 +9,11 @@ import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface BasicDestinyRelMapper extends BaseMapperPlus<BasicDestinyRelMapper, BasicDestinyRelEntity, BasicDestinyRelEntity> { public interface BasicDestinyRelMapper extends BaseMapperPlus<BasicDestinyRelMapper, BasicSkProjectDetailEntity, BasicSkProjectDetailEntity> {
List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest); List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest);
List<UdiRelevanceResponse> filterDestinyProducts(FilterUdiRelRequest filterUdiRelRequest); List<UdiRelevanceResponse> filterDestinyProducts(FilterUdiRelRequest filterUdiRelRequest);
} }

@ -0,0 +1,9 @@
package com.glxp.api.dao.basic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.basic.BasicSkPrescirbeDetailEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface BasicSkPrescirbeDetailMapper extends BaseMapper<BasicSkPrescirbeDetailEntity> {
}

@ -0,0 +1,9 @@
package com.glxp.api.dao.basic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.basic.BasicSkPrescribeEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface BasicSkPrescribeMapper extends BaseMapper<BasicSkPrescribeEntity> {
}

@ -0,0 +1,17 @@
package com.glxp.api.dao.basic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.basic.BasicSkProjectEntity;
import com.glxp.api.req.basic.BasicSkProjectRequest;
import com.glxp.api.req.inout.FilterOrderRequest;
import com.glxp.api.res.basic.BasicSkProjectResponse;
import com.glxp.api.res.inout.IoOrderResponse;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface BasicSkProjectMapper extends BaseMapper<BasicSkProjectEntity> {
List<BasicSkProjectResponse> filterList(BasicSkProjectRequest basicSkProjectRequest);
}

@ -0,0 +1,9 @@
package com.glxp.api.dao.basic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.basic.BasicSkSickerEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface BasicSkSickerMapper extends BaseMapper<BasicSkSickerEntity> {
}

@ -1,35 +0,0 @@
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 lombok.Data;
/**
*
*/
@Data
@TableName(value = "basic_destiny_rel")
public class BasicDestinyRelEntity {
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* id
*/
@TableField(value = "relId")
private Long relId;
/**
* id
*/
@TableField(value = "pId")
private Long pId;
/**
*
*/
@TableField(value = "`count`")
private Integer count;
}

@ -0,0 +1,132 @@
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.math.BigDecimal;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
*/
@ApiModel(value="com-glxp-api-entity-basic-BasicSkPrescirbeDetail")
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "basic_sk_prescirbe_detail")
public class BasicSkPrescirbeDetailEntity implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
@ApiModelProperty(value="")
private Long id;
/**
* id
*/
@TableField(value = "relId")
@ApiModelProperty(value="耗材产品id")
private Long relId;
/**
*
*/
@TableField(value = "thrName")
@ApiModelProperty(value="耗材名称")
private String thrName;
/**
*
*/
@TableField(value = "thrCode")
@ApiModelProperty(value="耗材编码")
private String thrCode;
/**
*
*/
@TableField(value = "pId")
@ApiModelProperty(value="项目组套外键")
private Long pId;
/**
*
*/
@TableField(value = "`count`")
@ApiModelProperty(value="数量")
private Integer count;
/**
*
*/
@TableField(value = "measureCount")
@ApiModelProperty(value="计量数量")
private String measureCount;
/**
*
*/
@TableField(value = "measureUnit")
@ApiModelProperty(value="计量单位")
private String measureUnit;
/**
*
*/
@TableField(value = "category")
@ApiModelProperty(value="类别")
private String category;
/**
*
*/
@TableField(value = "frequency")
@ApiModelProperty(value="频率")
private String frequency;
/**
*
*/
@TableField(value = "price")
@ApiModelProperty(value="价格")
private BigDecimal price;
/**
*
*/
@TableField(value = "ggxh")
@ApiModelProperty(value="规格型号")
private String ggxh;
/**
*
*/
@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;
}

@ -0,0 +1,112 @@
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.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
*/
@ApiModel(value="com-glxp-api-entity-basic-BasicSkPrescribe")
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "basic_sk_prescribe")
public class BasicSkPrescribeEntity implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
@ApiModelProperty(value="")
private Long id;
/**
*
*/
@TableField(value = "code")
@ApiModelProperty(value="处方编码")
private String code;
/**
*
*/
@TableField(value = "prescribeDate")
@ApiModelProperty(value="开方时间")
private Date prescribeDate;
/**
*
*/
@TableField(value = "createDr")
@ApiModelProperty(value="开方医生")
private String createDr;
/**
*
*/
@TableField(value = "deptCode")
@ApiModelProperty(value="就诊科室编码")
private String deptCode;
/**
*
*/
@TableField(value = "deptName")
@ApiModelProperty(value="就诊科室名称")
private String deptName;
/**
*
*/
@TableField(value = "diagnosis")
@ApiModelProperty(value="诊断内容")
private String diagnosis;
/**
* ID
*/
@TableField(value = "sickerIdFk")
@ApiModelProperty(value="病人ID外键")
private String sickerIdFk;
@TableField(value = "remark")
@ApiModelProperty(value="")
private String remark;
/**
*
*/
@TableField(value = "`createUser`")
@ApiModelProperty(value="创建人")
private String createUser;
/**
*
*/
@TableField(value = "createTime")
@ApiModelProperty(value="创建时间")
private Date createTime;
/**
*
*/
@TableField(value = "updateUser")
@ApiModelProperty(value="更新人")
private String updateUser;
/**
*
*/
@TableField(value = "updateTime")
@ApiModelProperty(value="更新时间")
private Date updateTime;
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,63 @@
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 lombok.Data;
/**
*
*/
@Data
@TableName(value = "basic_sk_project_detail")
public class BasicSkProjectDetailEntity {
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* id
*/
@TableField(value = "relId")
private Long relId;
/**
* id
*/
@TableField(value = "pId")
private Long pId;
/**
*
*/
@TableField(value = "`count`")
private Integer count;
@TableField(value = "`thrName`")
private String thrName;
@TableField(value = "`thrCode`")
private String thrCode;
@TableField(value = "`measureCount`")
private String measureCount;
@TableField(value = "`measureUnit`")
private String measureUnit;
@TableField(value = "`category`")
private String category;
@TableField(value = "`frequency`")
private String frequency;
@TableField(value = "`price`")
private String price;
@TableField(value = "`ggxh`")
private String ggxh;
@TableField(value = "`remark`")
private String remark;
@TableField(value = "`createTime`")
private String createTime;
@TableField(value = "`createUser`")
private String createUser;
@TableField(value = "`updateTime`")
private String updateTime;
@TableField(value = "`updateUser`")
private String updateUser;
}

@ -0,0 +1,94 @@
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.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-glxp-api-entity-basic-BasicSkProject")
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "basic_sk_project")
public class BasicSkProjectEntity implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
@ApiModelProperty(value = "")
private Long id;
/**
*
*/
@TableField(value = "idCode")
@ApiModelProperty(value = "自定义编码")
private String idCode;
/**
*
*/
@TableField(value = "code")
@ApiModelProperty(value = "项目编码")
private String code;
/**
*
*/
@TableField(value = "`name`")
@ApiModelProperty(value = "项目名称")
private String name;
/**
*
*/
@TableField(value = "category")
@ApiModelProperty(value = "类别")
private String category;
/**
*
*/
@TableField(value = "ggxh")
@ApiModelProperty(value = "规格")
private String ggxh;
/**
*
*/
@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;
/**
* 1使2
*/
@TableField(value = "type")
@ApiModelProperty(value = "类型1定数包内部使用2项目、组套外部关联")
private Integer type;
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,171 @@
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.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
*/
@ApiModel(value="com-glxp-api-entity-basic-BasicSkSicker")
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "basic_sk_sicker")
public class BasicSkSickerEntity implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
@ApiModelProperty(value="")
private Long id;
/**
*
*/
@TableField(value = "code")
@ApiModelProperty(value="患者编码")
private String code;
/**
*
*/
@TableField(value = "`name`")
@ApiModelProperty(value="姓名")
private String name;
/**
*
*/
@TableField(value = "adNum")
@ApiModelProperty(value="住院号")
private String adNum;
/**
*
*/
@TableField(value = "idNum")
@ApiModelProperty(value="身份证号")
private String idNum;
/**
*
*/
@TableField(value = "phone")
@ApiModelProperty(value="手机号")
private String phone;
/**
*
*/
@TableField(value = "gender")
@ApiModelProperty(value="性别")
private String gender;
/**
*
*/
@TableField(value = "job")
@ApiModelProperty(value="职业")
private String job;
/**
*
*/
@TableField(value = "bornDate")
@ApiModelProperty(value="出生年月")
private String bornDate;
/**
*
*/
@TableField(value = "nationality")
@ApiModelProperty(value="国籍")
private String nationality;
/**
*
*/
@TableField(value = "education")
@ApiModelProperty(value="文化程度")
private String education;
/**
*
*/
@TableField(value = "guardianName")
@ApiModelProperty(value="监护人")
private String guardianName;
/**
*
*/
@TableField(value = "guardianRel")
@ApiModelProperty(value="监护人与患者关系")
private String guardianRel;
/**
*
*/
@TableField(value = "curAddr")
@ApiModelProperty(value="现居住地")
private String curAddr;
/**
*
*/
@TableField(value = "kosekiAddr")
@ApiModelProperty(value="户籍地")
private String kosekiAddr;
/**
*
*/
@TableField(value = "medicalIns")
@ApiModelProperty(value="医保")
private String medicalIns;
/**
*
*/
@TableField(value = "`createUser`")
@ApiModelProperty(value="创建人")
private String createUser;
/**
*
*/
@TableField(value = "createTime")
@ApiModelProperty(value="创建时间")
private Date createTime;
/**
*
*/
@TableField(value = "updateUser")
@ApiModelProperty(value="更新人")
private String updateUser;
/**
*
*/
@TableField(value = "updateTime")
@ApiModelProperty(value="更新时间")
private Date updateTime;
/**
*
*/
@TableField(value = "remark")
@ApiModelProperty(value="备注")
private String remark;
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,58 @@
package com.glxp.api.req.basic;
import com.baomidou.mybatisplus.annotation.TableField;
import com.glxp.api.util.page.ListPageRequest;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
public class BasicSkProjectRequest extends ListPageRequest {
private Long id;
/**
*
*/
private String idCode;
/**
*
*/
private String code;
/**
*
*/
private String name;
/**
*
*/
private String category;
/**
*
*/
private String ggxh;
/**
*
*/
private String remark;
private Date createTime;
private String createUser;
private Date updateTime;
private String updateUser;
/**
* 1使2
*/
private Integer type;
}

@ -0,0 +1,4 @@
package com.glxp.api.res.basic;
public class BasicSkProjectDetailResponse {
}

@ -0,0 +1,56 @@
package com.glxp.api.res.basic;
import lombok.Data;
import java.util.Date;
@Data
public class BasicSkProjectResponse {
private Long id;
/**
*
*/
private String idCode;
/**
*
*/
private String code;
/**
*
*/
private String name;
/**
*
*/
private String category;
/**
*
*/
private String ggxh;
/**
*
*/
private String remark;
private Date createTime;
private String createUser;
private Date updateTime;
private String updateUser;
private String createByName;
/**
* 1使2
*/
private Integer type;
}

@ -1,24 +0,0 @@
package com.glxp.api.service.basic;
import com.glxp.api.req.basic.BasicDestinyRelRequest;
import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.res.basic.UdiRelevanceResponse;
import org.springframework.stereotype.Service;
import java.util.List;
public interface BasicDestinyRelService{
Boolean addModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest);
List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest);
List<Long> filterDestinyRelIds(Long pId);
List<UdiRelevanceResponse> filterDestinyProducts(FilterUdiRelRequest filterUdiRelRequest);
Boolean delectModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest);
Boolean uploadModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest);
}

@ -0,0 +1,10 @@
package com.glxp.api.service.basic;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.entity.basic.BasicSkPrescirbeDetailEntity;
import com.glxp.api.dao.basic.BasicSkPrescirbeDetailMapper;
@Service
public class BasicSkPrescirbeDetailService extends ServiceImpl<BasicSkPrescirbeDetailMapper, BasicSkPrescirbeDetailEntity> {
}

@ -0,0 +1,10 @@
package com.glxp.api.service.basic;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.entity.basic.BasicSkPrescribeEntity;
import com.glxp.api.dao.basic.BasicSkPrescribeMapper;
@Service
public class BasicSkPrescribeService extends ServiceImpl<BasicSkPrescribeMapper, BasicSkPrescribeEntity> {
}

@ -0,0 +1,35 @@
package com.glxp.api.service.basic;
import com.github.pagehelper.PageHelper;
import com.glxp.api.entity.thrsys.ThrProductsEntity;
import com.glxp.api.req.basic.BasicSkProjectRequest;
import com.glxp.api.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.res.basic.BasicSkProjectResponse;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.dao.basic.BasicSkProjectMapper;
import com.glxp.api.entity.basic.BasicSkProjectEntity;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Service
public class BasicSkProjectService extends ServiceImpl<BasicSkProjectMapper, BasicSkProjectEntity> {
@Resource
BasicSkProjectMapper basicSkProjectMapper;
public List<BasicSkProjectResponse> filterThrProducts(BasicSkProjectRequest basicSkProjectRequest) {
if (basicSkProjectRequest == null) {
return Collections.emptyList();
}
if (basicSkProjectRequest.getPage() != null) {
int offset = (basicSkProjectRequest.getPage() - 1) * basicSkProjectRequest.getLimit();
PageHelper.offsetPage(offset, basicSkProjectRequest.getLimit());
}
List<BasicSkProjectResponse> data = basicSkProjectMapper.filterList(basicSkProjectRequest);
return data;
}
}

@ -0,0 +1,10 @@
package com.glxp.api.service.basic;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.entity.basic.BasicSkSickerEntity;
import com.glxp.api.dao.basic.BasicSkSickerMapper;
@Service
public class BasicSkSickerService extends ServiceImpl<BasicSkSickerMapper, BasicSkSickerEntity> {
}

@ -3,14 +3,16 @@ package com.glxp.api.service.basic.impl;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.basic.BasicDestinyRelMapper; import com.glxp.api.dao.basic.BasicDestinyRelMapper;
import com.glxp.api.dao.basic.BasicSkProjectMapper;
import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.dao.basic.UdiRelevanceDao;
import com.glxp.api.entity.basic.BasicDestinyRelEntity; import com.glxp.api.entity.basic.BasicSkProjectDetailEntity;
import com.glxp.api.entity.basic.BasicSkProjectEntity;
import com.glxp.api.req.basic.BasicDestinyRelRequest; import com.glxp.api.req.basic.BasicDestinyRelRequest;
import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.service.basic.BasicDestinyRelService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -20,7 +22,7 @@ import java.util.List;
@Service @Service
public class BasicDestinyRelServiceImpl implements BasicDestinyRelService { public class BasicDestinyRelService extends ServiceImpl<BasicDestinyRelMapper, BasicSkProjectDetailEntity> {
@Resource @Resource
BasicDestinyRelMapper basicDestinyRelMapper; BasicDestinyRelMapper basicDestinyRelMapper;
@ -28,22 +30,21 @@ public class BasicDestinyRelServiceImpl implements BasicDestinyRelService {
@Resource @Resource
UdiRelevanceDao udiRelevanceDao; UdiRelevanceDao udiRelevanceDao;
@Override
public Boolean addModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest) { public Boolean addModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest) {
List<BasicDestinyRelEntity> basicDestinyRelEntitList = new ArrayList<>(); List<BasicSkProjectDetailEntity> basicDestinyRelEntitList = new ArrayList<>();
for (Long str : basicDestinyRelRequest.getList()) { for (Long str : basicDestinyRelRequest.getList()) {
BasicDestinyRelEntity basicDestinyRelEntity = new BasicDestinyRelEntity(); BasicSkProjectDetailEntity basicSkProjectDetailEntity = new BasicSkProjectDetailEntity();
basicDestinyRelEntity.setId(IdUtil.getSnowflakeNextId()); basicSkProjectDetailEntity.setId(IdUtil.getSnowflakeNextId());
basicDestinyRelEntity.setRelId(str); basicSkProjectDetailEntity.setRelId(str);
basicDestinyRelEntity.setPId(basicDestinyRelRequest.getpId()); basicSkProjectDetailEntity.setPId(basicDestinyRelRequest.getpId());
basicDestinyRelEntitList.add(basicDestinyRelEntity); basicDestinyRelEntitList.add(basicSkProjectDetailEntity);
} }
Boolean flag = basicDestinyRelMapper.insertBatch(basicDestinyRelEntitList); Boolean flag = basicDestinyRelMapper.insertBatch(basicDestinyRelEntitList);
return flag; return flag;
} }
@Override
public List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest) { public List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest) {
if (filterUdiRelRequest == null) { if (filterUdiRelRequest == null) {
return Collections.emptyList(); return Collections.emptyList();
@ -56,20 +57,20 @@ public class BasicDestinyRelServiceImpl implements BasicDestinyRelService {
return data; return data;
} }
@Override
public List<Long> filterDestinyRelIds(Long pId) { public List<Long> filterDestinyRelIds(Long pId) {
List<Long> stringList = new ArrayList<>(); List<Long> stringList = new ArrayList<>();
QueryWrapper<BasicDestinyRelEntity> ew = new QueryWrapper<>(); QueryWrapper<BasicSkProjectDetailEntity> ew = new QueryWrapper<>();
ew.eq("pId", pId); ew.eq("pId", pId);
List<BasicDestinyRelEntity> basicDestinyRelEntities = basicDestinyRelMapper.selectList(ew); List<BasicSkProjectDetailEntity> basicDestinyRelEntities = basicDestinyRelMapper.selectList(ew);
for (BasicDestinyRelEntity basicDestinyRelEntity : basicDestinyRelEntities) { for (BasicSkProjectDetailEntity basicSkProjectDetailEntity : basicDestinyRelEntities) {
stringList.add(basicDestinyRelEntity.getRelId()); stringList.add(basicSkProjectDetailEntity.getRelId());
} }
return stringList; return stringList;
} }
@Override
public List<UdiRelevanceResponse> filterDestinyProducts(FilterUdiRelRequest filterUdiRelRequest) { public List<UdiRelevanceResponse> filterDestinyProducts(FilterUdiRelRequest filterUdiRelRequest) {
if (filterUdiRelRequest == null) { if (filterUdiRelRequest == null) {
return Collections.emptyList(); return Collections.emptyList();
@ -82,16 +83,16 @@ public class BasicDestinyRelServiceImpl implements BasicDestinyRelService {
return data; return data;
} }
@Override
public Boolean delectModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest) { public Boolean delectModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest) {
return basicDestinyRelMapper.deleteById(basicDestinyRelRequest.getId()) > 0 ? true : false; return basicDestinyRelMapper.deleteById(basicDestinyRelRequest.getId()) > 0 ? true : false;
} }
@Override
public Boolean uploadModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest) { public Boolean uploadModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest) {
BasicDestinyRelEntity basicDestinyRelEntity=new BasicDestinyRelEntity(); BasicSkProjectDetailEntity basicSkProjectDetailEntity = new BasicSkProjectDetailEntity();
basicDestinyRelEntity.setId(basicDestinyRelRequest.getId()); basicSkProjectDetailEntity.setId(basicDestinyRelRequest.getId());
basicDestinyRelEntity.setCount(basicDestinyRelRequest.getCount()); basicSkProjectDetailEntity.setCount(basicDestinyRelRequest.getCount());
return basicDestinyRelMapper.updateById(basicDestinyRelEntity)> 0 ? true : false; return basicDestinyRelMapper.updateById(basicSkProjectDetailEntity) > 0 ? true : false;
} }
} }

@ -106,10 +106,7 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
public UdiRelevanceResponse selectByRelId(String relId) { public UdiRelevanceResponse selectByRelId(String relId) {
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
filterUdiRelRequest.setId(Long.parseLong(relId)); filterUdiRelRequest.setId(Long.parseLong(relId));
List<UdiRelevanceResponse> udiRelevanceResponses = filterUdiRelevance(filterUdiRelRequest); UdiRelevanceResponse udiRelevanceResponses = selectOneUdi(filterUdiRelRequest);
if (CollUtil.isNotEmpty(udiRelevanceResponses)) {
return udiRelevanceResponses.get(0);
}
return null; return null;
} }

@ -16,21 +16,17 @@ import com.glxp.api.req.inout.IodestinyProcessRequest;
import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.inout.IodestinyProcessResponse; import com.glxp.api.res.inout.IodestinyProcessResponse;
import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.basic.BasicDestinyRelService;
import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.service.inout.IoDestinyProcessService; import com.glxp.api.service.basic.impl.BasicDestinyRelService;
import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.FilterUdiUtils;
import com.glxp.api.util.udi.UdiCalCountUtil; import com.glxp.api.util.udi.UdiCalCountUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.dao.inout.IoDestinyProcessDetailMapper; import com.glxp.api.dao.inout.IoDestinyProcessDetailMapper;
import com.glxp.api.entity.inout.IoDestinyProcessDetailEntity; import com.glxp.api.entity.inout.IoDestinyProcessDetailEntity;
import com.glxp.api.service.inout.IoDestinyProcessDetailService; import com.glxp.api.service.inout.IoDestinyProcessDetailService;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.awt.geom.QuadCurve2D;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;

@ -4,7 +4,7 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ph?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: 123456 password: 123456
hikari: hikari:

@ -1,303 +1,287 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.basic.BasicDestinyRelMapper"> <mapper namespace="com.glxp.api.dao.basic.BasicDestinyRelMapper">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.BasicDestinyRelEntity"> <resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.BasicSkProjectDetailEntity">
<!--@mbg.generated--> </resultMap>
<!--@Table basic_destiny_rel-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="relId" jdbcType="BIGINT" property="relId" />
<result column="pId" jdbcType="BIGINT" property="pId" />
<result column="count" jdbcType="INTEGER" property="count" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, relId, pId, `count`
</sql>
<select id="filterUdiJoinSup" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest" <select id="filterUdiJoinSup" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
resultType="com.glxp.api.res.basic.UdiRelevanceResponse"> resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
select basic_udirel.*, select basic_udirel.*,
basic_products.id as PRId, basic_products.id as PRId,
basic_products.originUuid, basic_products.originUuid,
basic_products.nameCode, basic_products.nameCode,
basic_products.deviceRecordKey, basic_products.deviceRecordKey,
basic_products.packRatio, basic_products.packRatio,
basic_products.packUnit, basic_products.packUnit,
basic_products.packLevel, basic_products.packLevel,
basic_products.bhxjsl, basic_products.bhxjsl,
basic_products.bhzxxsbzsl, basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl, basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm, basic_products.bhxjcpbm,
basic_products.bzcj, basic_products.bzcj,
basic_products.cpmctymc, basic_products.cpmctymc,
basic_products.cplb, basic_products.cplb,
basic_products.flbm, basic_products.flbm,
basic_products.ggxh, basic_products.ggxh,
basic_products.qxlb, basic_products.qxlb,
basic_products.tyshxydm, basic_products.tyshxydm,
basic_products.ylqxzcrbarmc, basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh, basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc, basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs, basic_products.sydycpbs,
basic_products.sjcpbm, basic_products.sjcpbm,
basic_products.versionNumber, basic_products.versionNumber,
basic_products.diType, basic_products.diType,
basic_products.ybbm, basic_products.ybbm,
basic_products.sptm, basic_products.sptm,
basic_products.manufactory, basic_products.manufactory,
basic_products.measname, basic_products.measname,
basic_products.productType, basic_products.productType,
basic_products.scbssfbhph, basic_products.scbssfbhph,
basic_products.scbssfbhxlh, basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq, basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq, basic_products.scbssfbhsxrq,
basic_products.cpms, basic_products.cpms,
basic_products.allowNoBatch, basic_products.allowNoBatch,
basic_products.allowNoExpire, basic_products.allowNoExpire,
basic_products.allowNoProduct, basic_products.allowNoProduct,
basic_products.allowNoSerial, basic_products.allowNoSerial,
basic_products.spmc, basic_products.spmc,
basic_products.cplx, basic_products.cplx,
basic_products.hchzsb, basic_products.hchzsb,
basic_products.cpdls, basic_products.cpdls,
company_product_relevance.price, company_product_relevance.price,
basic_products.basicPrductRemak1, basic_products.basicPrductRemak1,
basic_products.basicPrductRemak2, basic_products.basicPrductRemak2,
basic_products.basicPrductRemak3, basic_products.basicPrductRemak3,
basic_products.basicPrductRemak4, basic_products.basicPrductRemak4,
basic_products.basicPrductRemak5, basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6, basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7, basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8, basic_products.basicPrductRemak8,
basic_products.sfwblztlcp, basic_products.sfwblztlcp,
basic_products.cgzmraqxgxx, basic_products.cgzmraqxgxx,
basic_products.sfbjwycxsy, basic_products.sfbjwycxsy,
basic_products.zdcfsycs, basic_products.zdcfsycs,
basic_products.sfwwjbz, basic_products.sfwwjbz,
basic_products.syqsfxyjxmj, basic_products.syqsfxyjxmj,
basic_products.mjfs, basic_products.mjfs,
basic_products.categoryName, basic_products.categoryName,
company_product_relevance.unitFk, company_product_relevance.unitFk,
basic_corp.erpId as customerId, basic_corp.erpId as customerId,
basic_corp.name companyName basic_corp.name companyName
FROM basic_udirel FROM basic_udirel
inner JOIN basic_products inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid ON basic_products.uuid = basic_udirel.uuid
left join company_product_relevance left join company_product_relevance
on basic_udirel.id = company_product_relevance.udiRlIdFk on basic_udirel.id = company_product_relevance.udiRlIdFk
left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
left join basic_hosp_type bht on basic_udirel.relCode = bht.code left join basic_hosp_type bht on basic_udirel.relCode = bht.code
left join thr_products tp on tp.code = basic_udirel.mainId left join thr_products tp on tp.code = basic_udirel.mainId
left join basic_product_category_rel on basic_product_category_rel.relId = basic_udirel.id left join basic_product_category_rel on basic_product_category_rel.relId = basic_udirel.id
left join basic_product_category on basic_product_category_rel.code = basic_product_category.code left join basic_product_category on basic_product_category_rel.code = basic_product_category.code
<where> <where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null"> <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND basic_products.ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') AND basic_products.ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
</if> </if>
<if test="category != '' and category != null"> <if test="category != '' and category != null">
AND basic_product_category.name = #{category} AND basic_product_category.name = #{category}
</if> </if>
<if test="manufactory != '' and manufactory != null"> <if test="manufactory != '' and manufactory != null">
AND basic_products.manufactory LIKE concat('%', #{manufactory}, '%') AND basic_products.manufactory LIKE concat('%', #{manufactory}, '%')
</if> </if>
<if test="supName != '' and supName != null"> <if test="supName != '' and supName != null">
AND supName LIKE concat('%', #{supName}, '%') AND supName LIKE concat('%', #{supName}, '%')
</if> </if>
<if test="ids != null and ids.size() > 0"> <if test="ids != null and ids.size() > 0">
and basic_udirel.id not in and basic_udirel.id not in
<foreach collection="ids" item="item" open="(" separator="," close=")"> <foreach collection="ids" item="item" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="pinyinInitial != null and pinyinInitial != ''"> <if test="pinyinInitial != null and pinyinInitial != ''">
AND basic_products.pinyinInitial like concat('%', #{pinyinInitial}, '%') AND basic_products.pinyinInitial like concat('%', #{pinyinInitial}, '%')
</if> </if>
<if test="thrPiId != '' and thrPiId != null"> <if test="thrPiId != '' and thrPiId != null">
and (basic_udirel.thirdId LIKE concat('%', #{thrPiId}, '%') and (basic_udirel.thirdId LIKE concat('%', #{thrPiId}, '%')
or basic_udirel.thirdId1 LIKE concat('%', #{thrPiId}, '%') or basic_udirel.thirdId1 LIKE concat('%', #{thrPiId}, '%')
or basic_udirel.thirdId2 LIKE concat('%', #{thrPiId}, '%') or basic_udirel.thirdId2 LIKE concat('%', #{thrPiId}, '%')
or basic_udirel.thirdId3 LIKE concat('%', #{thrPiId}, '%') or basic_udirel.thirdId3 LIKE concat('%', #{thrPiId}, '%')
or basic_udirel.thirdId4 LIKE concat('%', #{thrPiId}, '%')) or basic_udirel.thirdId4 LIKE concat('%', #{thrPiId}, '%'))
</if> </if>
<if test="ggxh != '' and ggxh != null"> <if test="ggxh != '' and ggxh != null">
AND basic_products.ggxh LIKE concat('%', #{ggxh}, '%') AND basic_products.ggxh LIKE concat('%', #{ggxh}, '%')
</if> </if>
<if test="cpmctymc != '' and cpmctymc != null"> <if test="cpmctymc != '' and cpmctymc != null">
AND basic_products.cpmctymc LIKE concat('%', #{cpmctymc}, '%') AND basic_products.cpmctymc LIKE concat('%', #{cpmctymc}, '%')
</if> </if>
<if test="nameCode != '' and nameCode != null"> <if test="nameCode != '' and nameCode != null">
AND nameCode LIKE concat(#{nameCode}, '%') AND nameCode LIKE concat(#{nameCode}, '%')
</if> </if>
<if test="thirdId != '' and thirdId != null"> <if test="thirdId != '' and thirdId != null">
AND basic_udirel.thirdId LIKE concat(#{thirdId}, '%') AND basic_udirel.thirdId LIKE concat(#{thirdId}, '%')
</if> </if>
<if test="uuid != '' and uuid != null"> <if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid} AND basic_udirel.uuid = #{uuid}
</if> </if>
<if test="unitFk != '' and unitFk != null"> <if test="unitFk != '' and unitFk != null">
AND company_product_relevance.unitFk = #{unitFk} AND company_product_relevance.unitFk = #{unitFk}
</if> </if>
<if test="id != '' and id != null"> <if test="id != '' and id != null">
AND basic_udirel.id = #{id} AND basic_udirel.id = #{id}
</if> </if>
<if test="udplatCode != '' and udplatCode != null"> <if test="udplatCode != '' and udplatCode != null">
AND basic_udirel.udplatCode = #{udplatCode} AND basic_udirel.udplatCode = #{udplatCode}
</if> </if>
<if test="diType != null"> <if test="diType != null">
AND basic_products.diType = #{diType} AND basic_products.diType = #{diType}
</if> </if>
<if test="lockStatus != '' and lockStatus != null"> <if test="lockStatus != '' and lockStatus != null">
AND basic_udirel.lockStatus = #{lockStatus} AND basic_udirel.lockStatus = #{lockStatus}
</if> </if>
<if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null"> <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
AND basic_products.zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%') AND basic_products.zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
</if> </if>
<if test="lastUpdateTime != null and lastUpdateTime != ''"> <if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[ <![CDATA[
and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]> ]]>
</if> </if>
<if test="mainId != '' and mainId != null"> <if test="mainId != '' and mainId != null">
AND mainId = #{mainId} AND mainId = #{mainId}
</if> </if>
<if test="unionFilterStr != '' and unionFilterStr != null"> <if test="unionFilterStr != '' and unionFilterStr != null">
or basic_products.cpmctymc LIKE concat('%', #{unionFilterStr}, '%') or basic_products.cpmctymc LIKE concat('%', #{unionFilterStr}, '%')
or basic_products.ylqxzcrbarmc LIKE concat('%', #{unionFilterStr}, '%') or basic_products.ylqxzcrbarmc LIKE concat('%', #{unionFilterStr}, '%')
or basic_products.ggxh LIKE concat('%', #{unionFilterStr}, '%') or basic_products.ggxh LIKE concat('%', #{unionFilterStr}, '%')
or basic_products.zczbhhzbapzbh LIKE concat('%', #{unionFilterStr}, '%') or basic_products.zczbhhzbapzbh LIKE concat('%', #{unionFilterStr}, '%')
</if> </if>
<if test="isAdavence != '' and isAdavence != null"> <if test="isAdavence != '' and isAdavence != null">
AND isAdavence = #{isAdavence} AND isAdavence = #{isAdavence}
</if> </if>
<if test="uniqueNameCode != '' and uniqueNameCode != null"> <if test="uniqueNameCode != '' and uniqueNameCode != null">
AND nameCode = #{uniqueNameCode} AND nameCode = #{uniqueNameCode}
</if> </if>
<if test="relIds != null and relIds.size() > 0"> <if test="relIds != null and relIds.size() > 0">
and basic_udirel.id in and basic_udirel.id in
<foreach collection="relIds" item="item" index="index" separator="," open="(" close=")"> <foreach collection="relIds" item="item" index="index" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="flbm != '' and flbm != null"> <if test="flbm != '' and flbm != null">
and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm} or tp.cplb = #{flbm} or and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm} or tp.cplb = #{flbm} or
basic_udirel.relCode = #{flbm}) basic_udirel.relCode = #{flbm})
</if> </if>
<if test="companyName != '' and companyName != null"> <if test="companyName != '' and companyName != null">
AND basic_corp.name like concat('%', #{companyName}, '%') AND basic_corp.name like concat('%', #{companyName}, '%')
</if> </if>
<if test="basicPrductRemak1 != '' and basicPrductRemak1 != null"> <if test="basicPrductRemak1 != '' and basicPrductRemak1 != null">
AND basic_products.basicPrductRemak1 like concat('%', #{basicPrductRemak1}, '%') AND basic_products.basicPrductRemak1 like concat('%', #{basicPrductRemak1}, '%')
</if> </if>
<if test="basicPrductRemak2 != '' and basicPrductRemak2 != null"> <if test="basicPrductRemak2 != '' and basicPrductRemak2 != null">
AND basic_products.basicPrductRemak2 like concat('%', #{basicPrductRemak2}, '%') AND basic_products.basicPrductRemak2 like concat('%', #{basicPrductRemak2}, '%')
</if> </if>
<if test="basicPrductRemak3 != '' and basicPrductRemak3 != null"> <if test="basicPrductRemak3 != '' and basicPrductRemak3 != null">
AND basic_products.basicPrductRemak3 like concat('%', #{basicPrductRemak3}, '%') AND basic_products.basicPrductRemak3 like concat('%', #{basicPrductRemak3}, '%')
</if> </if>
<if test="basicPrductRemak4 != '' and basicPrductRemak4 != null"> <if test="basicPrductRemak4 != '' and basicPrductRemak4 != null">
AND basic_products.basicPrductRemak4 like concat('%', #{basicPrductRemak4}, '%') AND basic_products.basicPrductRemak4 like concat('%', #{basicPrductRemak4}, '%')
</if> </if>
<if test="basicPrductRemak5 != '' and basicPrductRemak5 != null"> <if test="basicPrductRemak5 != '' and basicPrductRemak5 != null">
AND basic_products.basicPrductRemak5 like concat('%', #{basicPrductRemak5}, '%') AND basic_products.basicPrductRemak5 like concat('%', #{basicPrductRemak5}, '%')
</if> </if>
<if test="basicPrductRemak6 != '' and basicPrductRemak6 != null"> <if test="basicPrductRemak6 != '' and basicPrductRemak6 != null">
AND basic_products.basicPrductRemak6 like concat('%', #{basicPrductRemak6}, '%') AND basic_products.basicPrductRemak6 like concat('%', #{basicPrductRemak6}, '%')
</if> </if>
<if test="basicPrductRemak7 != '' and basicPrductRemak7 != null"> <if test="basicPrductRemak7 != '' and basicPrductRemak7 != null">
AND basic_products.basicPrductRemak7 like concat('%', #{basicPrductRemak7}, '%') AND basic_products.basicPrductRemak7 like concat('%', #{basicPrductRemak7}, '%')
</if> </if>
<if test="basicPrductRemak8 != '' and basicPrductRemak8 != null"> <if test="basicPrductRemak8 != '' and basicPrductRemak8 != null">
AND basic_products.basicPrductRemak8 like concat('%', #{basicPrductRemak8}, '%') AND basic_products.basicPrductRemak8 like concat('%', #{basicPrductRemak8}, '%')
</if> </if>
</where> </where>
GROUP BY basic_udirel.id GROUP BY basic_udirel.id
</select>
</select>
<select id="filterDestinyProducts" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
<select id="filterDestinyProducts" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest" SELECT basic_udirel.*,
resultType="com.glxp.api.res.basic.UdiRelevanceResponse"> basic_products.id AS PRId,
SELECT basic_products.originUuid,
basic_udirel.*, basic_products.nameCode,
basic_products.id AS PRId, basic_products.deviceRecordKey,
basic_products.originUuid, basic_products.packRatio,
basic_products.nameCode, basic_products.packUnit,
basic_products.deviceRecordKey, basic_products.packLevel,
basic_products.packRatio, basic_products.bhxjsl,
basic_products.packUnit, basic_products.bhzxxsbzsl,
basic_products.packLevel, basic_products.zxxsbzbhsydysl,
basic_products.bhxjsl, basic_products.bhxjcpbm,
basic_products.bhzxxsbzsl, basic_products.bzcj,
basic_products.zxxsbzbhsydysl, basic_products.cpmctymc,
basic_products.bhxjcpbm, basic_products.cplb,
basic_products.bzcj, basic_products.flbm,
basic_products.cpmctymc, basic_products.ggxh,
basic_products.cplb, basic_products.qxlb,
basic_products.flbm, basic_products.tyshxydm,
basic_products.ggxh, basic_products.ylqxzcrbarmc,
basic_products.qxlb, basic_products.zczbhhzbapzbh,
basic_products.tyshxydm, basic_products.ylqxzcrbarywmc,
basic_products.ylqxzcrbarmc, basic_products.sydycpbs,
basic_products.zczbhhzbapzbh, basic_products.sjcpbm,
basic_products.ylqxzcrbarywmc, basic_products.versionNumber,
basic_products.sydycpbs, basic_products.diType,
basic_products.sjcpbm, basic_products.ybbm,
basic_products.versionNumber, basic_products.sptm,
basic_products.diType, basic_products.manufactory,
basic_products.ybbm, basic_products.measname,
basic_products.sptm, basic_products.productType,
basic_products.manufactory, basic_products.scbssfbhph,
basic_products.measname, basic_products.scbssfbhxlh,
basic_products.productType, basic_products.scbssfbhscrq,
basic_products.scbssfbhph, basic_products.scbssfbhsxrq,
basic_products.scbssfbhxlh, basic_products.cpms,
basic_products.scbssfbhscrq, basic_products.allowNoBatch,
basic_products.scbssfbhsxrq, basic_products.allowNoExpire,
basic_products.cpms, basic_products.allowNoProduct,
basic_products.allowNoBatch, basic_products.allowNoSerial,
basic_products.allowNoExpire, basic_products.spmc,
basic_products.allowNoProduct, basic_products.cplx,
basic_products.allowNoSerial, basic_products.hchzsb,
basic_products.spmc, basic_products.cpdls,
basic_products.cplx, basic_products.basicPrductRemak1,
basic_products.hchzsb, basic_products.basicPrductRemak2,
basic_products.cpdls, basic_products.basicPrductRemak3,
basic_products.basicPrductRemak1, basic_products.basicPrductRemak4,
basic_products.basicPrductRemak2, basic_products.basicPrductRemak5,
basic_products.basicPrductRemak3, basic_products.basicPrductRemak6,
basic_products.basicPrductRemak4, basic_products.basicPrductRemak7,
basic_products.basicPrductRemak5, basic_products.basicPrductRemak8,
basic_products.basicPrductRemak6, basic_sk_project_detail.count as count,
basic_products.basicPrductRemak7, basic_sk_project_detail.id as deId
basic_products.basicPrductRemak8, FROM basic_udirel
basic_destiny_rel.count as count, INNER JOIN basic_products ON basic_products.uuid = basic_udirel.uuid
basic_destiny_rel.id as deId INNER JOIN basic_sk_project_detail ON basic_sk_project_detail.relId = basic_udirel.id
FROM <where>
basic_udirel <if test="ids != null and ids.size() > 0">
INNER JOIN basic_products ON basic_products.uuid = basic_udirel.uuid and basic_udirel.id in
INNER JOIN basic_destiny_rel ON basic_destiny_rel.relId = basic_udirel.id <foreach collection="ids" item="item" open="(" separator="," close=")">
<where> #{item}
<if test="ids != null and ids.size() > 0"> </foreach>
and basic_udirel.id in </if>
<foreach collection="ids" item="item" open="(" separator="," close=")"> <if test="diType != null">
#{item} AND basic_products.diType = #{diType}
</foreach> </if>
</if> <if test="cpmctymc != '' and cpmctymc != null">
<if test="diType != null"> AND basic_products.cpmctymc like concat('%', #{cpmctymc}, '%')
AND basic_products.diType = #{diType} </if>
</if> <if test="destinyId != '' and destinyId != null">
<if test="cpmctymc != '' and cpmctymc != null"> AND basic_sk_project_detail.pId = #{destinyId}
AND basic_products.cpmctymc like concat('%', #{cpmctymc}, '%') </if>
</if> </where>
<if test="destinyId != '' and destinyId != null"> group by basic_products.uuid
AND basic_destiny_rel.pId = #{destinyId} </select>
</if> </mapper>
</where>
group by basic_products.uuid
</select>
</mapper>

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.basic.BasicSkPrescirbeDetailMapper">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.BasicSkPrescirbeDetailEntity">
<!--@mbg.generated-->
<!--@Table basic_sk_prescirbe_detail-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="relId" jdbcType="BIGINT" property="relId" />
<result column="thrName" jdbcType="VARCHAR" property="thrName" />
<result column="thrCode" jdbcType="VARCHAR" property="thrCode" />
<result column="pId" jdbcType="BIGINT" property="pId" />
<result column="count" jdbcType="INTEGER" property="count" />
<result column="measureCount" jdbcType="VARCHAR" property="measureCount" />
<result column="measureUnit" jdbcType="VARCHAR" property="measureUnit" />
<result column="category" jdbcType="VARCHAR" property="category" />
<result column="frequency" jdbcType="VARCHAR" property="frequency" />
<result column="price" jdbcType="DECIMAL" property="price" />
<result column="ggxh" jdbcType="VARCHAR" property="ggxh" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
<result column="createUser" jdbcType="VARCHAR" property="createUser" />
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
<result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, relId, thrName, thrCode, pId, `count`, measureCount, measureUnit, category, frequency,
price, ggxh, remark, createTime, `createUser`, updateTime, updateUser
</sql>
</mapper>

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.basic.BasicSkPrescribeMapper">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.BasicSkPrescribeEntity">
<!--@mbg.generated-->
<!--@Table basic_sk_prescribe-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="prescribeDate" jdbcType="TIMESTAMP" property="prescribeDate" />
<result column="createDr" jdbcType="VARCHAR" property="createDr" />
<result column="deptCode" jdbcType="VARCHAR" property="deptCode" />
<result column="deptName" jdbcType="VARCHAR" property="deptName" />
<result column="diagnosis" jdbcType="VARCHAR" property="diagnosis" />
<result column="sickerIdFk" jdbcType="VARCHAR" property="sickerIdFk" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="createUser" jdbcType="VARCHAR" property="createUser" />
<result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
<result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, code, prescribeDate, createDr, deptCode, deptName, diagnosis, sickerIdFk, remark,
`createUser`, createTime, updateUser, updateTime
</sql>
</mapper>

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.basic.BasicSkProjectMapper">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.BasicSkProjectEntity">
<!--@mbg.generated-->
<!--@Table basic_sk_project-->
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="idCode" jdbcType="VARCHAR" property="idCode"/>
<result column="code" jdbcType="VARCHAR" property="code"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="category" jdbcType="VARCHAR" property="category"/>
<result column="ggxh" jdbcType="VARCHAR" property="ggxh"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="createTime" jdbcType="TIMESTAMP" property="createTime"/>
<result column="createUser" jdbcType="VARCHAR" property="createUser"/>
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="updateUser" jdbcType="VARCHAR" property="updateUser"/>
<result column="type" jdbcType="INTEGER" property="type"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, idCode, code, `name`, category, ggxh, remark, createTime, `createUser`, updateTime,
updateUser
</sql>
<select id="filterList" parameterType="com.glxp.api.req.basic.BasicSkProjectRequest"
resultType="com.glxp.api.res.basic.BasicSkProjectResponse">
SELECT *, cb.userName as createByName
FROM basic_sk_project
LEFT JOIN auth_user cb ON basic_sk_project.createUser = cb.id
<where>
<if test="name != '' and name != null">
AND name LIKE concat('%', #{name}, '%')
</if>
<if test="code != '' and code != null">
AND code LIKE concat('%', #{code}, '%')
</if>
</where>
</select>
</mapper>

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.basic.BasicSkSickerMapper">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.BasicSkSickerEntity">
<!--@mbg.generated-->
<!--@Table basic_sk_sicker-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="adNum" jdbcType="VARCHAR" property="adNum" />
<result column="idNum" jdbcType="VARCHAR" property="idNum" />
<result column="phone" jdbcType="VARCHAR" property="phone" />
<result column="gender" jdbcType="VARCHAR" property="gender" />
<result column="job" jdbcType="VARCHAR" property="job" />
<result column="bornDate" jdbcType="VARCHAR" property="bornDate" />
<result column="nationality" jdbcType="VARCHAR" property="nationality" />
<result column="education" jdbcType="VARCHAR" property="education" />
<result column="guardianName" jdbcType="VARCHAR" property="guardianName" />
<result column="guardianRel" jdbcType="VARCHAR" property="guardianRel" />
<result column="curAddr" jdbcType="VARCHAR" property="curAddr" />
<result column="kosekiAddr" jdbcType="VARCHAR" property="kosekiAddr" />
<result column="medicalIns" jdbcType="VARCHAR" property="medicalIns" />
<result column="createUser" jdbcType="VARCHAR" property="createUser" />
<result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
<result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, code, `name`, adNum, idNum, phone, gender, job, bornDate, nationality, education,
guardianName, guardianRel, curAddr, kosekiAddr, medicalIns, `createUser`, createTime,
updateUser, updateTime, remark
</sql>
</mapper>
Loading…
Cancel
Save