[解决bug]

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

@@ -3,8 +3,13 @@ package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.MedicineDeviceDelivery;
import com.yihu.jw.entity.a1entity.MedicineDevicePrintMessage;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface MedicineDevicePrintMessageDao extends PagingAndSortingRepository<MedicineDevicePrintMessage, String> {
    @Query("select a from MedicineDevicePrintMessage a where a.deviceId = ?1")
    MedicineDevicePrintMessage findDeviceId(String deviceId);
}

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

@@ -47,7 +47,7 @@ public class MedicineOutEndpoint extends EnvelopRestEndpoint {
    public Envelop createUp(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        JSONObject jsonObject =  stockoutService.createDetailOut(jsonData);
        JSONObject jsonObject =  stockoutService.createDetailOut(jsonData,getUNAME());
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/open/nologin/ServiceNoLoginEndPoint.java

@@ -233,7 +233,7 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
                return failed("请确认设备编码是否正确");
            }
            if (mediicinewarray.get("msg")==null){
                return success("设备正常");
                return success("不存在该设备");
            }
            return success(mediicinewarray.get("msg"));
        }

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

@@ -12,10 +12,12 @@ 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.DmHospitalDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.entity.hospital.httplog.YlzHttpLogDO;
import com.yihu.jw.entity.wlyyinfo.OauthWlyyConfigDO;
import com.yihu.jw.hospital.HospitalDao;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
import com.yihu.jw.hospital.prescription.dao.OauthCaConfigDao;
import com.yihu.jw.restmodel.web.Envelop;
@@ -103,6 +105,11 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    @Autowired
    private WlyyHttpLogDao httpLogDao;
    @Autowired
    private MedicineDevicePrintMessageDao printMessageDao;
    @Autowired
    private WlyyHospitalSysDictDao hospitalSysDictDao;
    /**
     * 新增药品信息
     *
@@ -1098,12 +1105,32 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                    "\tt.order_id = '" + mediicineorder.getId() + "'";
            List<Map<String, Object>> tempList = hibenateUtils.createSQLQuery(tempSql);
            jsonObject.put("community", dmHospitalDO == null ? "" : dmHospitalDO.getName());
            jsonObject.put("phone", "123456");
            MedicineDevicePrintMessage devicePrintMessage = printMessageDao.findDeviceId(deviceId);
            if (devicePrintMessage==null){
                WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("printSys");
                if (hospitalSysDictDO!=null){
                    JSONObject object = JSONObject.parseObject(hospitalSysDictDO.getDictValue());
                    jsonObject.put("phone", object.getString("phone"));
                    jsonObject.put("remark",object.getString("remark"));
                    jsonObject.put("qrCodeContent", object.getString("qrCodeContent"));
                    jsonObject.put("info", object.getString("info"));
                }else {
                    jsonObject.put("phone", "123456");
                    jsonObject.put("remark", "若未取到货物，请您扫描小票二维码申请退款。\n谢谢慢走，祝您生活愉快！");
                    jsonObject.put("qrCodeContent", "谢谢慢走，祝您生活愉快！");
                    jsonObject.put("info","community,phone,equNum,shipTime");
                }
            }else {
                jsonObject.put("phone",devicePrintMessage.getPhone());
                jsonObject.put("remark",devicePrintMessage.getRemark());
                jsonObject.put("qrCodeContent", devicePrintMessage.getPicture());
                jsonObject.put("info",devicePrintMessage.getInfo());
            }
            jsonObject.put("num", mediicineorder.getPrescribeNum());
            jsonObject.put("date", DateUtil.dateToStr(new Date(), "yyyy-MM-dd"));
            jsonObject.put("time", DateUtil.dateToStr(new Date(), "HH:mm:ss"));
            jsonObject.put("remark", "若未取到货物，请您扫描小票二维码申请退款。\n谢谢慢走，祝您生活愉快！");
            jsonObject.put("qrCodeContent", "谢谢慢走，祝您生活愉快！");
            jsonObject.put("list", tempList);
            jsonObject.put("status", 1);
            result.put("response", ConstantUtils.SUCCESS);

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

@@ -67,7 +67,7 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public JSONObject createDetailOut(String jsonData) {
    public JSONObject createDetailOut(String jsonData,String userName) {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(jsonData)){
@@ -127,8 +127,9 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
        mediicinestockout.setReplenishInventory(obj.getDrugs().stream().reduce(0, (sum, p) -> sum += p.getQty() , Integer::sum).toString());
        //备货单号
        mediicinestockout.setUpNum(obj.getUpId());
        outDao.save(mediicinestockout);
        List<Mediicinestockupdetail> mediicinestockupdetailList = mediicinestockupdetailDao.getoutdetail(obj.getUpId());
        Double price = 0.0;
        for (DrugDO drug : obj.getDrugs()) {
            Mediicinedrugs mediicinedrugs = drugsDao.findOne(drug.getDrugId());
            Mediicinestockoutdetail mediicinestockoutdetail = new Mediicinestockoutdetail();
@@ -146,7 +147,11 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
                    mediicinestockupdetailDao.save(mediicinestockupdetail);
                }
            }
            price+=drug.getQty()*mediicinedrugs.getPrice();
        }
        mediicinestockout.setPrice(price+"");
        mediicinestockout.setCreateUserName(userName);
        outDao.save(mediicinestockout);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",ConstantUtils.SUCCESS);
        return result;
@@ -372,7 +377,7 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
                "    t.update_user_name as updateUserName,\n" +
                "    t.up_num as upNum\n" +
                "FROM\n" +
                "    t_mediicine_stockout AS t LEFT JOIN base_user bu ON t.replenish_er = bu.id LEFT JOIN t_mediicine_device tmd on t.replenish_equ = tmd.id  where 1=1";
                "    t_mediicine_stockout AS t LEFT JOIN  base_user bu ON t.replenish_er = bu.id LEFT JOIN t_mediicine_device tmd on t.replenish_equ = tmd.id  where 1=1";
        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')";
@@ -383,7 +388,7 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
            conditionSql += " and t.receive_state = '" + receiveState + "'";
        }
        if (!StringUtils.isEmpty(replenishEr)){
            conditionSql += " AND CONCAT(IFNULL(bu.name,''),IFNULL(bu.mobile,'') LIKE '%" + replenishEr + "%'";
            conditionSql += " AND CONCAT(IFNULL(bu.name,''),IFNULL(bu.mobile,'') LIKE '%" + replenishEr + "%' ";
        }
        if (!StringUtils.isEmpty(docNum)){
            conditionSql += " and t.doc_num like '%" + docNum + "%'";
@@ -413,6 +418,10 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
                    }
                }
            }
            Mediicinestockup mediicinestockup = upDao.findOne(map.get("id").toString());
            if (mediicinestockup!=null){
                map.put("upNo",mediicinestockup.getDocNum());
            }
        }
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));

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

@@ -745,8 +745,11 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
                    type="温度异常";
                }
            }
            mediicinedevice.setTemperature(temperature+"");
        }else {
            type="温度正常";
        }
        mediicinedevice.setTemperature(temperature+"");
        if (!StringUtils.isEmpty(mediicinedevice.getWaringHumidityHeight())&&!StringUtils.isEmpty(mediicinedevice.getWaringHumidityLow())){
            Float humidityHeight = Float.parseFloat(mediicinedevice.getWaringHumidityHeight());
            Float humidityLow = Float.parseFloat(mediicinedevice.getWaringHumidityLow());
@@ -759,15 +762,13 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
                    }
                }
            }
            mediicinedevice.setTemperature(humidity+"");
        }else {
            type="湿度正常";
        }
        mediicinedevice.setTemperature(humidity+"");
        deviceDao.save(mediicinedevice);
        if (!StringUtils.isEmpty(type)) {
            Mediicinewarray mediicinewarray = medicinedeviceService.uploadDeviceInfo(equNum, temperature, humidity, type);
            result.put("msg",mediicinewarray);
            return result;
        }
        result.put("msg",null);
        Mediicinewarray mediicinewarray = medicinedeviceService.uploadDeviceInfo(equNum, temperature, humidity, type);
        result.put("msg",mediicinewarray);
        return result;
    }
}

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

@@ -44,7 +44,7 @@ public class MedicinedevicePrintMessageService extends BaseJpaService<Medicinede
            printMessageDao.deleteAll();
            List<Mediicinedevice> mediicinedeviceList = mediicineDeviceDao.selectByBelongComminity();
            for (Mediicinedevice mediicinedevice:mediicinedeviceList){
               printMessage.setDeviceId(mediicinedevice.getId());
               printMessage.setDeviceId(mediicinedevice.getEquNum());
               printMessageDao.save(printMessage);
            }
@@ -72,7 +72,7 @@ public class MedicinedevicePrintMessageService extends BaseJpaService<Medicinede
     * @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.id ";
        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 ";
        if (StringUtils.isNoneBlank(condition)){
            sql += " where (d.equ_name LIKE '%"+condition+"%' OR d.equ_num LIKE '%"+condition+"%')";
        }