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

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

@@ -1,11 +1,13 @@
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_medicine_shipment_log")
@@ -30,7 +32,7 @@ public class MedicineShipmentLog extends UuidIdentityEntityWithOperator implemen
    /**
     * 出货时间
     */
    private String outTime;
    private Date outTime;
    /**
     * 层
     */
@@ -125,11 +127,12 @@ public class MedicineShipmentLog extends UuidIdentityEntityWithOperator implemen
        this.status = status;
    }
    public String getOutTime() {
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getOutTime() {
        return outTime;
    }
    public void setOutTime(String outTime) {
    public void setOutTime(Date outTime) {
        this.outTime = outTime;
    }

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

@@ -4,8 +4,10 @@ package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.MedicineShipmentLog;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface MedicineShipmentLogDao extends PagingAndSortingRepository<MedicineShipmentLog, String> {
import java.util.List;
public interface MedicineShipmentLogDao extends PagingAndSortingRepository<MedicineShipmentLog, String> {
    List<MedicineShipmentLog> findMedicineShipmentLogsByOrderId(String orderId);
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineOutEndpoint.java

@@ -137,11 +137,13 @@ public class MedicineOutEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "docNum", required = false) String docNum,
            @ApiParam(name = "userId", value = "用户id")
            @RequestParam(value = "userId", required = true) String userId,
            @ApiParam(name = "receiveState", value = "领料状态")
            @RequestParam(value = "receiveState") String receiveState,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = stockoutService.queryOutListFullInfo(startTime, endTime, replenishEr, docNum, userId, page,size,wechatId);
        JSONObject result = stockoutService.queryOutListFullInfo(startTime, endTime, replenishEr, docNum,receiveState, userId, page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/open/nologin/ServiceNoLoginEndPoint.java

@@ -108,9 +108,11 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
            @ApiParam(name = "shipmentLogId", value = "订单id", required = true)
            @RequestParam(value = "shipmentLogId", required = true) String shipmentLogId,
            @ApiParam(name = "status", value = "目标状态", required = true)
            @RequestParam(value = "status", required = true) String status
            @RequestParam(value = "status", required = true) String status,
            @ApiParam(name = "msg", value = "信息描述", required = false)
            @RequestParam(value = "msg", required = false) String msg
    ) throws Exception {
        JSONObject jsonObject =  orderservice.updateOrderOutStatus(shipmentLogId, status);
        JSONObject jsonObject =  orderservice.updateOrderOutStatus(shipmentLogId, status, msg);
        return success(jsonObject.getString("msg"));
    }

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

@@ -339,6 +339,11 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    }
    /**
     * 通过订单id，获取详细订单信息
     * @param orderId
     * @return
     */
    public JSONObject getOrderDetail(String orderId) {
        JSONObject result = new JSONObject();
        if (StringUtils.isEmpty(orderId)) {
@@ -354,7 +359,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        }
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("drugList", orderdetailDao.getorderdetail(orderId));
        List<MedicineShipmentLog> shipmentLogs = shipmentLogDao.findMedicineShipmentLogsByOrderId(orderId);
        jsonObject.put("outList", (shipmentLogs == null && shipmentLogs.size() == 0) ? null : shipmentLogs);
        jsonObject.put("patientName", mediicineorder.getName());
        jsonObject.put("patientSex", mediicineorder.getSex());
@@ -362,6 +368,13 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        jsonObject.put("patientAge", mediicineorder.getAge());
        jsonObject.put("patientContact", mediicineorder.getContact());
        jsonObject.put("patientAddress", mediicineorder.getAddress());
        jsonObject.put("prescribeNum", mediicineorder.getPrescribeNum());
        jsonObject.put("orderType", mediicineorder.getOrderType());
        jsonObject.put("prescribeTime", mediicineorder.getPrescribeTime());
        jsonObject.put("amount", mediicineorder.getAmount());
        jsonObject.put("socialinsurPayment", mediicineorder.getSocialinsurPayment());
        jsonObject.put("orderState", mediicineorder.getOrderState());
        jsonObject.put("infoAccess", mediicineorder.getInfoAccess());
        jsonObject.put("device",StringUtils.isEmpty(mediicineorder.getShippingEqu()) ?  null : deviceDao.findOne(mediicineorder.getShippingEqu()));
        result.put("msg", jsonObject);
        result.put("response", ConstantUtils.SUCCESS);
@@ -687,7 +700,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
     * @param status
     * @return
     */
    public JSONObject updateOrderOutStatus(String shipmentLogId, String status) {
    public JSONObject updateOrderOutStatus(String shipmentLogId, String status, String msg) {
        JSONObject result = new JSONObject();
        if (shipmentLogId == null || StringUtils.isEmpty(shipmentLogId)) {
            result.put("msg", "shipmentLogId is null or empty");
@@ -708,7 +721,12 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            return result;
        }
        medicineShipmentLog.setStatus(status);
        if ("2".equals(status)) {
            medicineShipmentLog.setOutTime(new Date());
        }
        if (!StringUtils.isEmpty(msg)) {
            medicineShipmentLog.setDescription(msg);
        }
        shipmentLogDao.save(medicineShipmentLog);
        //表示已出货

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

@@ -249,7 +249,7 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
    //orderNum, equNum, contact, startTime, endTime, sellState, orderState, dispensingWindow
    public JSONObject queryOutListFullInfo(
                                             String startTime, String endTime, String replenishEr,
                                             String docNum, String userId, int page, int size,String wechatId) throws Exception {
                                             String docNum, String receiveState, String userId, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        UserDO user = userDao.findOne(userId);
        RoleDO role = roleDao.findOne(user.getRoleId());
@@ -334,6 +334,9 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
            conditionSql += "  AND  t.doc_time >= '" + startTime +"'" +
                    " AND t.doc_time <= '" + endTime + "'";
        }
        if (!StringUtils.isEmpty(receiveState)){
            conditionSql += " and t.receive_state = '" + receiveState + "'";
        }
        if (!StringUtils.isEmpty(replenishEr)){
            conditionSql += " and t.replenish_er = '" + replenishEr + "'";
        }

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

@@ -85,6 +85,7 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
            mediicinestockup.setCommunity(mediicinedevice.getBelongCommunity());
            mediicinestockup.setDocTime(new Date());
            mediicinestockup.setDocNum(String.valueOf(System.currentTimeMillis()));
            mediicinestockup.setReplenishCate(String.valueOf(list.size()));
            mediicinestockup.setReplenishEqu(upDO.getDeviceId());
            mediicinestockup.setState("1");
            mediicinestockup.setReplenishInventory(String.valueOf(upDO.getDrugs().stream().mapToInt(DrugDO::getQty).sum()));