更xin&新增jiekou ,fix bug

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

@@ -8,16 +8,19 @@ public class DrugDO implements Serializable {
    /**
     * 状态
     * 药品在药品表的id
     */
    private String drugId;
    /**
     * 名称
     * 数量
     */
    private Integer qty;
    public DrugDO() {
    }
    public String getDrugId() {
        return drugId;
    }

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

@@ -7,7 +7,7 @@ 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_medicine_device_delivery")

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

@@ -18,6 +18,9 @@ public class MediicineDeviceUser extends UuidIdentityEntityWithOperator implemen
    private String del;
    public MediicineDeviceUser() {
    }
    public String getDeviceId() {
        return deviceId;
    }

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

@@ -43,8 +43,14 @@ public class MediicinecabinetInventory extends UuidIdentityEntityWithOperator im
     */
    private String drugId;
    /**
     * 药品sku
     */
    private String drugSku;
    /**
     * 药品编码
     */
    private String drugCode;
    /**
@@ -62,12 +68,15 @@ public class MediicinecabinetInventory extends UuidIdentityEntityWithOperator im
     */
    private String qty;
    /**
     * 药品机构编码
     */
    private String orgCode;
    public MediicinecabinetInventory() {
    }
    public String getIdDevice() {
        return idDevice;
    }

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

@@ -160,7 +160,9 @@ public class Mediicinedevice extends UuidIdentityEntityWithOperator implements S
     */
    private String cargoCapacity;
    //层数
    /**
     * 层数
     */
    private String layer;
    /**
@@ -171,20 +173,12 @@ public class Mediicinedevice extends UuidIdentityEntityWithOperator implements S
    public Mediicinedevice() {
    }
    public String getLayer() {
        return layer;
    }
    public void setLayer(String layer) {
        this.layer = layer;
    }
    public String getWayer() {
        return wayer;
    public String getBelongCommunity() {
        return belongCommunity;
    }
    public void setWayer(String wayer) {
        this.wayer = wayer;
    public void setBelongCommunity(String belongCommunity) {
        this.belongCommunity = belongCommunity;
    }
    public String getEquClass() {
@@ -195,14 +189,6 @@ public class Mediicinedevice extends UuidIdentityEntityWithOperator implements S
        this.equClass = equClass;
    }
    public String getBelongCommunity() {
        return belongCommunity;
    }
    public void setBelongCommunity(String belongCommunity) {
        this.belongCommunity = belongCommunity;
    }
    public String getNetworkStatus() {
        return networkStatus;
    }
@@ -266,12 +252,11 @@ public class Mediicinedevice extends UuidIdentityEntityWithOperator implements S
    public void setEquInfo(String equInfo) {
        this.equInfo = equInfo;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getRegDate() {
        return regDate;
    }
    public void setRegDate(Date regDate) {
        this.regDate = regDate;
    }
@@ -419,4 +404,20 @@ public class Mediicinedevice extends UuidIdentityEntityWithOperator implements S
    public void setCargoCapacity(String cargoCapacity) {
        this.cargoCapacity = cargoCapacity;
    }
    public String getLayer() {
        return layer;
    }
    public void setLayer(String layer) {
        this.layer = layer;
    }
    public String getWayer() {
        return wayer;
    }
    public void setWayer(String wayer) {
        this.wayer = wayer;
    }
}

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

@@ -1,7 +1,6 @@
package com.yihu.jw.entity.a1entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
@@ -11,11 +10,10 @@ import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_order")
@Table(name = "t_mediicine_order")
public class Mediicineorder extends UuidIdentityEntityWithOperator implements Serializable {
    /**
     * 订单号
     */
@@ -161,9 +159,56 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
    private String cargoInfo;
    /**
     * 社保卡号
     *订单属性
     */
    private String attr;
    /**
     *商户ID
     */
    private String userId;
    /**
     *门店编号
     */
    private String shopNo;
    /**
     *医院信息
     */
    private String hospitalInfo;
    /**
     *出生日期
     */
    private String birth;
    /**
     *科室信息
     */
    private String deptNum;
    /**
     *科室名称
     */
    private String deptName;
    /**
     *医生信息
     */
    private String doctorNum;
    /**
     *医生姓名
     */
    private String doctorName;
    /**
     *医嘱
     */
    private String doctorAdvice;
    /**
     *过敏史
     */
    private String allergyInfo;
    /**
     *诊断信息
     */
    private String info;
    /**
     *社保卡号
     */
    private String socialSecurityCardNum;
@@ -171,14 +216,6 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
    }
    public String getSocialSecurityCardNum() {
        return socialSecurityCardNum;
    }
    public void setSocialSecurityCardNum(String socialSecurityCardNum) {
        this.socialSecurityCardNum = socialSecurityCardNum;
    }
    public String getOrderNum() {
        return orderNum;
    }
