update bug

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

@@ -10,6 +10,7 @@ import com.yihu.jw.base.service.a3service.MedicinedeviceService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.*;
import com.yihu.jw.entity.base.area.BaseCityDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.restmodel.base.area.BaseCityVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -743,6 +744,9 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "refreshStatus", required = false, defaultValue = "false") Boolean refreshStatus,
            @ApiParam(name = "userId", value = "用户id", required = true)
            @RequestParam(value = "userId") String userId) throws Exception {
        if (refreshStatus==null){
            refreshStatus = deviceService.getRefreshStatus("refreshStatus");
        }
        return success(deviceService.updateMediicinecabineInventoryInfoById(id, qty, cargoCapacity, status,refreshStatus, userId));
    }
@@ -893,6 +897,10 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "outDetailId",required = false) String outDetailId,
            @ApiParam(name = "refreshStatus", value = "是否设置不缺货状态，默认false,通过规则判断，true,则直接设置，不缺货")
            @RequestParam(value = "refreshStatus",required = false, defaultValue = "false") Boolean refreshStatus) throws Exception {
        if (refreshStatus==null){
            refreshStatus = deviceService.getRefreshStatus("refreshStatus");
        }
        String str = deviceService.batchAddInventory(json, userId,outDetailId, refreshStatus);
        JSONObject jsonObject = JSONObject.parseObject(str);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {

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

@@ -414,7 +414,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        }
        Mediicineorder mediicineorder = orderDao.findOne(orderId);
        if (mediicineorder == null) {
            result.put("msg", "order doesn't exist");
            result.put("msg", "无相关订单信息，请重新确认信息！");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
@@ -557,7 +557,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            mediicineorder = orderDao.findMediicineorderBySocialSecurityCardNum(cardNum);
        }
        if (mediicineorder == null) {
            result.put("msg", "order doesn't exist");
            result.put("msg", "无相关订单信息，请重新确认信息！");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
@@ -1471,7 +1471,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            mediicineorder = orderDao.findMediicineorderBySocialSecurityCardNum(cardNum);
        }
        if (mediicineorder == null) {
            result.put("msg", "order doesn't exist");
            result.put("msg", "无相关订单信息，请重新确认信息！");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
@@ -1924,7 +1924,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        }
        orders = orders.stream().distinct().collect(Collectors.toList());
        if (orders == null || orders.size() == 0) {
            result.put("msg", "order doesn't exist");
            result.put("msg", "无相关订单信息，请重新确认信息！");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
@@ -1934,7 +1934,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            Map<String, Object> map = new HashMap<>();
            DmHospitalDO dmHospitalDO = hospitalDao.findByCode(order.getBelongCommunity());
            if (!mediicinedevice.getBelongCommunity().equals(order.getBelongCommunity())) {
                result.put("msg", "order doesn't exist");
                result.put("msg", "无相关订单信息，请重新确认信息！");
                result.put("response", ConstantUtils.FAIL);
                return result;
            }

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

@@ -15,7 +15,9 @@ 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.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.sms.dao.HospitalSysDictDao;
import com.yihu.jw.util.common.LatitudeUtils;
import com.yihu.jw.util.date.DateUtil;
@@ -23,8 +25,6 @@ import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
@@ -72,10 +72,6 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    @Autowired
    private RoleDao roleDao;
    @Autowired
    private UserAgent userAgent;
    @Autowired
    private HibenateUtils hibenateUtils;
@@ -99,6 +95,8 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    private MedicineWarrayRuleDao medicineWarrayRuleDao;
    @Autowired
    private MediicinestockoutdetailDao mediicinestockoutdetailDao;
    @Autowired
    private HospitalSysDictDao hospitalSysDictDao;
@@ -5660,6 +5658,17 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        return result.toJSONString();
    }
    public boolean getRefreshStatus(String code){
        WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById(code);
        boolean flag =false;
        if (hospitalSysDictDO!=null){
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(hospitalSysDictDO.getDictValue())&&hospitalSysDictDO.getDictValue().equalsIgnoreCase("true")){
                flag=true;
            }
        }
        return flag;
    }
    /**
     * 首页信息