Merge remote-tracking branch 'upstream/master'

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

@@ -115,7 +115,7 @@ public class EmergencyRescueController {
         jzptnt.setInpatientNo(mzptnt.getPatNo());
         jzptnt.setAdmissTimes(mzptnt.getTimes());
         jzptnt.setLedgerSn(0);
-        jzptnt.setMedType(MedType.EMERGENCY_RESCUE.getCode());
+        jzptnt.setMedType(MedType.GENERAL_HOSPITALIZATION.getCode());
         jzptnt.setInsutype(mzptnt.getInsutype());
         jzptnt.setInsuplcAdmdvs(mzptnt.getInsuplcAdmdvs());
         jzptnt.setStaffId(mzptnt.getStaffId());

src/main/java/thyyxxk/webserver/service/medicalinsurance/impl/ZyYbData.java

@@ -34,7 +34,7 @@ public class ZyYbData implements ZyOrJzYbData {
         }
         Gender idGender = IdCardUtil.getGenderByIdCard(zyptnt.getSocialNo());
         Gender inputGender = Gender.getGenderByCode(zyptnt.getSex());
-        if (idGender != inputGender) {
+        if (idGender != Gender.UNKNOWN && idGender != inputGender) {
             throw new BizException(ExceptionEnum.LOGICAL_ERROR, "患者HIS性别与证件不符，请检查！");
         }
         Date setlEndTime = dao.selectSetlEndTime(zyptnt.getInpatientNo(), zyptnt.getAdmissTimes());