@@ -210,7 +247,7 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
    public void setDispensingWindow(String dispensingWindow) {
        this.dispensingWindow = dispensingWindow;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getPrescribeTime() {
        return prescribeTime;
    }
@@ -251,7 +288,6 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
        this.goodsTotalAmount = goodsTotalAmount;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getPayTime() {
        return payTime;
    }
@@ -403,4 +439,108 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
    public void setCargoInfo(String cargoInfo) {
        this.cargoInfo = cargoInfo;
    }
    public String getAttr() {
        return attr;
    }
    public void setAttr(String attr) {
        this.attr = attr;
    }
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    public String getShopNo() {
        return shopNo;
    }
    public void setShopNo(String shopNo) {
        this.shopNo = shopNo;
    }
    public String getHospitalInfo() {
        return hospitalInfo;
    }
    public void setHospitalInfo(String hospitalInfo) {
        this.hospitalInfo = hospitalInfo;
    }
    public String getBirth() {
        return birth;
    }
    public void setBirth(String birth) {
        this.birth = birth;
    }
    public String getDeptNum() {
        return deptNum;
    }
    public void setDeptNum(String deptNum) {
        this.deptNum = deptNum;
    }
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
    public String getDoctorNum() {
        return doctorNum;
    }
    public void setDoctorNum(String doctorNum) {
        this.doctorNum = doctorNum;
    }
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    public String getDoctorAdvice() {
        return doctorAdvice;
    }
    public void setDoctorAdvice(String doctorAdvice) {
        this.doctorAdvice = doctorAdvice;
    }
    public String getAllergyInfo() {
        return allergyInfo;
    }
    public void setAllergyInfo(String allergyInfo) {
        this.allergyInfo = allergyInfo;
    }
    public String getInfo() {
        return info;
    }
    public void setInfo(String info) {
        this.info = info;
    }
    public String getSocialSecurityCardNum() {
        return socialSecurityCardNum;
    }
    public void setSocialSecurityCardNum(String socialSecurityCardNum) {
        this.socialSecurityCardNum = socialSecurityCardNum;
    }
}

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

