ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
@@ -282,9 +282,13 @@ if (jyjgval.compareTo(min) < 0) { // jyjg 小于范围最小值，添加下箭头 jyjg = jyjg + " ↓"; hybgd.setYcbz("1"); } else if (jyjgval.compareTo(max) > 0) { // jyjg 大于范围最大值，添加上箭头 jyjg = jyjg + " ↑"; hybgd.setYcbz("1"); }else { hybgd.setYcbz("0"); } hybgd.setJyjg(jyjg); } catch (Exception ignored) {} ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -562,11 +562,11 @@ String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); if(null !=code && code.equals("200")){ JSONArray resultData = object.getJSONArray("ResultData"); Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0); String cfh = resultDatasss.get("cfh").toString(); if(null !=code && code.equals("0")){ JSONObject resultData = object.getJSONObject("ResultData"); // Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0); String cfh = resultData.getStr("cfh"); log.info("药品申请后的处方号是: "+cfh+" outpinmedicapplyDetilsDtos 里面的值为: "+outpinmedicapplyDetilsDtos.toString()); for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) { TjCf cf=new TjCf(); cf.setCardId(cardId); @@ -670,7 +670,7 @@ String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); if(null !=code && code.equals("200")){ if(null !=code && code.equals("0")){ cfService.delCfByCardId(cfh); } } @@ -760,7 +760,7 @@ String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); if(null !=code && code.equals("200")){ if(null !=code && code.equals("0")){ cfService.delCfByCardId(cfh); } } @@ -845,7 +845,7 @@ String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); if(null !=code && code.equals("200")){ if(null !=code && code.equals("0")){ cfService.delCfByCardId(cfh); } } ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
@@ -353,7 +353,7 @@ Map<String, Object> map = new HashMap<> (); map.put ("his_registration_id", hisRegistrationId); map.put ("czybm", czybm); map.put ("zflxbm", sqdh); map.put ("sqdh", sqdh); String post = HttpClientUtils.sendPost (HIS_URL+"Outpindelmedicapply", map); return AjaxResult.success ().put ("data", post); } ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -1125,10 +1125,10 @@ String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); if(null !=code && code.equals("200")){ JSONArray resultData = object.getJSONArray("ResultData"); Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0); String cfh = resultDatasss.get("cfh").toString(); if(null !=code && code.equals("0")){ JSONObject resultData = object.getJSONObject("ResultData"); // Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0); String cfh = resultData.getStr("cfh"); for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) { TjCf cf=new TjCf(); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -2859,7 +2859,7 @@ String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); if (null != code && code.equals("200")) { if (null != code && code.equals("0")) { } return AjaxResult.success(); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -326,6 +326,130 @@ /** * 导入团体体检预约列表 */ @PostMapping("/newExcelImportNotDwDeptId") @ApiOperation(value = "团体导入 (新版本不传单位部门id)") @Transactional public AjaxResult newExcelImportNotDwDeptId(@RequestPart(value = "file") @ApiParam(value = "Excel文件") MultipartFile file, @RequestParam @ApiParam(value = "单位id") String dwId) { List<TjReservation> tjReservations = null; try { tjReservations = ExcelUtils.readMultipartFile(file, TjReservation.class); } catch (Exception e) { return AjaxResult.error("导入文件有误请检查导入文件!"); } int grouping = dwGroupingService.selectTjDwGroupingByDwId(dwId); if(grouping==0){ return AjaxResult.error("请检查该单位是否存否存在项目!"); } List<String> wrongList = new ArrayList<>(); List<TjReservation> rightList = new ArrayList<>(); List<TjReservation> yyList = new ArrayList<>(); Map<String, Object> map = new HashMap<>(); TjDwGrouping groupingMan = null;//男 TjDwGrouping groupingWoMan = null;//女 TjDwGrouping groupingWz = null;//未知(不分性别) try { groupingMan = dwGroupingService.getOne(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId,dwId) .eq(TjDwGrouping::getSex, 0)); groupingWoMan = dwGroupingService.getOne(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId,dwId) .eq(TjDwGrouping::getSex, 1)); groupingWz = dwGroupingService.getOne(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId,dwId) .eq(TjDwGrouping::getSex, 2)); } catch (Exception e) { return AjaxResult.error("分组信息有误请重新分组!"); } //计算合计 BigDecimal hjMoney = new BigDecimal("0.00"); //男组金额 BigDecimal manMoney = new BigDecimal("0.00"); //女组金额 BigDecimal woManMoney = new BigDecimal("0.00"); int count=0;//总计人数 int manCount=0;//男组人数 int woManCount=0;//女组人数 for (TjReservation tjReservation : tjReservations) { String idCard = tjReservation.getIdCard(); String phoe = tjReservation.getPhoe(); if (null != idCard && null != phoe) { // if (!MatchUtils.isIdCard(idCard) || !MatchUtils.isMobileNO(phoe)) { if (idCard.isEmpty() || phoe.isEmpty()) { wrongList.add(tjReservation.getName()); } else { //年龄 tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard()))); //出生日期 tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()),"yyyy-MM-dd")); if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex()))) { tjReservation.setGroupingId(groupingMan.getId()); tjReservation.setGroupingName(groupingMan.getGroupingName()); tjReservation.setYsPrice(groupingMan.getYsPrice()); //合计 hjMoney = hjMoney.add(groupingMan.getYsPrice()); count+=1; //男组人数 manMoney=manMoney.add(groupingMan.getYsPrice()); manCount+=1; } else if (null != groupingWoMan && groupingWoMan.getSex().equals(String.valueOf(tjReservation.getSex()))) { tjReservation.setGroupingId(groupingWoMan.getId()); tjReservation.setGroupingName(groupingWoMan.getGroupingName()); tjReservation.setYsPrice(groupingWoMan.getYsPrice()); //合计 hjMoney = hjMoney.add(groupingWoMan.getYsPrice()); count+=1; woManMoney=woManMoney.add(groupingWoMan.getYsPrice());woManCount+=1; } else if (null != groupingWz && groupingWz.getSex().equals(String.valueOf(tjReservation.getSex()))) { tjReservation.setGroupingId(groupingWz.getId()); tjReservation.setGroupingName(groupingWz.getGroupingName()); tjReservation.setYsPrice(groupingWz.getYsPrice()); //合计 hjMoney = hjMoney.add(groupingWz.getYsPrice()); count+=1; } LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>(); wq.eq(TjReservation::getIdCard, tjReservation.getIdCard()); wq.eq(TjReservation::getIsExpire, 2); TjReservation one = tjReservationService.getOne(wq); if (null != one) { yyList.add(one); } rightList.add(tjReservation); } } else { wrongList.add(tjReservation.getName()); } } if (yyList.size() > 0) { map.put("list", yyList); map.put("hjMoney", hjMoney); return AjaxResult.error("操作失败,以上人员已经预约无需导入!!!", map); } if (wrongList.size() > 0) { map.put("list", wrongList); map.put("hjMoney", hjMoney); return AjaxResult.error("操作失败, 请核对信息后重新导入!!!", map); } else { map.put("list", rightList); map.put("count", count); map.put("hjMoney", hjMoney); map.put("manCount", manCount); map.put("manMoney", manMoney); map.put("woManCount", woManCount); map.put("woManMoney", woManMoney); return AjaxResult.success("操作成功", map); } } /** * 个人预约接口 */ @PostMapping("/addTjReservation") ltkj-admin/src/main/resources/application-dev.yml
@@ -219,7 +219,7 @@ # path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin # path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin # path: http://192.168.0.5:5000/ltkj-admin path: http://127.0.0.1:5011 path: http://192.168.1.113:5011 # path: http://192.168.0.105:5011 # path: http://192.168.1.113:5011
@@ -85,4 +85,22 @@ " GROUP BY\n" + " b.sex)b") public int selectTjDwGroupingByDwDeptId(String dwDeptId); @Select("SELECT SUM(b.aa) cc FROM ( SELECT\n" + " CASE WHEN ISNULL( b.sex )\n" + " AND ISNULL( c.pro_name ) THEN 0\n" + " WHEN !ISNULL( b.sex )\n" + " AND ISNULL(c.pro_name ) THEN 0 ELSE 1\n" + " END\n" + " aa\n" + " FROM\n" + " tj_dw_dept a\n" + " LEFT JOIN tj_dw_grouping b ON a.id = b.dw_dept_id\n" + " LEFT JOIN tj_grouping_pro c ON b.id = c.grouping_id\n" + " WHERE\n" + " a.dw_id =#{dwId} \n" + " GROUP BY\n" + " b.sex)b") public int selectTjDwGroupingByDwId(String dwId); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjDwGroupingService.java
@@ -65,4 +65,5 @@ public int selectTjDwGroupingByDwDeptId(String dwDeptId); public int selectTjDwGroupingByDwId(String dwId); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjDwGroupingServiceImpl.java
@@ -99,4 +99,9 @@ public int selectTjDwGroupingByDwDeptId(String dwDeptId) { return tjDwGroupingMapper.selectTjDwGroupingByDwDeptId(dwDeptId); } @Override public int selectTjDwGroupingByDwId(String dwId) { return tjDwGroupingMapper.selectTjDwGroupingByDwId(dwId); } }
