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

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -3261,6 +3261,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                "WHERE " +
                "room.patient_id=patient.id " +
                "AND room.outpatient_id=outpatient.id " +
                "AND outpatient.pay_status = 1 " +
                "AND outpatient.status = 0 ";
        //视频复诊，协同门诊 医生抢单
        if(type == 2 ){
@@ -4338,8 +4339,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                "base_patient patient " +
                "WHERE " +
                "outpatient.patient=patient.id " +
                "AND outpatient.status in (0,1) " +
                "AND outpatient.status <> -1 " +
                "AND outpatient.doctor='"+doctor+"' " +
                "AND outpatient.pay_status = 1 " +
                "AND outpatient.outpatient_type= '"+outpatient_type+"' ";
        if("1".equals(outpatient_type)){//复诊
            sql =  sql + " AND outpatient.type= '"+type+"' ";

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -40,6 +40,7 @@ import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionDiagnosisVO;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionInfoVO;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionVO;
import com.yihu.jw.restmodel.im.ConsultVO;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.util.common.FileUtil;
import com.yihu.jw.util.common.IdCardUtil;
@@ -791,6 +792,13 @@ public class ImService {
				//中山医院互联网医院
				if("xm_zsyy_wx".equals(wechat_appid)){
					accessToken = entranceService.getAccessToken("100033");
					
					net.sf.json.JSONObject object1 = net.sf.json.JSONObject.fromObject(accessToken);
					if (null != object1&&null!=object1.get("respCode") && "00".equals(object1.get("respCode"))) {
						accessToken  = object1.getJSONObject("respEntity").getString("access_token");
					} else {
						throw new Exception("获取ACCESSTOKEN失败");
					}
				}else{
					wxAccessTokenService.deleteByWechatId(wechat_appid);
					accessToken = wxAccessTokenService.updateAccessToken(wechat_appid);

common/common-request-mapping/src/main/java/com/yihu/jw/rm/iot/IotRequestMapping.java

@@ -380,6 +380,7 @@ public class IotRequestMapping {
        public static final String addInterface ="addInterface";
        public static final String editInterface ="editInterface";
        public static final String findInterfaceById ="findInterfaceById";
        public static final String parameterDescription = "parameterDescription";
        public static final String findAll ="findAll";
        public static final String findAllApp ="findAllApp";
        public static final String findAllLog ="findAllLog";

svr/svr-iot/src/main/java/com/yihu/iot/controller/platform/IotInterfaceController.java

@@ -89,6 +89,19 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
    }
    @GetMapping(value = IotRequestMapping.Platform.parameterDescription)
    @ApiOperation(value = "查找公共参数说明",notes = "查找公共参数说明")
    public MixEnvelop parameterDescription(){
        try {
            IotShareInterfaceDO iotShareInterfaceDO = iotShareInterfaceService.findByIdNew("0");
            return MixEnvelop.getSuccess("获取成功",iotShareInterfaceDO.getDocUrl());
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
        }
    }
    @PostMapping(value = IotRequestMapping.Platform.findAll)
    @ApiOperation(value = "分页查询所有共享接口",notes = "分页查询所有共享接口")

svr/svr-iot/src/main/java/com/yihu/iot/dao/platform/IotShareInterfaceDao.java

@@ -14,4 +14,7 @@ public interface IotShareInterfaceDao extends PagingAndSortingRepository<IotShar
    @Query("from IotShareInterfaceDO w where w.id =?1 and w.del=0")
    IotShareInterfaceDO findById(String id);
    @Query("from IotShareInterfaceDO w where w.id =?1 ")
    IotShareInterfaceDO findByIdNew(String id);
}

svr/svr-iot/src/main/java/com/yihu/iot/service/platform/IotShareInterfaceService.java

@@ -76,7 +76,7 @@ public class IotShareInterfaceService extends BaseJpaService<IotShareInterfaceDO
        oldInterface.setExplanation(newInterface.getExplanation());
        oldInterface.setMethodName(newInterface.getMethodName());
        oldInterface.setInterfaceName(newInterface.getInterfaceName());
        oldInterface.setId(newInterface.getId());
        oldInterface.setDocUrl(newInterface.getDocUrl());
        oldInterface.setDel("0");
        iotShareInterfaceDao.save(oldInterface);
    }
@@ -92,6 +92,17 @@ public class IotShareInterfaceService extends BaseJpaService<IotShareInterfaceDO
        return iotShareInterfaceDO;
    }
    /**
     * 根据ID查询接口
     * @param id
     * @return
     */
    public IotShareInterfaceDO findByIdNew(String id) {
        IotShareInterfaceDO iotShareInterfaceDO = iotShareInterfaceDao.findByIdNew(id);
        return iotShareInterfaceDO;
    }
    /**
     * 分页查询所有

svr/svr-iot/src/main/resources/application.yml

@@ -109,9 +109,9 @@ spring:
    password: ssgg@jkzl2019
  elasticsearch:
    cluster-name: jkzl #默认即为elasticsearch  集群名
    cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    cluster-nodes: 172.26.0.112:9300,172.26.0.112:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    jest:
      uris: http://172.19.103.45:9200,http://172.19.103.68:9200
      uris: http://172.26.0.112:9200,http://172.26.0.112:9200
  wlyy:
    url: http://ehr.yihu.com/wlyy/
    appid: 915d0345-5b1d-11e6-8344-fa163e8aee62