医保移动支付

src/main/java/thyyxxk/wxservice_server/controller/api/PowersiMiPayPlugin.java

@@ -2,9 +2,13 @@ package thyyxxk.wxservice_server.controller.api;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.tencent.mip.DataHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 import thyyxxk.wxservice_server.config.auth.PassToken;
@@ -12,20 +16,25 @@ import thyyxxk.wxservice_server.config.exception.ExceptionEnum;
 import thyyxxk.wxservice_server.dao.api.PowersiPluginDao;
 import thyyxxk.wxservice_server.entity.ResultVo;
 import thyyxxk.wxservice_server.entity.medinsmobilepay.InsuinfoRequest;
+import thyyxxk.wxservice_server.entity.medinsmobilepay.frompowersiplugin.OrdState;
+import thyyxxk.wxservice_server.entity.medinsmobilepay.frompowersiplugin.request.CommonRequest;
+import thyyxxk.wxservice_server.entity.medinsmobilepay.frompowersiplugin.request.PowersiMipSetlinfo;
+import thyyxxk.wxservice_server.entity.medinsmobilepay.frompowersiplugin.request.RevokeSettleRequest;
 import thyyxxk.wxservice_server.entity.medinsmobilepay.frompowersiplugin.response.BillInfo;
 import thyyxxk.wxservice_server.entity.medinsmobilepay.frompowersiplugin.response.CommonResponse;
 import thyyxxk.wxservice_server.entity.medinsmobilepay.frompowersiplugin.response.Upload6201;
 import thyyxxk.wxservice_server.factory.thmz.ThmzService;
 import thyyxxk.wxservice_server.factory.thmz.model.QueryReceiptRequest;
+import thyyxxk.wxservice_server.factory.thmz.model.SaveMzPayRequest;
 import thyyxxk.wxservice_server.service.IdCardAnalyzeService;
+import thyyxxk.wxservice_server.utils.DateUtil;
 import thyyxxk.wxservice_server.utils.ResultVoUtil;
+import thyyxxk.wxservice_server.utils.SnowFlakeId;
 import thyyxxk.wxservice_server.utils.TokenUtil;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.math.BigDecimal;
+import java.util.*;
 
 @Slf4j
 @RestController
@@ -60,17 +69,6 @@ public class PowersiMiPayPlugin {
 
     @PostMapping("/getOpenid")
     public ResultVo<String> getOpenid(@RequestBody InsuinfoRequest request) throws Exception {
-        String[] hisOrdInfo = request.getHisOrdNum().split("_");
-        if (hisOrdInfo.length == 3) {
-            request.setPatNo(hisOrdInfo[0]);
-            request.setTimes(Integer.parseInt(hisOrdInfo[1]));
-            request.setSocialNo(dao.selectIdNo(hisOrdInfo[0]));
-            ResultVo<String> insuinfo = new RestTemplate().postForObject
-                    (MZ_API_URL+"/queryInsuInfo", request, ResultVo.class);
-            if (insuinfo.getCode() != ExceptionEnum.SUCCESS.getCode()) {
-                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, insuinfo.getMessage());
-            }
-        }
         return ResultVoUtil.success(TokenUtil.getInstance().getUserOpenid());
     }
 
