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

src/main/java/thyyxxk/webserver/constants/sidicts/MdtrtCertType.java

@@ -10,11 +10,11 @@ import thyyxxk.webserver.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/webserver/service/medicalinsurance/SiZyService.java

@@ -99,14 +99,14 @@ public class SiZyService {
         if (readCardBizType == ReadCardBizType.ADMISSION) {
             MdtrtCertType mdtrtCertType = MdtrtCertType.getByLabel(p.getMdtrtCertType());
             admMdtrtinfo.setMdtrtCertType(mdtrtCertType.getCode());
-            if (mdtrtCertType == MdtrtCertType.SOCIAL_SECURITY_CARD) {
+            if (mdtrtCertType.getCode().equals(MdtrtCertType.SOCIAL_SECURITY_CARD.getCode())) {
                 String[] out = p.getReadCardResult().split("\\|");
                 if (!p.getName().trim().equals(out[4].trim())) {
                     return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "社保卡姓名与HIS姓名不一致，请确认是否人证相符。");
                 }
                 admMdtrtinfo.setMdtrtCertNo(out[2]);
                 admMdtrtinfo.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.getName().trim().equals(qrinfo.getString("userName").trim())) {
                     return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "电子医保凭证姓名与HIS姓名不一致，请确认是否人证相符。");
@@ -511,7 +511,7 @@ public class SiZyService {
         if (readCardBizType == ReadCardBizType.SETTLEMENT) {
             MdtrtCertType mdtrtCertType = MdtrtCertType.getByLabel(p.getMdtrtCertType());
             preSetlmt.setMdtrtCertType(mdtrtCertType.getCode());
-            if (mdtrtCertType == MdtrtCertType.SOCIAL_SECURITY_CARD) {
+            if (mdtrtCertType.getCode().equals(MdtrtCertType.SOCIAL_SECURITY_CARD.getCode())) {
                 String[] out = p.getReadCardResult().split("\\|");
                 if (!p.getName().trim().equals(out[4].trim())) {
                     revokeDischarge(p);
@@ -519,7 +519,7 @@ public class SiZyService {
                 }
                 preSetlmt.setMdtrtCertNo(out[2]);
                 preSetlmt.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.getName().trim().equals(qrinfo.getString("userName").trim())) {
                     revokeDischarge(p);