medtype

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

@@ -53,36 +53,7 @@ public enum MedType {
 
     JIA_YI_FU_WU("9908", "家庭医师服务包", "clinic", "at"),
 
-    FU_ZHU_SHENG_ZHI("108", "辅助生殖门诊", "clinic", "au"),
-
-
-
-
-    EMERGENCY_RESCUE("1301", "急诊抢救", "clinic", "bb"),
-
-    OUTPATIENT_CHRONIC_IDIOPATHIC_DISEASES("14", "门诊慢特病", "clinic", "ac"),
-
-    SINGLE_DISEASE_HOSPITALIZATION("2102", "单病种住院", "hospitalization", "ae"),
-
-    RESIDENTS_NORMAL_BIRTH("2106", "生育平产(居民)", "hospitalization", "af"),
-
-    RESIDENTS_BIRTH_CESAREAN_SECTION("2107", "生育剖宫产(居民)", "hospitalization", "ag"),
-
-    DESIGNATED_DRUGSTORES_PURCHASE("41", "定点药店购药", "drug", "ai"),
-
-    INJURY_HOSPITALIZATION("42", "工伤住院", "hospitalization", "al"),
-
-    OCCUPATIONAL_INJURY_CLINIC("41", "工伤门诊", "clinic", "bl"),
-
-    INJURY_TBD("4X", "工伤待定", "hospitalization", "cl"),
-
-    INJURY_RECOVER_CLINIC("46", "康复门诊", "clinic", "dl"),
-
-
-
-    ACCIDENTAL_INJURY_CLINIC("9903", "意外伤害门诊", "clinic", "an"),
-
-    SPECIAL_MEDICINE_FOR_SERIOUS_ILLNESS("9904", "大病特药", "clinic", "ao");
+    FU_ZHU_SHENG_ZHI("108", "辅助生殖门诊", "clinic", "au");
 
     private final String code;
     private final String name;

src/main/java/thyyxxk/webserver/dao/his/dictionary/YibaoKeShiPiPeiDao.java

@@ -31,7 +31,7 @@ public interface YibaoKeShiPiPeiDao {
             "<if test=\"flag == 2\">" +
             "si_caty is not null " +
             "</if>" +
-            "and (code like '1%' or code like '2%' or code like '3%')  " +
+            "and (code like '1%' or code like '2%' or code like '3%' or code like '8%')  " +
             "</script>")
     List<GetDropdownBox> getBenYuanKeShiCode(Integer flag);
 

src/main/java/thyyxxk/webserver/service/inpatient/DictionaryService.java

@@ -139,11 +139,7 @@ public class DictionaryService {
                 param.setMedType(medType);
             }
         }
-        if (param.getMedType().equals(MedType.INJURY_HOSPITALIZATION.getCode())){
-            res = getInjuryDssForFrontSheet(param);
-        } else {
-            res = executeSearch(param);
-        }
+        res = executeSearch(param);
         if (!Objects.equals(res.getCode(), ExceptionEnum.SUCCESS.getCode())) {
             return res;
         }

src/main/java/thyyxxk/webserver/service/inpatient/DismissService.java

@@ -268,37 +268,20 @@ public class DismissService {
             if (null != deathOrderCount && deathOrderCount > 0) {
                 return ResultVoUtil.success();
             }
-            if (medinfo.getMedType().equals(MedType.INJURY_HOSPITALIZATION.getCode())) {
-                if (param.getMidSetl()) {
-                    param.setBegntime(begntime);
-                    param.setEndtime(tmpendtime);
-                }
-                InjuryCareQualification qualification = new InjuryCareQualification();
-                qualification.setPatNo(patNo);
-                qualification.setTimes(times);
-                qualification.setLedgerSn(ledgerSn);
-                qualification.setSid(param.getSid());
-                qualification.setStaffId(TokenUtil.getInstance().getTokenUserId());
-                ResultVo<String> feeCheck = injuryFeeUpld.uploadFees(siInjuryFeeUrl, qualification);
-                if (feeCheck.getCode() != 0) {
-                    throw new BizException(ExceptionEnum.LOGICAL_ERROR, feeCheck.getMessage());
-                }
-            } else {
-                Overview o = new Overview();
-                o.setInpatientNo(patNo);
-                o.setAdmissTimes(times);
-                o.setLedgerSn(ledgerSn);
-                o.setStaffId(param.getStaffId());
-                o.setSid(param.getSid());
-                o.setMidSetl(param.getMidSetl());
-                if (o.getMidSetl()) {
-                    o.setBegntime(begntime);
-                    o.setEndtime(tmpendtime);
-                }
-                ResultVo<String> feeCheck = zySrvc.uploadFeeDetail(siZyFeeUrl, o);
-                if (!Objects.equals(feeCheck.getCode(), ExceptionEnum.SUCCESS.getCode())) {
-                    throw new BizException(ExceptionEnum.LOGICAL_ERROR, feeCheck.getMessage());
-                }
+            Overview o = new Overview();
+            o.setInpatientNo(patNo);
+            o.setAdmissTimes(times);
+            o.setLedgerSn(ledgerSn);
+            o.setStaffId(param.getStaffId());
+            o.setSid(param.getSid());
+            o.setMidSetl(param.getMidSetl());
+            if (o.getMidSetl()) {
+                o.setBegntime(begntime);
+                o.setEndtime(tmpendtime);
+            }
+            ResultVo<String> feeCheck = zySrvc.uploadFeeDetail(siZyFeeUrl, o);
+            if (!Objects.equals(feeCheck.getCode(), ExceptionEnum.SUCCESS.getCode())) {
+                throw new BizException(ExceptionEnum.LOGICAL_ERROR, feeCheck.getMessage());
             }
         }
         return ResultVoUtil.success();

src/main/java/thyyxxk/webserver/service/inpatient/PatientService.java

@@ -393,7 +393,7 @@ public class PatientService {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "是否早产不能为空！");
             }
         }