@@ -169,6 +167,16 @@ public class PowersiMiPayPlugin {
         request.put("times", Integer.parseInt(arr[1]));
 
         Upload6201 upload6201 = new RestTemplate().postForObject(MZ_API_URL + "/getUpload6201", request, Upload6201.class);
+        if (null == upload6201) {
+            JSONObject res = new JSONObject();
+            res.put("code", -1);
+            res.put("success", false);
+            res.put("message", "网络异常，请稍后再试。");
+            return res;
+        }
+        upload6201.setIdNo(request.getString("idNo"));
+        upload6201.setIdType(request.getString("idType"));
+        upload6201.setUserName(request.getString("userName"));
 
         String raw = dataHandler.buildReqData(JSONObject.toJSONString(upload6201));
         JSONObject response = JSONObject.parseObject(raw);
@@ -182,9 +190,150 @@ public class PowersiMiPayPlugin {
     @PostMapping("/settleNotify")
     public CommonResponse settleNotify(@RequestBody JSONObject body) throws Exception {
         JSONObject request = decryptRequest(body);
-        log.info("结算通知：{}", request);
-        // todo 结算成功后的业务处理
-        return new CommonResponse();
+        PowersiMipSetlinfo setlinfo = dao.selectById(request.getString("platformOrderId"));
+        if (null != setlinfo) {
+            return new CommonResponse();
+        }
+        setlinfo = JSONObject.parseObject(request.toJSONString(), PowersiMipSetlinfo.class);
+        int insert = dao.insert(setlinfo);
+        if (insert == 1) {
+            SaveMzPayRequest saveMzPayRequest = new SaveMzPayRequest.Builder()
+                    .payTime(DateUtil.formatDatetime(setlinfo.getTraceTime()))
+                    .patCardNo(setlinfo.getMedOrgOrd().split("_")[0])
+                    .agtOrdNum(setlinfo.getThirdOrderId())
+                    .payAmt(setlinfo.getFeeSumamt())
+                    .fundpayAmt(setlinfo.getFundPay())
+                    .acctpayAmt(setlinfo.getPsnAcctPay())
+                    .couponAmt(BigDecimal.ZERO)
+                    .cashpayAmt(setlinfo.getOwnpayAmt())
+                    .hisOrdNum(setlinfo.getMedOrgOrd())
+                    .psOrdNum(setlinfo.getPlatformOrderId()).build();
+            thmzService.saveMzPay(saveMzPayRequest);
+            return new CommonResponse();
+        }
+        return new CommonResponse("接收通知失败。");
+    }
+
+    @PassToken
+    @GetMapping("/isMipOrder")
+    public ResultVo<String> isMipOrder(@RequestParam("hisOrdNum") String hisOrdNum) throws Exception {
+        PowersiMipSetlinfo setlinfo = getSetlinfo(hisOrdNum, OrdState.SETTLED);
+        if (null == setlinfo) {
+            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
+        }
+        return ResultVoUtil.success(setlinfo.getPlatformOrderId());
+    }
+
+    @PassToken
+    @PostMapping("/revokeMipSettle")
+    public ResultVo<String> revokeMipSettle(@RequestBody CommonRequest request) throws Exception {
+        PowersiMipSetlinfo setlinfo = getRefundableSetl(request.getHisOrdNum());
+        if (null == setlinfo) {
+            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有可以退款的结算交易。");
+        }
+        Date now = new Date();
+        RevokeSettleRequest refd = new RevokeSettleRequest();
+        refd.setMedOrgOrd(request.getHisOrdNum());
+        refd.setMedRefdId(SnowFlakeId.instance().nextId());
+        refd.setRefdTime(DateUtil.formatDatetime(now));
+        refd.setTotlRefdAmt(setlinfo.getFeeSumamt());
+        refd.setPsnAcctRefdAmt(setlinfo.getPsnAcctPay());
+        refd.setFundRefdAmt(setlinfo.getFundPay());
+        refd.setCashRefdAmt(setlinfo.getOwnpayAmt());
+        refd.setRefdReason(request.getRefundReason());
+        refd.setEcToken(request.getEcToken());
+        refd.setPlatformOrderId(setlinfo.getPlatformOrderId());
+
+        JSONObject raw = JSONObject.parseObject(JSONObject.toJSONString(refd));
+        String body = dataHandler.buildReqData(raw);
+        String url = "http://webhis.thyy.cn:8077/powersiMipRefund";
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        HttpEntity<String> entity = new HttpEntity<>(body, headers);
+        RestTemplate restTemplate = new RestTemplate();
+        String encRes = restTemplate.postForObject(url, entity, String.class);
+        String decRes = dataHandler.processRspData(encRes);
+        JSONObject resObj = JSONObject.parseObject(decRes);
+
+        log.info("医保移动支付退款结果: {}", resObj);
+        Integer code = resObj.getInteger("code");
+        if (null != code && code == 0) {
+            JSONObject data = resObj.getJSONObject("data");
+            OrdState state = OrdState.get(data.getString("refStatus"));
+            if (null == state) {
+                return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
+            }
+            String refId = data.getString("platformRefdId");
+            dao.updateRevokeInfo(request.getStaffId(), now, refId, setlinfo.getMedOrgOrd(), state);
+            if (state == OrdState.REFUND_SUCCEED) {
+                return ResultVoUtil.success("医保移动支付退款成功");
+            }
+            if (state == OrdState.REFUND_PROCEEDING) {
+                return ResultVoUtil.success("医保移动支付退款进行中，请稍后查询退款结果。");
+            }
+            if (state == OrdState.REFUND_ABNORMAL) {
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医保移动支付退款异常，请稍后查询退款结果。");
+            }
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, data.getString("failMsg"));
+        }
+        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, resObj.getString("message"));
+    }
+
+    private PowersiMipSetlinfo getRefundableSetl(String id) {
+        PowersiMipSetlinfo setlinfo = getSetlinfo(id, OrdState.SETTLED);
+        if (null == setlinfo) {
+            setlinfo = getSetlinfo(id, OrdState.REFUND_FAILED);
+            if (null == setlinfo) {
+                setlinfo = getSetlinfo(id, OrdState.REFUND_ABNORMAL);
+            }
+        }
+        return setlinfo;
+    }
+
+    private PowersiMipSetlinfo getSetlinfo(String id, OrdState state) {
+        QueryWrapper<PowersiMipSetlinfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("med_org_ord", id);
+        wrapper.eq("ord_state", state);
+        return dao.selectOne(wrapper);
+    }
+
+    @PassToken
+    @GetMapping("/queryRefundState")
+    public ResultVo<String> queryRefundState(@RequestParam("hisOrdNum") String hisOrdNum) throws Exception {
+        QueryWrapper<PowersiMipSetlinfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("med_org_ord", hisOrdNum);
+        wrapper.ne("ord_state", OrdState.SETTLED);
+        wrapper.isNotNull("platform_refd_id");
+        PowersiMipSetlinfo setlinfo = dao.selectOne(wrapper);
+        if (null == setlinfo) {
+            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
+        }
+        JSONObject params = new JSONObject();
+        params.put("platformRefdId", setlinfo.getPlatformRefdId());
+        params.put("orgCodg", "H43010500370");
+        JSONObject raw = JSONObject.parseObject(JSONObject.toJSONString(params));
+        String body = dataHandler.buildReqData(raw);
+        String url = "http://webhis.thyy.cn:8077/powersiMipRefundQuery";
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        HttpEntity<String> entity = new HttpEntity<>(body, headers);
+        RestTemplate restTemplate = new RestTemplate();
+        String encRes = restTemplate.postForObject(url, entity, String.class);
+        String decRes = dataHandler.processRspData(encRes);
+        JSONObject resObj = JSONObject.parseObject(decRes);
+        Integer code = resObj.getInteger("code");
+        if (null != code && code == 0) {
+            JSONObject data = resObj.getJSONObject("data");
+            data.remove("hiExtData");
+            OrdState state = OrdState.get(data.getString("refdStatus"));
+            if (null == state) {
+                return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
+            }
+            String refId = data.getString("platformRefdId");
+            dao.updateRefundState(refId, state);
+            return ResultVoUtil.success(state.toString());
+        }
+        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, resObj.getString("message"));
     }
 
 }

