Merge branch 'dev' of chenjiasheng/wlyy2.0 into medicare

server/svr-authentication/src/main/java/com/yihu/jw/security/service/UserService.java

@@ -37,8 +37,8 @@ public class UserService {
        userDO.setUsername(userDO.getMobile());
        userDO.setName(userDO.getMobile());
        userDO.setSalt(randomString(5));
        userDO.setEnabled(true);
        userDO.setLocked(false);
        userDO.setEnabled(1);
        userDO.setLocked(0);
        userDO.setLoginFailureCount(0);
        String password = userDO.getPassword();
        if (StringUtils.isEmpty(password)) {

svr/svr-base/src/main/java/com/yihu/jw/base/dao/equipment/WlyyUserAreaDao.java

@@ -11,7 +11,7 @@ import java.util.List;
public interface WlyyUserAreaDao extends PagingAndSortingRepository<WlyyUserAreaDO, String>, JpaSpecificationExecutor<WlyyUserAreaDO> {
    @Query("select id from WlyyUserAreaDO where userId = ?1 ")
    @Query("select a from WlyyUserAreaDO a where a.userId = ?1 and a.del=1")
    List<WlyyUserAreaDO> findAllByUserId(String userId);
    @Modifying

svr/svr-base/src/main/java/com/yihu/jw/base/dao/equipment/WlyyUserEquipmentDao.java

@@ -15,6 +15,6 @@ public interface WlyyUserEquipmentDao extends PagingAndSortingRepository<WlyyUse
    @Query("delete from WlyyUserEquipmentDO p where p.userId=?1 and del=1 ")
    void deleteByUserId(String userId);
    @Query("select id from WlyyUserEquipmentDO where userId = ?1 and del=1 ")
    @Query("select a from WlyyUserEquipmentDO a where a.userId = ?1 and a.del=1 ")
    List<WlyyUserEquipmentDO> findAllByUserId(String userId);
}

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

@@ -38,7 +38,7 @@ public class MedicineOrderDrugsEndpoint extends EnvelopRestEndpoint {
        if (map.size()>0&&mediicineorder!=null&&mediicinedrugs!=null) {
            return success(map);
        }
        return failed("处方已存在",500);
        return failed(map.get("failed").toString());
    }
}

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

@@ -6,6 +6,8 @@ import com.yihu.jw.base.dao.a2dao.MedicineorderDao;
import com.yihu.jw.base.dao.a2dao.MediicineorderdetailDao;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import com.yihu.jw.entity.a1entity.Mediicineorderdetail;
import com.yihu.jw.entity.hospital.DmHospitalDO;
import com.yihu.jw.hospital.HospitalDao;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,6 +28,9 @@ public class MedOrderService {
    MedicineorderDao mediicineorderDao;
    @Autowired
    MediicineorderdetailDao mediicineorderdetailDao;
    @Autowired
    HospitalDao hospitalDao;
    /**
     * 获取续方订单及药方
     * @return
@@ -50,9 +55,11 @@ public class MedOrderService {
            mediicineorder.setName(name);
            String age=params.getString("rx_patient_age");
            mediicineorder.setAge(age);
            mediicineorder.setBelongCommunity(params.getString("belong_community"));
            String belongCommunity=params.getString("belong_community");
            mediicineorder.setBelongCommunity(belongCommunity);
            mediicineorder.setSellState("0");
            mediicineorder.setCommunity(params.getString("community"));
            DmHospitalDO hospitalDO=hospitalDao.findByCode(belongCommunity);
            mediicineorder.setCommunity(hospitalDO.getName());
            mediicineorder.setUserId(params.getString("user_id"));
            mediicineorder.setShopNo(params.getString("shop_no"));
            mediicineorder.setPrescribeNum(params.getString("rx_no"));