Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/common/thread/UploadChargeThread.java

@@ -1,6 +1,5 @@
package com.yihu.wlyy.sign.common.thread;
import com.yihu.wlyy.sign.common.util.DateUtil;
import com.yihu.wlyy.sign.common.util.SpringContextHolder;
import com.yihu.wlyy.sign.service.ChargeZYService;
import com.yihu.wlyy.sign.service.SystemDictService;

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/service/ChargeZYService.java

@@ -120,23 +120,28 @@ public class ChargeZYService {
            Patient patient = patientDao.findByCode(sign.getPatient());
            try {
                hm = getHospitalMapping(sign.getHospital()); //获取机构映射
    
                com.alibaba.fastjson.JSONObject jsonObject = new com.alibaba.fastjson.JSONObject();
                
                Map<String, String> params = new HashMap<>();
                params.put("IDENTITY_CARD_NO", idcard);  //身份证
                params.put("SIGN_MANAGE_YEAR", year);  //签约年度
                params.put("SICK_NAME", patient.getName());  //姓名
                jsonObject.put("IDENTITY_CARD_NO", idcard);//身份证
                jsonObject.put("SIGN_MANAGE_YEAR", year);//签约年度
                jsonObject.put("SICK_NAME", patient.getName());//姓名
                
                if(sign.getExpensesTime() == null){
                    //如果签约表的支付时间为空，则从支付表获取支付时间
                    Date newdate = DateUtil.formatCharDateYMD(charge.getChargeTime(),"yyyyMMddHHmmss");
                    params.put("CHARGE_TIME", DateUtil.dateToStrLong(newdate));  //缴费时间
//                    params.put("CHARGE_TIME", DateUtil.dateToStrLong(newdate));  //缴费时间
                    jsonObject.put("CHARGE_TIME", DateUtil.dateToStrLong(newdate));//缴费时间
                    sign.setExpensesTime(newdate);
                    sign.setExpensesStatus("1");//已支付
                }else{
                    params.put("CHARGE_TIME", DateUtil.dateToStrLong(sign.getExpensesTime()));  //缴费时间
//                    params.put("CHARGE_TIME", DateUtil.dateToStrLong(sign.getExpensesTime()));  //缴费时间
                    jsonObject.put("CHARGE_TIME",DateUtil.dateToStrLong(sign.getExpensesTime()));//缴费时间
                }
                
               
                params.put("INSUR_PRO_ID", charge.getMiRegisterNo());  //医保签约号
    
                jsonObject.put("INSUR_PRO_ID",charge.getMiRegisterNo());//医保签约号
//                params.put("INSUR_PRO_ID", charge.getMiRegisterNo());  //医保签约号
                if("1".equals(sign.getRenewFlag())||"2".equals(sign.getRenewFlag())){
@@ -178,41 +183,43 @@ public class ChargeZYService {
                        return true;
                    }
                }
                params.put("PRO_ID", proId);  //标志(智业签约主键)
    
                jsonObject.put("PRO_ID",proId);////标志(智业签约主键)
//                params.put("PRO_ID", proId);  //标志(智业签约主键)
                operator = doctorMappingDao.findByDocotrCodeAndJwDoctorHospital(operator,hm[0]);  //【医生映射】
                if(operator==null)
                {
                    System.out.print("operator:"+operator+","+hm[0]);
                }
                params.put("CHARGE_OPERATOR", operator);  //收费医生
                jsonObject.put("CHARGE_OPERATOR",operator);////收费医生
//                params.put("CHARGE_OPERATOR", operator);  //收费医生
    
                //缴费明细---2017.12.12---黄文杰
                Map<String, String> INSUR_FEE_INFO = new HashMap<>();
//                Map<String, String> INSUR_FEE_INFO = new HashMap<>();
                com.alibaba.fastjson.JSONObject infoobj = new com.alibaba.fastjson.JSONObject();
                HospitalMapping hospitalMapping = hospitalMappingDao.getMappingCode(sign.getHospital(), "1");  //转换成基卫机构代码
                INSUR_FEE_INFO.put("qyjg00",hospitalMapping.getSbCode());//签约机构
                INSUR_FEE_INFO.put("qyys00",sign.getDoctorName());//签约医生
                INSUR_FEE_INFO.put("btlx00",sign.getExpensesType());//补贴类型
                INSUR_FEE_INFO.put("djjg00",hospitalMapping.getSbCode());//登记机构
                INSUR_FEE_INFO.put("djr000",sign.getDoctorName());//登记人
                INSUR_FEE_INFO.put("djsj00",DateUtil.dateToStrShort(sign.getBegin()));//登记时间
                INSUR_FEE_INFO.put("qyzt00",charge.getMiRegisterStatus());//登记状态
                INSUR_FEE_INFO.put("kfjg00",hospitalMapping.getSbCode());//扣费机构
                INSUR_FEE_INFO.put("kfrxm0",sign.getDoctorName());//扣费人
                INSUR_FEE_INFO.put("kfsj00",charge.getChargeTime());//扣费时间
                INSUR_FEE_INFO.put("kfzt00",charge.getMiCollectStatus());//扣费状态
                INSUR_FEE_INFO.put("kfdjh0",charge.getMiSettleNo());//扣费单据号
                INSUR_FEE_INFO.put("zje000",String.valueOf(charge.getMiTotalFee()));//扣费总额
                INSUR_FEE_INFO.put("zfbtzf",charge.getCadresPay());//政府补贴支付
                INSUR_FEE_INFO.put("tcjjzf",charge.getHealthCarePay());//医保统筹支付
                INSUR_FEE_INFO.put("jkzhzf",charge.getHeathPay());//健康账户支付
                INSUR_FEE_INFO.put("zhzfe0",charge.getAccountPay());//医保账户支付
                INSUR_FEE_INFO.put("xjzfe0",charge.getSelfPay());//个人现金自付
                INSUR_FEE_INFO.put("INSUR_FEE_INFO",JSONObject.fromObject(INSUR_FEE_INFO).toString());
                infoobj.put("qyjg00",hospitalMapping.getSbCode());//签约机构
                infoobj.put("qyys00",sign.getDoctorName());//签约医生
                infoobj.put("btlx00",sign.getExpensesType());//补贴类型
                infoobj.put("djjg00",hospitalMapping.getSbCode());//登记机构
                infoobj.put("djr000",sign.getDoctorName());//登记人
                infoobj.put("djsj00",DateUtil.dateToStrShort(sign.getBegin()));//登记时间
                infoobj.put("qyzt00",charge.getMiRegisterStatus());//登记状态
                infoobj.put("kfjg00",hospitalMapping.getSbCode());//扣费机构
                infoobj.put("kfrxm0",sign.getDoctorName());//扣费人
                infoobj.put("kfsj00",charge.getChargeTime());//扣费时间
                infoobj.put("kfzt00",charge.getMiCollectStatus());//扣费状态
                infoobj.put("kfdjh0",charge.getMiSettleNo());//扣费单据号
                infoobj.put("zje000",String.valueOf(charge.getMiTotalFee()));//扣费总额
                infoobj.put("zfbtzf",charge.getCadresPay());//政府补贴支付
                infoobj.put("tcjjzf",charge.getHealthCarePay());//医保统筹支付
                infoobj.put("jkzhzf",charge.getHeathPay());//健康账户支付
                infoobj.put("zhzfe0",charge.getAccountPay());//医保账户支付
                infoobj.put("xjzfe0",charge.getSelfPay());//个人现金自付
                jsonObject.put("INSUR_FEE_INFO",infoobj);
                
                String response = zysoftService.uploadChargeInfo(params, hm[0], hm[1], operator);
                String response = zysoftService.uploadChargeInfo(jsonObject, hm[0], hm[1], operator);
                Map<String, String> map = zysoftService.getJwOne(response);
                msg = map.get("MESSAGE");

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/service/ZysoftService.java

@@ -1,5 +1,6 @@
package com.yihu.wlyy.sign.service;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.wlyy.sign.common.http.HttpApiException;
import com.yihu.wlyy.sign.common.util.StringUtil;
@@ -171,6 +172,78 @@ public class ZysoftService {
        return re;
    }
    
    /**
     * 基卫二次封装Post接口
     */
    private String postSecondJson(String api, String content, com.alibaba.fastjson.JSONObject jsonParams, Map<String,String> headers,boolean needRetry) throws Exception
    {
        String re = "";
        headers.put("INTERFACE",api);
        
        Map<String,String> paramsList = new HashMap<>();
        String msgBody = com.alibaba.fastjson.JSONObject.toJSONString(jsonParams, SerializerFeature.WriteMapNullValue);
        String msgHeader = JSONObject.fromObject(headers).toString();
        paramsList.put("msgHeader",msgHeader);
        paramsList.put("msgBody",msgBody);
    
    
        //System.out.print("msgHeader:"+msgHeader+"\r\n");
        //System.out.print("msgBody:"+msgBody+"\r\n");
    
        //新增日志
        String method = "POST";
        Boolean isSuccess = true;
        String error = "";
    
        int times = 0;
        try {
            re = ZysoftApi.getSingleton().post("base/CallEhrInterface", paramsList, null, true);
            if(needRetry)
            {
                int maxTimes = retryTimes;
                while(maxTimes>0 && re.contains("接口调用传入的参数[msgHeader]格式不正确"))    //基卫bug预防，重调接口
                {
                    re = ZysoftApi.getSingleton().post("base/CallEhrInterface", paramsList, null,true);
                    maxTimes --;
                    times++;
                }
            }
        
            Map<String,String> map = objectMapper.readValue(re, Map.class);
            String code = map.get("CODE");
        
            if(!code.equals("1"))
            {
                throw new HttpApiException(Integer.valueOf(code),map.get("MESSAGE"));
            }
        
            //保存http日志
            logService.saveHttpLog(isSuccess,api,content,method,msgHeader,msgBody,re,error);
        }
        catch (Exception ex)
        {
            isSuccess = false;
            StringWriter sw = new StringWriter();
            PrintWriter pw = new PrintWriter(sw);
            ex.printStackTrace(pw);
            error = sw.toString();
        
            //保存http日志
            logService.saveHttpLog(isSuccess,api,content,method,msgHeader,msgBody,re,error);
        
            if(ex instanceof ApiException)
            {
                ApiException apiEx = (ApiException) ex;
                throw new HttpApiException(apiEx.errorCode(),ex.getMessage());
            }
            else{
                throw new HttpApiException(-1,ex.getMessage());
            }
        }
    
        return re;
    }
    /**
@@ -479,14 +552,14 @@ public class ZysoftService {
    /**
     * 上传缴费记录
     */
    public String uploadChargeInfo(Map<String,String> params,String hospital,String licence,String operator)  throws Exception
    public String uploadChargeInfo(com.alibaba.fastjson.JSONObject jsonParams,String hospital,String licence,String operator)  throws Exception
    {
        Map<String,String> header = new HashMap<>();
        header.put("ORGCODE",hospital);
        header.put("LICENCE",licence);
        header.put("OPERATOR",operator);
        String response = postSecond("uploadPaymentInformation","上传缴费记录",params,header,true);
        String response = postSecondJson("uploadPaymentInformation","上传缴费记录",jsonParams,header,true);
        return response;
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/jimeiJkEdu/JMJkEduArticleService.java

@@ -710,7 +710,7 @@ public class JMJkEduArticleService extends BaseService {
        patientSet.addAll(resultList);
    }
    public JSONArray pushArticleLogs(int page, int pagesize, String patientCode) throws Exception {
    public JSONArray pushArticleLogs(int page, int pagesize, String patientCode,String level1Type) throws Exception {
        pagesize = page * pagesize;
        page = (page - 1) * pagesize;
@@ -718,7 +718,13 @@ public class JMJkEduArticleService extends BaseService {
//        StringBuffer sql2 = new StringBuffer("select *  from   " + esType +
//                " where  sendCode='" + sendCode + "' ");
//        sql2.append("  order by createTime limit " + page + "," + pagesize);
        String sql = "SELECT * FROM " + esType + "  where nested(patients.code)= '" + patientCode + "' order by createTime desc limit " + page + "," + pagesize;
        String sql = "SELECT * FROM " + esType + "  where nested(patients.code)= '" + patientCode + "' ";
        
        if(!StringUtils.isEmpty(level1Type)){
            sql= sql + " and level1Type = '"+level1Type+"' ";
        }
        
        sql= sql+  " order by createTime desc limit " + page + "," + pagesize;
        List<com.yihu.es.entity.HealthEduArticlePatient> esList = elasticsearchUtil.excute(sql, com.yihu.es.entity.HealthEduArticlePatient.class, esIndex, esType);
        HealthEduArticlePatientModel heapm = null;
        com.alibaba.fastjson.JSONObject article = null;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/health/HealthEduArticleController.java

@@ -255,7 +255,7 @@ public class HealthEduArticleController extends BaseController {
                                           @ApiParam(name = "pageSize", value = "每页显示数 ，默认5")
                                           @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            com.alibaba.fastjson.JSONArray response = healthEducationArticleService.getCollectionArticalList(articleTitle,articleState,firstLevelCategoryId,pageIndex,pageSize,getUID(),2,null);
            com.alibaba.fastjson.JSONArray response = healthEducationArticleService.getCollectionArticalList(articleTitle,articleState,firstLevelCategoryId,pageIndex,pageSize,getRepUID(),2,null);
//            com.alibaba.fastjson.JSONArray response = healthEducationArticleService.getCollectionArticalList(articleTitle,articleState,firstLevelCategoryId,pageIndex,pageSize,"0de7295862dd11e69faffa163e8aee56",1);
            return write(200,"查询成功！","data",response);
        }catch (Exception e){

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/jimeiJkEdu/PatientJMJkEduArticleController.java

@@ -27,9 +27,10 @@ public class PatientJMJkEduArticleController extends BaseController {
    @ApiOperation("居民获取被推送文章列表 ")
    public String pushArticleLogs(
            @ApiParam(name = "page", value = "当前页 起始1", required = true) @RequestParam(value = "page", required = true) Integer page,
            @ApiParam(name = "pagesize", value = "每页显示条数", required = true) @RequestParam(value = "pagesize", required = true) Integer pagesize){
            @ApiParam(name = "pagesize", value = "每页显示条数", required = true) @RequestParam(value = "pagesize", required = true) Integer pagesize,
            @ApiParam(name = "level1Type", value = "", required = false) @RequestParam(value = "level1Type", required = false) String  level1Type){
        try {
            com.alibaba.fastjson.JSONArray response = jmJkEduArticleService.pushArticleLogs(page,pagesize,getUID());
            com.alibaba.fastjson.JSONArray response = jmJkEduArticleService.pushArticleLogs(page,pagesize,getRepUID(),level1Type);
//            Long count = healthEducationArticleService.pushArticleLogsCount("ece5c665b16542b0847e52b4a9fee44a");
            return write(200,"查询成功！","data",response);
        }catch (Exception e) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/jkEduArticle/ThirdJkEduArticleController.java

@@ -120,7 +120,7 @@ public class ThirdJkEduArticleController extends BaseController {
    public String cancelArticleCollection(@ApiParam(name = "articleId", value = "文章id",defaultValue = "1")
                                          @RequestParam(value = "articleId", required = true) String articleId){
        try {
            thirdJkEduArticleService.cancelArticleCollection(articleId,getUID(),1);
            thirdJkEduArticleService.cancelArticleCollection(articleId,getRepUID(),1);
//            thirdJkEduArticleService.cancelArticleCollection(articleId,"0de7295862dd11e69faffa163e8aee56",1);
            return success("取消成功！");
        }catch (Exception e){
@@ -139,7 +139,7 @@ public class ThirdJkEduArticleController extends BaseController {
                                        @ApiParam(name = "articleCategoryName", value = "文章类别名称")
                                        @RequestParam(value = "articleCategoryName", required = false) String articleCategoryName){
        try {
            thirdJkEduArticleService.saveArticleCollection(articleId,articleCategoryId,articleCategoryName,getUID(),1);
            thirdJkEduArticleService.saveArticleCollection(articleId,articleCategoryId,articleCategoryName,getRepUID(),1);
//            thirdJkEduArticleService.saveArticleCollection(articleId,articleCategoryId,articleCategoryName,"0de7295862dd11e69faffa163e8aee56",1);
            return success("收藏成功！");

patient-co/patient-co-wlyy/src/main/resources/application-devtest.yml

@@ -112,8 +112,8 @@ es:
#http://172.19.103.87:9088/JkEduWeb
jkEdu:
  web:
    articleBaseUrl: http://yihu.com:9088/
#    articleBaseUrl: http://172.19.103.87:9088/
#    articleBaseUrl: http://yihu.com:9088/
    articleBaseUrl: http://172.19.103.87:9088/
#消息队列
activemq: