浏览代码

电子病历

wangjun 4 年之前
父节点
当前提交
d60c03701c

+ 10 - 12
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java

@ -1707,25 +1707,25 @@ public class XzzxEntranceService{
            condition+="<emrtitle>"+jsonObject.getString("emrtitle")+"</emrtitle>";
        }
        if (null!=jsonObject.get("catalogid")){
            condition = "<catalogid>"+jsonObject.getString("catalogid")+"</catalogid>";
            condition += "<catalogid>"+jsonObject.getString("catalogid")+"</catalogid>";
        }
        if (null!=jsonObject.get("operatorname")){
            condition = "<operatorname>"+jsonObject.getString("operatorname")+"</operatorname>";
            condition += "<operatorname>"+jsonObject.getString("operatorname")+"</operatorname>";
        }
        if (null!=jsonObject.get("operatorname")){
            condition = "<operatorname>"+jsonObject.getString("operatorname")+"</operatorname>";
            condition += "<operatorname>"+jsonObject.getString("operatorname")+"</operatorname>";
        }
        if (null!=jsonObject.get("operatorid")){
            condition = "<operatorid>"+jsonObject.getString("operatorid")+"</operatorid>";
            condition += "<operatorid>"+jsonObject.getString("operatorid")+"</operatorid>";
        }
        if (null!=jsonObject.get("operatorid")){
            condition = "<operatorid>"+jsonObject.getString("operatorid")+"</operatorid>";
            condition += "<operatorid>"+jsonObject.getString("operatorid")+"</operatorid>";
        }
        if (null!=jsonObject.get("emrtype")){
            condition = "<emrtype>"+jsonObject.getString("emrtype")+"</emrtype>";
            condition += "<emrtype>"+jsonObject.getString("emrtype")+"</emrtype>";
        }
        if (null!=jsonObject.get("id")){
            condition = "<id>"+jsonObject.getString("id")+"</id>";
            condition += "<id>"+jsonObject.getString("id")+"</id>";
        }
        String msgBody ="<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
                "<root>"+condition+"</root>";
@ -1733,12 +1733,10 @@ public class XzzxEntranceService{
        params.put("msgHeader",msgHeader);
        params.put("msgBody",msgBody);
        logger.info("returnEmrHtmlByHLW params:"+params.toString());
        String xml = getXzzxWebServiceInfo("CallInterface",params,getSelectUrl());
        XMLSerializer xmlSerializer = new XMLSerializer();
        String json = xmlSerializer.read(xml).toString();
        logger.info("returnEmrHtmlByHLW json:"+json);
        String xml = getXzzxWebServiceInfo("CallInterface",params,getOperateUrl());
        logger.info("returnEmrHtmlByHLW json:"+xml);
        return json;
        return xml;
    }
//=====================微信模板消息推送===================================

+ 3 - 1
business/base-service/src/main/java/com/yihu/jw/internet/service/InternetCommonService.java

@ -984,7 +984,9 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
                "      join base_doctor b on b.id = a.doctor" +
                "      join base_patient c on c.id = a.patient" +
                " where a.register_no is NOT NULL and a.dept is not null " +
                " and a.register_date is not null " ;
                " and a.register_date is not null " +
                " and a.doctor not in ('402803816babc778016babd0dee21112')" +
                " and a.patient not in ('2c9081aa6c2f1892016c6a26a8c102ca','39686349deff487d8f3372fc253b8417') " ;
        Map<String,Object> params = new HashedMap();

+ 1 - 0
svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/XzzxCotroller.java

@ -605,4 +605,5 @@ public class XzzxCotroller extends EnvelopRestEndpoint {
        WlyyPrescriptionEmrDO wlyyPrescriptionEmrDO = toEntity(emrInfo,WlyyPrescriptionEmrDO.class);
        return ObjEnvelop.getSuccess("ok",xzzxEntranceService.returnEmrHtmlByHLW(jsonObject,wlyyPrescriptionEmrDO));
    }
}