-        if (medType == MedType.MATERNITY_HOSPITALIZATION || medType == MedType.SINGLE_DISEASE_HOSPITALIZATION) {
+        if (medType == MedType.MATERNITY_HOSPITALIZATION) {
             if (StringUtil.isBlank(patient.getDiseCode())) {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "患者病种不能为空！");
             }

src/main/java/thyyxxk/webserver/service/inpatient/charge/ForceInAndOutService.java

@@ -172,19 +172,6 @@ public class ForceInAndOutService {
         patient.setStaffId(user.getCode());
         patient.setStaffName(user.getName());
         patient.setLedgerSn(dao.getMaxLedgerSn(patient));
-        MedType medType = MedType.get(patient.getMedType());
-        if (medType == MedType.INJURY_HOSPITALIZATION) {
-            InjuryCareQualification qualification = new InjuryCareQualification();
-            qualification.setPatNo(patient.getPatNo());
-            qualification.setTimes(patient.getTimes());
-            qualification.setLedgerSn(patient.getLedgerSn());
-            qualification.setStaffId(user.getCode());
-            ResultVo<String> response = injurySystem.cancelCalculate(siInjurySystmUrl, qualification);
-            if (!response.isSuccess()) {
-                throw new BizException(ExceptionEnum.LOGICAL_ERROR, response.getMessage());
-            }
-            return revokeHisSettle(patient);
-        }
         ZyPatientInfo zyPatientInfo = new ZyPatientInfo();
         zyPatientInfo.setInpatientNo(patient.getPatNo());
         zyPatientInfo.setAdmissTimes(patient.getTimes());

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiAdmVerifyService.java

@@ -40,8 +40,7 @@ public class SiAdmVerifyService {
         if (null == medType) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医疗类别不能为空！");
         }
-        if (medType == MedType.GENERAL_HOSPITALIZATION ||
-                (medType == MedType.SINGLE_DISEASE_HOSPITALIZATION && p.getInpatientNo().startsWith("JT"))) {
+        if (medType == MedType.GENERAL_HOSPITALIZATION || p.getInpatientNo().startsWith("JT")) {
             SiAdmissApply apply = new SiAdmissApply();
             apply.setStatus(1);
             return ResultVoUtil.success(apply);

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiQueryService.java

@@ -149,9 +149,6 @@ public class SiQueryService {
             psnBaseinfo.setPatNo(qryPsnBsInfo.getPatNo());
             psnBaseinfo.setTimes(qryPsnBsInfo.getTimes());
             psnBaseinfo.setLedgerSn(qryPsnBsInfo.getLedgerSn());
-            if (Objects.equals(qryPsnBsInfo.getMedType(), MedType.EMERGENCY_RESCUE.getCode())) {
-                qryPsnBsInfo.setMedType(MedType.GENERAL_HOSPITALIZATION.getCode());
-            }
             psnBaseinfo.setMedType(qryPsnBsInfo.getMedType());
             psnBaseinfo.setGendName(Gend.get(psnBaseinfo.getGend()).getName());
             psnBaseinfo.setPsnCertTypeName(PsnCertType.get(psnBaseinfo.getPsnCertType()).getName());

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiZyService.java

@@ -238,9 +238,7 @@ public class SiZyService {
 
     private boolean invalidMultipleUploadPatient(String medtype) {
         MedType medType = MedType.get(medtype);
-        return null == medType || medType == MedType.INJURY_HOSPITALIZATION
-                || medType == MedType.SELF_PAY
-                || medType == MedType.INJURY_TBD;
+        return null == medType ||  medType == MedType.SELF_PAY;
     }
 
     public String hospitalizationPreSettlement(ZyPatientInfo p, ZyOrJzYbData ybData) {

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

@@ -36,9 +36,6 @@ public class JzYbData implements ZyOrJzYbData {
         if (admMdtrtinfo.getMdtrtCertType().equals("01")) {
             admMdtrtinfo.setMdtrtCertType("02");
         }
-        if (admMdtrtinfo.getMedType().equals(MedType.EMERGENCY_RESCUE.getCode())) {
-            admMdtrtinfo.setMedType(MedType.GENERAL_HOSPITALIZATION.getCode());
-        }
         Date setlEndTime = dao.selectSetlEndTime(jzptnt.getInpatientNo(), jzptnt.getAdmissTimes());
         if (null != setlEndTime && setlEndTime.after(admMdtrtinfo.getBegntime())) {
             throw new BizException(ExceptionEnum.LOGICAL_ERROR, "此患者有 " +