From ff584d153492ea746690cf8e05c2b859f170ae0b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 07 八月 2024 18:10:47 +0800
Subject: [PATCH] zjh 2024/08/07-1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjDwGroupingServiceImpl.java | 5 +
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java | 4 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java | 18 ++++
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 8 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 124 +++++++++++++++++++++++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 16 ++--
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjDwGroupingService.java | 1
ltkj-admin/src/main/resources/application-dev.yml | 2
10 files changed, 167 insertions(+), 15 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
index 23abc8f..28f5057 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
+++ b/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) {}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 36cfa27..bce6b5c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/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);
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
index 5487919..deea4cd 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
+++ b/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);
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index b4f9b15..fdcb44c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/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();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 95a5bac..163de7f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/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();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index 9309e20..6e0525c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -326,6 +326,130 @@
/**
+ * 瀵煎叆鍥綋浣撴棰勭害鍒楄〃
+ */
+ @PostMapping("/newExcelImportNotDwDeptId")
+ @ApiOperation(value = "鍥綋瀵煎叆 (鏂扮増鏈笉浼犲崟浣嶉儴闂╥d)")
+ @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")
diff --git a/ltkj-admin/src/main/resources/application-dev.yml b/ltkj-admin/src/main/resources/application-dev.yml
index 2cdbcf0..fc50ab6 100644
--- a/ltkj-admin/src/main/resources/application-dev.yml
+++ b/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
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java
index 82f9226..9eb718c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java
@@ -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);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjDwGroupingService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjDwGroupingService.java
index e7c75f9..2bcd246 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjDwGroupingService.java
+++ b/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);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjDwGroupingServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjDwGroupingServiceImpl.java
index f790ec8..67de622 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjDwGroupingServiceImpl.java
+++ b/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);
+ }
}
--
Gitblit v1.8.0