From 6ea42e85e4214bafeb3315f2e31dc64f74e6263e Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 25 一月 2024 14:48:00 +0800
Subject: [PATCH] zjh 2024/01/25--1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjDwGroupingServiceImpl.java | 5 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java | 18 ++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java | 13 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 4
ltkj-hosp/src/main/resources/mapper/hosp/TjDiscardInspectionMapper.xml | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 138 +--------------------------------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjDwGroupingService.java | 3
8 files changed, 43 insertions(+), 142 deletions(-)
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 aad0fcf..4dca8d3 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
@@ -176,7 +176,6 @@
public void ttextracted(TjOrder tjOrder, TjCustomer tjCustomer, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
-
boolean b = tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
if (!b) {
List<TjGroupingPro> proList = groupingProService.list(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId, tjOrder.getGroupId()));
@@ -239,7 +238,8 @@
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
}
-
+ transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(),BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber());
+ tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
// List<TjOrderDetail> list = tjOrderDetailService.getTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()));
// if (list != null) {
// for (TjOrderDetail tjOrderDetail : list) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
index 06d11c7..21165b2 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
@@ -51,13 +51,10 @@
public class SysLoginController {
@Autowired
private SysLoginService loginService;
-
@Autowired
private ISysMenuService menuService;
-
@Autowired
private SysPermissionService permissionService;
-
@Resource
private ITjCustomerService customerService;
@Resource
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
index ba25dab..e849ab1 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
@@ -719,13 +719,14 @@
Integer tuan=0;
BigDecimal shouyi=new BigDecimal(0);
for (TjOrder tjOrder : list) {
- final TjCustomer byId = customerService.getById(tjOrder.getUserId());
- if (byId.getCusSex()==0){
- boys+=1;
- }else if (byId.getCusSex()==1){
- girls+=1;
+ TjCustomer customer = customerService.getById(tjOrder.getUserId());
+ if(null !=customer){
+ if (customer.getCusSex()==0){
+ boys+=1;
+ }else if (customer.getCusSex()==1){
+ girls+=1;
+ }
}
-
if ("2".equals(tjOrder.getTjType())){
person+=1;
} else if ("1".equals(tjOrder.getTjType())) {
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 3ec2412..6f9f6e7 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
@@ -203,40 +203,6 @@
/**
* 瀵煎叆鍥綋浣撴棰勭害鍒楄〃
*/
- @PostMapping("/excelImport")
- @ApiOperation(value = "鍥綋瀵煎叆 (鏃х増鏈�)")
- public AjaxResult excelImport(@RequestPart(value = "file") @ApiParam(value = "Excel鏂囦欢") MultipartFile file) {
- List<TjReservation> tjReservations = null;
- try {
- tjReservations = ExcelUtils.readMultipartFile(file, TjReservation.class);
- } catch (Exception e) {
- return AjaxResult.error("瀵煎叆鏂囦欢鏈夎璇锋鏌ュ鍏ユ枃浠�!");
- }
- List<String> wrongList = new ArrayList<>();
- List<TjReservation> rightList = new ArrayList<>();
- for (TjReservation tjReservation : tjReservations) {
- String idCard = tjReservation.getIdCard();
- String phoe = tjReservation.getPhoe();
- if (null != idCard && null != phoe) {
- if (!MatchUtils.isIdCard(idCard) || !MatchUtils.isMobileNO(phoe)) {
- wrongList.add(tjReservation.getName());
- } else {
- rightList.add(tjReservation);
- }
- } else {
- wrongList.add(tjReservation.getName());
- }
- }
- if (wrongList.size() > 0) {
- return AjaxResult.success("鎿嶄綔澶辫触", wrongList);
- } else {
- return AjaxResult.success("鎿嶄綔鎴愬姛",rightList);
- }
- }
-
- /**
- * 瀵煎叆鍥綋浣撴棰勭害鍒楄〃
- */
@PostMapping("/newExcelImport")
@ApiOperation(value = "鍥綋瀵煎叆 (鏂扮増鏈�)")
@Transactional
@@ -249,6 +215,12 @@
} catch (Exception e) {
return AjaxResult.error("瀵煎叆鏂囦欢鏈夎璇锋鏌ュ鍏ユ枃浠�!");
}
+ int grouping = dwGroupingService.selectTjDwGroupingByDwDeptId(dwDeptId);
+
+ if(grouping==0){
+ return AjaxResult.error("璇锋鏌ラ儴闂ㄥ垎缁勬垨鍒嗙粍涓槸鍚﹀瓨鍦ㄩ」鐩�!");
+ }
+
List<String> wrongList = new ArrayList<>();
List<TjReservation> rightList = new ArrayList<>();
List<TjReservation> yyList = new ArrayList<>();
@@ -344,102 +316,6 @@
map.put("woManMoney", woManMoney);
return AjaxResult.success("鎿嶄綔鎴愬姛", map);
}
- }
-
-
- @PostMapping("/reservationConfirm")
- @ApiOperation(value = "鍥綋棰勭害纭鎺ュ彛 (鏃х増鏈�)")
- public AjaxResult reservationConfirm(@RequestBody Map<String, Object> map) {
- List<TjReservation> rightLists = (List<TjReservation>) map.get("rightList");
- String pacId = map.get("pacId").toString();
- String copeWith = map.get("copeWith").toString();
- String[] proIds = (String[]) map.get("proIds");
- Object compId1 = map.get("compId");
- if (null == compId1 || compId1.equals("")) {
- return AjaxResult.error("璇烽�夋嫨鍗曚綅淇℃伅");
- }
- String compId = map.get("compId").toString();
- Object reservationTime1 = map.get("reservationTime");
- if (null == reservationTime1) {
- return AjaxResult.error("璇烽�夋嫨棰勭害鏃堕棿!");
- }
- String reservationTime = map.get("reservationTime").toString();
- String payType = map.get("payType").toString();
- String jsonString = JSON.toJSONString(rightLists);
- List<TjReservation> rightList = JSON.parseArray(jsonString, TjReservation.class);
-
- if (null != rightList) {
- if (null != pacId || null != proIds && proIds.length > 0) {
- String teamNo = PinyinUtil.getFirstLetter(compService.getById(compId).getCnName(), "") + DateUtil.format(new Date(), "yyMMddHHmmss");
- for (TjReservation reservation : rightList) {
- LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
- wq.eq(TjReservation::getIdCard, reservation.getIdCard());
- wq.eq(TjReservation::getIsExpire, 2);
- TjReservation one = tjReservationService.getOne(wq);
- if (null != one) {
- continue;
- }
- if (null != pacId) {
- reservation.setPacId(pacId);
- }
- if (null != proIds && proIds.length > 0) {
- reservation.setProIds(Joiner.on(",").join(proIds));
- }
- reservation.setReservationTime(DateUtil.parse(reservationTime, "yyyy-MM-dd"));
- reservation.setCompanyId(compId);
- reservation.setCompany(compService.getById(compId).getCnName());
- reservation.setPayType(Long.valueOf(payType));
- reservation.setTjType(String.valueOf(1));
- reservation.setTeamNo(teamNo);
- tjReservationService.save(reservation);
-// delayService.reservation(reservation.getId());
- }
- LambdaQueryWrapper<TjCompPay> wq0 = new LambdaQueryWrapper<>();
- wq0.eq(TjCompPay::getCompId, compId);
- wq0.eq(TjCompPay::getTeamNo, teamNo);
- TjCompPay one = compPayService.getOne(wq0);
- if (null != one) {
- one.setCopeWith(new BigDecimal(copeWith));
- one.setSerialNumber(SecurityUtils.getUsername() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
- one.setInvoiceNo("FP" + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
- one.setPaidIn(new BigDecimal("0.00"));
- compPayService.updateById(one);
- } else {
- TjCompPay tjCompPay = new TjCompPay();
- tjCompPay.setCompId(compId);
- tjCompPay.setTeamNo(teamNo);
- tjCompPay.setCopeWith(new BigDecimal(copeWith));
- tjCompPay.setSerialNumber(SecurityUtils.getUsername() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
- tjCompPay.setInvoiceNo("FP" + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
- tjCompPay.setPaidIn(new BigDecimal("0.00"));
- tjCompPay.setDifference(tjCompPay.getCopeWith().subtract(BigDecimal.valueOf(0.00)));
- compPayService.save(tjCompPay);
- }
- LambdaQueryWrapper<TjTeamSelectRecord> wq = new LambdaQueryWrapper<>();
- wq.eq(TjTeamSelectRecord::getTeamNo, teamNo);
- wq.eq(TjTeamSelectRecord::getCompId, compId);
- TjTeamSelectRecord recordServiceOne = selectRecordService.getOne(wq);
- if (null != recordServiceOne) {
- if (null != pacId) recordServiceOne.setPacId(pacId);
- recordServiceOne.setProIds(Joiner.on(";").join(proIds != null ? proIds : new String[0]));
- recordServiceOne.setTeamNo(teamNo);
- recordServiceOne.setTransactionAmount(new BigDecimal("0.00"));
- recordServiceOne.setCount(rightList.size());
- selectRecordService.updateById(recordServiceOne);
- }
- TjTeamSelectRecord selectRecord = new TjTeamSelectRecord();
- selectRecord.setCompId(compId);
- if (null != pacId) selectRecord.setPacId(pacId);
- selectRecord.setProIds(Joiner.on(";").join(proIds != null ? proIds : new String[0]));
- selectRecord.setTeamNo(teamNo);
- selectRecord.setTransactionAmount(new BigDecimal("0.00"));
- selectRecord.setCount(rightList.size());
- selectRecordService.save(selectRecord);
- return AjaxResult.success("棰勭害鎴愬姛");
- }
- return AjaxResult.error("璇烽�夋嫨浣撴鍐呭");
- }
- return AjaxResult.error("璇烽�夋嫨棰勭害瀵硅薄");
}
@@ -606,7 +482,7 @@
for (TjGroupingPro groupingPro : proList) {
TjProject project = projectService.getById(groupingPro.getProId());
if(null !=project){
- if (project.getProType().equals("") || project.getProType()==null) {
+ if (project.getProType()==null || project.getProType().equals("")) {
groupingPro.setProType("2");
}else {
groupingPro.setProType(project.getProType());
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 9b27272..420223b 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
@@ -67,4 +67,22 @@
@Select("SELECT COUNT(*) FROM tj_dw_grouping a WHERE a.dw_dept_id=#{dwDeptId} AND a.sex=#{sex} ")
public int selectTjDwGroupingBySex(@Param("dwDeptId")String dwDeptId,@Param("sex") String sex);
+
+
+ @Select("SELECT SUM(b.aa) cc FROM ( SELECT" +
+ "CASE WHEN ISNULL( b.sex )" +
+ "AND ISNULL( c.pro_name ) THEN 0" +
+ "WHEN ! ISNULL( b.sex )" +
+ "AND ISNULL( c.pro_name ) THEN 0 ELSE 1" +
+ "END" +
+ "aa" +
+ "FROM" +
+ "tj_dw_dept a" +
+ "LEFT JOIN tj_dw_grouping b ON a.id = b.dw_dept_id" +
+ "LEFT JOIN tj_grouping_pro c ON b.id = c.grouping_id " +
+ "WHERE" +
+ "a.id =#{dwDeptId}" +
+ "GROUP BY" +
+ "b.sex)b")
+ public int selectTjDwGroupingByDwDeptId(String dwDeptId);
}
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 b6b6954..e7c75f9 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
@@ -62,4 +62,7 @@
public int selectTjDwGroupingBySex(String dwDeptId,String sex);
+
+
+ public int selectTjDwGroupingByDwDeptId(String dwDeptId);
}
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 410d2c2..f790ec8 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
@@ -94,4 +94,9 @@
public int selectTjDwGroupingBySex(String dwDeptId, String sex) {
return tjDwGroupingMapper.selectTjDwGroupingBySex(dwDeptId,sex);
}
+
+ @Override
+ public int selectTjDwGroupingByDwDeptId(String dwDeptId) {
+ return tjDwGroupingMapper.selectTjDwGroupingByDwDeptId(dwDeptId);
+ }
}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjDiscardInspectionMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjDiscardInspectionMapper.xml
index 4255612..b795dad 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjDiscardInspectionMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjDiscardInspectionMapper.xml
@@ -53,6 +53,7 @@
</if>
and deleted=0
</where>
+ order by create_time desc
</select>
<select id="selectTjDiscardInspectionById" parameterType="Long"
--
Gitblit v1.8.0