Skip to content

huang.tao / jmai-platform

Go to a project
Commit 2c050fb7 by huangtao
Options

physic

parent bd887008
Inline Side-by-side
Showing with 210 additions and 1 deletions
jmai-physic/src/main/java/com/jmai/physic/controller/PhysicAmpouleController.java
package com.jmai.physic.controller; package com.jmai.physic.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicAmpouleCreateReq; import com.jmai.physic.dto.PhysicAmpouleCreateReq;
import com.jmai.physic.dto.PhysicAmpouleQueryReq;
import com.jmai.physic.dto.PhysicStorageAmpouleCreateReq; import com.jmai.physic.dto.PhysicStorageAmpouleCreateReq;
import com.jmai.physic.entity.PhysicAmpoule;
import com.jmai.physic.entity.PhysicStorageAmpoule;
import com.jmai.physic.service.PhysicAmpouleService; import com.jmai.physic.service.PhysicAmpouleService;
import com.jmai.physic.service.PhysicStorageAmpouleService; import com.jmai.physic.service.PhysicStorageAmpouleService;
import com.jmai.sys.aop.Auth; import com.jmai.sys.aop.Auth;
...@@ -38,4 +42,10 @@ public class PhysicAmpouleController { ...@@ -38,4 +42,10 @@ public class PhysicAmpouleController {
physicAmpouleService.create(req); physicAmpouleService.create(req);
return ResponseData.ok(); return ResponseData.ok();
} }
@PostMapping("/listPage")
@ApiOperation(value = "查询")
public Page<PhysicAmpoule> listPage(@RequestBody PhysicAmpouleQueryReq req) {
return physicAmpouleService.listPage(req);
}
} }
jmai-physic/src/main/java/com/jmai/physic/controller/PhysicRecordController.java
package com.jmai.physic.controller; package com.jmai.physic.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicRecordCreateReq; import com.jmai.physic.dto.PhysicRecordCreateReq;
import com.jmai.physic.dto.PhysicRecordQueryReq;
import com.jmai.physic.entity.PhysicRecord;
import com.jmai.physic.service.PhysicRecordService; import com.jmai.physic.service.PhysicRecordService;
import com.jmai.sys.aop.Auth; import com.jmai.sys.aop.Auth;
import com.jmai.sys.dto.ResponseData; import com.jmai.sys.dto.ResponseData;
...@@ -17,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -17,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.List;
@Slf4j @Slf4j
@Auth @Auth
...@@ -35,4 +39,11 @@ public class PhysicRecordController { ...@@ -35,4 +39,11 @@ public class PhysicRecordController {
physicRecordService.PhysicRecordCreate(req); physicRecordService.PhysicRecordCreate(req);
return ResponseData.ok(); return ResponseData.ok();
} }
@PostMapping("/listPage")
@ApiOperation(value = "查询")
public Page<PhysicRecord> listPage(@RequestBody PhysicRecordQueryReq req) {
return physicRecordService.listPage(req);
}
} }
jmai-physic/src/main/java/com/jmai/physic/controller/PhysicStorageAmpouleController.java
package com.jmai.physic.controller; package com.jmai.physic.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicAmpouleQueryReq;
import com.jmai.physic.dto.PhysicRecordQueryReq;
import com.jmai.physic.dto.PhysicStorageAmpouleCreateReq; import com.jmai.physic.dto.PhysicStorageAmpouleCreateReq;
import com.jmai.physic.entity.PhysicRecord;
import com.jmai.physic.entity.PhysicStorageAmpoule;
import com.jmai.physic.service.PhysicStorageAmpouleService; import com.jmai.physic.service.PhysicStorageAmpouleService;
import com.jmai.sys.aop.Auth; import com.jmai.sys.aop.Auth;
import com.jmai.sys.dto.ResponseData; import com.jmai.sys.dto.ResponseData;
...@@ -36,4 +41,12 @@ public class PhysicStorageAmpouleController { ...@@ -36,4 +41,12 @@ public class PhysicStorageAmpouleController {
physicStorageAmpouleService.create(req); physicStorageAmpouleService.create(req);
return ResponseData.ok(); return ResponseData.ok();
} }
@PostMapping("/listPage")
@ApiOperation(value = "查询")
public Page<PhysicStorageAmpoule> listPage(@RequestBody PhysicAmpouleQueryReq req) {
return physicStorageAmpouleService.listPage(req);
}
} }
jmai-physic/src/main/java/com/jmai/physic/dto/PhysicAmpouleQueryReq.java 0 → 100644
package com.jmai.physic.dto;
import com.jmai.sys.dto.PageReq;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
import java.util.Date;
@Data
public class PhysicAmpouleQueryReq extends PageReq {
@ApiModelProperty("药品名称")
private String physicName;
private LocalDate dateTime;
@ApiModelProperty(value = "部门")
private Integer deptId;
}
jmai-physic/src/main/java/com/jmai/physic/dto/PhysicRecordQueryReq.java 0 → 100644
package com.jmai.physic.dto;
import com.jmai.sys.dto.PageReq;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class PhysicRecordQueryReq extends PageReq {
@ApiModelProperty("关键字")
private String keyword;
@ApiModelProperty(value = "状态 0-待调配 1-待发药 2-已完成")
private Integer status;
}
jmai-physic/src/main/java/com/jmai/physic/entity/PhysicRecord.java
...@@ -44,7 +44,7 @@ public class PhysicRecord extends BaseVersionEntity { ...@@ -44,7 +44,7 @@ public class PhysicRecord extends BaseVersionEntity {
@ApiModelProperty(value = "处方医生") @ApiModelProperty(value = "处方医生")
private String prescriptionDoctor; private String prescriptionDoctor;
@ApiModelProperty(value = "状态 0-待调配 1-待发药 2-已完成+") @ApiModelProperty(value = "状态 0-待调配 1-待发药 2-已完成")
private Integer status; private Integer status;
private String dpUser; private String dpUser;
......
jmai-physic/src/main/java/com/jmai/physic/mapper/PhysicAmpouleMapper.java
...@@ -2,9 +2,13 @@ package com.jmai.physic.mapper; ...@@ -2,9 +2,13 @@ package com.jmai.physic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicAmpouleQueryReq;
import com.jmai.physic.entity.PhysicAmpoule; import com.jmai.physic.entity.PhysicAmpoule;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper @Mapper
public interface PhysicAmpouleMapper extends BaseMapper<PhysicAmpoule> { public interface PhysicAmpouleMapper extends BaseMapper<PhysicAmpoule> {
Page<PhysicAmpoule> selectAmpoulePage(Page<PhysicAmpoule> page, @Param("req") PhysicAmpouleQueryReq req);
} }
jmai-physic/src/main/java/com/jmai/physic/mapper/PhysicRecordMapper.java
...@@ -2,9 +2,13 @@ package com.jmai.physic.mapper; ...@@ -2,9 +2,13 @@ package com.jmai.physic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicRecordQueryReq;
import com.jmai.physic.entity.PhysicRecord; import com.jmai.physic.entity.PhysicRecord;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper @Mapper
public interface PhysicRecordMapper extends BaseMapper<PhysicRecord> { public interface PhysicRecordMapper extends BaseMapper<PhysicRecord> {
Page<PhysicRecord> selectRecordPage(Page<PhysicRecord> page,@Param("req") PhysicRecordQueryReq req);
} }
jmai-physic/src/main/java/com/jmai/physic/mapper/PhysicStorageAmpouleMapper.java
...@@ -2,9 +2,13 @@ package com.jmai.physic.mapper; ...@@ -2,9 +2,13 @@ package com.jmai.physic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicAmpouleQueryReq;
import com.jmai.physic.entity.PhysicStorageAmpoule; import com.jmai.physic.entity.PhysicStorageAmpoule;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper @Mapper
public interface PhysicStorageAmpouleMapper extends BaseMapper<PhysicStorageAmpoule> { public interface PhysicStorageAmpouleMapper extends BaseMapper<PhysicStorageAmpoule> {
Page<PhysicStorageAmpoule> selectAmpoulePage(Page<PhysicStorageAmpoule> page, @Param("req") PhysicAmpouleQueryReq req);
} }
jmai-physic/src/main/java/com/jmai/physic/service/PhysicAmpouleService.java
package com.jmai.physic.service; package com.jmai.physic.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicAmpouleCreateReq; import com.jmai.physic.dto.PhysicAmpouleCreateReq;
import com.jmai.physic.dto.PhysicAmpouleQueryReq;
import com.jmai.physic.entity.PhysicAmpoule;
public interface PhysicAmpouleService { public interface PhysicAmpouleService {
void create(PhysicAmpouleCreateReq req); void create(PhysicAmpouleCreateReq req);
Page<PhysicAmpoule> listPage(PhysicAmpouleQueryReq req);
} }
jmai-physic/src/main/java/com/jmai/physic/service/PhysicRecordService.java
package com.jmai.physic.service; package com.jmai.physic.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicRecordCreateReq; import com.jmai.physic.dto.PhysicRecordCreateReq;
import com.jmai.physic.dto.PhysicRecordQueryReq;
import com.jmai.physic.entity.PhysicRecord;
import java.util.List;
public interface PhysicRecordService { public interface PhysicRecordService {
void PhysicRecordCreate(PhysicRecordCreateReq req); void PhysicRecordCreate(PhysicRecordCreateReq req);
Page<PhysicRecord> listPage(PhysicRecordQueryReq req);
} }
jmai-physic/src/main/java/com/jmai/physic/service/PhysicStorageAmpouleService.java
package com.jmai.physic.service; package com.jmai.physic.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicAmpouleQueryReq;
import com.jmai.physic.dto.PhysicStorageAmpouleCreateReq; import com.jmai.physic.dto.PhysicStorageAmpouleCreateReq;
import com.jmai.physic.entity.PhysicStorageAmpoule;
public interface PhysicStorageAmpouleService { public interface PhysicStorageAmpouleService {
void create(PhysicStorageAmpouleCreateReq req); void create(PhysicStorageAmpouleCreateReq req);
Page<PhysicStorageAmpoule> listPage(PhysicAmpouleQueryReq req);
} }
jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicAmpouleServiceImpl.java
...@@ -2,8 +2,11 @@ package com.jmai.physic.service.impl; ...@@ -2,8 +2,11 @@ package com.jmai.physic.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicAmpouleCreateReq; import com.jmai.physic.dto.PhysicAmpouleCreateReq;
import com.jmai.physic.dto.PhysicAmpouleQueryReq;
import com.jmai.physic.entity.PhysicAmpoule; import com.jmai.physic.entity.PhysicAmpoule;
import com.jmai.physic.entity.PhysicStorageAmpoule;
import com.jmai.physic.mapper.PhysicAmpouleMapper; import com.jmai.physic.mapper.PhysicAmpouleMapper;
import com.jmai.physic.service.PhysicAmpouleService; import com.jmai.physic.service.PhysicAmpouleService;
import com.jmai.sys.AbstractService; import com.jmai.sys.AbstractService;
...@@ -35,4 +38,12 @@ public class PhysicAmpouleServiceImpl extends AbstractService implements PhysicA ...@@ -35,4 +38,12 @@ public class PhysicAmpouleServiceImpl extends AbstractService implements PhysicA
} }
} }
@Override
public Page<PhysicAmpoule> listPage(PhysicAmpouleQueryReq req) {
Page<PhysicAmpoule> page = buildEmptyPage(req);
Page<PhysicAmpoule> ampoulePage= physicAmpouleMapper.selectAmpoulePage(page, req);
return ampoulePage;
}
} }
jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicRecordServiceImpl.java
...@@ -3,7 +3,9 @@ package com.jmai.physic.service.impl; ...@@ -3,7 +3,9 @@ package com.jmai.physic.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicRecordCreateReq; import com.jmai.physic.dto.PhysicRecordCreateReq;
import com.jmai.physic.dto.PhysicRecordQueryReq;
import com.jmai.physic.entity.PhysicRecord; import com.jmai.physic.entity.PhysicRecord;
import com.jmai.physic.mapper.PhysicRecordMapper; import com.jmai.physic.mapper.PhysicRecordMapper;
import com.jmai.physic.service.PhysicRecordService; import com.jmai.physic.service.PhysicRecordService;
...@@ -15,6 +17,7 @@ import org.springframework.stereotype.Service; ...@@ -15,6 +17,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
@Service @Service
public class PhysicRecordServiceImpl extends AbstractService implements PhysicRecordService { public class PhysicRecordServiceImpl extends AbstractService implements PhysicRecordService {
...@@ -49,4 +52,12 @@ public class PhysicRecordServiceImpl extends AbstractService implements PhysicRe ...@@ -49,4 +52,12 @@ public class PhysicRecordServiceImpl extends AbstractService implements PhysicRe
} }
@Override
public Page<PhysicRecord> listPage(PhysicRecordQueryReq req) {
Page<PhysicRecord> page = buildEmptyPage(req);
Page<PhysicRecord> recordPage = physicRecordMapper.selectRecordPage(page, req);
return recordPage;
}
} }
jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicStorageAmpouleServiceImpl.java
...@@ -2,7 +2,10 @@ package com.jmai.physic.service.impl; ...@@ -2,7 +2,10 @@ package com.jmai.physic.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicAmpouleQueryReq;
import com.jmai.physic.dto.PhysicStorageAmpouleCreateReq; import com.jmai.physic.dto.PhysicStorageAmpouleCreateReq;
import com.jmai.physic.entity.PhysicRecord;
import com.jmai.physic.entity.PhysicStorageAmpoule; import com.jmai.physic.entity.PhysicStorageAmpoule;
import com.jmai.physic.mapper.PhysicStorageAmpouleMapper; import com.jmai.physic.mapper.PhysicStorageAmpouleMapper;
import com.jmai.physic.service.PhysicStorageAmpouleService; import com.jmai.physic.service.PhysicStorageAmpouleService;
...@@ -35,4 +38,12 @@ public class PhysicStorageAmpouleServiceImpl extends AbstractService implements ...@@ -35,4 +38,12 @@ public class PhysicStorageAmpouleServiceImpl extends AbstractService implements
} }
} }
@Override
public Page<PhysicStorageAmpoule> listPage(PhysicAmpouleQueryReq req) {
Page<PhysicStorageAmpoule> page = buildEmptyPage(req);
Page<PhysicStorageAmpoule> ampoulePage= physicStorageAmpouleMapper.selectAmpoulePage(page, req);
return ampoulePage;
}
} }
jmai-physic/src/main/resources/mapper/PhysicAmpouleMapper.xml 0 → 100644
<?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.jmai.physic.mapper.PhysicAmpouleMapper">
<select id="selectAmpoulePage" resultType="com.jmai.physic.entity.PhysicAmpoule">
select * from physic_ampoule
where
del_flag 0
<if test="req.dateTime != null ">
and DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(#{req.dateTime}, '%Y-%m-%d')
</if>
<if test="req.physicName!=null and req.physicName !=''">
and physic_name LIKE CONCAT('%', #{req.physicName}, '%')
</if>
<if test="req.deptId!=null">
and dept_id = #{req.deptId}
</if>
order by create_time desc
</select>
</mapper>
jmai-physic/src/main/resources/mapper/PhysicRecordMapper.xml 0 → 100644
<?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.jmai.physic.mapper.PhysicRecordMapper">
<select id="selectRecordPage" resultType="com.jmai.physic.entity.PhysicRecord">
select * from physic_record
where del_flag
<if test="req.keyword != null and req.keyword != ''">
AND (
physic_name LIKE CONCAT('%', #{req.keyword}, '%')
OR batch_no LIKE CONCAT('%', #{req.keyword}, '%')
OR sick_name LIKE CONCAT('%', #{req.keyword}, '%')
OR sick_id_card LIKE CONCAT('%', #{req.keyword}, '%')
OR hospital_number LIKE CONCAT('%', #{req.keyword}, '%')
OR disease_name LIKE CONCAT('%', #{req.keyword}, '%')
OR prescription_number LIKE CONCAT('%', #{req.keyword}, '%')
OR prescription_doctor LIKE CONCAT('%', #{req.keyword}, '%')
)
</if>
<if test="req.status =!null">
and status =#{req.status}
</if>
</select>
</mapper>
jmai-physic/src/main/resources/mapper/PhysicStorageAmpouleMapper.xml 0 → 100644
<?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.jmai.physic.mapper.PhysicStorageAmpouleMapper">
<select id="selectAmpoulePage" resultType="com.jmai.physic.entity.PhysicStorageAmpoule">
select * from physic_storage_ampoule
where
del_flag 0
<if test="req.dateTime != null ">
and DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(#{req.dateTime}, '%Y-%m-%d')
</if>
<if test="req.physicName!=null and req.physicName !=''">
and physic_name LIKE CONCAT('%', #{req.physicName}, '%')
</if>
<if test="req.deptId!=null">
and dept_id = #{req.deptId}
</if>
order by create_time desc
</select>
</mapper>
logs/jmai/root.log
This diff could not be displayed because it is too large.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment