门诊结算添加个人账户使用标志。

src/main/java/thyyxxk/simzfeeoprnsystm/pojo/MzPatientInfo.java

@@ -1,6 +1,7 @@
 package thyyxxk.simzfeeoprnsystm.pojo;
 
 import lombok.Data;
+import thyyxxk.simzfeeoprnsystm.utils.StringUtil;
 
 import java.util.Date;
 
@@ -24,6 +25,7 @@ public class MzPatientInfo {
     private String mdtrtId;
     private String medType;
     private String psnType;
+    private String acctUsedFlag;
     private Date visitDate;
     private String doctorCode;
     private String doctorName;
@@ -39,8 +41,12 @@ public class MzPatientInfo {
     private String readCardResult;
     private String readCardBizType;
 
+    public String getAcctUsedFlag() {
+        return StringUtil.isBlank(acctUsedFlag) ? "0" : acctUsedFlag;
+    }
 
     public Integer getSaved() {
         return null == saved ? 0 : saved;
     }
+
 }

src/main/java/thyyxxk/simzfeeoprnsystm/service/SiMzFeeService.java

@@ -2,7 +2,6 @@ package thyyxxk.simzfeeoprnsystm.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import thyyxxk.simzfeeoprnsystm.dao.SiLogDao;
 import thyyxxk.simzfeeoprnsystm.dao.SiMzDao;
 import thyyxxk.simzfeeoprnsystm.dao.SiSetldetailDao;
@@ -11,6 +10,9 @@ import thyyxxk.simzfeeoprnsystm.dicts.*;
 import thyyxxk.simzfeeoprnsystm.pojo.*;
 import thyyxxk.simzfeeoprnsystm.pojo.ResultVo;
 import thyyxxk.simzfeeoprnsystm.pojo.SiPatInfo;
+import thyyxxk.simzfeeoprnsystm.pojo.onlinepayment.EcTokenParams;
+import thyyxxk.simzfeeoprnsystm.pojo.onlinepayment.upload.EcTokenUpldDetl;
+import thyyxxk.simzfeeoprnsystm.pojo.onlinepayment.upload.EcTokenUpldRslt;
 import thyyxxk.simzfeeoprnsystm.utils.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -394,7 +396,7 @@ public class SiMzFeeService {
         setlmt.setMedfeeSumamt(setlmt.getMedfeeSumamt().setScale(2, RoundingMode.HALF_UP));
         setlmt.setPsnSetlway(PsnSetlWay.SETTLE_BY_ITEMS.getCode());
         setlmt.setChrgBchno(p.getPatNo() + "_" + p.getTimes());
-        setlmt.setAcctUsedFlag(YesOrNo.NO.getCodeStr());
+        setlmt.setAcctUsedFlag(p.getAcctUsedFlag());
         setlmt.setInvono(SnowFlakeId.getInstance().nextId());
         String ref = JSONObject.toJSONString(setlmt);
         input.getJSONObject("input").put("data", JSONObject.parseObject(ref));
@@ -497,8 +499,27 @@ public class SiMzFeeService {
         }
     }
 
-//    public ResultVo<String> uploadClinicRecords() {
-//        JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.UPLOAD_CLINIC_RECORDS, "", "99999");
+//    public ResultVo<String> payOnline(EcTokenParams params) {
 //
+//
+//    }
+
+//    private ResultVo<EcTokenUpldRslt> ecTokenUploadFees(EcTokenParams params) {
+//        EcTokenUpldDetl upldDetl = mzDao.selectEcTokenUpldDetl(params.getPatientId(), params.getTimes());
+//        if (null == upldDetl || StringUtil.isBlank(upldDetl.getMdtrtId())) {
+//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "患者有没有效的医保登记信息，请核实。");
+//        }
+//        upldDetl.setIdNo(params.getIdNo());
+//        upldDetl.setUserName(params.getUserName());
+//        upldDetl.setIdType(params.getIdType());
+//        upldDetl.setEcToken(params.getEcToken());
+//        upldDetl.setInsuCode(params.getInsuOrg());
+//        upldDetl.setIptOtpNo(params.getPatientId());
+//
+//        upldDetl.setDiseinfoList(null);
+//        upldDetl.setFeedetailList(null);
+//
+//        JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.ECTOKEN_UPLOAD_FEE_DETAIL,
+//                params.getInsuOrg(), params.getStaffId());
 //    }
 }