门诊共济添加读卡类型

src/main/java/thyyxxk/webserver/controller/medicalinsurance/MarkMtFeesController.java

@@ -1,23 +1,18 @@
 package thyyxxk.webserver.controller.medicalinsurance;
 
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import thyyxxk.webserver.config.auth.PassToken;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
-import thyyxxk.webserver.constants.sidicts.MdtrtCertType;
-import thyyxxk.webserver.constants.sidicts.ReadCardBizType;
 import thyyxxk.webserver.entity.ResultVo;
-import thyyxxk.webserver.entity.markmtfees.EcTokenParams;
-import thyyxxk.webserver.entity.markmtfees.UploadMtFeeParam;
+import thyyxxk.webserver.entity.markmtfees.SiMzBusinessParams;
 import thyyxxk.webserver.entity.medicalinsurance.onlinepayment.EcToken;
 import thyyxxk.webserver.entity.medicalinsurance.outpatient.MzPatientInfo;
 import thyyxxk.webserver.entity.medicalinsurance.outpatient.SpcChrDiseAcct;
 import thyyxxk.webserver.entity.medicalinsurance.setlinfo.FundDetail;
 import thyyxxk.webserver.service.medicalinsurance.SiMzService;
 import thyyxxk.webserver.utils.ResultVoUtil;
-import thyyxxk.webserver.utils.StringUtil;
 
 import java.util.*;
 
@@ -46,7 +41,7 @@ public class MarkMtFeesController {
      * */
     @PassToken
     @PostMapping("/uploadFees")
-    public Map<String, Object> uploadFees(@RequestBody UploadMtFeeParam param) {
+    public Map<String, Object> uploadFees(@RequestBody SiMzBusinessParams param) {
         MzPatientInfo mz = new MzPatientInfo();
         mz.setPatNo(param.getPatientId());
         mz.setTimes(param.getTimes());
@@ -60,7 +55,7 @@ public class MarkMtFeesController {
      * */
     @PassToken
     @PostMapping("/calculateCost")
-    public Map<String, Object> settlement(@RequestBody UploadMtFeeParam param) {
+    public Map<String, Object> settlement(@RequestBody SiMzBusinessParams param) {
         MzPatientInfo mz = new MzPatientInfo();
         mz.setPatNo(param.getPatientId());
         mz.setTimes(param.getTimes());
@@ -74,7 +69,7 @@ public class MarkMtFeesController {
      * */
     @PassToken
     @PostMapping("/retractFees")
-    public Map<String, Object> revokeSettlement(@RequestBody UploadMtFeeParam param) {
+    public Map<String, Object> revokeSettlement(@RequestBody SiMzBusinessParams param) {
         MzPatientInfo mz = new MzPatientInfo();
         mz.setPatNo(param.getPatientId());
         mz.setTimes(param.getTimes());
@@ -83,7 +78,7 @@ public class MarkMtFeesController {
         return getStringObjectMap(param, result, "收费窗口撤销门特结算", true);
     }
 
-    private Map<String, Object> getStringObjectMap(@RequestBody UploadMtFeeParam param,
+    private Map<String, Object> getStringObjectMap(@RequestBody SiMzBusinessParams param,
                                                    ResultVo<FundDetail> result,
                                                    String logText, boolean settlement) {
         Map<String, Object> map = new HashMap<>();
@@ -121,40 +116,20 @@ public class MarkMtFeesController {
 
     @PassToken
     @PostMapping("/queryInsuinfo")
-    public Map<String, Object> queryInsuinfo(@RequestBody UploadMtFeeParam param) {
+    public Map<String, Object> queryInsuinfo(@RequestBody SiMzBusinessParams param) {
         return mzService.queryInsuinfo(param);
     }
 
-    @PassToken
-    @PostMapping("/mzRegister")
-    public Map<String, Object> mzRegister(@RequestBody UploadMtFeeParam param) {
-        MzPatientInfo mzptnt = new MzPatientInfo();
-        mzptnt.setStaffId(param.getStaffId());
-        mzptnt.setPatNo(param.getPatientId());
-        mzptnt.setTimes(-1);
-        EcTokenParams ecpms = param.getEcpms();
-        if (StringUtil.notBlank(ecpms.getEcIndexNo())) {
-            mzptnt.setMdtrtCertType(MdtrtCertType.MEDICAL_INSURANCE_ELECTRONIC_VOUCHER.getLabel());
-            mzptnt.setReadCardBizType("01101");
-            mzptnt.setReadCardResult(JSONObject.toJSONString(ecpms));
-        }
-        return mzService.mzRegister(mzptnt);
-    }
-
     @PassToken
     @PostMapping("/directRegistration")
-    public Map<String, Object> directRegistration(@RequestBody UploadMtFeeParam param) {
-        EcTokenParams ecpms = param.getEcpms();
-        if (null == ecpms) {
+    public Map<String, Object> directRegistration(@RequestBody SiMzBusinessParams param) {
+        if (null == param.getReadCardResult()) {
             Map<String, Object> map = new HashMap<>();
             map.put("code", -1);
             map.put("msg", "读卡信息不能为空！");
             return map;
         }
-        ecpms.setPatientId(param.getPatientId());
-        ecpms.setTimes(param.getTimes());
-        ecpms.setStaffId(param.getStaffId());
-        ResultVo<FundDetail> result = mzService.directRegistration(ecpms);
+        ResultVo<FundDetail> result = mzService.directRegistration(param);
         return getStringObjectMap(param, result, "医生保存处方试算", false);
     }
 

src/main/java/thyyxxk/webserver/entity/markmtfees/UploadMtFeeParam.java → src/main/java/thyyxxk/webserver/entity/markmtfees/SiMzBusinessParams.java

@@ -9,12 +9,19 @@ import javax.validation.constraints.NotNull;
  * @author dj
  */
 @Data
-public class UploadMtFeeParam {
+public class SiMzBusinessParams {
     @NotBlank(message = "操作员id不能为空。")
     private String staffId;
     @NotBlank(message = "门诊id号不能为空。")
     private String patientId;
     @NotNull(message = "就诊次数不能为空。")
     private Integer times;
-    private EcTokenParams ecpms;
+
+    // 个人账户使用标志：1-使用，0-不使用
+    private Integer acctUsedFlag;
+    // 读卡类型：01-电子凭证，02-身份证，03-社保卡
+    private String readCardType;
+    // 读卡结果
+    private String readCardResult;
 }
+