Merge branch 'medicare' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -202,6 +202,52 @@ public class Mediicinedrugs extends UuidIdentityEntityWithOperator implements Se
        this.orgCode = orgCode;
    }
    /**
     * 药品SKU
     */
    private String drugSku;
    /**
     * 药品数量
     */
    private String drugNum;
    /**
     * 使用量
     */
    private String useNum;
    /**
     * 使用方法
     */
    private String useWay;
    /**
     * 使用频率
     */
    private String useRate;
    /**
     * 每次使用剂量
     */
    private String useDose;
    /**
     * 补充方法
     */
    private String useWayAdd;
    /**
     * 机构
     */
    private String orgCode;
    /**
     * 机构名称
     */
    private String orgName;
    public Mediicinedrugs() {
    }
@@ -444,4 +490,76 @@ public class Mediicinedrugs extends UuidIdentityEntityWithOperator implements Se
    public void setBrand(String brand) {
        this.brand = brand;
    }
    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 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 getUseWayAdd() {
        return useWayAdd;
    }
    public void setUseWayAdd(String useWayAdd) {
        this.useWayAdd = useWayAdd;
    }
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
}

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

@@ -0,0 +1,181 @@
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_mediicine_stockup_detail")
public class Mediicinestockrecorddetail extends UuidIdentityEntityWithOperator implements Serializable {
    /**
     * idstockup
     */
    private String idstockup;
    /**
     * orderno
     */
    private String orderNo;
    /**
     * 药品信息
     */
    private String medInfo;
    /**
     * 售价
     */
    private Double price;
    /**
     * 数量
     */
    private String quantity;
    /**
     * 批次号
     */
    private String batchNum;
    /**
     * cargoinfo
     */
    private String cargoInfo;
    /**
     * drugcode
     */
    private String drugCode;
    /**
     * 生产日期
     */
    private Date proDate;
    /**
     * 有效期至
     */
    private Date expDate;
    /**
     * 商品图
     */
    private String productPic;
    private String layerNo;
    private String wayerNo;
    public Mediicinestockrecorddetail() {
    }
    public String getIdstockup() {
        return idstockup;
    }
    public void setIdstockup(String idstockup) {
        this.idstockup = idstockup;
    }
    public String getOrderNo() {
        return orderNo;
    }
    public void setOrderNo(String orderNo) {
        this.orderNo = orderNo;
    }
    public String getMedInfo() {
        return medInfo;
    }
    public void setMedInfo(String medInfo) {
        this.medInfo = medInfo;
    }
    public Double getPrice() {
        return price;
    }
    public void setPrice(Double price) {
        this.price = price;
    }
    public String getQuantity() {
        return quantity;
    }
    public void setQuantity(String quantity) {
        this.quantity = quantity;
    }
    public String getBatchNum() {
        return batchNum;
    }
    public void setBatchNum(String batchNum) {
        this.batchNum = batchNum;
    }
    public String getCargoInfo() {
        return cargoInfo;
    }
    public void setCargoInfo(String cargoInfo) {
        this.cargoInfo = cargoInfo;
    }
    public String getDrugCode() {
        return drugCode;
    }
    public void setDrugCode(String drugCode) {
        this.drugCode = drugCode;
    }
    public Date getProDate() {
        return proDate;
    }
    public void setProDate(Date proDate) {
        this.proDate = proDate;
    }
    public Date getExpDate() {
        return expDate;
    }
    public void setExpDate(Date expDate) {
        this.expDate = expDate;
    }
    public String getProductPic() {
        return productPic;
    }
    public void setProductPic(String productPic) {
        this.productPic = productPic;
    }
    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;
    }
}

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

