Merge branch 'master' of http://192.168.1.220:10080/esb/esb

Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/util/RPCUtil.java

@@ -91,19 +91,19 @@ public class RPCUtil {
        //param = "<Req><TransactionCode>5001</TransactionCode><Data><CardType>1</CardType><CardNo>000021341249</CardNo><IdCardNo>352103197603094519</IdCardNo><StartDate>2016-01-01</StartDate><EndDate>2016-04-05</EndDate><Mobile>1885215394</Mobile><PatientName>周春生</PatientName><ReportType>1</ReportType></Data></Req>";
        //检查/检验报告单
        	//	apiName = "ZEUS.HosHOPWs.GetReportInfo";
       //	apiName = "ZEUS.HosHOPWs.GetReportInfo";
        //		param = "<Req><TransactionCode>5002</TransactionCode><Data><ReportId>201405228-A-110B</ReportId><ReportType>0</ReportType><CardNo>000021341249</CardNo></Data></Req>";
        //查询病人信息
        //		apiName = "ZEUS.HosHOPWs.QueryUserInfo";
       // 		param = "<Req><TransactionCode>5003</TransactionCode><Data><CardType>1</CardType><CardNo>000021341249</CardNo><Mobile></Mobile><PatientId></PatientId></Data></Req>";
       //		param = "<Req><TransactionCode>5003</TransactionCode><Data><CardType>1</CardType><CardNo>000021341249</CardNo><Mobile></Mobile><PatientId></PatientId></Data></Req>";
       apiName = "ZEUS.HosHOPWs.QueryRegInfo";
       param = "<Req><TransactionCode>5003</TransactionCode><Data><CardType>1</CardType><CardNo>6001</CardNo><IdCardNo>123123</IdCardNo><OrderId>订单号</OrderId><ClinicCard>就诊卡号</ClinicCard><TimeSlice>就诊时段</TimeSlice><StartTime>就诊日期开始</StartTime><EndTime>就诊日期结束</EndTime><RegFlag>1-预约 2-当天挂号</RegFlag></Data></Req>" ;
       // param = "<Req><TransactionCode>5003</TransactionCode><Data><StartTime>2016-04-08</StartTime></Data></Req>" ;
        //挂号事件推送
        //		apiName = "ZEUS.HosHOPWs.PushGuaHaoEvent";
        //apiName = "ZEUS.HosHOPWs.PushGuaHaoEvent";
        //		param = "<Req><TransactionCode></TransactionCode><Data><EventType>事件类型:门诊、住院</EventType><EventNo>事件编码：门诊号、住院号</EventNo><CardType>证件类型</CardType><CardNo>证件号</CardNo><PatientId>病人id</PatientId></Data></Req>";
        //检查/检验报告单推送

Hos-Resource-Rest/src/main/java/com/yihu/hos/qlc/controller/QLCController.java

@@ -47,7 +47,7 @@ public class QLCController {
    /**
     * 院方_挂号事件推送
     * http://localhost:8081/gateway/transfer?api=17&param={EventType:"1",EventNo:"1",CardType:"1",CardNo:"1",PatientId:"1004295",HospitalId:"1026333"}&requestId="目前没用随便写"
     *http://localhost:8081/gateway/transfer?api=17&param={EventType:"1",EventNo:"1",CardType:"1",CardNo:"6001",PatientId:"10001",HospitalId:"1026333"}&requestId="目前没用随便写"
     */
    @RequestMapping(value = "/queryUserInfo", method = RequestMethod.POST)
    @ApiOperation(value = "挂号事件推送", response = Object.class, produces = "application/json", notes = "院方挂号事件推送")
@@ -59,7 +59,6 @@ public class QLCController {
                                         @ApiParam(value = "医院ID", required = true) @RequestParam(value = "HospitalId") String HospitalId,
                                         HttpServletRequest request) {
        SQLResponResult restResponseResult = new SQLResponResult();
        Object s = null;
        try {
            //判断参数是否为空
            isEmpty(EventType, "EventType is null");
@@ -68,83 +67,94 @@ public class QLCController {
            isEmpty(CardNo, "CardNo is null");
            isEmpty(PatientId, "PatientId is null");
            isEmpty(HospitalId, "HospitalId is null");
            //-----------------------------得到挂号信息--start
            //拼凑RPC参数
            String param = "<Req><TransactionCode>5003</TransactionCode><Data><CardType>"+CardType+"</CardType><CardNo>"+CardNo+"</CardNo><IdCardNo></IdCardNo><OrderId></OrderId><ClinicCard></ClinicCard><TimeSlice></TimeSlice><StartTime></StartTime><EndTime></EndTime><RegFlag>2</RegFlag></Data></Req>";
            String apiparam = "{\"ChannelId\"=\"" + Config.channelId + "\"," +
                    "\"ParamType\"=1," +
                    "\"Params\"=\"" + param + "\"," +
                    "\"Guid\"=\"00000001111111\"," +
                    "\"V\"=\"3.0.0\"," +
                    "\"OutType\"=1," +
                    "\"HospitalId\"=\"" + HospitalId + "\"}";
            s = RPCUtil.getRPCData("ZEUS.HosHOPWs.QueryRegInfo", apiparam);
            //解析xml
            SAXReader saxReader = new SAXReader();
            Document document = DocumentHelper.parseText(s.toString());
            Element root = document.getRootElement();
            String respCode=root.element("RespCode").getText();
            if ("10000".equals(respCode)) {
                //調用接口存入mongo--挂号信息
                Map<String, Object> params = new HashMap<String, Object>();
                params.put("dataset", "HDSC01_02");
                params.put("data", XML2JsonData(root.asXML()));
                params.put("orgCode", HospitalId);
                String monogoUrl = httpClientUtil.doPost(Config.monogoUrl, params, null, null);
                monogoUrlValid(monogoUrl,"挂号信息mongo入库失败");
            } else {
                throw new Exception(s.toString());
            }
            //-----------------------------得到挂号信息--end
            //-----------------------------得到人口学信息--start
            //拼凑RPC参数
             param = "<Req><TransactionCode>5003</TransactionCode><Data><CardType>"+CardType+"</CardType><CardNo>"+CardNo+"</CardNo><Mobile>123</Mobile><PatientId>"+PatientId+"</PatientId></Data></Req>";
             apiparam = "{\"ChannelId\"=\"" + Config.channelId + "\"," +
                    "\"ParamType\"=1," +
                    "\"Params\"=\"" + param + "\"," +
                    "\"Guid\"=\"00000001111111\"," +
                    "\"V\"=\"3.0.0\"," +
                    "\"OutType\"=1," +
                    "\"HospitalId\"=\"" + HospitalId + "\"}";
            s = RPCUtil.getRPCData("ZEUS.HosHOPWs.QueryUserInfo", apiparam);
            //解析xml
            saxReader = new SAXReader();
            document = DocumentHelper.parseText(s.toString());
            root = document.getRootElement();
            respCode=root.element("RespCode").getText();
            if ("10000".equals(respCode)) {
                //調用接口存入mongo--人口学信息
                Map<String, Object> params = new HashMap<String, Object>();
                params.put("dataset", "HDSA00_01");
                params.put("data", XML2JsonData(root.asXML()));
                params.put("orgCode", HospitalId);
                String monogoUrl = httpClientUtil.doPost(Config.monogoUrl, params, null, null);
                monogoUrlValid(monogoUrl,"人口学信息mongo入库失败");
                //触发採集上傳
                params = new HashMap<String, Object>();
                String jsonObject="{\"orgCode\":\""+HospitalId+"\",\"eventNo\":\""+EventNo+"\",\"patientId\":\""+PatientId+"\"}";
                params.put("patient", jsonObject);
                String startCollect = httpClientUtil.doPost(Config.startCollect, params, null, null);
                monogoUrlValid(startCollect,"数据上传失败");
            } else {
                throw new Exception(s.toString());
            }
            //得到挂号信息和病人基本信息
            getRegAndUserInfo(CardType, CardNo, PatientId, HospitalId);
            Map<String, Object> params = new HashMap<String, Object>();
            //触发採集上傳
            String jsonObject="{\"orgCode\":\""+HospitalId+"\",\"eventNo\":\""+EventNo+"\",\"patientId\":\""+PatientId+"\"}";
            params.put("patient", jsonObject);
            String startCollect = httpClientUtil.doPost(Config.startCollect, params, null, null);
            monogoUrlValid(startCollect,"数据上传失败");
        } catch (Exception e) {
            restResponseResult.setStatus("1");
            restResponseResult.setStatusInfo(e.getMessage() + "       RPC:返回" + s);
            restResponseResult.setStatusInfo(e.getMessage());
            e.printStackTrace();
            return restResponseResult;
        }
        return restResponseResult;
    }
    /**
     * 得到挂号信息的病人基本信息入mongo
     * @param CardType
     * @param CardNo
     * @param PatientId
     * @param HospitalId
     * @return
     * @throws Exception
     */
    private void getRegAndUserInfo(String CardType,String CardNo,String PatientId,  String HospitalId) throws Exception {
        //-----------------------------得到挂号信息--start
        //拼凑RPC参数
        String param = "<Req><TransactionCode>5003</TransactionCode><Data><CardType>"+CardType+"</CardType><CardNo>"+CardNo+"</CardNo><IdCardNo></IdCardNo><OrderId></OrderId><ClinicCard></ClinicCard><TimeSlice></TimeSlice><StartTime></StartTime><EndTime></EndTime><RegFlag>2</RegFlag></Data></Req>";
        String apiparam = "{\"ChannelId\"=\"" + Config.channelId + "\"," +
                "\"ParamType\"=1," +
                "\"Params\"=\"" + param + "\"," +
                "\"Guid\"=\"00000001111111\"," +
                "\"V\"=\"3.0.0\"," +
                "\"OutType\"=1," +
                "\"HospitalId\"=\"" + HospitalId + "\"}";
        Object s = RPCUtil.getRPCData("ZEUS.HosHOPWs.QueryRegInfo", apiparam);
        //解析xml
        Document document = DocumentHelper.parseText(s.toString());
        Element root = document.getRootElement();
        String respCode=root.element("RespCode").getText();
        if ("10000".equals(respCode)) {
            //調用接口存入mongo--挂号信息
            Map<String, Object> params = new HashMap<String, Object>();
            params.put("dataset", "HDSC01_02");
            params.put("data", XML2JsonData(root.asXML()));
            params.put("orgCode", HospitalId);
            String monogoUrl = httpClientUtil.doPost(Config.monogoUrl, params, null, null);
            monogoUrlValid(monogoUrl,"挂号信息mongo入库失败");
        } else {
            throw new Exception(s.toString());
        }
        //-----------------------------得到挂号信息--end
        //-----------------------------得到人口学信息--start
        //拼凑RPC参数
        param = "<Req><TransactionCode>5003</TransactionCode><Data><CardType>"+CardType+"</CardType><CardNo>"+CardNo+"</CardNo><Mobile>123</Mobile><PatientId></PatientId></Data></Req>";
        apiparam = "{\"ChannelId\"=\"" + Config.channelId + "\"," +
               "\"ParamType\"=1," +
               "\"Params\"=\"" + param + "\"," +
               "\"Guid\"=\"00000001111111\"," +
               "\"V\"=\"3.0.0\"," +
               "\"OutType\"=1," +
               "\"HospitalId\"=\"" + HospitalId + "\"}";
        s = RPCUtil.getRPCData("ZEUS.HosHOPWs.QueryUserInfo", apiparam);
        //解析xml
        document = DocumentHelper.parseText(s.toString());
        root = document.getRootElement();
        respCode=root.element("RespCode").getText();
        Map<String, Object> params = new HashMap<String, Object>();
        if ("10000".equals(respCode)) {
            //調用接口存入mongo--人口学信息
            params.put("dataset", "HDSA00_01");
            params.put("data", XML2JsonData(root.asXML()));
            params.put("orgCode", HospitalId);
            String monogoUrl = httpClientUtil.doPost(Config.monogoUrl, params, null, null);
            monogoUrlValid(monogoUrl,"人口学信息mongo入库失败");
        } else {
            throw new Exception(s.toString());
        }
        //-----------------------------得到人口学信息--end
    }
    /**
     * 院方_检查/检验报告单推送---数据说明
     * localhost:8081/gateway/transfer?api=18&param={CardType:"",CardNo:"000021341249",ReportType:"0",ReportId:"201405228-A-110B",State:"2",HospitalId:"1026333"}&requestId="目前没用随便写"
     * localhost:8081/gateway/transfer?api=18&param={CardType:"1",CardNo:"10003",ReportType:"2",ReportId:"123",State:"2",HospitalId:"1026333"}&requestId="目前没用随便写"
     */
    @RequestMapping(value = "/patientInformation", method = RequestMethod.POST)
    @ApiOperation(value = "检查/检验报告单推送-", response = Object.class, produces = "application/json", notes = "检查/检验报告单推送-")
@@ -168,9 +178,12 @@ public class QLCController {
            if ("1".equals(State)) {
                throw new Exception("报告未出，结束");
            }
            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
            String data =
                    "<Req><TransactionCode>5001</TransactionCode><Data><CardNo>" + CardNo + "</CardNo><ReportId>" + ReportId + "</ReportId><ReportType>" + ReportType + "</ReportType></Data></Req>";
            //得到挂号信息和病人基本信息
            getRegAndUserInfo(CardType, CardNo, null, HospitalId);
            String data ="<Req><TransactionCode>5001</TransactionCode><Data><CardNo>" + CardNo + "</CardNo><ReportId>" + ReportId + "</ReportId><ReportType>" + ReportType + "</ReportType></Data></Req>";
            String apiparam = "{\"ChannelId\"=\"" + Config.channelId + "\"," +
                    "\"ParamType\"=1," +
                    "\"Params\"=\"" + data + "\"," +
@@ -208,12 +221,24 @@ public class QLCController {
                            jsonArray1.add(jo1);
                        }
                    }
                    String evenNo=jo.get("EVENT_NO").toString();
                    jsonArray.add(jo);
                    //上傳主表
                    addMongoAndUpload("HDSD02_01",  jo.get("EVENT_NO").toString(),CardNo, HospitalId, jsonArray);
                    //上傳細表
                    addMongoAndUpload("HDSD02_02",  jo.get("EVENT_NO").toString(),CardNo, HospitalId, jsonArray1);
                    if(ReportType.equals("1")){
                        //检验报告
                        //上傳主表
                        addMongo("HDSD02_01", evenNo,CardNo, HospitalId, jsonArray);
                        //上傳細表
                        addMongo("HDSD02_03", evenNo,CardNo, HospitalId, jsonArray1);
                    }else{
                        //检查报告
                        addMongo("HDSD01_01", evenNo,CardNo, HospitalId, jsonArray);
                    }
                    //出發採集上傳
                    Map<String,Object> params = new HashMap<String, Object>();
                    String jsonObject="{\"orgCode\":\""+HospitalId+"\",\"eventNo\":\""+evenNo+"\",\"patientId\":\""+CardNo+"\"}";
                    params.put("patient", jsonObject);
                    String startCollect = httpClientUtil.doPost(Config.startCollect, params, null, null);
                    monogoUrlValid(startCollect,"数据上传失败");
                }
            } else {
@@ -227,19 +252,13 @@ public class QLCController {
        return restResponseResult;
    }
    private void addMongoAndUpload(String tableName,String evenNo,String CardNo,String HospitalId, JSONArray jsonArray) throws Exception {
    private void addMongo(String tableName,String evenNo,String CardNo,String HospitalId, JSONArray jsonArray) throws Exception {
        Map<String, Object> params = new HashMap<String, Object>();
        params.put("dataset", tableName);
        params.put("data", jsonArray.toString());
        params.put("orgCode", HospitalId);
        String monogoUrl = httpClientUtil.doPost(Config.monogoUrl, params, null, null);
        monogoUrlValid(monogoUrl,"mongo入库失败");
        //出發採集上傳
        params = new HashMap<String, Object>();
        String jsonObject="{\"orgCode\":\""+HospitalId+"\",\"eventNo\":\""+evenNo+"\",\"patientId\":\""+CardNo+"\"}";
        params.put("patient", jsonObject);
        String startCollect = httpClientUtil.doPost(Config.startCollect, params, null, null);
        monogoUrlValid(startCollect,"数据上传失败");
    }
    private String getOrgCodeBy(String orgCode) {

Hos-Resource-Rest/src/main/java/com/yihu/hos/resource/viewModel/SQLResponResult.java

@@ -17,7 +17,7 @@ public class SQLResponResult {
     * "data": []
     * }
     */
    private String statusInfo;
    private String statusInfo="推送数据成功";
    public String getStatus() {
        return status;

Hos-resource/src/main/java/com/yihu/ehr/datacollect/controller/DataCollectController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -103,6 +104,22 @@ public class DataCollectController extends BaseController {
        }
    }
    @RequestMapping("compareServeTime")
    @ResponseBody
    public Result getJob(String time){
        try {
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            if(df.parse(time).before(new Date())) {
                return Result.success("beforeServeTime");
            }
            else
                return Result.error("afterServeTime");
        }catch (Exception ex){
            return Result.error(ex.getMessage());
        }
    }
    /**
     * 根据适配方案获取数据集列表
     */

Hos-resource/src/main/resources/config/http.properties

@@ -4,7 +4,7 @@ httpUrl = https://172.19.103.73:443/api/v1.0
  #https://172.19.103.73:443/api/v1.0
sslKeystore = D:/apache-tomcat-7.0.6/tomcat.keystore
sslKeystore = D:/keystore/tomcat.keystore
sslPassword = 123456
clientId = 1FtXTrSL8D
clientKey = MUZ0WFRyU0w4RDp1c3ZOeWxWc0ZvdFVlQ2tE

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/editorJobJs.jsp

@@ -5,6 +5,7 @@
<script>
    var editorJob={
        beforeServeTime:false,
        archiveUpload:"com.yihu.ehr.job.service.ArchiveUploadJob",
        $form:$("#div_form"),
        $listPlan:null,//适配方案列表
@@ -568,6 +569,15 @@
                    //档案上传接口值校验
                    if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload)
                    {
                        if($("#repeatStartTime").ligerDateEditor("getValue")!="")
                        {
                            editorJob.compareServeTime($("#repeatStartTime").ligerDateEditor("getValue"));
                            if(editorJob.beforeServeTime==true) {
                                return false;
                            }
                            else
                                return true;
                        }
                        if(data.jobType == "0") {
                            if($("#repeatStartTime").ligerDateEditor("getValue")==""&&$("#repeatEndTime").ligerDateEditor("getValue")=="")
                            {
@@ -846,7 +856,33 @@
                    }
                }
            }
        }
        },
        compareServeTime:function(time){
            $.ajax({ //获取表的字段列表
                type: "POST",
                url : "${contextRoot}/datacollect/compareServeTime",
                dataType : "json",
                data:{time:time},
                cache:false,
                async:false,
                success :function(data){
                    if(data.successFlg) {
                        editorJob.beforeServeTime=true;
                        $.ligerDialog.error("采集时间不能小于当前时间！");
                    }
                    else{
                    }
                },
                error :function(data){
                    editorJob.beforeServeTime=true;
                    $.ligerDialog.error("Status:"+data.status +"(" +data.statusText+")");
                }
            });
        },
    }
    $(function () {