src/main/java/thyyxxk/wxservice_server/dao/api/PowersiPluginDao.java

@@ -1,12 +1,17 @@
 package thyyxxk.wxservice_server.dao.api;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+import thyyxxk.wxservice_server.entity.medinsmobilepay.frompowersiplugin.OrdState;
+import thyyxxk.wxservice_server.entity.medinsmobilepay.frompowersiplugin.request.PowersiMipSetlinfo;
 
+import java.util.Date;
 import java.util.List;
 
 @Mapper
-public interface PowersiPluginDao {
+public interface PowersiPluginDao extends BaseMapper<PowersiMipSetlinfo> {
     @Select("select rtrim(patient_id) from mz_patient_mi where social_no=#{id}")
     List<String> selectPatientCount(String id);
 
@@ -14,6 +19,11 @@ public interface PowersiPluginDao {
             "where name=#{name} and isnull(del_flag,'0')!='1'")
     String selectDeptId(String name);
 
-    @Select("select max(social_no) from t_wechat_patient_bind where patient_id=#{patNo}")
-    String selectIdNo(String patNo);
+    @Update("update powersi_mip_setlinfo set revoke_staff=#{staff}, " +
+            "revoke_datetime=#{time},platform_refd_id=#{refdId}, " +
+            "ord_state=#{state} where med_org_ord=#{id}")
+    void updateRevokeInfo(String staff, Date time, String refdId, String id, OrdState state);
+
+    @Update("update powersi_mip_setlinfo set ord_state=#{state} where platform_refd_id=#{refdId}")
+    void updateRefundState(String refdId, OrdState state);
 }

src/main/java/thyyxxk/wxservice_server/entity/medinsmobilepay/frompowersiplugin/OrdState.java

@@ -0,0 +1,45 @@
+package thyyxxk.wxservice_server.entity.medinsmobilepay.frompowersiplugin;
+
+public enum OrdState {
+    /**
+     * 已结算
+     */
+    SETTLED,
+
+    /**
+     * 退款处理中
+     */
+    REFUND_PROCEEDING,
+
+    /**
+     * 退款成功
+     */
+    REFUND_SUCCEED,
+
+    /**
+     * 退款失败
+     */
+    REFUND_FAILED,
+
+    /**
+     * 退款异常
+     */
+    REFUND_ABNORMAL;
+
+    public static OrdState get(String refStatus) {
+        if (null == refStatus) {
+            return null;
+        }
+        switch (refStatus) {
+            case "0":
+                return REFUND_PROCEEDING;
+            case "1":
+                return REFUND_SUCCEED;
+            case "2":
+                return REFUND_FAILED;
+            case "3":
+                return REFUND_ABNORMAL;
+        }
+        return null;
+    }
+}

src/main/java/thyyxxk/wxservice_server/entity/medinsmobilepay/frompowersiplugin/request/CommonRequest.java

@@ -4,24 +4,8 @@ import lombok.Data;
 
 @Data
 public class CommonRequest {
-    // 证件号码
-    private String idNo;
-
-    // 字典人员证件类型(psn_cert_type)
-    private String idType;
-
-    // 人员姓名
-    private String userName;
-
-    // 医药机构编码
-    private String orgCodg;
-
-    // 手机号码
-    private String MobileNo;
-
-    // 业务唯一标识
-    private String bizId;
-
-    private String patNo;
-    private Integer times;
+    private String staffId;
+    private String hisOrdNum;
+    private String ecToken;
+    private String refundReason;
 }

src/main/java/thyyxxk/wxservice_server/entity/medinsmobilepay/frompowersiplugin/request/PowersiMipSetlinfo.java

@@ -0,0 +1,198 @@
+package thyyxxk.wxservice_server.entity.medinsmobilepay.frompowersiplugin.request;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import thyyxxk.wxservice_server.entity.medinsmobilepay.frompowersiplugin.OrdState;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class PowersiMipSetlinfo {
+	/**
+	 * 组件订单号
+	 */
+	@TableId(type = IdType.INPUT)
+	private String platformOrderId;
+
+	/**
+	 * 医院订单号
+	 */
+	private String medOrgOrd;
+
+	/**
+	 * 订单状态
+	 * */
+	private OrdState ordState;
+
+	/**
+	 * 支付类型： 0-全自费，1-医保支付
+	 */
+	private String payType;
+
+	/**
+	 * 医保结算中心订单号
+	 */
+	private String payOrdId;
+
+	/**
+	 * 交易成功时间
+	 */
+	private Date traceTime;
+
+	/**
+	 * 费用总金额
+	 */
+	private BigDecimal feeSumamt;
+
+	/**
+	 * 个人现金自付
+	 */
+	private BigDecimal ownpayAmt;
+
+	/**
+	 * 个人账户支付
+	 */
+	private BigDecimal psnAcctPay;
+
+	/**
+	 * 基金支付
+	 */
+	private BigDecimal fundPay;
+
+	/**
+	 * 医保收费时间
+	 */
+	private Date hiChrgTime;
+
+	/**
+	 * 医保交易流水号，对应setl_id
+	 */
+	private String hiDocSn;
+
+	/**
+	 * 医保挂号流水号（对应mdtrt_id）
+	 */
+	private String hiRgsSn;
+
+	/**
+	 * 机构名称
+	 */
+	private String orgName;
+
+	/**
+	 * 电子凭证码值
+	 */
+	private String ecCode;
+
+	/**
+	 * 结算类型（ ALL-医保自费全部，CASH-只结现金，HI-只结医保）
+	 */
+	private String setlType;
+
+	/**
+	 * 用于院内结算失败对医保的冲正授权（1小时内有效）
+	 */
+	private String revsToken;
+
+	/**
+	 * 两定机构编号
+	 */
+	private String orgCodg;
+
+	/**
+	 * 住院押金
+	 */
+	private String deposit;
+
+	/**
+	 * 参保区划
+	 */
+	private String insuCode;
+
+	/**
+	 * 险种类型
+	 */
+	private String insuType;
+
+	/**
+	 * 人员编号
+	 */
+	private String psnNo;
+
+	/**
+	 * 第三方支付平台类型
+	 */
+	private String thirdType;
+
+	/**
+	 * 个人账户类型（1-虚账，2-实账）
+	 */
+	private String psnAcctType;
+
+	/**
+	 * 证件号码
+	 */
+	private String idNo;
+
+	/**
+	 * 证件类型
+	 */
+	private String idType;
+
+	/**
+	 * 人员姓名
+	 */
+	private String userName;
+
+	/**
+	 * 三方支付渠道订单号
+	 */
+	private String thirdOrderId;
+
+	/**
+	 * 三方支付平台返回交易号
+	 */
+	private String thirdpartTransId;
+
+	/**
+	 * 微信用户openid
+	 */
+	private String openid;
+
+	/**
+	 * 亲情支付标志（1-是，0-否）
+	 */
+	private String familyPayFlag;
+
+	/**
+	 * 付款人姓名（亲情付时）
+	 */
+	private String payerName;
+
+	/**
+	 * 付款人证件号码（亲情付时）
+	 */
+	private String payerCertNo;
+
+	/**
+	 * 医保扩展数据
+	 */
+	private String hiExtData;
+
+	/**
+	 * 撤销结算人员编号
+	 * */
+	private String revokeStaff;
+
+	/**
+	 * 撤销结算时间
+	 * */
+	private Date revokeDatetime;
+
+	/**
+	 * 平台退费订单号，后续可根据此订单号查退费状态
+	 * */
+	private String platformRefdId;
+}

src/main/java/thyyxxk/wxservice_server/entity/medinsmobilepay/frompowersiplugin/request/RevokeSettleRequest.java

@@ -0,0 +1,73 @@
+package thyyxxk.wxservice_server.entity.medinsmobilepay.frompowersiplugin.request;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class RevokeSettleRequest {
+    /**
+     * 医院原支付订单号
+     * */
+    private String medOrgOrd;
+
+    /**
+     * 医疗机构编号
+     * */
+    private String orgCodg = "H43010500370";
+
+    /**
+     * 医疗机构退款编号（每次请求唯一）
+     * */
+    private String medRefdId;
+
+    /**
+     * 申请退费时间
+     * */
+    private String refdTime;
+
+    /**
+     * 总退费金额
+     * */
+    private BigDecimal totlRefdAmt;
+
+    /**
+     * 医保个人账户退费金额
+     * */
+    private BigDecimal psnAcctRefdAmt;
+
+    /**
+     * 医保统筹退费金额
+     * */
+    private BigDecimal fundRefdAmt;
+
+    /**
+     * 现金退费金额
+     * */
+    private BigDecimal cashRefdAmt;
+
+    /**
+     * 电子凭证授权Token（医保电子凭证线下扫码返回,医保订单退款此字段与payAuthNoKey不能同时为空）
+     * */
+    private String ecToken;
+
+    /**
+     * 退费类型（ ALL:全部（医保+现金），CASH:只退现金，HI:只退医保（统筹+个账））
+     * */
+    private String refdType = "CASH";
+
+    /**
+     * 退款原因
+     * */
+    private String refdReason;
+
+    /**
+     * 平台订单号
+     * */
+    private String platformOrderId;
+
+    /**
+     * 退款授权编号秘钥（线上退款使用,通过前端对接获取,医保订单退款此字段与ecToken不能同时为空）
+     * */
+    private String payAuthNoKey;
+}

src/main/java/thyyxxk/wxservice_server/entity/medinsmobilepay/frompowersiplugin/request/SettleNotify.java

@@ -1,176 +0,0 @@
-package thyyxxk.wxservice_server.entity.medinsmobilepay.frompowersiplugin.request;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * 结算成功通知
- * */
-@Data
-public class SettleNotify {
-    /**
-     * 回调类型。固定传02，目前仅支付成功回调
-     * */
-    private String callType;
-        
-    /**
-     * 支付类型。 0：全自费，1：医保支付
-     * */
-    private String payType;
-        
-    /**
-     * 医院订单号
-     * */
-    private String medOrgOrd;
-        
-    /**
-     * 医保结算中心订单号
-     * */
-    private String payOrdId;
-        
-    /**
-     * 交易时间
-     * */
-    private String traceTime;
-        
-    /**
-     * 费用总金额
-     * */
-    private BigDecimal feeSumamt;
-        
-    /**
-     * 个人现金自付
-     * */
-    private BigDecimal ownpayAmt;
-        
-    /**
-     * 个人账户支付
-     * */
-    private BigDecimal psnAcctPay;
-        
-    /**
-     * 其中基金支付
-     * */
-    private BigDecimal fundPay;
-        
-    /**
-     * 医保收费时间
-     * */
-    private String hiChrgTime;
-        
-    /**
-     * 医保交易流水号，对应:setl_id
-     * */
-    private String hiDocSn;
-        
-    /**
-     * 医保挂号流水号，对应:mdtrt_id
-     * */
-    private String hiRgstSn;
-        
-    /**
-     * 机构名称
-     * */
-    private String orgName;
-        
-    /**
-     * 电子凭证码值
-     * */
-    private String ecCode;
-        
-    /**
-     * 结算类型。 ALL:医保自费全部，CASH:只结现金，HI:只结医保
-     * */
-    private String setlType;
-        
-    /**
-     * 用于院内结算失败对医保的冲正授权， 1小时内有效
-     * */
-    private String revsToken;
-        
-    /**
-     * 医保扩展数据
-     * */
-    private String extData;
-        
-    /**
-     * 两定机构编号
-     * */
-    private String orgCodg;
-        
-    /**
-     * 住院押金
-     * */
-    private BigDecimal deposit;
-        
-    /**
-     * 参保区划
-     * */
-    private String insuCode;
-        
-    /**
-     * 险种类型
-     * */
-    private String insuType;
-        
-    /**
-     * 人员编号
-     * */
-    private String psnNo;
-        
-    /**
-     * 第三方支付平台类型。  wx, alipay
-     * */
-    private String thirdType;
-        
-    /**
-     * 个人账户类型。 1.虚账 2.实账
-     * */
-    private String psnAcctType;
-        
-    /**
-     * 机构扩展信息
-     * */
-    private String orgExtData;
-        
-    /**
-     * 证件号码
-     * */
-    private String idNo;
-        
-    /**
-     * 证件类型
-     * */
-    private String idType;
-        
-    /**
-     * 人员姓名
-     * */
-    private String userName;
-        
-    /**
-     * 平台订单号
-     * */
-    private String platformOrderId;
-        
-    /**
-     * 医保扩展数据
-     * */
-    private String hiExtData;
-        
-    /**
-     * 三方支付渠道订单号
-     * */
-    private String thirdOrderId;
-        
-    /**
-     * 三方支付平台返回交易号
-     * */
-    private String thirdpartTransId;
-        
-    /**
-     * 微信用户openid
-     * */
-    private String openid;
-}

src/main/java/thyyxxk/wxservice_server/entity/medinsmobilepay/frompowersiplugin/response/Upload6201.java

@@ -12,8 +12,8 @@ public class Upload6201 {
      */
     private String orgCodg = "H43010500370";
 
-    private String payAuthNo;
-    private String uldLatlnt;
+//    private String payAuthNo;
+//    private String uldLatlnt;
     private String mdtrtCertType = "02";
 
     /**
@@ -24,12 +24,12 @@ public class Upload6201 {
     /**
      * 人员编号
      */
-    private String psnNo;
+//    private String psnNo;
 
     /**
      * 险种类型
      */
-    private String insutype;
+//    private String insutype;
 
     /**
      * 医疗机构订单号

src/main/java/thyyxxk/wxservice_server/service/IdCardAnalyzeService.java

@@ -11,7 +11,6 @@ import thyyxxk.wxservice_server.dao.PatientCardsDao;
 import thyyxxk.wxservice_server.entity.ResultVo;
 import thyyxxk.wxservice_server.entity.analyzeidcard.IdCardAnalyzeResult;
 import thyyxxk.wxservice_server.entity.analyzeidcard.UploadIdCardParam;
-import thyyxxk.wxservice_server.entity.medinsmobilepay.frompowersiplugin.request.CommonRequest;
 import thyyxxk.wxservice_server.entity.medinsmobilepay.frompowersiplugin.response.CommonResponse;
 import thyyxxk.wxservice_server.entity.patientcards.CreatCardParam;
 import thyyxxk.wxservice_server.entity.wxapi.PushMessageParam;