From 88ee7561ab60710099182514bf639e37fd6114a9 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 17 五月 2024 18:03:21 +0800
Subject: [PATCH] zjh 2024/05/17-1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjCustomerBlackService.java | 8 +
ltkj-hosp/src/main/resources/mapper/hosp/TjSurveyTemplateMapper.xml | 20 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java | 4
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 4
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerBlackMapper.java | 9 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 8 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerBlackController.java | 15 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerBlackServiceImpl.java | 11 +
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TreeTjSurveryTemplate.java | 36 ++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomerBlack.java | 34 +++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java | 4
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSurveyTemplateController.java | 79 +++++++++---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSurveyTemplateService.java | 10 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 24 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSurveyTemplateServiceImpl.java | 19 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java | 6 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java | 10 +
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSurveyTemplate.java | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSurveyTemplateMapper.java | 14 ++
25 files changed, 314 insertions(+), 25 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerBlackController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerBlackController.java
new file mode 100644
index 0000000..bb2d489
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerBlackController.java
@@ -0,0 +1,15 @@
+package com.ltkj.web.controller.system;
+
+import com.ltkj.common.core.controller.BaseController;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/hosp/cusBlack")
+@Api(tags = "PC绔� ----浣撴榛戝悕鍗曡褰曟帴鍙�")
+@Slf4j
+public class TjCustomerBlackController extends BaseController {
+
+}
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 71b9fac..ac27e20 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
@@ -52,6 +52,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
+import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpRequest;
@@ -1869,5 +1870,28 @@
return AjaxResult.success(list);
}
+
+ @GetMapping("/revokeTjOrderByTjNum")
+ @ApiOperation(value = "鏍规嵁瀹㈡埛浣撴鍙锋挙閿�浣撴璁板綍")
+ @Transactional
+ public AjaxResult revokeTjOrderByTjNum(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
+
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+ if(null !=order){
+ String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
+ if(null!=payByTjNum){
+ return AjaxResult.success("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
+ }
+ tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+ tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
+ remarkService.deletedOrderRemarkByTjNum(tjNum);
+ tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
+ transitionService.deletedTbTransitionByTjNum(tjNum);
+ transitionService.updateTbTransitionByTjNum(tjNum);
+ return AjaxResult.success("鎾ら攢鎴愬姛!!!");
+ }
+ return AjaxResult.success("绛惧埌璁板綍涓嶅瓨鍦�!");
+ }
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSurveyTemplateController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSurveyTemplateController.java
index 68a43e5..4d66e1c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSurveyTemplateController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSurveyTemplateController.java
@@ -10,12 +10,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.TreeSelect;
import com.ltkj.common.core.domain.entity.SysDept;
-import com.ltkj.hosp.domain.TjSurveyOptions;
-import com.ltkj.hosp.domain.TjSurveyQuestion;
-import com.ltkj.hosp.domain.TjSurveyTempQues;
+import com.ltkj.common.core.domain.entity.SysDictData;
+import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.ITjSurveyQuestionService;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
+import com.ltkj.system.service.ISysDictDataService;
import com.ltkj.tduck.domain.UserFormEntity;
import com.ltkj.tduck.enums.FormSourceTypeEnum;
import com.ltkj.tduck.enums.FormStatusEnum;
@@ -30,7 +30,6 @@
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.enums.BusinessType;
-import com.ltkj.hosp.domain.TjSurveyTemplate;
import com.ltkj.hosp.service.ITjSurveyTemplateService;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.common.core.page.TableDataInfo;
@@ -58,7 +57,6 @@
@Autowired
private ISysDeptService deptService;
-
/**
* 鍒ゆ柇鏄惁寮�鍚～楦〃鍗曡璁�
*/
@@ -161,21 +159,6 @@
}
return AjaxResult.success("鏆傛棤淇℃伅");
-
-
-// List<TjSurveyQuestion> l11=new ArrayList<>();
-// TjSurveyTemplate byId1 = tjSurveyTemplateService.selectTjSurveyTemplateByMid(mid);
-// List<TjSurveyTempQues> tjSurveyTempQuesList = byId1.getTjSurveyTempQuesList();
-// if (tjSurveyTempQuesList!=null){
-// for (TjSurveyTempQues tjSurveyTempQues : tjSurveyTempQuesList) {
-// TjSurveyQuestion byId11 = tjSurveyQuestionService.selectTjSurveyQuestionByQid(tjSurveyTempQues.getQid());
-// if (byId11!=null){
-// l11.add(byId11);
-// }
-// }
-// return AjaxResult.success(l11);
-// }
-// return AjaxResult.success("鏆傛棤淇℃伅");
}
@@ -185,7 +168,6 @@
@GetMapping("/getQuesByMids")
@ApiOperation(value = "鑾峰彇闂嵎妯℃澘淇℃伅")
public AjaxResult getQuesByMids(@RequestParam Long mid) {
-
List<TjSurveyQuestion> l1 = new ArrayList<>();
// TjSurveyTemplate byId = tjSurveyTemplateService.selectTjSurveyTemplateByMid(mid);
@@ -215,6 +197,10 @@
@PostMapping
public AjaxResult add(@RequestBody TjSurveyTemplate tjSurveyTemplate) {
// return toAjax(tjSurveyTemplateService.insertTjSurveyTemplate(tjSurveyTemplate));
+ TjSurveyTemplate byId = tjSurveyTemplateService.selectTemplateByTjCategory(tjSurveyTemplate.getTempType());
+ if(null !=byId){
+ return AjaxResult.error("璇ョ被鍨嬫ā鏉垮凡瀛樺湪 涓嶅彲閲嶅鍒涘缓!!!");
+ }
final String call = configService.selectConfigByKey("need_design");
//鍒ゆ柇鏄惁寮�鍚～楦〃鍗曡璁�
if ("true".equals(call)){
@@ -289,12 +275,63 @@
/**
+ * 鏌ヨ闂嵎妯℃澘鍒楄〃
+ */
+ @GetMapping("/listByDeptId1")
+ public AjaxResult listByDeptId1() {
+ SysDictData data=new SysDictData();
+ data.setDictType("question_template_type");
+ data.setStatus("0");
+ List<TreeTjSurveryTemplate> list = tjSurveyTemplateService.selectDictDataList(data);
+ if(null !=list && list.size()>0){
+ for (TreeTjSurveryTemplate dictData : list) {
+ List<TreeTjSurveryTemplate> templateList = tjSurveyTemplateService.getTreeTjSurveryTemplate(dictData.getVaule());
+ dictData.setChildren(templateList);
+ }
+ }
+ return AjaxResult.success(list);
+ }
+
+
+
+ @GetMapping("/getTjrWnJuanMoBan")
+ public AjaxResult getTjrWnJuanMoBan(String tjCategory) {
+ TjSurveyTemplate byId = tjSurveyTemplateService.selectTemplateByTjCategory(tjCategory);
+// TjSurveyTemplate byId = tjSurveyTemplateService.selectTemplateByMid1(Long.valueOf(mid));
+ if(null !=byId){
+ if ("1".equals(byId.getQybz())){
+ return AjaxResult.success("璇ラ棶鍗锋ā鏉夸笉瀛樺湪鎴栧凡鍋滅敤");
+ }
+ //鍒ゆ柇鏄惁鏈夐棶棰�
+ if(byId.getDesignId()!=null){
+ return AjaxResult.success(byId.getDesignId());
+ }
+ LambdaQueryWrapper<TjSurveyQuestion> wq1=new LambdaQueryWrapper<>();
+ wq1.eq(TjSurveyQuestion::getMid,byId.getMid());
+ final List<TjSurveyQuestion> list1 = tjSurveyQuestionService.list(wq1);
+ for (TjSurveyQuestion tjSurveyQuestion : list1) {
+ final List<TjSurveyOptions> tjSurveyOptions = tjSurveyQuestionService.selectOptionsByQid(String.valueOf(tjSurveyQuestion.getQid()));
+ tjSurveyQuestion.setTjSurveyOptionsList(tjSurveyOptions);
+ }
+ return AjaxResult.success(list1);
+
+ }
+ return AjaxResult.success("鏆傛棤淇℃伅");
+ }
+
+
+
+ /**
* 淇敼闂嵎妯℃澘
*/
//@PreAuthorize("@ss.hasPermi('hosp:surveyTemplate:edit')")
@Log(title = "闂嵎妯℃澘", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TjSurveyTemplate tjSurveyTemplate) {
+ TjSurveyTemplate byId = tjSurveyTemplateService.selectTemplateByTjCategory(tjSurveyTemplate.getTempType());
+ if(null !=byId){
+ return AjaxResult.error("璇ョ被鍨嬫ā鏉垮凡瀛樺湪 涓嶅彲閲嶅鍒涘缓!!!");
+ }
return toAjax(tjSurveyTemplateService.updateTjSurveyTemplate(tjSurveyTemplate));
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomerBlack.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomerBlack.java
new file mode 100644
index 0000000..8e36f2c
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomerBlack.java
@@ -0,0 +1,34 @@
+package com.ltkj.hosp.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ltkj.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "浣撴榛戝悕鍗曞璞�")
+public class TjCustomerBlack extends BaseEntity {
+
+ @TableId(type = IdType.AUTO)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long cus_id;
+ private String yuanyin;
+ private String days;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date expiration_time;
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSurveyTemplate.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSurveyTemplate.java
index 5df30ab..d0fc61d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSurveyTemplate.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSurveyTemplate.java
@@ -72,6 +72,7 @@
@TableField(exist = false)
private String remark;
+ @TableField(exist = false)
private Integer flag;
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TreeTjSurveryTemplate.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TreeTjSurveryTemplate.java
new file mode 100644
index 0000000..8ac7034
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TreeTjSurveryTemplate.java
@@ -0,0 +1,36 @@
+package com.ltkj.hosp.domain;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ltkj.common.core.domain.TreeSelect;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class TreeTjSurveryTemplate implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+
+ @JsonSerialize(using = ToStringSerializer.class)
+// 涓婚敭
+ private Long id;
+
+ /**
+ * 鍚嶇О
+ */
+ private String name;
+
+
+ //鍊�
+ private String vaule;
+
+
+ /**
+ * 瀛愯妭鐐�
+ */
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ private List<TreeTjSurveryTemplate> children;
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
index d525862..2a78241 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -69,6 +69,14 @@
public boolean deletedTbTransitionByCusId(String cusId);
+ @Delete("DELETE FROM tb_transition WHERE tj_num=#{tjNum}")
+ public boolean deletedTbTransitionByTjNum(String tjNum);
+
+ @Update("UPDATE tb_transition a SET "+
+ "a.tj_num=null" +
+ " WHERE a.tj_num=#{tjNum}")
+ boolean updateTbTransitionByTjNum(String tjNum);
+
@Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND pac_id=#{pacId}")
public List<TbTransition> getTbTransitionListByCusIdAndPac(@Param("cusId") String cusId,@Param("pacId") String pacId);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerBlackMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerBlackMapper.java
new file mode 100644
index 0000000..4d4c08e
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerBlackMapper.java
@@ -0,0 +1,9 @@
+package com.ltkj.hosp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.TjCustomerBlack;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TjCustomerBlackMapper extends BaseMapper<TjCustomerBlack> {
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
index 89f3d37..ad21c5b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjFlowingWater;
import com.ltkj.hosp.domain.TjOrderDetail;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -93,4 +94,9 @@
"AND a.pay_stasus !=0 " +
"AND a.update_time BETWEEN #{beginTime} AND #{endTime}")
List<Long> getFlowingWaterIdList(@Param("userId") String userId,@Param("beginTime") Date beginTime,@Param("endTime") Date endTime);
+
+ @Delete(" delete" +
+ " from tj_flowing_water" +
+ " where order_id = #{order}")
+ public int deleteTjFlowingWaterByOrderId(String order);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
index 4954eff..59ebe3e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -55,6 +55,11 @@
*/
public int deleteTjOrderDetailByOrderDetailId(String orderDetailId);
+ @Delete(" delete\n" +
+ " from tj_order_detail\n" +
+ " where order_id = #{orderId}")
+ int deleteTjOrderDetailByOrderId(String orderId);
+
/**
* 鎵归噺鍒犻櫎浣撴椤圭洰鏄庣粏
*
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index 0cdbafc..e274de6 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -202,4 +202,8 @@
@Select("SELECT a.card_id FROM tj_order a WHERE a.deleted=0")
List<String> selectTjOrderByCardId1();
+
+
+ @Select("SELECT a.order_id FROM tj_order_detail a WHERE a.order_id=#{orderId} AND !ISNULL(a.flowing_water_id)")
+ String isPayByTjNum(String orderId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSurveyTemplateMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSurveyTemplateMapper.java
index 3b6e314..24b704a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSurveyTemplateMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSurveyTemplateMapper.java
@@ -3,10 +3,12 @@
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ltkj.hosp.domain.TjSurveyQuestion;
+import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.hosp.domain.TjSurveyTemplate;
import com.ltkj.hosp.domain.TjSurveyTempQues;
+import com.ltkj.hosp.domain.TreeTjSurveryTemplate;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
/**
* 闂嵎妯℃澘Mapper鎺ュ彛
@@ -93,4 +95,14 @@
* @return 缁撴灉
*/
public int deleteTjSurveyTempQuesByMid(Long mid);
+
+ List<TreeTjSurveryTemplate> selectDictDataList(SysDictData dictData);
+
+
+ @Select("SELECT a.mid id,a.temp_name name,a.mid vaule FROM tj_survey_template a WHERE a.temp_type=#{vaule} AND a.qybz='0'")
+ List<TreeTjSurveryTemplate> getTreeTjSurveryTemplate(String vaule);
+
+
+ @Select("SELECT * FROM tj_survey_template a WHERE a.temp_type=#{tjCategory} AND a.qybz='0'")
+ TjSurveyTemplate selectTemplateByTjCategory(String tjCategory);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
index 67ee2f7..589c83c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
@@ -66,6 +66,10 @@
//鏍规嵁韬唤璇佸彿鍒犻櫎
public boolean deletedTbTransitionByCusId(String cusId);
+ public boolean deletedTbTransitionByTjNum(String tjNum);
+
+ public boolean updateTbTransitionByTjNum(String tjNum);
+
//鏍规嵁韬唤璇佸彿鍜屽椁恑d鏌ヨ
public List<TbTransition> getTbTransitionListByCusIdAndPac(String cusId,String pacId);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
index 893bcfa..5ce34c9 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
@@ -69,4 +69,8 @@
String getproNameByOrderId(String orderId);
List<Long> getFlowingWaterIdList(String userId, Date beginTime,Date endTime);
+
+
+
+ public int deleteTjFlowingWaterByOrderId(String order);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
index fb42240..5060183 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
@@ -62,6 +62,7 @@
* @return 缁撴灉
*/
public int deleteTjOrderDetailByOrderDetailId(String orderDetailId);
+ public int deleteTjOrderDetailByOrderId(String orderId);
/**
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index 7c1a74c..5c7f1e2 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -131,4 +131,6 @@
public int selectTjOrderByCardId(String cardId);
List<String> selectTjOrderByCardId1();
+
+ String isPayByTjNum(String orderId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSurveyTemplateService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSurveyTemplateService.java
index bc7c223..6981bc8 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSurveyTemplateService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSurveyTemplateService.java
@@ -3,8 +3,9 @@
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ltkj.hosp.domain.TjSurveyQuestion;
+import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.hosp.domain.TjSurveyTemplate;
+import com.ltkj.hosp.domain.TreeTjSurveryTemplate;
/**
* 闂嵎妯℃澘Service鎺ュ彛
@@ -65,4 +66,11 @@
* @return 缁撴灉
*/
public int deleteTjSurveyTemplateByMid(Long mid);
+
+
+ public List<TreeTjSurveryTemplate> selectDictDataList(SysDictData dictData);
+
+ List<TreeTjSurveryTemplate> getTreeTjSurveryTemplate(String vaule);
+
+ TjSurveyTemplate selectTemplateByTjCategory(String tjCategory);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjCustomerBlackService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjCustomerBlackService.java
new file mode 100644
index 0000000..981aad1
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjCustomerBlackService.java
@@ -0,0 +1,8 @@
+package com.ltkj.hosp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.TjCustomerBlack;
+
+
+public interface TjCustomerBlackService extends IService<TjCustomerBlack> {
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
index 8f09ca2..c6ae87b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
@@ -97,6 +97,16 @@
}
@Override
+ public boolean deletedTbTransitionByTjNum(String tjNum) {
+ return tbTransitionMapper.deletedTbTransitionByTjNum(tjNum);
+ }
+
+ @Override
+ public boolean updateTbTransitionByTjNum(String tjNum) {
+ return tbTransitionMapper.updateTbTransitionByTjNum(tjNum);
+ }
+
+ @Override
public List<TbTransition> getTbTransitionListByCusIdAndPac(String cusId, String pacId) {
return tbTransitionMapper.getTbTransitionListByCusIdAndPac(cusId,pacId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerBlackServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerBlackServiceImpl.java
new file mode 100644
index 0000000..287de8a
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerBlackServiceImpl.java
@@ -0,0 +1,11 @@
+package com.ltkj.hosp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.hosp.domain.TjCustomerBlack;
+import com.ltkj.hosp.mapper.TjCustomerBlackMapper;
+import com.ltkj.hosp.service.TjCustomerBlackService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TjCustomerBlackServiceImpl extends ServiceImpl<TjCustomerBlackMapper, TjCustomerBlack> implements TjCustomerBlackService {
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
index bdf86dc..5ddcac1 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
@@ -113,4 +113,9 @@
public List<Long> getFlowingWaterIdList(String userId, Date beginTime, Date endTime) {
return tjFlowingWaterMapper.getFlowingWaterIdList(userId,beginTime,endTime);
}
+
+ @Override
+ public int deleteTjFlowingWaterByOrderId(String order) {
+ return tjFlowingWaterMapper.deleteTjFlowingWaterByOrderId(order);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
index 88b5020..af80276 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
@@ -94,6 +94,11 @@
}
@Override
+ public int deleteTjOrderDetailByOrderId(String orderId) {
+ return tjOrderDetailMapper.deleteTjOrderDetailByOrderId(orderId);
+ }
+
+ @Override
public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNotNull(String orderId) {
return tjOrderDetailMapper.selectTjOrderDetailListByFlowingWaterIdIsNotNull(orderId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index cc91c96..7652f50 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -268,4 +268,9 @@
public List<String> selectTjOrderByCardId1() {
return tjOrderMapper.selectTjOrderByCardId1();
}
+
+ @Override
+ public String isPayByTjNum(String orderId) {
+ return tjOrderMapper.isPayByTjNum(orderId);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSurveyTemplateServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSurveyTemplateServiceImpl.java
index 98a9128..75de0ae 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSurveyTemplateServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSurveyTemplateServiceImpl.java
@@ -3,9 +3,9 @@
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.common.utils.DateUtils;
-import com.ltkj.hosp.domain.TjSurveyQuestion;
-import com.ltkj.hosp.mapper.TjSurveyQuestionMapper;
+import com.ltkj.hosp.domain.TreeTjSurveryTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -124,6 +124,21 @@
return tjSurveyTemplateMapper.deleteTjSurveyTemplateByMid(mid);
}
+ @Override
+ public List<TreeTjSurveryTemplate> selectDictDataList(SysDictData dictData) {
+ return tjSurveyTemplateMapper.selectDictDataList(dictData);
+ }
+
+ @Override
+ public List<TreeTjSurveryTemplate> getTreeTjSurveryTemplate(String vaule) {
+ return tjSurveyTemplateMapper.getTreeTjSurveryTemplate(vaule);
+ }
+
+ @Override
+ public TjSurveyTemplate selectTemplateByTjCategory(String tjCategory) {
+ return tjSurveyTemplateMapper.selectTemplateByTjCategory(tjCategory);
+ }
+
/**
* 鏂板闂嵎妯℃澘闂淇℃伅
*
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjSurveyTemplateMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjSurveyTemplateMapper.xml
index 3b560b4..18f994c 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjSurveyTemplateMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjSurveyTemplateMapper.xml
@@ -267,5 +267,25 @@
</foreach>
</insert>
+ <sql id="selectDictDataVo">
+ select dict_code id,
+ dict_label name,
+ dict_value vaule
+ from sys_dict_data
+ </sql>
+
+ <select id="selectDictDataList" parameterType="SysDictData" resultType="com.ltkj.hosp.domain.TreeTjSurveryTemplate">
+ <include refid="selectDictDataVo"/>
+ <where>
+ <if test="dictType != null and dictType != ''">
+ AND dict_type = #{dictType}
+ </if>
+
+ <if test="status != null and status != ''">
+ AND status = #{status}
+ </if>
+ </where>
+ order by dict_sort asc
+ </select>
</mapper>
--
Gitblit v1.8.0