hurugang 2 роки тому
батько
коміт
e3822bb81d

+ 34 - 28
src/main/java/cn/hnthyy/thmz/controller/api/MedicalViewApiController.java

@@ -259,19 +259,19 @@ public class MedicalViewApiController {
         mzPatientMi.setAge(haicipat.getPatAge());
         mzPatientMi.setBirthDay(haicipat.getPatBirth());
         Map<String, String> result = AddressResolutionUtil.addressResolution(haicipat.getPatAddress());
-        String province=result.get("province");
-        String city=result.get("city");
-        String district=result.get("district");
-        CodeNameEntity codeNameEntity=regionService.queryByName(province,null);
-        if(codeNameEntity!=null && StringUtils.isNotBlank(codeNameEntity.getName())){
+        String province = result.get("province");
+        String city = result.get("city");
+        String district = result.get("district");
+        CodeNameEntity codeNameEntity = regionService.queryByName(province, null);
+        if (codeNameEntity != null && StringUtils.isNotBlank(codeNameEntity.getName())) {
             mzPatientMi.setProvinceCode(codeNameEntity.getCode());
         }
-        if((district==null || StringUtils.isBlank(district) && (city!=null && StringUtils.isNotBlank(city)))){
-            district=city;
+        if ((district == null || StringUtils.isBlank(district) && (city != null && StringUtils.isNotBlank(city)))) {
+            district = city;
             //只有市,没有区,将市设置到区
         }
-        codeNameEntity=regionService.queryByName(district,codeNameEntity==null?null:codeNameEntity.getCode());
-        if(codeNameEntity!=null && StringUtils.isNotBlank(codeNameEntity.getName())){
+        codeNameEntity = regionService.queryByName(district, codeNameEntity == null ? null : codeNameEntity.getCode());
+        if (codeNameEntity != null && StringUtils.isNotBlank(codeNameEntity.getName())) {
             mzPatientMi.setCityCode(codeNameEntity.getParentCode());
             mzPatientMi.setDistrictCode(codeNameEntity.getCode());
         }
@@ -574,13 +574,13 @@ public class MedicalViewApiController {
                 map.put("selfAmt", totalAmount);
                 map.put("priceTime", DateUtil.fomart(mzChargeDetail.getPriceTime(), "yyyy-MM-dd HH:mm:ss"));
                 //不是医保查询的时候调用,需要查询是否有医保报销信息
-                if(haicipat.getYbRequest()==null || !YesNoEnum.YES.code.equals(haicipat.getYbRequest())){
+                if (haicipat.getYbRequest() == null || !YesNoEnum.YES.code.equals(haicipat.getYbRequest())) {
                     PayInfo payInfo = tsmzService.uploadFees(whiteList.getOpId(), mzChargeDetail.getPatientId(), mzChargeDetail.getTimes(), mzChargeDetail.getReceiptNo());
                     if (payInfo != null && payInfo.getCode() == 0) {
-                        if(payInfo.getAcctPay()==null){
+                        if (payInfo.getAcctPay() == null) {
                             payInfo.setAcctPay(BigDecimal.ZERO);
                         }
-                        if(payInfo.getFundPay()==null){
+                        if (payInfo.getFundPay() == null) {
                             payInfo.setFundPay(BigDecimal.ZERO);
                         }
                         //个人医保账户支付
@@ -606,7 +606,6 @@ public class MedicalViewApiController {
     }
 
 
-
     /**
      * 门诊待缴费记录明细查询
      *
@@ -816,6 +815,12 @@ public class MedicalViewApiController {
             results.put("resultMessage", "缴费成功");
             results.put("guideListInfo", "");
             return results;
+        } catch (MzException e) {
+            e.printStackTrace();
+            results.put("resultCode", -1);
+            results.put("resultMessage", "缴费失败," + e.getMessage());
+            log.error("缴费失败,系统异常,错误信息【{}】", e);
+            return results;
         } catch (Exception e) {
             e.printStackTrace();
             results.put("resultCode", -1);
@@ -1187,7 +1192,7 @@ public class MedicalViewApiController {
             }
             Clinic clinic = mzChargeDetailService.nucleicOnlyYellowAcidApplication(patientId, whiteList.getOpId());
             if (clinic != null && clinic.getId() != null) {
-                MzDepositFileVo mzDepositFileVo=new MzDepositFileVo();
+                MzDepositFileVo mzDepositFileVo = new MzDepositFileVo();
                 mzDepositFileVo.setPatientId(clinic.getPatientId());
                 mzDepositFileVo.setTimes(clinic.getTimes());
                 mzDepositFileVo.setReceiptNo(clinic.getReceiptNo());
@@ -1420,7 +1425,7 @@ public class MedicalViewApiController {
         } catch (Exception e) {
             e.printStackTrace();
             resultMap.put("resultCode", -1);
-            resultMap.put("resultMessage", "保存住院收费出错,错误信息【"+e.getMessage()+"】,请联系管理员");
+            resultMap.put("resultMessage", "保存住院收费出错,错误信息【" + e.getMessage() + "】,请联系管理员");
             log.error("保存住院收费异常,错误信息{}", e.getMessage());
             return resultMap;
         }
@@ -1867,27 +1872,28 @@ public class MedicalViewApiController {
 
     /**
      * 获取不能使用的时间区间
-      * @param requestDay
+     *
+     * @param requestDay
      * @return
      */
-    private List<String> getNotUsedWorkTimes(String requestDay){
+    private List<String> getNotUsedWorkTimes(String requestDay) {
         List<String> ampms = null;
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String now = simpleDateFormat.format(new Date());
         if (requestDay.equals(now)) {
             int flg = DateUtil.IsAfternoon(java.util.Calendar.getInstance().getTime().getHours());
             if (flg >= 0) {
-                ampms=new ArrayList<>();
+                ampms = new ArrayList<>();
                 ampms.add(Constants.AM);
             }
             List<MzZdWorkTime> mzZdWorkTimes = mzZdWorkTimeService.queryAllMzZdWorkTimeBeforeNow();
-            if (mzZdWorkTimes!=null && mzZdWorkTimes.size()>0) {
-                for(MzZdWorkTime mzZdWorkTime:mzZdWorkTimes){
-                    if(mzZdWorkTime==null || mzZdWorkTime.getCode()==null || StringUtils.isBlank(mzZdWorkTime.getCode())){
-                       continue;
+            if (mzZdWorkTimes != null && mzZdWorkTimes.size() > 0) {
+                for (MzZdWorkTime mzZdWorkTime : mzZdWorkTimes) {
+                    if (mzZdWorkTime == null || mzZdWorkTime.getCode() == null || StringUtils.isBlank(mzZdWorkTime.getCode())) {
+                        continue;
                     }
-                    if(ampms==null){
-                        ampms=new ArrayList<>();
+                    if (ampms == null) {
+                        ampms = new ArrayList<>();
                     }
                     ampms.add(mzZdWorkTime.getCode());
                 }
@@ -2765,8 +2771,8 @@ public class MedicalViewApiController {
     public Map<String, Object> getHyBirdTime() {
         Map<String, Object> resultMap = new HashMap<>();
         try {
-            Config config =configService.queryUserByKey(Constants.HYBIRD_TIME_KEY);
-            if (config==null){
+            Config config = configService.queryUserByKey(Constants.HYBIRD_TIME_KEY);
+            if (config == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "该键没有对应的配置");
                 return resultMap;
@@ -2775,9 +2781,9 @@ public class MedicalViewApiController {
             resultMap.put("message", "获取核酸混采时间成功");
             resultMap.put("data", config);
             return resultMap;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            log.error("获取核酸混采时间失败,错误信息{}",e);
+            log.error("获取核酸混采时间失败,错误信息{}", e);
             resultMap.put("code", -1);
             resultMap.put("message", "获取核酸混采时间失败");
             return resultMap;