跟新相关bug

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

@@ -11,4 +11,7 @@ public interface MediicineDeviceUserDao extends PagingAndSortingRepository<Medii
    @Query("select deviceId as deviceId from MediicineDeviceUser where userId = ?1 and del = ?2")
    List<String> getdevicesbyuserid(String userId, String del);
    @Query("select a from MediicineDeviceUser a where a.userId = ?1 and a.del = ?2")
    List<MediicineDeviceUser> getdevicesbyuseridList(String userId, String del);
}

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

@@ -14,4 +14,5 @@ public interface MediicineUserDao extends PagingAndSortingRepository<Mediicineus
    @Query("select a from Mediicineuser a  ")
    List<Mediicinedrugs> getorderdetail();
}

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

@@ -4901,6 +4901,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            }
            //原货道信息
            MediicinecabinetInventory mediicinecabinetInventory = inventoryDao.findOne(inventoryDO.getCargoId());
            total+=(inventoryDO.getQty()-Integer.parseInt(mediicinecabinetInventory.getQty()));
            //没有药品跳过
            if (inventoryDO.getDrugId() == null || StringUtils.isEmpty(inventoryDO.getDrugId())) {
                if (mediicinecabinetInventory.getOrgCode() != null && !StringUtils.isEmpty(mediicinecabinetInventory.getOrgCode())
@@ -4925,7 +4926,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                    updateMediicinecabineInventoryById(inventoryDO.getCargoId(), inventoryDO.getDrugId(), inventoryDO.getQty() + "", userId);
                }
            }
            total+=inventoryDO.getQty();
        }
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(outDetailId)){
            Mediicinestockoutdetail detail =mediicinestockoutdetailDao.findOne(outDetailId);

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MediicineDeviceUserDao;
import com.yihu.jw.base.dao.a2dao.MediicineUserDao;
import com.yihu.jw.base.dao.equipment.WlyyUserAreaDao;
import com.yihu.jw.base.dao.equipment.WlyyUserEquipmentDao;
import com.yihu.jw.base.dao.role.BaseRoleMenuDao;
@@ -15,6 +17,7 @@ import com.yihu.jw.base.service.equipment.WlyyUserEquipmentService;
import com.yihu.jw.base.service.org.*;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.MediicineDeviceUser;
import com.yihu.jw.entity.base.org.BaseOrgUserDO;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.saas.SaasDO;
@@ -89,6 +92,8 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
    private StringRedisTemplate redisTemplate;
    @Autowired
    private HibenateUtils hibenateUtils;
    @Autowired
    private MediicineDeviceUserDao mediicineDeviceUserDao;
    @Value("${configDefault.saasId}")
    private String defaultSaasId;
@@ -1230,25 +1235,16 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            if (roleDO.getCode().equalsIgnoreCase("replenisher")) {
                String sql = "select d.id as id,d.equ_name as name from t_mediicine_device d where d.belong_community ='" + doctorJson.getString("hospital") + "' ";
                List<Map<String, Object>> mapList = jdbcTemplate.queryForList(sql);
                List<WlyyUserEquipmentDO> equipmentDOList = userEquipmentDao.findAllByUserId(userDO.getId());
                equipmentService.delete(equipmentDOList);
                List<MediicineDeviceUser> mediicineDeviceUserList = mediicineDeviceUserDao.getdevicesbyuseridList(userDO.getId(),"1");
                mediicineDeviceUserDao.delete(mediicineDeviceUserList);
                for (Map<String, Object> map : mapList) {
                    WlyyUserEquipmentDO equipmentDO = new WlyyUserEquipmentDO();
                    MediicineDeviceUser mediicineDeviceUser = new MediicineDeviceUser();
                    String id = map.get("id").toString();
                    String name = map.get("name") == null ? "" : map.get("name").toString();
                    equipmentDO.setEquipmentId(id);
                    equipmentDO.setEquipmentName(name);
                    equipmentDO.setUserId(userDO.getId());
                    equipmentDO.setDel(1);
                    equipmentDO.setCityName(doctorJson.getString("cityName"));
                    equipmentDO.setCity(doctorJson.getString("city"));
                    equipmentDO.setTown(doctorJson.getString("town"));
                    equipmentDO.setTownName(doctorJson.getString("townName"));
                    equipmentDO.setHospital(doctorJson.getString("hospital"));
                    equipmentDO.setHospitalName(doctorJson.getString("hospitalName"));
                    equipmentDO.setCreateTime(new Date());
                    equipmentDO.setUpdateTime(new Date());
                    userEquipmentDao.save(equipmentDO);
                    mediicineDeviceUser.setDel("1");
                    mediicineDeviceUser.setUserId(userDO.getId());
                    mediicineDeviceUser.setDeviceId(id);
                    mediicineDeviceUserDao.save(mediicineDeviceUser);
                }
            }
        } else {
@@ -1297,25 +1293,16 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            if (roleDO.getCode().equalsIgnoreCase("replenisher")) {
                String sql = "select d.id as id,d.equ_name as name from t_mediicine_device d where d.belong_community ='" + doctorJson.getString("hospital") + "' ";
                List<Map<String, Object>> mapList = jdbcTemplate.queryForList(sql);
                List<WlyyUserEquipmentDO> equipmentDOList = userEquipmentDao.findAllByUserId(userDO.getId());
                equipmentService.delete(equipmentDOList);
                List<MediicineDeviceUser> mediicineDeviceUserList = mediicineDeviceUserDao.getdevicesbyuseridList(userDO.getId(),"1");
                mediicineDeviceUserDao.delete(mediicineDeviceUserList);
                for (Map<String, Object> map : mapList) {
                    WlyyUserEquipmentDO equipmentDO = new WlyyUserEquipmentDO();
                    MediicineDeviceUser mediicineDeviceUser = new MediicineDeviceUser();
                    String id = map.get("id").toString();
                    String name = map.get("name") == null ? "" : map.get("name").toString();
                    equipmentDO.setEquipmentId(id);
                    equipmentDO.setEquipmentName(name);
                    equipmentDO.setUserId(userDO.getId());
                    equipmentDO.setDel(1);
                    equipmentDO.setCityName(doctorJson.getString("cityName"));
                    equipmentDO.setCity(doctorJson.getString("city"));
                    equipmentDO.setTown(doctorJson.getString("town"));
                    equipmentDO.setTownName(doctorJson.getString("townName"));
                    equipmentDO.setHospital(doctorJson.getString("hospital"));
                    equipmentDO.setHospitalName(doctorJson.getString("hospitalName"));
                    equipmentDO.setCreateTime(new Date());
                    equipmentDO.setUpdateTime(new Date());
                    userEquipmentDao.save(equipmentDO);
                    mediicineDeviceUser.setDel("1");
                    mediicineDeviceUser.setUserId(userDO.getId());
                    mediicineDeviceUser.setDeviceId(id);
                    mediicineDeviceUserDao.save(mediicineDeviceUser);
                }
            }
        }