Merge branch 'dev' of chaoren1/wlyy2.0 into medicare

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/MediicineStockoutDetailVO.java

@@ -7,6 +7,7 @@ import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.Date;
@@ -88,6 +89,10 @@ public class MediicineStockoutDetailVO extends UuidIdentityEntityWithOperator im
    private String drugId;
    @Transient
    private String total;
    private Integer inventoryNum;
    private String specif;
@@ -251,4 +256,13 @@ public class MediicineStockoutDetailVO extends UuidIdentityEntityWithOperator im
    public void setDrugName(String drugName) {
        this.drugName = drugName;
    }
    @Transient
    public String getTotal() {
        return total;
    }
    public void setTotal(String total) {
        this.total = total;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/MediicinecabinetInventoryVO.java

@@ -0,0 +1,330 @@
package com.yihu.jw.entity.a1entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicinecabinet_inventory")
public class MediicinecabinetInventoryVO extends UuidIdentityEntityWithOperator implements Serializable {
  /**
   * 设备id
   */
  private String idDevice;
  /**
   * sku
   */
  private String sku;
  /**
   * state,用于区分是单列货道，还是合并货道，1，单列，21合并主，20合并副货道
   */
  private String state;
  /**
   * num,预警数量
   */
  private String num;
  /**
   * num
   */
  private Date longtime;
  /**
   * 药品id
   */
  private String drugId;
  /**
   * 药品sku
   */
  private String drugSku;
  /**
   * 药品编码
   */
  private String drugCode;
  /**
   * 层
   */
  private String layerNo;
  /**
   * 列
   */
  private String wayerNo;
  /**
   * 数量
   */
  private String qty;
  /**
   * 药品机构编码
   */
  private String orgCode;
  /**
   * 药品名称
   */
  private String drugName;
  /**
   * 货道容量，默认5
   */
  private String cargoCapacity;
  /**
   * 上下架状态，0下架，1上架、
   */
  private String shelfStatus;
  /**
   * 单价
   */
  private String price;
  /**
   * 图片
   */
  private String pic;
  private String equNum;
  /**
   * 合并，列组，英文逗号分隔
   */
  private String merge;
  /**
   * 货道状态，1开启，0关闭，只针对出货的问题，
   * 初始化，默认开启，1、解绑设备，2、设备初始化两位置涉及到，3更新设备货道故障状态也会更改这次内容
   */
  private String cargoState;
  /**
   * 2021-12-22，新增故障，
   * 货道故障状态，1故障，0正常，
   * 涉及位置：
   * 1、设备初始化，默认正常，（解绑设备就不更改了，故障就是故障）
   * 2、更新设备故障状态
   */
  private String faultState;
  /**
   * 2021-12-29 额定库存，用于设备药品库存预警，单货道额定库存------->统计判断缺货在进行累加
   * 初始化为0，+
   * 重置设备（解绑设备）为0，+
   * 设定商品，更换商品，矫正库存--->qty，下架药品-->0 +
   */
  private Integer ratedInventory;
  /**
   * 规格
   */
  private String specif;
  public MediicinecabinetInventoryVO() {
  }
  public String getSpecif() {
    return specif;
  }
  public void setSpecif(String specif) {
    this.specif = specif;
  }
  public String getIdDevice() {
    return idDevice;
  }
  public void setIdDevice(String idDevice) {
    this.idDevice = idDevice;
  }
  public String getSku() {
    return sku;
  }
  public void setSku(String sku) {
    this.sku = sku;
  }
  public String getState() {
    return state;
  }
  public void setState(String state) {
    this.state = state;
  }
  public String getNum() {
    return num;
  }
  public void setNum(String num) {
    this.num = num;
  }
  public Date getLongtime() {
    return longtime;
  }
  public void setLongtime(Date longtime) {
    this.longtime = longtime;
  }
  public String getDrugId() {
    return drugId;
  }
  public void setDrugId(String drugId) {
    this.drugId = drugId;
  }
  public String getDrugSku() {
    return drugSku;
  }
  public void setDrugSku(String drugSku) {
    this.drugSku = drugSku;
  }
  public String getDrugCode() {
    return drugCode;
  }
  public void setDrugCode(String drugCode) {
    this.drugCode = drugCode;
  }
  public String getLayerNo() {
    return layerNo;
  }
  public void setLayerNo(String layerNo) {
    this.layerNo = layerNo;
  }
  public String getWayerNo() {
    return wayerNo;
  }
  public void setWayerNo(String wayerNo) {
    this.wayerNo = wayerNo;
  }
  public String getQty() {
    return qty;
  }
  public void setQty(String qty) {
    this.qty = qty;
  }
  public String getOrgCode() {
    return orgCode;
  }
  public void setOrgCode(String orgCode) {
    this.orgCode = orgCode;
  }
  public String getDrugName() {
    return drugName;
  }
  public void setDrugName(String drugName) {
    this.drugName = drugName;
  }
  public String getCargoCapacity() {
    return cargoCapacity;
  }
  public void setCargoCapacity(String cargoCapacity) {
    this.cargoCapacity = cargoCapacity;
  }
  public String getShelfStatus() {
    return shelfStatus;
  }
  public void setShelfStatus(String shelfStatus) {
    this.shelfStatus = shelfStatus;
  }
  public String getPrice() {
    return price;
  }
  public void setPrice(String price) {
    this.price = price;
  }
  public String getPic() {
    return pic;
  }
  public void setPic(String pic) {
    this.pic = pic;
  }
  public String getEquNum() {
    return equNum;
  }
  public void setEquNum(String equNum) {
    this.equNum = equNum;
  }
  public String getMerge() {
    return merge;
  }
  public void setMerge(String merge) {
    this.merge = merge;
  }
  public String getCargoState() {
    return cargoState;
  }
  public void setCargoState(String cargoState) {
    this.cargoState = cargoState;
  }
  public String getFaultState() {
    return faultState;
  }
  public void setFaultState(String faultState) {
    this.faultState = faultState;
  }
  public Integer getRatedInventory() {
    return ratedInventory;
  }
  public void setRatedInventory(Integer ratedInventory) {
    this.ratedInventory = ratedInventory;
  }
}

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinestockout.java

@@ -104,7 +104,7 @@ public class Mediicinestockout extends UuidIdentityEntityWithOperator implements
    private String upNum;
    @Transient
    private List<Mediicinestockoutdetail> mediicinestockoutdetails;
    private List<MediicineStockoutDetailVO> mediicinestockoutdetails;
    public Mediicinestockout() {
    }
@@ -247,11 +247,11 @@ public class Mediicinestockout extends UuidIdentityEntityWithOperator implements
    }
    @Transient
    public List<Mediicinestockoutdetail> getMediicinestockoutdetails() {
    public List<MediicineStockoutDetailVO> getMediicinestockoutdetails() {
        return mediicinestockoutdetails;
    }
    public void setMediicinestockoutdetails(List<Mediicinestockoutdetail> mediicinestockoutdetails) {
    public void setMediicinestockoutdetails(List<MediicineStockoutDetailVO> mediicinestockoutdetails) {
        this.mediicinestockoutdetails = mediicinestockoutdetails;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinestockup.java

@@ -10,9 +10,9 @@ import javax.persistence.Transient;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_stockup")
public class Mediicinestockup extends UuidIdentityEntityWithOperator implements Serializable {
    @Entity
    @Table(name="t_mediicine_stockup")
    public class Mediicinestockup extends UuidIdentityEntityWithOperator implements Serializable {

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineStockUpService.java

@@ -18,6 +18,7 @@ import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import io.swagger.util.Json;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -434,7 +435,9 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
        for (Mediicinestockup mediicinestockup:mediicinestockups){
            Mediicinestockout mediicinestockout = mediicinestockoutDao.selectBydocNum(mediicinestockup.getId());
            List<Mediicinestockoutdetail> mediicinestockoutdetailList = mediicinestockoutdetailDao.getoutdetail(mediicinestockout.getId());
            List<MediicineStockoutDetailVO> mediicineStockoutDetailVOList = new ArrayList<>(mediicinestockoutdetailList.size());
            for (Mediicinestockoutdetail detail:mediicinestockoutdetailList){
                MediicineStockoutDetailVO mediicineStockoutDetailVO = new MediicineStockoutDetailVO();
                String sql = "select sum(qty) as total from t_mediicinecabinet_inventory where id_device='"+deviceId+"' and drug_id ='"+detail.getDrugId()+"'";
                Map<String,Object> map = jdbcTemplate.queryForMap(sql);
                if (map.get("total")!=null){
@@ -442,8 +445,18 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
                }else {
                    detail.setTotal("0");
                }
                BeanUtils.copyProperties(detail, mediicineStockoutDetailVO);
                if (mediicineStockoutDetailVO != null && !StringUtils.isEmpty(mediicineStockoutDetailVO.getDrugId())) {
                    Mediicinedrugs drug = drugsDao.findOne(mediicineStockoutDetailVO.getDrugId());
                    if (drug != null) {
                        if (StringUtils.isEmpty(drug.getSpecif())) {
                            mediicineStockoutDetailVO.setSpecif(drug.getSpecif());
                        }
                    }
                }
                mediicineStockoutDetailVOList.add(mediicineStockoutDetailVO);
            }
            mediicinestockout.setMediicinestockoutdetails(mediicinestockoutdetailList);
            mediicinestockout.setMediicinestockoutdetails(mediicineStockoutDetailVOList);
            mediicinestockup.setMediicinestockout(mediicinestockout);
        }
@@ -464,7 +477,10 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
        Mediicinestockout mediicinestockout = mediicinestockoutDao.selectBydocNum(mediicinestockup.getId());
        List<Mediicinestockoutdetail> mediicinestockoutdetailList = mediicinestockoutdetailDao.getoutdetail(mediicinestockout.getId());
        List<MediicineStockoutDetailVO> mediicineStockoutDetailVOList = new ArrayList<>(mediicinestockoutdetailList.size());
        for (Mediicinestockoutdetail detail:mediicinestockoutdetailList){
            MediicineStockoutDetailVO mediicineStockoutDetailVO = new MediicineStockoutDetailVO();
            String sql = "select sum(qty) as total from t_mediicinecabinet_inventory where equ_num='"+equNum+"' and drug_id ='"+detail.getDrugId()+"'";
            Map<String,Object> map = jdbcTemplate.queryForMap(sql);
            if (map.get("total")!=null){
@@ -472,8 +488,18 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
            }else {
                detail.setTotal("0");
            }
            BeanUtils.copyProperties(detail, mediicineStockoutDetailVO);
            if (mediicineStockoutDetailVO != null && !StringUtils.isEmpty(mediicineStockoutDetailVO.getDrugId())) {
                Mediicinedrugs drug = drugsDao.findOne(mediicineStockoutDetailVO.getDrugId());
                if (drug != null) {
                    if (StringUtils.isEmpty(drug.getSpecif())) {
                        mediicineStockoutDetailVO.setSpecif(drug.getSpecif());
                    }
                }
            }
            mediicineStockoutDetailVOList.add(mediicineStockoutDetailVO);
        }
        mediicinestockout.setMediicinestockoutdetails(mediicinestockoutdetailList);
        mediicinestockout.setMediicinestockoutdetails(mediicineStockoutDetailVOList);
        mediicinestockup.setMediicinestockout(mediicinestockout);
        return mediicinestockup;
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@@ -25,6 +25,7 @@ import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -4393,8 +4394,24 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
     * @return
     * @throws Exception
     */
    public MediicinecabinetInventory selectMediicinecabineInventoryById(String id) throws Exception {
        return  inventoryDao.findOne(id);
    public MediicinecabinetInventoryVO selectMediicinecabineInventoryById(String id) throws Exception {
        MediicinecabinetInventory inventory = inventoryDao.findOne(id);
        MediicinecabinetInventoryVO inventoryVO = new MediicinecabinetInventoryVO();
        BeanUtils.copyProperties(inventory, inventoryVO);
        if (inventory != null && !StringUtils.isEmpty(inventory.getDrugId())) {
            Mediicinedrugs drug = mediicinedrugsDao.findOne(inventory.getDrugId());
            if(drug != null) {
                //设置规格
                if (!StringUtils.isEmpty(drug.getSpecif())) {
                    inventoryVO.setSpecif(drug.getSpecif());
                }
                //设置剂量
//                if (!StringUtils.isEmpty(drug)) {
//                    inventoryVO;
//                }
            }
        }
        return  inventoryVO;
    }
    /**