共济账户传1

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

@@ -60,8 +60,8 @@ public class MzPatientInfo {
         return null != revokeRegistration && revokeRegistration;
     }
 
-    public String getAcctUsedFlag() {
-        return null == acctUsedFlag ? "0" : String.valueOf(acctUsedFlag);
+    public Integer getAcctUsedFlag() {
+        return null == acctUsedFlag ? 0 : acctUsedFlag;
     }
 
     public Integer getRealAcctUsedFlag() {

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

@@ -477,7 +477,10 @@ public class SiMzFeeService {
         JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.OUTPATIENT_PRE_SETTLEMENT,
                 mzPreSetlmt.getInsuplcAdmdvs(), p.getStaffId());
         mzPreSetlmt.setPsnSetlway(PsnSetlWay.SETTLE_BY_ITEMS.getCode());
-        mzPreSetlmt.setAcctUsedFlag(p.getAcctUsedFlag());
+        if (p.getAcctUsedFlag() == 2) {
+            p.setAcctUsedFlag(1);
+        }
+        mzPreSetlmt.setAcctUsedFlag(String.valueOf(p.getAcctUsedFlag()));
         mzPreSetlmt.setChrgBchno(p.getPatNo() + "_" + p.getTimes());
         mzPreSetlmt.setExpContent(p.getExpContent());
         String ref = JSONObject.toJSONString(mzPreSetlmt);
@@ -817,6 +820,9 @@ public class SiMzFeeService {
         mzptnt.setTimes(param.getTimes());
         mzptnt.setMedType(param.getMedType());
         mzptnt.setAcctUsedFlag(param.getAcctUsedFlag());
+        if (mzptnt.getAcctUsedFlag() == 2) {
+            mzptnt.setAcctUsedFlag(1);
+        }
         mzptnt.setStraitSettle(param.getStraitSettle());
         mzptnt.setAbortBeforeUploadFees(param.abortBeforeUploadFees());
         mzptnt.setVisitDate(param.getVisitDate());