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

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

@@ -0,0 +1,48 @@
package com.yihu.jw.entity.a1entity;
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")
public class MedicineDeviceDelivery extends UuidIdentityEntityWithOperator implements Serializable {
    /**
     * 所属社区
     */
    private String belongCommunity;
    /**
     * 详细投放地址
     */
    private String address;
    public MedicineDeviceDelivery() {
    }
    public String getBelongCommunity() {
        return belongCommunity;
    }
    public void setBelongCommunity(String belongCommunity) {
        this.belongCommunity = belongCommunity;
    }
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -141,6 +141,7 @@ public class BaseRequestMapping {
        public static final String DOCINFO  = "/docInfo";
        public static final String CREATE  = "/create";
        public static final String getOrderDetailListById  = "/getOrderDetailListById";
        public static final String getOrderDetailById  = "/getOrderDetailById";
        public static final String sumamount  = "/sumamount";
        public static final String getcount  = "/getcount";
        public static final String getsumquantity  = "/getsumquantity";
@@ -168,6 +169,8 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/baseDevice";
        public static final String DOCINFO  = "/docInfo";
        public static final String CREATE  = "/create";
        public static final String CREATEADDRESS  = "/createAddress";
        public static final String DELETEADDRESS  = "/deleteAddress";
        public static final String updateCommunity  = "/updateCommunity";
        public static final String updateAddressInfo  = "/updateAddressInfo";
        public static final String UPDATESTATUS  = "/updateStatus";
@@ -176,6 +179,7 @@ public class BaseRequestMapping {
        public static final String getDeviceListByUserId  = "/getDeviceListByUserId";
        public static final String getUserListByDeviceId  = "/getUserListByDeviceId";
        public static final String getOutOfStockDeviceList  = "/getOutOfStockDeviceList";
        public static final String getDevicesDeliveryList  = "/getDevicesDeliveryList";
        public static final String getDetialOutOfStock  = "/getDetialOutOfStock";
        public static final String getDevInventory  = "/getDevInventory";
        public static final String countall  = "/countall";

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

@@ -0,0 +1,11 @@
package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.MedicineDeviceDelivery;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface MedicineDeviceDeliveryDao extends PagingAndSortingRepository<MedicineDeviceDelivery, String> {
}

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

@@ -10,7 +10,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
public interface MediicineorderDao extends PagingAndSortingRepository<Mediicineorder, Long>, JpaSpecificationExecutor<Mediicineorder> {
public interface MediicineorderDao extends PagingAndSortingRepository<Mediicineorder, String>, JpaSpecificationExecutor<Mediicineorder> {
    //统计时间段的销售额
    @Query("select sum(a.amount) from Mediicineorder a where a.prescribeTime >=?1 and a.prescribeTime<=?2")

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.a3service.MedicinedeviceService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.MedicineDeviceDelivery;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.entity.a1entity.Mediicineuser;
@@ -55,6 +56,21 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
        return success(jsonObject.getString("msg"));
    }
    @PostMapping(value = BaseRequestMapping.BaseDevice.CREATEADDRESS)
    @ApiOperation(value = "新增设备投放地址")
    public Envelop createAddress(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        JSONObject jsonObject = null;
        String str = deviceService.createDeviceAddress(jsonData);
        jsonObject = JSONObject.parseObject(str);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("response"));
    }
    @PostMapping(value = BaseRequestMapping.BaseDevice.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
@@ -64,6 +80,15 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseDevice.DELETEADDRESS)
    @ApiOperation(value = "删除设备投放地址")
    public Envelop deleteAddress(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        return success(deviceService.deleteAddress(ids).getString("response"));
    }
    @PostMapping(value = BaseRequestMapping.BaseDevice.UPDATE)
    @ApiOperation(value = "更新设备信息")
    public Envelop update(
@@ -81,7 +106,7 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseRequestMapping.BaseDevice.updateAddressInfo)
    @ApiOperation(value = "设备分配投放地址")
    public Envelop updateAddressInfo(
            @ApiParam(name = "deviceIds", value = "设备Id", required = true)
            @ApiParam(name = "deviceIds", value = "设备Ids", required = true)
            @RequestParam(value = "deviceIds", required = true) String deviceIds,
            @ApiParam(name = "deliveryAddress", value = "投放地址", required = true)
            @RequestParam(value = "deliveryAddress", required = true) String deliveryAddress) throws Exception {
@@ -317,5 +342,13 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
        JSONObject jsonObject = deviceService.getDevInventory(belongCommunity, deviceId, netStatus);
        return success(jsonObject.getJSONArray("msg"));
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.getDevicesDeliveryList)
    @ApiOperation(value = "设备投放地址列表" , notes="获取设备投放地址列表")
    public ListEnvelop getDevicesDelivery(
            @ApiParam(name = "belongCommunity", value = "所属社区", required = true)
            @RequestParam(value = "belongCommunity", required = true) String belongCommunity) throws Exception {
        return success(deviceService.getDevicesDelivery(belongCommunity));
    }
}

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

@@ -197,6 +197,15 @@ public class MedicineOrderEndpoint extends EnvelopRestEndpoint {
    }
    @GetMapping(value = BaseRequestMapping.BaseOrder.getOrderDetailById)
    @ApiOperation(value = "获取订货药品信息【订单明细】" , notes="获取药品信息")
    public Envelop getOrderDetailById(
            @ApiParam(name = "orderId", value = "订单号", required = true)
            @RequestParam String orderId) throws Exception {
        JSONObject baseDoctors = orderservice.getOrderDetail(orderId);
        return success(baseDoctors.getJSONObject("msg"));
    }

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

@@ -12,6 +12,7 @@ import com.yihu.jw.entity.patient.Message;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.elasticsearch.common.recycler.Recycler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -243,6 +244,35 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    }
    public JSONObject getOrderDetail(String orderId) {
        JSONObject result = new JSONObject();
        if (StringUtils.isEmpty(orderId)) {
            result.put("msg", "orderId is empty");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        Mediicineorder mediicineorder = orderDao.findOne(orderId);
        if (mediicineorder == null) {
            result.put("msg", "order doesn't exist");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("drugList", orderdetailDao.getorderdetail(orderId));
        jsonObject.put("patientName", mediicineorder.getName());
        jsonObject.put("patientSex", mediicineorder.getSex());
        jsonObject.put("patientIdNum", mediicineorder.getIdNum());
        jsonObject.put("patientAge", mediicineorder.getAge());
        jsonObject.put("patientContact", mediicineorder.getContact());
        jsonObject.put("patientAddress", mediicineorder.getAddress());
        jsonObject.put("device",StringUtils.isEmpty(mediicineorder.getShippingEqu()) ?  null : deviceDao.findOne(mediicineorder.getShippingEqu()));
        result.put("msg", jsonObject);
        result.put("response", ConstantUtils.SUCCESS);
        return result;
    }
    /**
     * 获取时间范围内的订单销售额
     * @param beg

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

@@ -310,6 +310,11 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
    }
    /**
     * 获取出库单详情
     * @param idstockout
     * @return
     */
    public JSONObject getOutDetailById(String idstockout) {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(idstockout)){

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

@@ -4,14 +4,17 @@ package com.yihu.jw.base.service.a3service;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MedicineDeviceDeliveryDao;
import com.yihu.jw.base.dao.a2dao.MediicineDeviceDao;
import com.yihu.jw.base.dao.a2dao.MediicineDeviceUserDao;
import com.yihu.jw.base.dao.a2dao.MediicinedrugsDao;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.MedicineDeviceDelivery;
import com.yihu.jw.entity.a1entity.MediicineDeviceUser;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.restmodel.ResponseContant;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
@@ -38,6 +41,10 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    @Autowired
    private MediicineDeviceUserDao deviceUserDao;
    @Autowired
    private MedicineDeviceDeliveryDao deviceDeliveryDao;
    @Autowired
    private ObjectMapper objectMapper;
@@ -90,6 +97,69 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        return result.toJSONString();
    }
    @Transactional(rollbackFor = Exception.class)
    public String createDeviceAddress(String jsonData) {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(jsonData)){
            result.put("msg","jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        JSONObject device = JSONObject.parseObject(jsonData);
        if(null == device){
            result.put("msg","parameter delivery of jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        //判断设备id是否存在
//        if(StringUtils.isEmpty(device.getString("id"))){
//            result.put("msg","parameter id for device is null when update device");
//            result.put("response", ConstantUtils.FAIL);
//            return result.toJSONString();
//        }
        MedicineDeviceDelivery deviceDelivery = null;
        try {
            deviceDelivery = objectMapper.readValue(device.toJSONString(), MedicineDeviceDelivery.class);
        } catch (IOException e) {
            result.put("msg", "convert deviceDelivery jsonObject to BaseDeviceDO failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        } catch (Exception e) {
            result.put("msg", "convert deviceDelivery birth failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        deviceDeliveryDao.save(deviceDelivery);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",deviceDelivery);
        return result.toJSONString();
    }
    /**
     * 删除投放地址
     * @param ids
     * @return
     */
    public JSONObject deleteAddress(String ids) {
        JSONObject result = new JSONObject();
        if (StringUtils.isEmpty(ids)) {
            result.put("response",ConstantUtils.FAIL);
            result.put("msg","ids is empty");
            return result;
        }
        for (String id : ids.split(",")) {
            if (!StringUtils.isEmpty(id)) {
                deviceDeliveryDao.delete(id);
            }
        }
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",ConstantUtils.SUCCESS);
        return result;
    }
    /**
     * 修改设备
     * @param jsonData
@@ -165,6 +235,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        for (String deviceId : deviceIds.split(",")) {
            if(!StringUtils.isEmpty(deviceId)){
                Mediicinedevice mediicinedevice = deviceDao.findOne(deviceId);
@@ -1114,5 +1185,24 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        result.put("msg",list);
        return result;
    }
    //getDevicesDelivery
    public List<Map<String,Object>> getDevicesDelivery(String belongCommunity){
        String sql = "SELECT\n" +
                "    t.id AS id,\n" +
                "    t.belong_community AS belongCommunity,\n" +
                "    t.address AS address,\n" +
                "    t.create_time AS createTime,\n" +
                "    t.create_user AS createUser,\n" +
                "    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" +
                "FROM\n" +
                "    t_medicine_device_delivery AS t \n" +
                "WHERE t.belong_community = '" + belongCommunity + "'";
        List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql);
        return list;
    }
}