Merge branch 'medicare' of liubing/wlyy2.0 into medicare

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/JwService.java

@@ -85,6 +85,7 @@ public class JwService {
     * @param equ_num
     * @return
     */
    @Transactional(propagation= Propagation.NOT_SUPPORTED)
    public JSONObject getSettleDept(String equ_num){
        Map<String,String> param = new HashMap<>();
        param.put("equ_num",equ_num);

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedOrderService.java

@@ -407,47 +407,52 @@ public class MedOrderService {
         **/
//        if (StringUtils.isBlank(ylzMedicalRelationDO.getHisSerial())){
           if (1==ylzMedicalRelationDO.getMedicalState()){
               //费别是医保时，医保挂号流水号空则需发起门诊挂号
               settleTmp.put("needRegister",true);
               strinObj = JSONObject.parseObject(deviceParam.get("yb_strin").toString());
               input = new JSONObject();
               inputDetail = new JSONObject();
               inputDetail.put("psn_no","");//人员编码  前端封装
               inputDetail.put("insutype","310");//前端替换成医保返回险种类型
               inputDetail.put("begntime",DateUtil.dateToStrLong(ylzMedicalRelationDO.getDate()));
               if ("02".equals(mdtrt_cert_type)){
                   inputDetail.put("mdtrt_cert_no",idcard);
               }
               else{
                   inputDetail.put("mdtrt_cert_no",cardNo);
               }
               inputDetail.put("mdtrt_cert_type",mdtrt_cert_type);
               inputDetail.put("ipt_otp_no",ylzMedicalRelationDO.getRelationCode());
               inputDetail.put("atddr_no",ylzMedicalRelationDO.getAtddrNo());
               inputDetail.put("dr_name",ylzMedicalRelationDO.getDrName());
               inputDetail.put("dept_code",ylzMedicalRelationDO.getDeptCode());
               inputDetail.put("dept_name",ylzMedicalRelationDO.getDeptName());
               inputDetail.put("caty",ylzMedicalRelationDO.getCaty());
               input.put("data",inputDetail);
               dataDetail.put("input",input);
               netData.put("msgid",ylzMedicalRelationDO.getVisitMsgid());//挂号发送方报文id
               dataDetail.put("net_data",netData);
               strinObj.put("func","fsi.terminal.register");
               strinObj.put("data",dataDetail);
               settleTmp.put("registerParam",strinObj.toJSONString());
               logDO = new WlyyHttpLogDO();
               logDO.setCode("fsi.terminal.register");
               logDO.setName("药柜医保挂号请求参数");
               logDO.setPatient(ylzMedicalRelationDO.getLogNo());
               logDO.setRequest(strinObj.toJSONString());
               logDO.setResponse(null);
               logDO.setCreateTime(new Date());
               httpLogDao.save(logDO);
               if ("jwtest".equals(springProfiles)){//测试线返回模拟数据
                   settleTmp.put("registerResult","{\"data\":{\"net_data\":{\"inf_refmsgid\":\"350000202207151648010011544274\",\"refmsg_time\":\"20220715164800718\",\"respond_time\":\"20220715164801114\"},\"output\":{\"data\":{\"exp_content\":null,\"ipt_otp_no\":\"72474660\",\"mdtrt_id\":\"4208923\",\"psn_no\":\"3500000135052419940523061301\"}}},\"func\":\"fsi.terminal.register\",\"retCode\":\"0000\",\"retMsg\":\"操作成功\"}");
               if (org.apache.commons.lang3.StringUtils.isBlank(ylzMedicalRelationDO.getVisitMsgid())){
                   //无挂号发送方报文ID 不走挂号。
                   // 无发送方报文ID【用于基线门诊挂号接口，自助机fsi.terminal.register接口】
               }else {
                   //费别是医保时，医保挂号流水号空则需发起门诊挂号
                   settleTmp.put("needRegister",true);
                   strinObj = JSONObject.parseObject(deviceParam.get("yb_strin").toString());
                   input = new JSONObject();
                   inputDetail = new JSONObject();
                   inputDetail.put("psn_no","");//人员编码  前端封装
                   inputDetail.put("insutype","310");//前端替换成医保返回险种类型
                   inputDetail.put("begntime",DateUtil.dateToStrLong(ylzMedicalRelationDO.getDate()));
                   if ("02".equals(mdtrt_cert_type)){
                       inputDetail.put("mdtrt_cert_no",idcard);
                   }
                   else{
                       inputDetail.put("mdtrt_cert_no",cardNo);
                   }
                   inputDetail.put("mdtrt_cert_type",mdtrt_cert_type);
                   inputDetail.put("ipt_otp_no",ylzMedicalRelationDO.getRelationCode());
                   inputDetail.put("atddr_no",ylzMedicalRelationDO.getAtddrNo());
                   inputDetail.put("dr_name",ylzMedicalRelationDO.getDrName());
                   inputDetail.put("dept_code",ylzMedicalRelationDO.getDeptCode());
                   inputDetail.put("dept_name",ylzMedicalRelationDO.getDeptName());
                   inputDetail.put("caty",ylzMedicalRelationDO.getCaty());
                   input.put("data",inputDetail);
                   dataDetail.put("input",input);
                   netData.put("msgid",ylzMedicalRelationDO.getVisitMsgid());//挂号发送方报文id
                   dataDetail.put("net_data",netData);
                   strinObj.put("func","fsi.terminal.register");
                   strinObj.put("data",dataDetail);
                   settleTmp.put("registerParam",strinObj.toJSONString());
                   logDO = new WlyyHttpLogDO();
                   logDO.setCode("fsi.terminal.register");
                   logDO.setName("药柜医保挂号请求参数");
                   logDO.setPatient(ylzMedicalRelationDO.getLogNo());
                   logDO.setRequest(strinObj.toJSONString());
                   logDO.setResponse(null);
                   logDO.setCreateTime(new Date());
                   httpLogDao.save(logDO);
                   if ("jwtest".equals(springProfiles)){//测试线返回模拟数据
                       settleTmp.put("registerResult","{\"data\":{\"net_data\":{\"inf_refmsgid\":\"350000202207151648010011544274\",\"refmsg_time\":\"20220715164800718\",\"respond_time\":\"20220715164801114\"},\"output\":{\"data\":{\"exp_content\":null,\"ipt_otp_no\":\"72474660\",\"mdtrt_id\":\"4208923\",\"psn_no\":\"3500000135052419940523061301\"}}},\"func\":\"fsi.terminal.register\",\"retCode\":\"0000\",\"retMsg\":\"操作成功\"}");
                   }
               }
           }
//        }
@@ -1129,8 +1134,8 @@ public class MedOrderService {
            }
            cardNo = ylzMedicalRelationDO.getCardNo();
            orgCode = ylzMedicalRelationDO.getOrgCode();
            BigDecimal personCashTmp =  new BigDecimal(ylzMedicalRelationDO.getPersonCash());
            personCash.add(personCashTmp);//个人现金支付
            BigDecimal personCashTmp =  new BigDecimal(ylzMedicalRelationDO.getPersonCash());//10.35
            personCash =  personCash.add(personCashTmp);//个人现金支付
            if (0==personCashTmp.doubleValue()){//费用为0
                try {
                  if (!jwService.executeSickSettleMultiNew(recipe_no,equ_num)){

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/channel/MedicineService.java

@@ -383,6 +383,9 @@ public class MedicineService {
    public void updateYjjResult() {
        Date now = new Date();
        String nowTime = com.yihu.jw.util.DateUtil.dateToStrLong(now);
        String prTime = com.yihu.jw.util.DateUtil.getPreTime(nowTime, "-5");
        String sql = " update base_ylz_medical_recharge set charge_result='overTime',charge_result_name='支付超时' where charge_result='ing' and  create_time<='" + prTime + "' ";
        jdbcTemplate.execute(sql);
        List<YlzMedicalRecharge> chargeList = ylzMedicalRechargeDao.findByChargeResult("ing");
        for (YlzMedicalRecharge tmp : chargeList) {
            Map<String, String> param = new HashMap<>();
@@ -407,17 +410,10 @@ public class MedicineService {
                        JSONObject paramTmpObj = new JSONObject();
                        paramTmpObj.put("param",paramTmp);
                        params.add(new BasicNameValuePair("responsStr",paramTmpObj.toJSONString()));
                        String ret = httpClientUtil.post(url, params, "UTF-8");
                        httpClientUtil.post(url, params, "UTF-8");
                    }
                }
            }
        }
        String mins = com.yihu.jw.util.DateUtil.dateToStr(now,"mm");
        Integer minsInt = Integer.parseInt(mins);
        if (minsInt % 5 == 0) {
            String prTime = com.yihu.jw.util.DateUtil.getPreTime(nowTime, "-5");
            String sql = " update base_ylz_medical_recharge set charge_result='overTime',charge_result_name='支付超时' where charge_result='ing' and  create_time<='" + prTime + "' ";
            jdbcTemplate.execute(sql);
        }
    }
}