wangjun преди 4 години
родител
ревизия
1d31a96316

+ 2 - 5
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/YkyyEntranceService.java

@ -445,11 +445,10 @@ public class YkyyEntranceService {
        }
        List<WlyyOutpatientVO> wlyyOutpatientVOS = new ArrayList<>();
        WlyyOutpatientVO wlyyOutpatientVO;
        for (int i = 0; i < jsonArray.size(); i++) {
            JSONObject jsonObjectMgsInfo = jsonArray.getJSONObject(i);
            if (null != jsonObjectMgsInfo) {
                wlyyOutpatientVO = new WlyyOutpatientVO();
                WlyyOutpatientVO wlyyOutpatientVO = new WlyyOutpatientVO();
                wlyyOutpatientVO.setHospital(orgCode);
                wlyyOutpatientVO.setHospitalName(orgName);
                wlyyOutpatientVO.setWinNo("6");
@ -484,7 +483,6 @@ public class YkyyEntranceService {
                String conDate = null == jsonObjectMgsInfo.get("KSSJ") ? "" : jsonObjectMgsInfo.get("KSSJ") + "";
                wlyyOutpatientVO.setAdmDate(DateUtil.strToDate(admDate, DateUtil.YYYY_MM_DD_HH_MM_SS_));
                wlyyOutpatientVO.setConDate(DateUtil.strToDate(conDate, DateUtil.YYYY_MM_DD_HH_MM_SS_));
                wlyyOutpatientVOS.add(wlyyOutpatientVO);
                List<WlyyInspectionVO> inspectionVOList = new ArrayList<>();
                JSONArray array = findV_ZKSG_JCCX(PAT_NO,wlyyOutpatientVO.getAdmNo(),demoFlag);
                for (int j=0;j<array.size();j++){
@ -504,7 +502,7 @@ public class YkyyEntranceService {
                    inspectionVOList.add(wlyyInspectionVO);
                }
                wlyyOutpatientVO.setInspectionVOS(inspectionVOList);
                wlyyOutpatientVOS.add(wlyyOutpatientVO);
            }
        }
        return wlyyOutpatientVOS;
@ -532,7 +530,6 @@ public class YkyyEntranceService {
        return new JSONArray();
    }
    /**
     * 查找眼科his 审方失败
     * @throws Exception

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

@ -2159,7 +2159,7 @@ public class ImService {
		String  sql = "";
		//专家咨询
		if("1".equals(type) || "15".equals(type) || type.contains(",")){
		if("1".equals(type) || "15".equals(type) || type.contains(",")||"17".equals(type)){
			sql = "SELECT " +
					"a.id AS \"id\"," +
					"a.type AS \"type\"," +
@ -2581,7 +2581,7 @@ public class ImService {
		}*/
		String  sql = "";
		//专家咨询
		if("1".equals(type) || "15".equals(type) || type.contains(",")){
		if("1".equals(type) || "15".equals(type) || type.contains(",")||"17".equals(type)){
			sql = "SELECT " +
					" COUNT(1) AS \"total\" "+
					"FROM wlyy_consult a," +

+ 1 - 3
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/wechat/WechatMenuController.java

@ -29,8 +29,6 @@ public class WechatMenuController extends EnvelopRestEndpoint {
    private static String wechat_token ="xAeQrX7uOD0OusIZ5JUQzrLPYIQBlqbS" ;
    @Autowired
    private HttpUtil httpUtil;
    @Autowired
    private WxAccessTokenService wxAccessTokenService;
    @Value("${wechat.id}")
    private String wechatId;
@ -62,7 +60,7 @@ public class WechatMenuController extends EnvelopRestEndpoint {
            bufferedReader.close();
            reader.close();
            // 请求微信接口创建菜单
            String jsonStr = httpUtil.sendPost(url, params);
            String jsonStr = HttpUtil.sendPost(url, params);
            JSONObject result = new JSONObject(jsonStr);
            if (result != null && result.get("errcode").toString().equals("0") && result.getString("errmsg").equals("ok")) {
                return  "创建成功!";