xinzeng

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

@@ -125,7 +125,7 @@ public class MedicineOutEndpoint extends EnvelopRestEndpoint {
    }
    @GetMapping(value = BaseRequestMapping.BaseOut.docFullInfo)
    @ApiOperation(value = "获取出货单信息基础信息列表")
    @ApiOperation(value = "获取出货(库）单信息基础信息列表")
    public PageEnvelop getOutFullInfolist(
            @ApiParam(name = "startTime", value = "开始时间", required = false, defaultValue = "")
            @RequestParam(value = "startTime",required = false) String startTime,
@@ -135,11 +135,13 @@ public class MedicineOutEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "replenishEr", required = false) String replenishEr,
            @ApiParam(name = "docNum", value = "单号")
            @RequestParam(value = "docNum", required = false) String docNum,
            @ApiParam(name = "userId", value = "用户id")
            @RequestParam(value = "userId", required = true) String userId,
            @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,page,size,wechatId);
        JSONObject result = stockoutService.queryOutListFullInfo(startTime, endTime, replenishEr, docNum, 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/a4endpoint/MedicineUpEndpoint.java

@@ -99,11 +99,13 @@ public class MedicineUpEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "content", required = false) String content,
            @ApiParam(name = "community", value = "社区")
            @RequestParam(value = "community", required = false) String community,
            @ApiParam(name = "userId", value = "用户id")
            @RequestParam(value = "userId", required = true) String userId,
            @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.queryUpListFullInfo(startTime, endTime, content, community,page,size,wechatId);
        JSONObject result = stockupService.queryUpListFullInfo(startTime, endTime, content, community, 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/a4endpoint/MedicineUserEndpoint.java

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping(value = BaseRequestMapping.BaseUser.PREFIX)
@Api(value = "用户管理", description = "用户（补货员）管理服务接口", tags = {"MedicineUser - 备货单管理服务接口"})
@Api(value = "用户管理", description = "用户（补货员）管理服务接口", tags = {"MedicineUser - 补货员管理服务接口"})
public class MedicineUserEndpoint extends EnvelopRestEndpoint {
    @Autowired

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

@@ -220,7 +220,9 @@ public class MedicineDrugsService extends BaseJpaService<Mediicinedrugs, Mediici
                "    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" +
                "    t.org_name as orgName,\n" +
                "    t.quantity_unit as quantityUnit,\n" +
                "    t.pack_unit as packUnit\n" +
                "FROM\n" +
                "    t_mediicine_drugs AS t where 1=1";

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

@@ -167,8 +167,6 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        Date sTime = DateUtil.strToDate(startTime);
        Date eTime = DateUtil.strToDate(endTime);
        UserDO user = userDao.findOne(userId);
        RoleDO role = roleDao.findOne(user.getRoleId());

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

@@ -5,10 +5,14 @@ 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.*;
import com.yihu.jw.base.dao.role.RoleDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.*;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
@@ -42,6 +46,11 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
    @Autowired
    private MediicinestockupDao upDao;
    @Autowired
    private UserDao userDao;
    @Autowired
    private RoleDao roleDao;
    @Autowired
    private ObjectMapper objectMapper;
@@ -240,9 +249,61 @@ 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, int page, int size,String wechatId) throws Exception {
                                             String docNum, 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());
        String conditionSql = "";
        if ("replenisher".equals(role.getCode())) {
            conditionSql += " AND t.replenish_equ = '" + userId + "'\n";
        } else {
            String belongCommunitys = "";
            String sql = "";
            //市管理员
            if ("saasAdmin".equals(role.getCode())) {
                sql = "SELECT\n" +
                        "\tid\tas community\n" +
                        "FROM\n" +
                        "\tdm_hospital\n" +
                        "WHERE\n" +
                        "\tdel = 1";
            }
            //区域管理员
            if ("regionAdmin".equals(role.getCode())) {
                sql = "SELECT\n" +
                        "\tdh.id AS community\n" +
                        "FROM\n" +
                        "\twlyy_user_area t\n" +
                        "LEFT JOIN dm_hospital dh ON t.town = dh.town\n" +
                        "WHERE\n" +
                        "\tt.user_id = '" + userId + "'\n" +
                        "AND t.del = 1\n" +
                        "AND dh.del = 1";
            }
            //社区管理员
            if ("communityAdmin".equals(role.getCode())) {
                sql = "SELECT\n" +
                        "t.hospital AS community\n" +
                        "FROM\n" +
                        "wlyy_user_area AS t\n" +
                        "WHERE\n" +
                        "t.user_id = '" + userId + "'\n" +
                        "AND t.del = 1";
            }
            List<Map<String, Object>> list = hibenateUtils.createSQLQuery(sql);
            for (Map<String, Object> stringObjectMap : list) {
                if (stringObjectMap.get("community") != null && !StringUtils.isEmpty(stringObjectMap.get("community").toString())) {
                    if (StringUtils.isEmpty(belongCommunitys)) {
                        belongCommunitys += stringObjectMap.get("community").toString();
                    } else {
                        belongCommunitys += "," +  stringObjectMap.get("community").toString();
                    }
                }
            }
            if (!StringUtils.isEmpty(belongCommunitys)) {
                conditionSql += " AND ',"+ belongCommunitys +",' LIKE CONCAT('%,',t.community,',%')\n";
            }
        }
        String sql="SELECT\n" +
                "    t.id as id,\n" +
                "    t.address as address,\n" +
@@ -267,7 +328,6 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
                "    t.up_num as upNum\n" +
                "FROM\n" +
                "    t_mediicine_stockout AS t where 1=1";
        String conditionSql = "";
        if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
//            conditionSql += "  AND  t.prescribe_time BETWEEN to_date('" + startTime +"','yyyy-mm-dd hh24:mi:ss') " +
//                    " AND to_date('" + endTime + "','yyyy-mm-dd hh24:mi:ss')";

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

@@ -5,9 +5,13 @@ 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.*;
import com.yihu.jw.base.dao.role.RoleDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.*;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +42,11 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
    @Autowired
    private MediicinedrugsDao drugsDao;
    @Autowired
    private UserDao userDao;
    @Autowired
    private RoleDao roleDao;
    @Autowired
    private ObjectMapper objectMapper;
@@ -191,8 +200,61 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
    public JSONObject queryUpListFullInfo(
            String startTime, String endTime, String replenishErAndTrackNum,
            String community, int page, int size,String wechatId) throws Exception {
            String community, 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());
        String conditionSql = "";
        if ("replenisher".equals(role.getCode())) {
            conditionSql += " AND t.create_user = '" + userId + "'\n";
        } else {
            String belongCommunitys = "";
            String sql = "";
            //市管理员
            if ("saasAdmin".equals(role.getCode())) {
                sql = "SELECT\n" +
                        "\tid\tas community\n" +
                        "FROM\n" +
                        "\tdm_hospital\n" +
                        "WHERE\n" +
                        "\tdel = 1";
            }
            //区域管理员
            if ("regionAdmin".equals(role.getCode())) {
                sql = "SELECT\n" +
                        "\tdh.id AS community\n" +
                        "FROM\n" +
                        "\twlyy_user_area t\n" +
                        "LEFT JOIN dm_hospital dh ON t.town = dh.town\n" +
                        "WHERE\n" +
                        "\tt.user_id = '" + userId + "'\n" +
                        "AND t.del = 1\n" +
                        "AND dh.del = 1";
            }
            //社区管理员
            if ("communityAdmin".equals(role.getCode())) {
                sql = "SELECT\n" +
                        "t.hospital AS community\n" +
                        "FROM\n" +
                        "wlyy_user_area AS t\n" +
                        "WHERE\n" +
                        "t.user_id = '" + userId + "'\n" +
                        "AND t.del = 1";
            }
            List<Map<String, Object>> list = hibenateUtils.createSQLQuery(sql);
            for (Map<String, Object> stringObjectMap : list) {
                if (stringObjectMap.get("community") != null && !StringUtils.isEmpty(stringObjectMap.get("community").toString())) {
                    if (StringUtils.isEmpty(belongCommunitys)) {
                        belongCommunitys += stringObjectMap.get("community").toString();
                    } else {
                        belongCommunitys += "," +  stringObjectMap.get("community").toString();
                    }
                }
            }
            if (!StringUtils.isEmpty(belongCommunitys)) {
                conditionSql += " AND ',"+ belongCommunitys +",' LIKE CONCAT('%,',t.community,',%')\n";
            }
        }
        String sql = "SELECT\n" +
                "    t.id as id,\n" +
                "    t.community as community,\n" +
@@ -213,12 +275,9 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
                "FROM\n" +
                "    t_mediicine_stockup AS t where 1=1";
        String conditionSql = "";
        //单据时间
        if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
//            conditionSql += "  AND  t.prescribe_time BETWEEN to_date('" + startTime +"','yyyy-mm-dd hh24:mi:ss') " +
//                    " AND to_date('" + endTime + "','yyyy-mm-dd hh24:mi:ss')";
            conditionSql += "  AND  t.doc_time >= '" + startTime +"'" +
            conditionSql += " AND  t.doc_time >= '" + startTime +"'" +
                    " AND t.doc_time <= '" + endTime + "'";
        }
        if (!StringUtils.isEmpty(replenishErAndTrackNum)){

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

@@ -1843,7 +1843,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                "\ttmd.use_dose AS useDose,\n" +
                "\ttmd.use_way_add AS useWayAdd,\n" +
                "\ttmd.org_code AS orgCode,\n" +
                "\ttmd.org_name AS orgName\n" +
                "\ttmd.org_name as orgName,\n" +
                "\ttmd.quantity_unit as quantityUnit,\n" +
                "\ttmd.pack_unit as packUnit\n" +
                "FROM\n" +
                "\tt_mediicinecabinet_inventory tmi\n" +
                "LEFT JOIN t_mediicine_drugs tmd ON tmi.drug_id = tmd.id";
@@ -2020,7 +2022,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                "\ttmd.use_dose AS useDose,\n" +
                "\ttmd.use_way_add AS useWayAdd,\n" +
                "\ttmd.org_code AS orgCode,\n" +
                "\ttmd.org_name AS orgName\n" +
                "\ttmd.org_name as orgName,\n" +
                "\ttmd.quantity_unit as quantityUnit,\n" +
                "\ttmd.pack_unit as packUnit\n" +
                "FROM\n" +
                "\tt_mediicinecabinet_inventory tmi\n" +
                "LEFT JOIN t_mediicine_drugs tmd ON tmi.drug_id = tmd.id";