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

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineOrderDrugsEndpoint.java

@@ -115,7 +115,7 @@ public class MedicineOrderDrugsEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping("/open/getSettlementInfoSecode")
    @PostMapping("/open/getSettlementInfoSecode")
    @ApiOperation(value = "获取患者待结算--费用明细上传接口封装", notes = "费用明细上传接口封装")
    public Envelop getSettlementInfoSecode(
            @ApiParam(name = "recipe_no", value = "recipe_no")
@@ -144,7 +144,7 @@ public class MedicineOrderDrugsEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping("/open/getSettlementInfo")
    @PostMapping("/open/getSettlementInfo")
    @ApiOperation(value = "获取患者待His结算信息页面", notes = "获取患者待His结算信息页面")
    public Envelop getSettlementInfo(
            @ApiParam(name = "chargeArr", value = "chargeArr")

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

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
@@ -231,14 +232,7 @@ public class MedOrderService {
        strinObj.put("data",dataDetail);
        result.put("readcardParam",strinObj.toJSONString());
        WlyyHttpLogDO logDO = new WlyyHttpLogDO();
        logDO.setCode("fsi.terminal.readcard");
        logDO.setName("药柜医保读卡请求参数");
        logDO.setPatient(inputDetail.getString("mdtrt_cert_no"));
        logDO.setRequest(strinObj.toJSONString());
        logDO.setResponse(null);
        logDO.setCreateTime(new Date());
        httpLogDao.save(logDO);
        saveHttpLog("fsi.terminal.readcard","药柜医保读卡请求参数",inputDetail.getString("mdtrt_cert_no"),strinObj.toJSONString(),null);
        return result;
    }
@@ -390,14 +384,7 @@ public class MedOrderService {
        strinObj.put("data",dataDetail);
        settleTmp.put("readcardParam",strinObj.toJSONString());
        WlyyHttpLogDO logDO = new WlyyHttpLogDO();
        logDO.setCode("fsi.terminal.readcard");
        logDO.setName("药柜医保读卡请求参数");
        logDO.setPatient(ylzMedicalRelationDO.getLogNo());
        logDO.setRequest(strinObj.toJSONString());
        logDO.setResponse(null);
        logDO.setCreateTime(new Date());
        httpLogDao.save(logDO);
        saveHttpLog("fsi.terminal.readcard","药柜医保读卡请求参数",ylzMedicalRelationDO.getLogNo(),strinObj.toJSONString(),null);
        if ("jwtest".equals(springProfiles)){//测试线返回模拟数据
            sql = " select dict_value from wlyy_hospital_sys_dict where dict_name='readcardResult' ";
@@ -443,14 +430,7 @@ public class MedOrderService {
                   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);
                   saveHttpLog("fsi.terminal.register","药柜医保挂号请求参数",ylzMedicalRelationDO.getLogNo(),strinObj.toJSONString(),null);
                   if ("jwtest".equals(springProfiles)){//测试线返回模拟数据
                       sql = " select dict_value from wlyy_hospital_sys_dict where dict_name='registerResult' ";
@@ -499,14 +479,7 @@ public class MedOrderService {
        }
        Map<String,Object> deviceParam = deviceParams.get(0);
        WlyyHttpLogDO logDO = new WlyyHttpLogDO();
        logDO.setCode("fsi.terminal.readcard");
        logDO.setName("药柜医保读卡返回值");
        logDO.setPatient(ylzMedicalRelationDO.getLogNo());
        logDO.setRequest(null);
        logDO.setResponse(readcardResult);
        logDO.setCreateTime(new Date());
        httpLogDao.save(logDO);
        saveHttpLog("fsi.terminal.readcard","药柜医保读卡返回值",ylzMedicalRelationDO.getLogNo(),null,readcardResult);
        JSONObject readcardObject = JSONObject.parseObject(readcardResult);
        if ("0000".equals(readcardObject.getString("retCode"))){
@@ -530,14 +503,7 @@ public class MedOrderService {
        }
        if (StringUtils.isNotBlank(registerResult)){
            logDO = new WlyyHttpLogDO();
            logDO.setCode("fsi.terminal.register");
            logDO.setName("药柜医保挂号返回值");
            logDO.setPatient(ylzMedicalRelationDO.getLogNo());
            logDO.setRequest(null);
            logDO.setResponse(registerResult);
            logDO.setCreateTime(new Date());
            httpLogDao.save(logDO);
            saveHttpLog("fsi.terminal.register","药柜医保挂号返回值",ylzMedicalRelationDO.getLogNo(),null,registerResult);
            JSONObject registerObject = JSONObject.parseObject(registerResult);
            if ("0000".equals(registerObject.getString("retCode"))){
@@ -678,14 +644,8 @@ public class MedOrderService {
                strinObj.put("data",dataDetail);
                resultTmp.put("chargeParam",strinObj.toJSONString());
                logDO = new WlyyHttpLogDO();
                logDO.setCode("fsi.terminal.charge");
                logDO.setName("药柜医保结算请求参数");
                logDO.setPatient(ylzMedicalRelationDO.getLogNo());
                logDO.setRequest(strinObj.toJSONString());
                logDO.setResponse(null);
                logDO.setCreateTime(new Date());
                httpLogDao.save(logDO);
                saveHttpLog("fsi.terminal.charge","药柜医保结算请求参数",ylzMedicalRelationDO.getLogNo(),strinObj.toJSONString(),null);
                /**
                 * 封装结算信息
                 */
@@ -718,14 +678,7 @@ public class MedOrderService {
                    throw new Exception("操作失败，无医保结算信息");
                }
                WlyyHttpLogDO logDO = new WlyyHttpLogDO();
                logDO.setCode("fsi.terminal.charge");
                logDO.setName("药柜医保结算返回值");
                logDO.setPatient(ylzMedicalRelationDO.getLogNo());
                logDO.setRequest(null);
                logDO.setResponse(chargeArr);
                logDO.setCreateTime(new Date());
                httpLogDao.save(logDO);
                saveHttpLog("fsi.terminal.charge","药柜医保结算返回值",ylzMedicalRelationDO.getLogNo(),null,chargeArr);
                YlzMedicalResponse ylzMedicalResponse = ylzMedicalResponseDao.findByMedicalId(ylzMedicalRelationDO.getId());
@@ -1327,4 +1280,16 @@ public class MedOrderService {
        return list;
    }
    @Transactional(propagation= Propagation.NOT_SUPPORTED)
    public void saveHttpLog(String code,String name,String patient,String request,String response){
        WlyyHttpLogDO logDO = new WlyyHttpLogDO();
        logDO.setCode(code);
        logDO.setName(name);
        logDO.setPatient(patient);
        logDO.setRequest(request);
        logDO.setResponse(response);
        logDO.setCreateTime(new Date());
        httpLogDao.save(logDO);
    }
}