Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/security/BaseEmergencyWarnLogDao.java

@@ -16,6 +16,6 @@ public interface BaseEmergencyWarnLogDao extends PagingAndSortingRepository<Base
    @Query("select w from BaseEmergencyWarnLogDO w where w.orderId = ?1 and w.type is null ")
    List<BaseEmergencyWarnLogDO> findByOrderIdOrderByCreateTimeDesc(String oderId);
    @Query("select w from BaseEmergencyWarnLogDO w where w.orderId = ?1 and w.type = 2")
    @Query("select w from BaseEmergencyWarnLogDO w where w.orderId = ?1 and w.type = 1")
    List<BaseEmergencyWarnLogDO> findByOrderIdByType(String orderId);
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/assistance/EmergencyAssistanceService.java

@@ -933,6 +933,20 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            doorConclusion.setDoctor(doctorDO.getId());
            doorConclusion.setDoctorName(doctorDO.getName());
        }
        List<BaseEmergencyWarnLogDO> byOrderIdByType = logDao.findByOrderIdByType(orderId);
        if (byOrderIdByType.size()==0){
            BaseEmergencyWarnLogDO logTypeDOOne = new BaseEmergencyWarnLogDO();
            logTypeDOOne.setUserCode(doctor);
            logTypeDOOne.setUserName(doctorDO.getName());
            logTypeDOOne.setOrderId(orderId);
            logTypeDOOne.setUserType(2);
            logTypeDOOne.setCreateTime(new Date());
            logTypeDOOne.setContent("已知悉");
            logTypeDOOne.setType(1);
            logDao.save(logTypeDOOne);
        }
        BaseEmergencyWarnLogDO logTypeDO = new BaseEmergencyWarnLogDO();
        logTypeDO.setUserCode(doctor);
        logTypeDO.setUserName(doctorDO.getName());
@@ -1107,15 +1121,16 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                logDao.save(logDO);
                List<BaseEmergencyWarnLogDO> byOrderIdByType = logDao.findByOrderIdByType(orderId);
                if (byOrderIdByType.size()<1){
                    logTypeDO.setUserCode(doctor);
                    logTypeDO.setUserName(doctorDO.getName());
                    logTypeDO.setOrderId(orderId);
                    logTypeDO.setUserType(2);
                    logTypeDO.setCreateTime(new Date());
                    logTypeDO.setContent("已知悉");
                    logTypeDO.setType(1);
                    logDao.save(logTypeDO);
                if (byOrderIdByType.size()==0){
                    BaseEmergencyWarnLogDO logTypeDOOne = new BaseEmergencyWarnLogDO();
                    logTypeDOOne.setUserCode(doctor);
                    logTypeDOOne.setUserName(doctorDO.getName());
                    logTypeDOOne.setOrderId(orderId);
                    logTypeDOOne.setUserType(2);
                    logTypeDOOne.setCreateTime(new Date());
                    logTypeDOOne.setContent("已知悉");
                    logTypeDOOne.setType(1);
                    logDao.save(logTypeDOOne);
                }
                logTypeDO.setUserCode(doctor);