Merge branch 'medicare' of liubing/wlyy2.0 into medicare

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

@@ -43,6 +43,7 @@ import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
@@ -122,6 +123,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    private MedicineWarrayRuleDao medicineWarrayRuleDao;
    @Autowired
    private WlyyUserAreaDao userAreaDao;
    @Value("${spring.profiles}")
    private String springProfiles;
    /**
     * 新增药品信息
@@ -1131,7 +1134,12 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    //=================================调用i健康接口=================================//
    public String getEhcCardInfo(String ehealthCode) throws Exception {
        OauthWlyyConfigDO oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("EHCVerify");
        OauthWlyyConfigDO oauthWlyyConfigDO = null;
        if ("jwZnygProd".equals(springProfiles)){
            oauthWlyyConfigDO  = oauthWlyyConfigDao.findOne("EHCVerify_OUT");
        }else {
            oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("EHCVerify");
        }
        //token获取accesstoken
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("appid", oauthWlyyConfigDO.getAppId()));
@@ -1195,7 +1203,12 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
     * @return
     */
    public boolean scanQrdispensaryCode(String code,String deviceNum){
        OauthWlyyConfigDO oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("scanQrdispensaryCode");
        OauthWlyyConfigDO oauthWlyyConfigDO=null;
        if ("jwZnygProd".equals(springProfiles)){
             oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("scanQrdispensaryCode_OUT");
        }else {
             oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("scanQrdispensaryCode");
        }
        //token获取accesstoken
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("appid", oauthWlyyConfigDO.getAppId()));
@@ -1304,7 +1317,12 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
     * @return
     */
    public boolean sickPhysicDosage(String orgCode,String applyNo,String deviceNum){
        OauthWlyyConfigDO oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("sickPhysicDosage");
        OauthWlyyConfigDO oauthWlyyConfigDO = null;
        if ("jwZnygProd".equals(springProfiles)){
            oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("sickPhysicDosage_OUT");
        }else {
            oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("sickPhysicDosage");
        }
        //token获取accesstoken
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("appid", oauthWlyyConfigDO.getAppId()));
@@ -1369,7 +1387,12 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            orgCode = mediicinedevice.getBelongCommunity();
            community = mediicinedevice.getCommunity();
        }
        OauthWlyyConfigDO oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("getPhysicApplyWaitExecList");
        OauthWlyyConfigDO oauthWlyyConfigDO = null;
        if ("jwZnygProd".equals(springProfiles)){
            oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("getPhysicApplyWaitExecList_OUT");
        }else{
             oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("getPhysicApplyWaitExecList");
        }
        //token获取accesstoken
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("appid", oauthWlyyConfigDO.getAppId()));
@@ -1602,7 +1625,12 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
     * @return
     */
    public boolean sendDoctorTemplates(String idcard,String type,String jumpUrl,String first,String remark,String keywords){
        OauthWlyyConfigDO oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("sendDoctorTemplates");
        OauthWlyyConfigDO oauthWlyyConfigDO = null;
        if ("jwZnygProd".equals(springProfiles)){
            oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("sendDoctorTemplates_OUT");
        }else {
            oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("sendDoctorTemplates");
        }
        //token获取accesstoken
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("appid", oauthWlyyConfigDO.getAppId()));

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/channel/MedicineService.java

@@ -25,6 +25,7 @@ import org.apache.http.message.BasicNameValuePair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -51,6 +52,8 @@ public class MedicineService {
    private HospitalDao hospitalDao;
    @Autowired
    private MediicinedrugsNumberDao mediicinedrugsNumberDao;
    @Value("${spring.profiles}")
    private String springProfiles;
    public void getOrgPhysicDict(String orgCode, String name, String orgName, String physicCode) {
@@ -173,7 +176,13 @@ public class MedicineService {
     * @return
     */
    public String getPhysicStorageInfo(String orgCode,String lotNumber,String execOperator){
        OauthWlyyConfigDO oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("getPhysicStorageInfo");
        OauthWlyyConfigDO oauthWlyyConfigDO = null;
        if ("jwZnygProd".equals(springProfiles)){
            oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("getPhysicStorageInfo_OUT");
        }else {
            oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("getPhysicStorageInfo");
        }
        //token获取accesstoken
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("appid", oauthWlyyConfigDO.getAppId()));