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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionService.java

@@ -146,10 +146,12 @@ public class PrescriptionService extends BaseService {
        // "bcghcs":"本次挂号次数","ghksmc":"挂号科室名称","cfxms0":"明细上传数量","mzlsh0":"医保挂号流水号 如果为空，将自动医保挂号并收费","ghfy00":"挂号费用",
        // "yszjdj":"医师诊金级别","bqbm00":"病情编码","sfygwd":"是否医改网点"}
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("yyksbm","医生科室编号");//医生科室编号-------------------------待处理
        jsonObject.put("yyksbm","医生科室编码");//医生科室编号-------------------------待处理
        jsonObject.put("bcsfcs",1);//本次收费次数
        jsonObject.put("yszjhm",doctorMapping.getJwDocotrIdcard());//医生证件号码
//        jsonObject.put("yszjhm","350681876766545567");//医生证件号码
        jsonObject.put("ysxm00",doctorMapping.getJwDoctorName());//医生姓名
//        jsonObject.put("ysxm00","林金城");//医生姓名
        jsonObject.put("mzlb00",101);//门诊类别---普通门诊默认为101
        jsonObject.put("sfydgh","N");//是否药店挂号，默认为N，不是药店挂号
        jsonObject.put("bcghcs",1);//本次挂号次数
@@ -174,9 +176,16 @@ public class PrescriptionService extends BaseService {
            }
        }
        if(StringUtils.isNotBlank(result)){
            JSONObject zyCfinfo =  JSON.parseObject(result);
//        JSONArray zdInfo = new JSONArray();
//        JSONObject j1 = new JSONObject();
//        j1.put("zdms00","高血压");//诊断或症状描述
//        j1.put("zdbh00","1212121");//诊断或症状编码
//        zdInfo.add(j1);
//        json.put("zdlist",zdInfo);
        if(StringUtils.isNotBlank(result)){
            JSONObject jwobj =  JSON.parseObject(result);
            JSONObject zyCfinfo = jwobj.getJSONObject("data");
            Integer code = zyCfinfo.getInteger("CODE");
            if( 1 == code){
@@ -201,7 +210,7 @@ public class PrescriptionService extends BaseService {
                    j2.put("xmgg00",zyCfinfoObj.getString("INSUR_ITEM_SPEC"));//项目规格(医保)
                    j2.put("xmsl00",zyCfinfoObj.getString("ITEM_QUANTITY"));//项目数量
                    j2.put("xmje00",zyCfinfoObj.getString("COST"));//项目金额
                    j2.put("ysxm00",doctorMapping.getJwDoctorName());//医生姓名
                    j2.put("ysxm00",zyCfinfoObj.getString("APPLY_OPERATOR_NAME"));//医生姓名
                    j2.put("sptxbm","");//商品条形编码
                    j2.put("yppl00",zyCfinfoObj.getString("FREQUENCY"));//药品频率
                    j2.put("ypyl00",zyCfinfoObj.getString("PHYSIC_DOSE"));//药品用量
@@ -222,7 +231,7 @@ public class PrescriptionService extends BaseService {
        }
//        String aa = json.toString();
        return json;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/express/SFExpressApiController.java

@@ -39,9 +39,8 @@ public class SFExpressApiController extends BaseController {
    public String SFRoutePushService (
            @ApiParam(name="content", value="入参报文") @RequestParam(value = "content",required = true) String content){
        try {
            logger.info("顺丰路由信息推送，xml="+content);
            content = URLDecoder.decode(content,"utf-8");
            logger.info("顺丰路由信息推送，xml="+content);
            sfexpressService.SFRoutePushService(content);
            return successxml;
        }catch (Exception e){

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/prescription/PatientPrescriptionPayController.java

@@ -28,6 +28,9 @@ public class PatientPrescriptionPayController extends WeixinBaseController {
    @Autowired
    private PatientPrescriptionPayService payService;
    @Autowired
    private PrescriptionService prescriptionService;
    /**
     * 患者长处方支付接口 可配送方式查询
     *
@@ -134,4 +137,19 @@ public class PatientPrescriptionPayController extends WeixinBaseController {
        }
    }
    @RequestMapping(value = "/testJWgetPayInfo", method = RequestMethod.GET)
    @ApiOperation(value = "测试待结算接口返回信息")
    public String testJWgetPayInfo(
            @ApiParam(name = "cardNo", value = "社保卡号", defaultValue = "D21085562")
            @RequestParam(value = "cardNo", required = true) String cardNo,
            @ApiParam(name = "visitNo", value = "挂号号", defaultValue = "3277865")
            @RequestParam(value = "visitNo", required = true) String visitNo){
        try {
            com.alibaba.fastjson.JSONObject jsonParams = prescriptionService.getPayInfo(cardNo,visitNo);
            return write(200, "获取成功!","data",jsonParams);
        } catch (Exception e) {
            return error(-1, "获取失败!");
        }
    }
}