[解决bug]

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

@@ -57,6 +57,6 @@ public class MedicineDevicePrintMessageEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "page", required = true)Integer page,
            @ApiParam(name = "size", value = "size", required = false)
            @RequestParam(value = "size", required = true)Integer size) throws Exception {
        return success(printMessageService.selectByCondition(condition,page,size));
        return success(printMessageService.selectByCondition(condition,page,size,getUID()));
    }
}

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

@@ -62,7 +62,7 @@ public class MedOrderService {
            mediicineorder.setCommunity(hospitalDO.getName());
            mediicineorder.setUserId(params.getString("user_id"));
            mediicineorder.setShopNo(params.getString("shop_no"));
            mediicineorder.setPrescribeNum(params.getString("rx_no"));
            mediicineorder.setPrescribeNum(order);
            mediicineorder.setAddress(params.getString("rx_patient_address"));
            mediicineorder.setContact(params.getString("rx_patient_phone"));
            mediicineorder.setIdNum(params.getString("rx_patient_identity"));

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

@@ -199,6 +199,9 @@ public class MedicineDrugsService extends BaseJpaService<Mediicinedrugs, Mediici
        JSONObject result = new JSONObject();
        UserDO user = userDao.findOne(userId);
        RoleDO role = roleDao.findOne(user.getRoleId());
        if (role==null){
            throw new Exception("角色为空!");
        }
        String belongCommunitys = "";
        String tempSql = "";
        //获取管理员所在社区id字符串

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

@@ -218,6 +218,9 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        UserDO user = userDao.findOne(userId);
        RoleDO role = roleDao.findOne(user.getRoleId());
        if (role==null){
            throw new Exception("角色为空!");
        }
        //订单列表
        List<Map<String, Object>> orderList = null;
        String conditionSql = "";

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

@@ -303,6 +303,9 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
        JSONObject result = new JSONObject();
        UserDO user = userDao.findOne(userId);
        RoleDO role = roleDao.findOne(user.getRoleId());
        if (role==null){
            throw new Exception("角色为空!");
        }
        String conditionSql = "";
        if ("replenisher".equals(role.getCode())) {
            conditionSql += " AND t.replenish_er = '" + userId + "'\n";

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

@@ -252,6 +252,9 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
        JSONObject result = new JSONObject();
        UserDO user = userDao.findOne(userId);
        RoleDO role = roleDao.findOne(user.getRoleId());
        if (role==null){
            throw new Exception("角色为空!");
        }
        String conditionSql = "";
        if ("replenisher".equals(role.getCode())) {
            conditionSql += " AND t.create_user = '" + userId + "'\n";

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

@@ -73,6 +73,9 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
        UserDO user = userDao.findOne(userId);
        RoleDO role = roleDao.findOne(user.getRoleId());
        if (role==null){
            throw new Exception("角色为空!");
        }
        String sql = "";
        String conditionSql = "";
        //登录者所管理的社区code串
@@ -219,6 +222,9 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
                if(isAll) {
                    UserDO user = userDao.findOne(operator);
                    RoleDO role = roleDao.findOne(user.getRoleId());
                    if (role==null){
                        throw new Exception("角色为空!");
                    }
                    String belongCommunitys = "";
                    String tempSql = "";
                    //获取管理员所在社区id字符串

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

@@ -3,8 +3,14 @@ package com.yihu.jw.base.service.a3service;
import com.yihu.jw.base.dao.a2dao.*;
import com.yihu.jw.base.dao.equipment.WlyyUserAreaDao;
import com.yihu.jw.base.dao.role.RoleDao;
import com.yihu.jw.base.dao.user.UserDao;
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.entity.equipment.WlyyUserAreaDO;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
@@ -29,6 +35,10 @@ public class MedicinedevicePrintMessageService extends BaseJpaService<Medicinede
    @Autowired
    private HibenateUtils hibenateUtils;
    @Autowired
    private UserDao userDao;
    @Autowired
    private RoleDao roleDao;
    //{"community":"社区名称","phone":"客服电话","equName":"设备名称","equNum":"设备编号","saleTime":"销售日期","shipTime":"取药时间","public":"公共信息","coding":"自编码","specifications":"规格","batchNo":"批次号","manufacturer":"生产厂家","validTime":"有效期","sourceCode":"溯源码","publicName":"药品通用名称","dosage":"剂型","holder":"上市许可持有人","approvalNumber":"批准文号"}
@@ -53,7 +63,12 @@ public class MedicinedevicePrintMessageService extends BaseJpaService<Medicinede
            }
            return printMessage;
        }else {
            return printMessageDao.save(printMessage);
            if (printMessageDao.findDeviceId(printMessage.getDeviceId())==null){
                return printMessageDao.save(printMessage);
            }else {
                throw new Exception("该设备打印设置已存在！");
            }
        }
    }
@@ -74,10 +89,48 @@ public class MedicinedevicePrintMessageService extends BaseJpaService<Medicinede
     * @param size
     * @return
     */
    public List<Map<String,Object>> selectByCondition(String condition,Integer page,Integer size){
        String sql = " SELECT d.equ_name as equName,d.equ_num as equNum,pm.picture,pm.remark_end as remarkEnd,pm.id as id from  t_mediicine_device_print_message pm LEFT JOIN t_mediicine_device d ON pm.device_id = d.equ_num ";
    public List<Map<String,Object>> selectByCondition(String condition,Integer page,Integer size,String uuid) throws Exception {
        UserDO user = userDao.findOne(uuid);
        RoleDO role = roleDao.findOne(user.getRoleId());
        if (role==null){
            throw new Exception("角色为空");
        }
        String conditionSql = "";
        //市管理员
        if ("saasAdmin".equals(role.getCode())) {
            conditionSql = "SELECT\n" +
                    "\t`code`\tas community\n" +
                    "FROM\n" +
                    "\tdm_hospital\n" +
                    "WHERE\n" +
                    "\tdel = 1";
        }
        //区域管理员
        if ("regionAdmin".equals(role.getCode())) {
            conditionSql = "SELECT\n" +
                    "\tdh.`code` 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 = '" + uuid + "'\n" +
                    "AND t.del = 1\n" +
                    "AND dh.del = 1";
        }
        //社区管理员
        if ("communityAdmin".equals(role.getCode())) {
            conditionSql = "SELECT\n" +
                    "t.hospital AS community\n" +
                    "FROM\n" +
                    "wlyy_user_area AS t\n" +
                    "WHERE\n" +
                    "t.user_id = '" + uuid + "'\n" +
                    "AND t.del = 1";
        }
        String sql = " SELECT d.equ_name as equName,d.equ_num as equNum,pm.picture,pm.remark_end as remarkEnd,pm.id as id from  t_mediicine_device_print_message pm LEFT JOIN t_mediicine_device d ON pm.device_id = d.equ_num where 1=1 and d.belong_community IN ("+conditionSql+") ";
        if (StringUtils.isNoneBlank(condition)){
            sql += " where (d.equ_name LIKE '%"+condition+"%' OR d.equ_num LIKE '%"+condition+"%')";
            sql += "  (d.equ_name LIKE '%"+condition+"%' OR d.equ_num LIKE '%"+condition+"%')";
        }
        sql+=" order by pm.create_time desc ";
        List<Map<String,Object>> mapList = hibenateUtils.createSQLQuery(sql,page,size);

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

@@ -1495,6 +1495,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        JSONObject jsonObject = new JSONObject();
        UserDO user = userDao.findOne(userId);
        RoleDO role = roleDao.findOne(user.getRoleId());
        if (role==null){
            throw new Exception("角色为空!");
        }
        //设备总数
        int count = 0;
        //在线设备
@@ -1834,6 +1837,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        UserDO user = userDao.findOne(userId);
        RoleDO role = roleDao.findOne(user.getRoleId());
        if (role==null){
            throw new Exception("角色为空!");
        }
        List<Map<String, Object>> deviceList = null;
        if ("replenisher".equals(role.getCode())) {
            //补货员所分配的设备
@@ -2089,6 +2095,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        UserDO user = userDao.findOne(userId);
        RoleDO role = roleDao.findOne(user.getRoleId());
        if (role==null){
            throw new Exception("角色为空!");
        }
        List<Map<String, Object>> deviceList = null;
        //查询控制语句
        String conditionSql = "";
@@ -2319,6 +2328,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        UserDO user = userDao.findOne(userId);
        RoleDO role = roleDao.findOne(user.getRoleId());
        if (role==null){
            throw new Exception("角色为空!");
        }
        List<Map<String, Object>> deviceList = null;
        //查询控制语句
        String conditionSql = "";
@@ -3932,7 +3944,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    public Mediicinedevice findByEquNum(String equNum){
        return deviceDao.findByEquNum(equNum);
        return deviceDao.findMediicinedeviceByEquNum(equNum);
    }