@@ -8,7 +8,7 @@ import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_order_detail")
@Table(name = "t_mediicine_order_detail")
public class Mediicineorderdetail extends UuidIdentityEntityWithOperator implements Serializable {
@@ -191,31 +191,57 @@ public class Mediicineorderdetail extends UuidIdentityEntityWithOperator impleme
    private Date shippingTime;
    /**
     * 社保卡号
     * 药品sku
     */
    private String drugSku;
    /**
     *药品购买数量
     */
    private String drugNum;
    /**
     *药品规格
     */
    private String specif;
    /**
     *药品使用数量
     */
    private String useNum;
    /**
     *药品使用方法
     */
    private String useWay;
    /**
     *药品使用频率
     */
    private String useRate;
    /**
     *药品每次服用量
     */
    private String useDose;
    /**
     *每次服用单位
     */
    private String unit;
    /**
     *补充用法
     */
    private String useWayAdd;
    /**
     *厂商
     */
    private String manufactor;
    /**
     *社保卡号
     */
    private String socialSecurityCardNum;
    /**
     *药品机构
     */
    private String orgCode;
    public Mediicineorderdetail() {
    }
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    public String getSocialSecurityCardNum() {
        return socialSecurityCardNum;
    }
    public void setSocialSecurityCardNum(String socialSecurityCardNum) {
        this.socialSecurityCardNum = socialSecurityCardNum;
    }
    public String getIdOrder() {
        return idOrder;
    }
@@ -495,4 +521,100 @@ public class Mediicineorderdetail extends UuidIdentityEntityWithOperator impleme
    public void setShippingTime(Date shippingTime) {
        this.shippingTime = shippingTime;
    }
    public String getDrugSku() {
        return drugSku;
    }
    public void setDrugSku(String drugSku) {
        this.drugSku = drugSku;
    }
    public String getDrugNum() {
        return drugNum;
    }
    public void setDrugNum(String drugNum) {
        this.drugNum = drugNum;
    }
    public String getSpecif() {
        return specif;
    }
    public void setSpecif(String specif) {
        this.specif = specif;
    }
    public String getUseNum() {
        return useNum;
    }
    public void setUseNum(String useNum) {
        this.useNum = useNum;
    }
    public String getUseWay() {
        return useWay;
    }
    public void setUseWay(String useWay) {
        this.useWay = useWay;
    }
    public String getUseRate() {
        return useRate;
    }
    public void setUseRate(String useRate) {
        this.useRate = useRate;
    }
    public String getUseDose() {
        return useDose;
    }
    public void setUseDose(String useDose) {
        this.useDose = useDose;
    }
    public String getUnit() {
        return unit;
    }
    public void setUnit(String unit) {
        this.unit = unit;
    }
    public String getUseWayAdd() {
        return useWayAdd;
    }
    public void setUseWayAdd(String useWayAdd) {
        this.useWayAdd = useWayAdd;
    }
    public String getManufactor() {
        return manufactor;
    }
    public void setManufactor(String manufactor) {
        this.manufactor = manufactor;
    }
    public String getSocialSecurityCardNum() {
        return socialSecurityCardNum;
    }
    public void setSocialSecurityCardNum(String socialSecurityCardNum) {
        this.socialSecurityCardNum = socialSecurityCardNum;
    }
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
}

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

@@ -88,14 +88,6 @@ public class Mediicinestockoutdetail extends UuidIdentityEntityWithOperator impl
    public Mediicinestockoutdetail() {
    }
    public String getDrugName() {
        return drugName;
    }
    public void setDrugName(String drugName) {
        this.drugName = drugName;
    }
    public String getIdStockOut() {
        return idStockOut;
    }
@@ -199,4 +191,12 @@ public class Mediicinestockoutdetail extends UuidIdentityEntityWithOperator impl
    public void setIdOrderDetail(String idOrderDetail) {
        IdOrderDetail = idOrderDetail;
    }
    public String getDrugName() {
        return drugName;
    }
    public void setDrugName(String drugName) {
        this.drugName = drugName;
    }
}

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

@@ -8,7 +8,7 @@ import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_stockup_detail")
@Table(name="t_mediicine_stockrecord_detail")
public class Mediicinestockrecorddetail extends UuidIdentityEntityWithOperator implements Serializable {
@@ -67,14 +67,19 @@ public class Mediicinestockrecorddetail extends UuidIdentityEntityWithOperator i
     */
    private String productPic;
    /**
     * 层
     */
    private String layerNo;
    /**
     * 列
     */
    private String wayerNo;
    public Mediicinestockrecorddetail() {
    }
    public String getIdstockup() {
        return idstockup;
    }

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

@@ -70,7 +70,6 @@ public class Mediicinestockup extends UuidIdentityEntityWithOperator implements
    public Mediicinestockup() {
    }
    public String getCommunity() {
        return community;
    }

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

@@ -91,7 +91,6 @@ public class Mediicinestockupdetail extends UuidIdentityEntityWithOperator imple
    public Mediicinestockupdetail() {
    }
    public String getIdstockup() {
        return idstockup;
    }

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

@@ -42,7 +42,6 @@ public class Mediicinestore extends UuidIdentityEntityWithOperator implements Se
    public Mediicinestore() {
    }
    
