添加终端刷脸和读电子凭证

src/main/java/thyyxxk/simzfeeoprnsystm/dicts/MdtrtCertType.java

@@ -10,11 +10,11 @@ import thyyxxk.simzfeeoprnsystm.utils.StringUtil;
 public enum MdtrtCertType {
 
     MEDICAL_INSURANCE_ELECTRONIC_VOUCHER("01", "医保电子凭证", "qrcode"),
-
+    MEDICAL_INSURANCE_ELECTRONIC_VOUCHER2("01", "医保电子凭证", "qrcode2"),
+    MEDICAL_INSURANCE_ELECTRONIC_VOUCHER3("01", "刷脸", "face"),
     RESIDENT_IDENTITY_CARD("02", "居民身份证", "idcard"),
-
+    RESIDENT_IDENTITY_CARD2("02", "居民身份证", "idcard2"),
     SOCIAL_SECURITY_CARD("03", "社会保障卡", "sicard"),
-
     OTHER("99", "其他", "other");
 
     private final String code;

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

@@ -54,9 +54,6 @@ public class SiMzFeeService {
     }
 
     public ResultVo<String> outpatientRegistration(MzPatientInfo p) {
-//        if (p.getInsuplcAdmdvs().equals("430182") && !Objects.equals("11", p.getMedType())) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "宁乡参保地区的患者我院只能办理普门医保业务，其他类别的业务暂不支持。");
-//        }
         Regstrtn regstrtn = mzDao.selectRegstrtn(p.getPatNo(), p.getTimes());
         if (null == regstrtn) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "mz_visit_table患者信息为空，请联系医生重开处方。");
@@ -71,11 +68,11 @@ public class SiMzFeeService {
         if (readCardBizType == ReadCardBizType.REGISTRATION) {
             MdtrtCertType mdtrtCertType = MdtrtCertType.getByLabel(p.getMdtrtCertType());
             regstrtn.setMdtrtCertType(mdtrtCertType.getCode());
-            if (mdtrtCertType == MdtrtCertType.SOCIAL_SECURITY_CARD) {
+            if (mdtrtCertType.getCode().equals(MdtrtCertType.SOCIAL_SECURITY_CARD.getCode())) {
                 String[] out = p.getReadCardResult().split("\\|");
                 regstrtn.setMdtrtCertNo(out[2]);
                 regstrtn.setCardSn(out[3]);
-            } else if (mdtrtCertType == MdtrtCertType.MEDICAL_INSURANCE_ELECTRONIC_VOUCHER) {
+            } else if (mdtrtCertType.getCode().equals(MdtrtCertType.MEDICAL_INSURANCE_ELECTRONIC_VOUCHER.getCode())) {
                 JSONObject qrinfo = JSONObject.parseObject(p.getReadCardResult());
                 regstrtn.setMdtrtCertNo(qrinfo.getString("ecToken"));
             }
@@ -342,11 +339,11 @@ public class SiMzFeeService {
         if (readCardBizType == ReadCardBizType.SETTLEMENT) {
             MdtrtCertType mdtrtCertType = MdtrtCertType.getByLabel(p.getMdtrtCertType());
             mzPreSetlmt.setMdtrtCertType(mdtrtCertType.getCode());
-            if (mdtrtCertType == MdtrtCertType.SOCIAL_SECURITY_CARD) {
+            if (mdtrtCertType.getCode().equals(MdtrtCertType.SOCIAL_SECURITY_CARD.getCode())) {
                 String[] out = p.getReadCardResult().split("\\|");
                 mzPreSetlmt.setMdtrtCertNo(out[2]);
                 mzPreSetlmt.setCardSn(out[3]);
-            } else if (mdtrtCertType == MdtrtCertType.MEDICAL_INSURANCE_ELECTRONIC_VOUCHER) {
+            } else if (mdtrtCertType.getCode().equals(MdtrtCertType.MEDICAL_INSURANCE_ELECTRONIC_VOUCHER.getCode())) {
                 JSONObject qrinfo = JSONObject.parseObject(p.getReadCardResult());
                 if (!p.getSocialNo().trim().equals(qrinfo.getString("idNo").trim())) {
                     return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "电子医保凭证身份证与HIS身份证不一致，请确认是否人证相符。");
@@ -430,11 +427,11 @@ public class SiMzFeeService {
         if (readCardBizType == ReadCardBizType.SETTLEMENT) {
             MdtrtCertType mdtrtCertType = MdtrtCertType.getByLabel(p.getMdtrtCertType());
             setlmt.setMdtrtCertType(mdtrtCertType.getCode());
-            if (mdtrtCertType == MdtrtCertType.SOCIAL_SECURITY_CARD) {
+            if (mdtrtCertType.getCode().equals(MdtrtCertType.SOCIAL_SECURITY_CARD.getCode())) {
                 String[] out = p.getReadCardResult().split("\\|");
                 setlmt.setMdtrtCertNo(out[2]);
                 setlmt.setCardSn(out[3]);
-            } else if (mdtrtCertType == MdtrtCertType.MEDICAL_INSURANCE_ELECTRONIC_VOUCHER) {
+            } else if (mdtrtCertType.getCode().equals(MdtrtCertType.MEDICAL_INSURANCE_ELECTRONIC_VOUCHER.getCode())) {
                 JSONObject qrinfo = JSONObject.parseObject(p.getReadCardResult());
                 if (!p.getSocialNo().trim().equals(qrinfo.getString("idNo").trim())) {
                     return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "电子医保凭证身份证与HIS身份证不一致，请确认是否人证相符。");