@@ -51,9 +51,11 @@ public class BaseRequestMapping {
        public static final String DOCINFO  = "/docInfo";
        public static final String CREATE  = "/create";
        public static final String getUpDetailListById  = "/getUpDetailListById";
        public static final String getRecordDetailListById  = "/getRecordDetailListById";
        public static final String getOrgListByTown  = "/getOrgListByTown";
        public static final String enableOrDis  = "/enableOrDis";
        public static final String docFullInfo  = "/docFullInfo";
        public static final String getRecordByPage  = "/getRecordByPage";
        public static final String docOrgDutyTreeInfo  = "/docOrgDutyTreeInfo";
        public static final String docOrgDeptTreeInfo  = "/docOrgDeptTreeInfo";
        public static final String getDoctorListByDept  = "/getDoctorListByDept";
@@ -78,6 +80,7 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/baseOut";
        public static final String DOCINFO  = "/docInfo";
        public static final String CREATE  = "/create";
        public static final String changeReceiveState  = "/changeReceiveState";
        public static final String getOutDetailListById  = "/getOutDetailListById";
        public static final String getOrgListByTown  = "/getOrgListByTown";
        public static final String enableOrDis  = "/enableOrDis";
@@ -105,6 +108,9 @@ 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 sumamount  = "/sumamount";
        public static final String getcount  = "/getcount";
        public static final String getsumquantity  = "/getsumquantity";
        public static final String enableOrDis  = "/enableOrDis";
        public static final String docFullInfo  = "/docFullInfo";
        public static final String docOrgDutyTreeInfo  = "/docOrgDutyTreeInfo";
@@ -123,12 +129,16 @@ public class BaseRequestMapping {
    }
    /**
     * 药柜设备
     * 设备
     */
    public static class BaseDevice extends Basic {
        public static final String PREFIX  = "/baseDevice";
        public static final String DOCINFO  = "/docInfo";
        public static final String CREATE  = "/create";
        public static final String getDeviceListByUserId  = "/getDeviceListByUserId";
        public static final String countall  = "/countall";
        public static final String countOnline  = "/countOnline";
        public static final String getDevicesByMoreContent  = "/getDevicesByMoreContent";
        public static final String getOrderDetailListById  = "/getOrderDetailListById";
        public static final String enableOrDis  = "/enableOrDis";
        public static final String docFullInfo  = "/docFullInfo";
@@ -155,6 +165,7 @@ public class BaseRequestMapping {
        public static final String DOCINFO  = "/docInfo";
        public static final String CREATE  = "/create";
        public static final String getDrugDetailListById  = "/getDrugDetailListById";
        public static final String getOrgListByTown  = "/getOrgListByTown";
        public static final String enableOrDis  = "/enableOrDis";
        public static final String docFullInfo  = "/docFullInfo";

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

@@ -5,9 +5,12 @@ 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.Mediicinedevice;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.entity.base.area.BaseCityDO;
import com.yihu.jw.restmodel.base.area.BaseCityVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
@@ -95,16 +98,96 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
    @ApiOperation(value = "获取设备总数量", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/countall")
    public Long countall(){
        return deviceService.countAll();
    @GetMapping(value = BaseRequestMapping.BaseDevice.getDevicesByMoreContent)
    @ApiOperation(value = "通过搜索内容查询设备列表" , notes="获取设备列表")
    public ListEnvelop<Mediicinedevice> getDevicesByMoreContent(
            @ApiParam(name = "content", value = "搜索内容")
            @RequestParam(value = "content", required = false) String content,
            @ApiParam(name = "equClass", value = "设备分类")
            @RequestParam(value = "equClass", required = false) String equClass,
            @ApiParam(name = "belongCommunity", value = "所属")
            @RequestParam(value = "belongCommunity", required = false) String belongCommunity,
            @ApiParam(name = "networkStatus", value = "网络状态")
            @RequestParam(value = "networkStatus", required = false) String networkStatus,
            @ApiParam(name = "saleStatus", value = "销售状态")
            @RequestParam(value = "saleStatus", required = false) String saleStatus,
            @ApiParam(name = "machineCode", value = "机器编码")
            @RequestParam(value = "machineCode", required = false) String machineCode,
            @ApiParam(name = "deviceType", value = "设备型号")
            @RequestParam(value = "deviceType", required = false) String deviceType,
            @ApiParam(name = "equArea", value = "设备区域")
            @RequestParam(value = "equArea", required = false) String equArea,
            @ApiParam(name = "del", value = "del")
            @RequestParam(value = "del", required = false) String del,
            @ApiParam(name = "status", value = "状态")
            @RequestParam(value = "status", required = false) String status,
            @ApiParam(name = "deliveryAddress", value = "投放地址")
            @RequestParam(value = "deliveryAddress", required = false) String deliveryAddress) throws Exception {
        JSONObject result = deviceService.getDevicesByMoreContent(content, equClass, belongCommunity, networkStatus,saleStatus, machineCode, deviceType, equArea, del, status, deliveryAddress, wechatId);
        List<Mediicinedevice> list = JSONObject.parseArray(result.getJSONArray("msg").toJSONString(), Mediicinedevice.class);
        return success(list, Mediicinedevice.class);
    }
    @ApiOperation(value = "获取在线设备总数量", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/countOnline")
    public Long countOnline(){
        return deviceService.countOnline();
    @GetMapping(value = BaseRequestMapping.BaseDevice.getDeviceListByUserId)
    @ApiOperation(value = "通过人员id获取设备列表" , notes="获取设备列表")
    public ListEnvelop<Mediicinedevice> getDeviceListByUserId(
            @ApiParam(name = "userId", value = "人员id", required = true)
            @RequestParam(value = "userId") String userId) throws Exception {
        JSONObject jsonObject = deviceService.getDevices(userId);
        List<Mediicinedevice> list = JSONObject.parseArray(jsonObject.getJSONArray("msg").toJSONString(), Mediicinedevice.class);
        return success(list, Mediicinedevice.class);
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.FINDBYID)
    @ApiOperation(value = "获取设备信息" , notes="获取设备信息")
    public Envelop getdevicedetail(
            @ApiParam(name = "deviceId", value = "设备id", required = true)
            @RequestParam(value = "deviceId") String deviceId) throws Exception {
        JSONObject jsonObject = deviceService.getOneDeviceInfo(deviceId);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("msg"));
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.countall)
    @ApiOperation(value = "获取设备总数量" , notes="参数未添加通过数据区域查询获取")
    public Envelop countall() throws Exception {
        JSONObject jsonObject = deviceService.countAll();
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("msg"));
    }
//    @ApiOperation(value = "获取设备总数量", notes="参数未添加通过数据区域查询获取")
//    @GetMapping("/countall")
//    public Long countall(){
//        return deviceService.countAll();
//    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.countOnline)
    @ApiOperation(value = "获取在线设备总数量" , notes="参数未添加通过数据区域查询获取")
    public Envelop countOnline() throws Exception {
        JSONObject jsonObject = deviceService.countOnline();
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("msg"));
    }
//    @ApiOperation(value = "获取在线设备总数量", notes="参数未添加通过数据区域查询获取")
//    @GetMapping("/countOnline")
//    public Long countOnline(){
//        return deviceService.countOnline();
//    }
}

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

@@ -106,33 +106,83 @@ public class MedicineOrderEndpoint extends EnvelopRestEndpoint {
//------合计类
//    @GetMapping(value = BaseRequestMapping.BaseOrder.docFullInfo)
//    @ApiOperation(value = "获得时间段内的销售金额", notes="获得时间段内的销售金额")
    @GetMapping("/sumamount")
    @ApiImplicitParams({
            @ApiImplicitParam(name="beg",value="开始日期 yyyy-mm-dd",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="end",value="结束日期 yyyy-mm-dd",dataType="string", paramType = "query")})
    public float sumamount(String beg, String end){
        return orderservice.sumamount(beg, end);
    @PostMapping(value = BaseRequestMapping.BaseOrder.sumamount)
    @ApiOperation(value = "获取某个时间段内的订单销售额")
    public Envelop sumamount(
            @ApiParam(name = "beg", value = "开始日期", required = false, defaultValue = "")
            @RequestParam(value = "beg",required = false) String beg,
            @ApiParam(name = "end", value = "结束日期", required = false, defaultValue = "")
            @RequestParam(value = "end",required = false) String end) throws Exception {
            JSONObject jsonObject = null;
            jsonObject = orderservice.sumamount(beg, end);
            if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
                return failed(jsonObject.getString("msg"));
            }
            return success(jsonObject.getString("msg"));
    }
    @ApiOperation(value = "获取订单数量", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/getcount")
    @ApiImplicitParams({
            @ApiImplicitParam(name="beg",value="开始日期 yyyy-mm-dd",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="end",value="结束日期 yyyy-mm-dd",dataType="string", paramType = "query")})
    public float getcount(String beg, String end){
        return orderservice.getcount(beg, end);
//    @GetMapping("/sumamount")
//    @ApiImplicitParams({
//            @ApiImplicitParam(name="beg",value="开始日期 yyyy-mm-dd",dataType="string", paramType = "query"),
//            @ApiImplicitParam(name="end",value="结束日期 yyyy-mm-dd",dataType="string", paramType = "query")})
//    public float sumamount(String beg, String end){
//        return orderservice.sumamount(beg, end);
//    }
    @PostMapping(value = BaseRequestMapping.BaseOrder.getcount)
    @ApiOperation(value = "获取某个时间段内的订单数量")
    public Envelop getcount(
            @ApiParam(name = "beg", value = "开始日期", required = false, defaultValue = "")
            @RequestParam(value = "beg",required = false) String beg,
            @ApiParam(name = "end", value = "结束日期", required = false, defaultValue = "")
            @RequestParam(value = "end",required = false) String end){
        JSONObject jsonObject = null;
        jsonObject = orderservice.getcount(beg, end);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("msg"));
    }
    @ApiOperation(value = "获时间段内的取药品销售数量合计", notes="获取处方订单信息")
    @GetMapping("/getsumquantity")
    @ApiImplicitParams({
            @ApiImplicitParam(name="beg",value="开始日期 yyyy-mm-dd",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="end",value="结束日期 yyyy-mm-dd",dataType="string", paramType = "query")})
    public float getsumquantity(String beg, String end){
        return orderservice.getsumquantity(beg, end);
//    @ApiOperation(value = "获取订单数量", notes="参数未添加通过数据区域查询获取")
//    @GetMapping("/getcount")
//    @ApiImplicitParams({
//            @ApiImplicitParam(name="beg",value="开始日期 yyyy-mm-dd",dataType="string", paramType = "query"),
//            @ApiImplicitParam(name="end",value="结束日期 yyyy-mm-dd",dataType="string", paramType = "query")})
//    public float getcount(String beg, String end){
//        return orderservice.getcount(beg, end);
//    }
    @PostMapping(value = BaseRequestMapping.BaseOrder.getsumquantity)
    @ApiOperation(value = "获时间段内的取药品销售数量合计")
    public Envelop getsumquantity(
            @ApiParam(name = "beg", value = "开始日期", required = false, defaultValue = "")
            @RequestParam(value = "beg",required = false) String beg,
            @ApiParam(name = "end", value = "结束日期", required = false, defaultValue = "")
            @RequestParam(value = "end",required = false) String end) throws Exception{
        JSONObject jsonObject = null;
        jsonObject = orderservice.getsumquantity(beg, end);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("msg"));
    }
//    @ApiOperation(value = "获时间段内的取药品销售数量合计", notes="获取处方订单信息")
//    @GetMapping("/getsumquantity")
//    @ApiImplicitParams({
//            @ApiImplicitParam(name="beg",value="开始日期 yyyy-mm-dd",dataType="string", paramType = "query"),
//            @ApiImplicitParam(name="end",value="结束日期 yyyy-mm-dd",dataType="string", paramType = "query")})
//    public float getsumquantity(String beg, String end){
//        return orderservice.getsumquantity(beg, end);
//    }
//---------操作类

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

@@ -75,6 +75,21 @@ public class MedicineOutEndpoint extends EnvelopRestEndpoint {
    }
    @PostMapping(value = BaseRequestMapping.BaseOut.changeReceiveState)
    @ApiOperation(value = "修改领取状态")
    public Envelop changeReceiveState(
            @ApiParam(name = "outId", value = "出库单id")
            @RequestParam(value = "outId", required = true) String outId,
            @ApiParam(name = "state", value = "需要修改的状态")
            @RequestParam(value = "state", required = true) String state) throws Exception {
        String str = stockoutService.changeReceiveState(outId, state);
        JSONObject jsonObject = JSONObject.parseObject(str);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("response"));
    }
    @GetMapping(value = BaseRequestMapping.BaseOut.docFullInfo)
    @ApiOperation(value = "获取出货单信息基础信息列表")
    public PageEnvelop getOutFullInfolist(

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

@@ -5,9 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.a3service.MedicineStockUpService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.Mediicinestockoutdetail;
import com.yihu.jw.entity.a1entity.Mediicinestockup;
import com.yihu.jw.entity.a1entity.Mediicinestockupdetail;
import com.yihu.jw.entity.a1entity.*;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
@@ -144,4 +142,40 @@ public class MedicineUpEndpoint extends EnvelopRestEndpoint {
//
//    }
    //补货记录-----------------------------
    @GetMapping(value = BaseRequestMapping.BaseUp.getRecordByPage)
    @ApiOperation(value = "获取补货记录基础信息列表")
    public PageEnvelop getRecordByPage(
            @ApiParam(name = "community", value = "社区")
            @RequestParam(value = "community", required = false) String community,
            @ApiParam(name = "equId", value = "所属设备")
            @RequestParam(value = "equId",required = false) String equId,
            @ApiParam(name = "equName", value = "设备名称")
            @RequestParam(value = "equName",required = false) String equName,
            @ApiParam(name = "equCode", value = "设备编号")
            @RequestParam(value = "equCode", required = false) String equCode,
            @ApiParam(name = "replenishEr", value = "补货员")
            @RequestParam(value = "replenishEr", required = false) String replenishEr,
            @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 = stockupService.getRecordByPage(community, equId, equName,equCode,replenishEr,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
    @GetMapping(value = BaseRequestMapping.BaseUp.getRecordDetailListById)
    @ApiOperation(value = "补货记录id获取补货记录清单信息" , notes="获取补货记录详细信息")
    public ListEnvelop<Mediicinestockrecorddetail> getRecordDetail  (
            @ApiParam(name = "recordId", value = "补货记录id", required = true)
            @RequestParam(value = "recordId") String recordId) throws Exception {
        JSONObject jsonObject = stockupService.getRecordDetail(recordId);
        List<Mediicinestockrecorddetail> list = JSONObject.parseArray(jsonObject.getJSONArray("msg").toJSONString(), Mediicinestockrecorddetail.class);
        return success(list, Mediicinestockrecorddetail.class);
    }
    //补货记录-----------------------------
}

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

@@ -181,8 +181,7 @@ public class MedicineDrugsService extends BaseJpaService<Mediicinedrugs, Mediici
        String nameOrIdcardValue = null == nameOrIdcard ? "" : "%" + nameOrIdcard + "%";
        int start = 0 == page ? page++ : (page - 1) * size;
        int end = 0 == size ? 15 : page * size;*/
        String sql="SELECT\n" +
        String sql = "SELECT\n" +
                "    t.id as id,\n" +
                "    t.approval_num as approvalNum,\n" +
                "    t.barcode as barcode,\n" +
@@ -212,9 +211,19 @@ public class MedicineDrugsService extends BaseJpaService<Mediicinedrugs, 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.drug_sku as drugSku,\n" +
                "    t.drug_num as drugNum,\n" +
                "    t.use_num as useNum,\n" +
                "    t.use_way as useWay,\n" +
                "    t.use_rate as useRate,\n" +
                "    t.use_dose as useDose,\n" +
                "    t.use_way_add as useWayAdd,\n" +
                "    t.org_code as orgCode,\n" +
                "    t.org_name as orgName\n" +
                "FROM\n" +
                "    t_mediicine_drugs AS t where 1=1\n";
                "    t_mediicine_drugs AS t where 1=1";
        String conditionSql = "";
        if (!StringUtils.isEmpty(state)){
            conditionSql += " and t.state = " + state;

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

@@ -133,6 +133,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        result.put("msg",mediicineorder);
        return result.toJSONString();
    }
    //orderNum, equNum, contact, startTime, endTime, sellState, orderState, dispensingWindow
    public JSONObject queryOrderListFullInfo(String orderNum, String equNum, String contact,
                                            String startTime, String endTime, String sellState,
@@ -238,29 +240,61 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
      return   orderdetailDao.getorderdetail(idOrder);
    }
    //时间范围内的订单销售额
    public  float sumamount(String beg, String end)
    {
    /**
     * 获取时间范围内的订单销售额
     * @param beg
     * @param end
     * @return
     */
    public  JSONObject sumamount(String beg, String end) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "select sum(t.amount) from t_mediicine_order t where t.prescribe_time >= '" + beg + "' and t.prescribe_time <= '" + end + "'";
        int count = jdbcTemplate.queryForObject(sql,Integer.class);
        Date startDate = DateUtil.strToDateShort(beg);
        Date endDate = DateUtil.strToDateShort(end);
        return orderDao.getsumamount(startDate, endDate);
        result.put("response",ConstantUtils.SUCCESS);
//        result.put("msg", orderDao.getsumamount(startDate, endDate));
        result.put("msg", count);
        return result;
    }
    //时间范围内的订单数量
    public  float getcount(String beg, String end) {
            Date startDate = DateUtil.strToDateShort(beg);
            Date endDate = DateUtil.strToDateShort(end);
            return orderDao.getsumamount(startDate, endDate);
        }
    /**
     * 获取时间范围内的订单数量
     * @param beg
     * @param end
     * @return
     */
    public JSONObject getcount(String beg, String end) {
        JSONObject result = new JSONObject();
        Date startDate = DateUtil.strToDateShort(beg);
        Date endDate = DateUtil.strToDateShort(end);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg", orderDao.getsumamount(startDate, endDate));
        return result;
    }
            //订单明细中的总药品销量
    public  float getsumquantity(String beg, String end) {
    public  JSONObject getsumquantity(String beg, String end) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "select sum(t.quantity) from t_mediicine_order_detail t where t.prescribe_time >= '" + beg + "' and t.prescribe_time <= '" + end + "'";
        int count = jdbcTemplate.queryForObject(sql,Integer.class);
        Date startDate = DateUtil.strToDateShort(beg);
        Date endDate = DateUtil.strToDateShort(end);
        return orderdetailDao.getsumquantity(startDate, endDate);
        result.put("response",ConstantUtils.SUCCESS);
//        result.put("msg", orderDao.getsumamount(startDate, endDate));
        result.put("msg", count);
        return result;
    }
            //订单明细中的总药品销量
//    public  float getsumquantity(String beg, String end) {
//        Date startDate = DateUtil.strToDateShort(beg);
//        Date endDate = DateUtil.strToDateShort(end);
//        return orderdetailDao.getsumquantity(startDate, endDate);
//    }
    //订单明细中的总药品销量
    public  List<Mediicinestockoutdetail> getoutdetail(String idorder) {

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

@@ -12,6 +12,7 @@ import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import com.yihu.jw.entity.a1entity.Mediicinestockout;
import com.yihu.jw.entity.a1entity.Mediicinestockoutdetail;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
@@ -128,6 +129,33 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
        result.put("msg",mediicineorder);
        return result.toJSONString();
    }
    /**
     * 修改出货单的领取状态
     * @param outId
     * @param state
     * @return
     */
    public String changeReceiveState(String outId,String state){
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(outId) || StringUtils.isEmpty(state)){
            result.put("msg","parameter outId or state is null");
            result.put("response",ConstantUtils.FAIL);
            return result.toJSONString();
        }
        Mediicinestockout mediicinestockout = outDao.findOne(outId);
        if( null == mediicinestockout ){
            result.put("msg","out not exist for id:" + outId);
            result.put("response",ConstantUtils.FAIL);
            return result.toJSONString();
        }
        mediicinestockout.setReceiveState(state);
        this.save(mediicinestockout);
        result.put("response",ConstantUtils.SUCCESS);
        return result.toJSONString();
    }
    //orderNum, equNum, contact, startTime, endTime, sellState, orderState, dispensingWindow
    public JSONObject queryOutListFullInfo(
                                             String startTime, String endTime, String replenishEr,

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

@@ -10,6 +10,7 @@ import com.yihu.jw.base.dao.a2dao.MediicinestockupdetailDao;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.Mediicinestockout;
import com.yihu.jw.entity.a1entity.Mediicinestockrecorddetail;
import com.yihu.jw.entity.a1entity.Mediicinestockup;
import com.yihu.jw.entity.a1entity.Mediicinestockupdetail;
import com.yihu.jw.utils.hibernate.HibenateUtils;
@@ -189,6 +190,9 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
        return result;
    }
    //订单明细
    public List<Mediicinestockup> getuplist() {
        return upDao.getlist();
@@ -197,4 +201,108 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
    public List<Mediicinestockupdetail> getUpDetail(String idstockup) {
        return updetailDao.getoutdetail(idstockup);
    }
    //补货记录
    public JSONObject getRecordByPage(
            String community, String equId, String equName,
            String equCode, String replenishEr, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "SELECT\n" +
                "    t.id as id,\n" +
                "    t.community as community,\n" +
                "    t.doc_time as docTime,\n" +
                "    t.remark as remark,\n" +
                "    t.replenish_cate as replenishCate,\n" +
                "    t.replenish_equ as replenishEqu,\n" +
                "    t.replenish_er as replenishEr,\n" +
                "    t.replenish_inventory as replenishInventory,\n" +
                "    t.state as state,\n" +
                "    t.track_num as trackNum,\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" +
                "    tmd.equ_name as equName,\n" +
                "    tmd.equ_num as equNum,\n" +
                "    tmu.name as replenishErName\n" +
                "FROM\n" +
                "    t_mediicine_stockrecord AS t left join t_mediicine_device tmd on replenish_equ = tmd.id left join t_mediicine_user tmu on t.replenish_er = tmu.id  where 1=1";
        String conditionSql = "";
        //社区
        if (!StringUtils.isEmpty(community)){
            conditionSql += " and t.community = " + community;
        }
        if (!StringUtils.isEmpty(equId)){
            conditionSql += " and t.replenish_equ = " + equId;
        }
        if (!StringUtils.isEmpty(equName)){
            conditionSql += " and tmd.equ_name like '%" + equName + "%'";
        }
        if (!StringUtils.isEmpty(equCode)){
            conditionSql += " and tmd.equ_num like '%" + equCode + "%'";
        }
        if (!StringUtils.isEmpty(replenishEr)){
            conditionSql += " and CONCAT(tmu.name,tmu.account) like '%" + replenishEr + "%'";
        }
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_stockrecord t left join t_mediicine_device tmd on replenish_equ = tmd.id left join t_mediicine_user tmu on t.replenish_er = tmu.id  " +
                "  where " +
                "  1=1   " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        for (Map<String,Object> map:list){
        }
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    public JSONObject getRecordDetail(String idstockup) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "SELECT\n" +
                "    t.id AS id,\n" +
                "    t.batch_num AS batchNum,\n" +
                "    t.cargo_info AS cargoInfo,\n" +
                "    t.drug_code AS drugCode,\n" +
                "    t.exp_date AS expDate,\n" +
                "    t.idstockup AS idstockup,\n" +
                "    t.med_info AS medInfo,\n" +
                "    t.order_no AS orderNo,\n" +
                "    t.price AS price,\n" +
                "    t.pro_date AS proDate,\n" +
                "    t.product_pic AS productPic,\n" +
                "    t.quantity AS quantity,\n" +
                "    t.layer_no AS layerNo,\n" +
                "    t.wayer_no AS wayerNo,\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_mediicine_stockrecord_detail AS t where idstockup = " + idstockup;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
}

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

@@ -10,6 +10,7 @@ import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.io.IOException;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
@@ -126,6 +128,19 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        return result.toJSONString();
    }
    /**
     * 分页查询设备信息
     * @param content
     * @param equClass
     * @param belongCommunity
     * @param networkStatus
     * @param saleStatus
     * @param page
     * @param size
     * @param wechatId
     * @return
     * @throws Exception
     */
    public JSONObject queryDeviceListFullInfo(String content, String equClass, String belongCommunity,
                                            String networkStatus, String saleStatus, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
@@ -204,16 +219,245 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        return result;
    }
    //获取当前设备数量
    public  long countAll() {
        return deviceDao.countAll();
    public JSONObject getDevicesByMoreContent(String content, String equClass, String belongCommunity,
                                              String networkStatus, String saleStatus, String machineCode, String deviceType, String equArea, String del, String status,String deliveryAddress, String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "SELECT\n" +
                "    t.id as id,\n" +
                "    t.belong_community as belongCommunity,\n" +
                "    t.community as community,\n" +
                "    t.del as del,\n" +
                "    t.delivery_address as deliveryAddress,\n" +
                "    t.detail_address as detailAddress,\n" +
                "    t.equ_area as equArea,\n" +
                "    t.equ_class as equClass,\n" +
                "    t.equ_info as equInfo,\n" +
                "    t.equ_name as equName,\n" +
                "    t.equ_num as equNum,\n" +
                "    t.equ_type as equType,\n" +
                "    t.fbelong_community as fbelongCommunity,\n" +
                "    t.machine_code as machineCode,\n" +
                "    t.network_status as networkStatus,\n" +
                "    t.poweron_test as poweronTest,\n" +
                "    t.reg_date as regDate,\n" +
                "    t.sale_status as saleStatus,\n" +
                "    t.signalintensity as signalintensity,\n" +
                "    t.upgr_adesit as upgrAdesit,\n" +
                "    t.`status` as `status`,\n" +
                "    t.card_status as cardStatus,\n" +
                "    t.operator as operator,\n" +
                "    t.pack_age as packAge,\n" +
                "    t.usage_flow as usageFlow,\n" +
                "    t.flow as flow,\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_mediicine_device AS t where 1=1\n";
        String conditionSql = "";
        if (!StringUtils.isEmpty(content)){
            conditionSql += " and CONCAT(t.equ_name, t.equ_num) like '%" + content + "%'";
        }
        if (!StringUtils.isEmpty(equClass)){
            conditionSql += " and t.equ_class = "+equClass;
        }
        if (!StringUtils.isEmpty(belongCommunity)){
            conditionSql += " and t.belong_community = " + belongCommunity;
        }
        if (!StringUtils.isEmpty(networkStatus)){
            conditionSql += " and t.network_status = " + networkStatus;
        }
        if (!StringUtils.isEmpty(saleStatus)){
            conditionSql += " and t.sale_status = " + saleStatus;
        }
        if (!StringUtils.isEmpty(machineCode)){
            conditionSql += " and t.machine_code like  '%" + machineCode + "%'";
        }
        if (!StringUtils.isEmpty(deviceType)){
            conditionSql += " and t.equ_type = "+deviceType;
        }
        if (!StringUtils.isEmpty(equArea)){
            conditionSql += " and t.equ_area = "+equArea;
        }
        if (!StringUtils.isEmpty(del)){
            conditionSql += " and t.del = "+del;
        }
        if (!StringUtils.isEmpty(status)){
            conditionSql += " and t.`status` = "+status;
        }
        if (!StringUtils.isEmpty(deliveryAddress)){
            conditionSql += " and t.delivery_address = "+deliveryAddress;
        }
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_device t " +
                "  where " +
                "  1=1   " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        for (Map<String,Object> map:list){
        }
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    /**
     * 根据人员id，查询与之绑定的设备
     * @param userId
     * @return
     * @throws Exception
     */
    public JSONObject getDevices(String userId) throws Exception {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(userId)){
            result.put("msg","parameter userId is null ");
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        String sql = "SELECT\n" +
                "    t.id as id,\n" +
                "    t.belong_community as belongCommunity,\n" +
                "    t.community as community,\n" +
                "    t.del as del,\n" +
                "    t.delivery_address as deliveryAddress,\n" +
                "    t.detail_address as detailAddress,\n" +
                "    t.equ_area as equArea,\n" +
                "    t.equ_class as equClass,\n" +
                "    t.equ_info as equInfo,\n" +
                "    t.equ_name as equName,\n" +
                "    t.equ_num as equNum,\n" +
                "    t.equ_type as equType,\n" +
                "    t.fbelong_community as fbelongCommunity,\n" +
                "    t.machine_code as machineCode,\n" +
                "    t.network_status as networkStatus,\n" +
                "    t.poweron_test as poweronTest,\n" +
                "    t.reg_date as regDate,\n" +
                "    t.sale_status as saleStatus,\n" +
                "    t.signalintensity as signalintensity,\n" +
                "    t.upgr_adesit as upgrAdesit,\n" +
                "    t.`status` as `status`,\n" +
                "    t.card_status as cardStatus,\n" +
                "    t.operator as operator,\n" +
                "    t.pack_age as packAge,\n" +
                "    t.usage_flow as usageFlow,\n" +
                "    t.flow as flow,\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_mediicine_device AS t where\n";
        String conditionSql = " t.id in (select du.device_id from t_mediicine_device_user du where del = 1 and du.user_id = " + userId + ")";
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql);
        for (Map<String,Object> map:list){
        }
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    public JSONObject getOneDeviceInfo(String deviceId) throws Exception{
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(deviceId)){
            result.put("msg","parameter deviceId is null ");
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        Mediicinedevice device = deviceDao.findOne(deviceId);
        if(null == device){
            result.put("msg","设备不存在:" + deviceId);
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("device",device);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",jsonObject);
        return result;
    }
//    /**
//     * 获取设备总数
//     * @return
//     * @throws Exception
//     */
//    public JSONObject countAll() throws Exception{
//        JSONObject result = new JSONObject();
//
//        JSONObject jsonObject = new JSONObject();
//        jsonObject.put("count",deviceDao.countAll());
//        result.put("response",ConstantUtils.SUCCESS);
//        result.put("msg",jsonObject);
//        return result;
//    }
    /**
     * 获取设备总数
     * @return
     * @throws Exception
     */
    public  JSONObject countAll() throws Exception {
        JSONObject result = new JSONObject();
        String sql = "select count(1) from t_mediicine_device a";
        int count = jdbcTemplate.queryForObject(sql,Integer.class);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg", count);
        return result;
    }
    //获取当前设备数量
    public  long countOnline() {
        return deviceDao.countOnline();
//    public  long countAll() {
//        return deviceDao.countAll();
//    }
    /**
     * 获取当前设备数量
     * @return
     * @throws Exception
     */
    public JSONObject countOnline() throws Exception{
        JSONObject result = new JSONObject();
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("count",deviceDao.countOnline());
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",jsonObject);
        return result;
    }
    //获取当前设备数量
//    public  long countOnline() {
//        return deviceDao.countOnline();
//    }
    public JSONObject saveDmMedicineDevice(String json) throws IOException {