    public String getIdDevice() {
        return idDevice;

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

@@ -74,7 +74,6 @@ public class Mediicineuser extends UuidIdentityEntityWithOperator implements Ser
    public Mediicineuser() {
    }
    public String getName() {
        return name;
    }

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

@@ -162,7 +162,6 @@ public class Mediicinewarray extends UuidIdentityEntityWithOperator implements S
    public Mediicinewarray() {
    }
    
    public String getType() {
        return type;

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

@@ -35,6 +35,17 @@ public class OutDO implements Serializable {
     */
    private List<DrugDO> drugs;
    public OutDO() {
    }
    public String getUpId() {
        return upId;
    }
    public void setUpId(String upId) {
        this.upId = upId;
    }
    public String getRemark() {
        return remark;
    }
@@ -66,12 +77,4 @@ public class OutDO implements Serializable {
    public void setDrugs(List<DrugDO> drugs) {
        this.drugs = drugs;
    }
    public String getUpId() {
        return upId;
    }
    public void setUpId(String upId) {
        this.upId = upId;
    }
}

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

@@ -9,16 +9,19 @@ public class UpDO implements Serializable {
    /**
     * 状态
     * 设备id
     */
    private String deviceId;
    /**
     * 名称
     * 药品列表，id and qty
     */
    private List<DrugDO> drugs;
    public UpDO() {
    }
    public String getDeviceId() {
        return deviceId;
    }

svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MediicineDeviceDao.java

@@ -9,11 +9,11 @@ public interface MediicineDeviceDao extends PagingAndSortingRepository<Mediicine
    //所有设备
    @Query("select count(1) from Mediicinedevice a ")
    @Query("select count(1) from Mediicinedevice a where a.del = 1 ")
    long countAll();
    //在线设备 离线设备 直接减
    @Query("select count(1) from Mediicinedevice a where a.status = 1 ")
    @Query("select count(1) from Mediicinedevice a where a.del = 1 and a.status = 1 ")
    long countOnline();
}

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

@@ -198,7 +198,20 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "    t.update_user_name as updateUserName,\n" +
                "    t.attr AS attr,\n" +
                "    t.userId AS userId,\n" +
                "    t.shopNo AS shopNo,\n" +
                "    t.hospitalInfo AS hospitalInfo,\n" +
                "    t.birth AS birth,\n" +
                "    t.deptNum AS deptNum,\n" +
                "    t.deptName AS deptName,\n" +
                "    t.doctorNum AS doctorNum,\n" +
                "    t.doctorName AS doctorName,\n" +
                "    t.doctorAdvice AS doctorAdvice,\n" +
                "    t.allergyInfo AS allergyInfo,\n" +
                "    t.info AS info,\n" +
                "    t.socialSecurityCardNum AS socialSecurityCardNum\n" +
                "FROM\n" +
                "    t_mediicine_order AS t where 1=1";

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

@@ -262,7 +262,8 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "    t.update_user_name as updateUserName,\n" +
                "    t.up_num as upNum\n" +
                "FROM\n" +
                "    t_mediicine_stockout AS t where 1=1";
        String conditionSql = "";

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

@@ -368,7 +368,9 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
                "    t.create_user_name AS createUserName,\n" +
                "    t.update_time AS updateTime,\n" +
                "    t.update_user AS updateUser,\n" +
                "    t.update_user_name AS updateUserName\n" +
                "    t.update_user_name AS updateUserName,\n" +
                "    t.layer_no AS layerNo,\n" +
                "    t.wayer_no AS wayerNo\n" +
                "FROM\n" +
                "    t_mediicine_stockrecord_detail AS t where idstockup = '" + idstockup + "'";
        List<Map<String,Object>> list=null;