From beca2c01d4f104ef145bbee9fa91aac2957ef360 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 29 十二月 2023 18:02:00 +0800
Subject: [PATCH] zjh 2023/12/29--1
---
ltkj-common/src/main/java/com/ltkj/common/mybatis/JsonIntegerArrayTypeHandler.java | 58 ++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/ITjAskHistorysServiceImpl.java | 11 +
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskHistorys.java | 7 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAskMedicalHistoryMapper.java | 13 +
ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml | 12 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java | 40 +++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAskHistorysMapper.java | 12 +
ltkj-common/src/main/java/com/ltkj/common/mybatis/JsonStringArrayTypeHandler.java | 58 ++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAskMedicalHistoryService.java | 7 +
ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java | 9
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 8
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java | 20 ++
ltkj-admin/src/test/java/zjhTest.java | 20 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAskHistorysService.java | 3
ltkj-common/src/main/java/com/ltkj/common/mybatis/JsonNodeTypeHandler.java | 80 +++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictZhengzhuang.java | 24 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAskMedicalHistoryServiceImpl.java | 15 +
19 files changed, 372 insertions(+), 27 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
index fa8727b..8fac456 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -92,6 +92,7 @@
public AjaxResult newGetTjPat(@RequestParam(required = false)String pacCode,
@RequestParam(required = false)String pacName,
@RequestParam(required = false)String pacRemark) {
+// List<Map<String, Object>> maps = testMapper.newGetTjPat111111(pacName);
List<Map<String, Object>> maps = testMapper.newGetTjPat(pacCode,pacName,pacRemark);
DynamicDataSourceContextHolder.clearDataSourceType();
return AjaxResult.success(maps);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
index 345a949..25736a2 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
@@ -41,17 +41,27 @@
private ITjCustomerService customerService;
@Resource
private ITjCustomerService tjCustomerService;
-
@Autowired
private ITjAskWorkLogService tjAskWorkLogService;
@Autowired
private ITjHarmTypeLogService tjHarmTypeLogService;
-
@Autowired
private ITjHarmTypeService tjHarmTypeService;
-
@Resource
private ITjOrderService tjOrderService;
+
+
+ /**
+ * 鏌ヨ闂瘖鍒楄〃
+ */
+ @GetMapping("/getZhengZhuang")
+ @ApiOperation(value = "鑾峰彇鐥囩姸鎺ュ彛闆�")
+ public AjaxResult getZhengZhuang() {
+ List<DictZhengzhuang> zhengZhuang = tjAskMedicalHistoryService.getZhengZhuang();
+ return AjaxResult.success(zhengZhuang);
+ }
+
+
/**
@@ -90,9 +100,10 @@
@ApiOperation(value = "鏍规嵁瀹㈡埛id鑾峰彇闂瘖璇︾粏淇℃伅")
public AjaxResult getInfoById(@RequestParam String tjNumber) {
if (null != tjNumber && !"".equals(tjNumber)) {
- LambdaQueryWrapper<TjAskMedicalHistory> wq = new LambdaQueryWrapper<>();
- wq.eq(TjAskMedicalHistory::getTjNum, tjNumber);
- TjAskMedicalHistory one = tjAskMedicalHistoryService.getOne(wq);
+// LambdaQueryWrapper<TjAskMedicalHistory> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjAskMedicalHistory::getTjNum, tjNumber);
+// TjAskMedicalHistory one = tjAskMedicalHistoryService.getOne(wq);
+ TjAskMedicalHistory one = tjAskMedicalHistoryService.selectTjAskMedicalHistoryByTjNum(tjNumber);
if (one != null) {
LambdaQueryWrapper<TjAskWorkLog> wqq = new LambdaQueryWrapper<>();
wqq.eq(TjAskWorkLog::getTjNumber, tjNumber);
@@ -121,11 +132,15 @@
TjAskMedicalHistory a = new TjAskMedicalHistory();
LambdaQueryWrapper<TjOrder> wqqq = new LambdaQueryWrapper<>();
wqqq.eq(TjOrder::getTjNumber, tjNumber);
- final TjOrder one1 = tjOrderService.getOne(wqqq);
- a.setCusId(one1.getUserId());
- TjCustomer byId11 = customerService.getById(a.getCusId());
- if (byId11 != null) {
- a.setCusName(MatchUtils.hideCusName(byId11.getCusName()));
+ final TjOrder order = tjOrderService.getOne(wqqq);
+ a.setCusId(order.getUserId());
+ a.setTjNum(order.getTjNumber());
+ a.setTjLx(order.getTjCategory());
+ TjCustomer customer = customerService.getById(a.getCusId());
+ if (customer != null) {
+ a.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+ a.setCusIdCard(customer.getCusIdcard());
+ a.setCusSex(String.valueOf(customer.getCusSex()));
}
return AjaxResult.success(a);
}
@@ -195,7 +210,6 @@
} else {
b = tjAskMedicalHistoryService.save(tjAskMedicalHistory);
}
- //boolean b = tjAskMedicalHistoryService.saveOrUpdate(tjAskMedicalHistory);
if (b) {
List<TjAskHistorys> tjAskHistorysList = tjAskMedicalHistory.getTjAskHistorysList();
if (tjAskHistorysList != null && tjAskHistorysList.size() > 0) {
@@ -227,7 +241,7 @@
log.setCusName(tjAskMedicalHistory.getCusName());
log.setTjNumber(tjAskMedicalHistory.getTjNum());
log.setWorkId(askWorkLog.getId());
- tjHarmTypeLogService.saveOrUpdate(log);
+ tjHarmTypeLogService.save(log);
}
}
}
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 a79608a..0327b17 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
@@ -838,6 +838,7 @@
if (null != tjReservation.getDepartment()) tjOrder.setFirmDeptName(tjReservation.getDepartment());
if (null != tjReservation.getJobNo()) tjOrder.setFirmWorkId(tjReservation.getJobNo());
if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId());
+ if (null != tjReservation.getTjCategory()) tjOrder.setTjCategory(tjReservation.getTjCategory());
if (null != tjReservation.getGroupingId()){
tjOrder.setGroupId(tjReservation.getGroupingId());
tjOrder.setFirmDeptId(tjReservation.getPacId());
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index 37b2de9..d4ed7e5 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -1,10 +1,12 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.LtkjApplication;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.hosp.domain.DictHosp;
+import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.service.*;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
@@ -19,6 +21,7 @@
import org.springframework.data.redis.core.ScanOptions;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.bind.annotation.PostMapping;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -38,8 +41,8 @@
//
// @Autowired
// private ITjGroupingProService groupingProService;
-// @Autowired
-// private ITjProjectService projectService;
+ @Autowired
+ private ITjProjectService projectService;
//
// @Resource
// private ITjOrderService tjOrderService;
@@ -88,6 +91,19 @@
// System.out.println(list);
// System.out.println(redisCache.getMultiCacheMapValue("check",null));
// }
+
+/* LambdaQueryWrapper<TjProject> wq=new LambdaQueryWrapper<>();
+ wq.eq(TjProject::getProParentId,0);
+ List<TjProject> projectList = projectService.list(wq);
+ for (TjProject project : projectList) {
+ LambdaQueryWrapper<TjProject> wqq=new LambdaQueryWrapper<>();
+ wqq.eq(TjProject::getProParentId,project.getProId());
+ List<TjProject> list = projectService.list(wqq);
+ for (TjProject tjProject : list) {
+ tjProject.setDeptId(project.getDeptId());
+ projectService.updateById(tjProject);
+ }
+ }*/
}
diff --git a/ltkj-common/src/main/java/com/ltkj/common/mybatis/JsonIntegerArrayTypeHandler.java b/ltkj-common/src/main/java/com/ltkj/common/mybatis/JsonIntegerArrayTypeHandler.java
new file mode 100644
index 0000000..18fe9a0
--- /dev/null
+++ b/ltkj-common/src/main/java/com/ltkj/common/mybatis/JsonIntegerArrayTypeHandler.java
@@ -0,0 +1,58 @@
+package com.ltkj.common.mybatis;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/*
+ <columnOverride column="ids" javaType="java.lang.Integer[]" typeHandler="JsonIntegerArrayTypeHandler"/>
+ */
+public class JsonIntegerArrayTypeHandler extends BaseTypeHandler<Integer[]> {
+ private static final ObjectMapper mapper = new ObjectMapper();
+
+ @Override
+ public void setNonNullParameter(PreparedStatement ps, int i, Integer[] parameter, JdbcType jdbcType) throws SQLException {
+ ps.setString(i, toJson(parameter));
+ }
+
+ @Override
+ public Integer[] getNullableResult(ResultSet rs, String columnName) throws SQLException {
+ return this.toObject(rs.getString(columnName));
+ }
+
+ @Override
+ public Integer[] getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+ return this.toObject(rs.getString(columnIndex));
+ }
+
+ @Override
+ public Integer[] getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+ return this.toObject(cs.getString(columnIndex));
+ }
+
+ private String toJson(Integer[] params) {
+ try {
+ return mapper.writeValueAsString(params);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return "[]";
+ }
+
+ private Integer[] toObject(String content) {
+ if (content != null && !content.isEmpty()) {
+ try {
+ return (Integer[]) mapper.readValue(content, Integer[].class);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ return null;
+ }
+ }
+}
diff --git a/ltkj-common/src/main/java/com/ltkj/common/mybatis/JsonNodeTypeHandler.java b/ltkj-common/src/main/java/com/ltkj/common/mybatis/JsonNodeTypeHandler.java
new file mode 100644
index 0000000..8f9070b
--- /dev/null
+++ b/ltkj-common/src/main/java/com/ltkj/common/mybatis/JsonNodeTypeHandler.java
@@ -0,0 +1,80 @@
+package com.ltkj.common.mybatis;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+import java.io.IOException;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/*
+ <columnOverride column="json_string" javaType="com.fasterxml.jackson.databind.JsonNode" typeHandler="JsonNodeTypeHandler"/>
+ */
+public class JsonNodeTypeHandler extends BaseTypeHandler<JsonNode> {
+ private static final ObjectMapper mapper = new ObjectMapper();
+
+
+ @Override
+ public void setNonNullParameter(PreparedStatement ps, int i, JsonNode parameter, JdbcType jdbcType) throws SQLException {
+ String str = null;
+ try {
+ str = mapper.writeValueAsString(parameter);
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ str = "{}";
+ }
+ ps.setString(i, str);
+ }
+
+ @Override
+ public JsonNode getNullableResult(ResultSet rs, String columnName) throws SQLException {
+ String jsonSource = rs.getString(columnName);
+ if (jsonSource == null) {
+ return null;
+ }
+ try {
+ JsonNode jsonNode = mapper.readTree(jsonSource);
+ return jsonNode;
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ @Override
+ public JsonNode getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+ String jsonSource = rs.getString(columnIndex);
+ if (jsonSource == null) {
+ return null;
+ }
+ try {
+ JsonNode jsonNode = mapper.readTree(jsonSource);
+ return jsonNode;
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+
+ }
+
+ @Override
+ public JsonNode getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+ String jsonSource = cs.getString(columnIndex);
+ if (jsonSource == null) {
+ return null;
+ }
+ try {
+ JsonNode jsonNode = mapper.readTree(jsonSource);
+ return jsonNode;
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+}
diff --git a/ltkj-common/src/main/java/com/ltkj/common/mybatis/JsonStringArrayTypeHandler.java b/ltkj-common/src/main/java/com/ltkj/common/mybatis/JsonStringArrayTypeHandler.java
new file mode 100644
index 0000000..6b71848
--- /dev/null
+++ b/ltkj-common/src/main/java/com/ltkj/common/mybatis/JsonStringArrayTypeHandler.java
@@ -0,0 +1,58 @@
+package com.ltkj.common.mybatis;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/*
+ <columnOverride column="urls" javaType="java.lang.String[]" typeHandler="JsonStringArrayTypeHandler"/>
+ */
+public class JsonStringArrayTypeHandler extends BaseTypeHandler<String[]> {
+ private static final ObjectMapper mapper = new ObjectMapper();
+
+ @Override
+ public void setNonNullParameter(PreparedStatement ps, int i, String[] parameter, JdbcType jdbcType) throws SQLException {
+ ps.setString(i, toJson(parameter));
+ }
+
+ @Override
+ public String[] getNullableResult(ResultSet rs, String columnName) throws SQLException {
+ return this.toObject(rs.getString(columnName));
+ }
+
+ @Override
+ public String[] getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+ return this.toObject(rs.getString(columnIndex));
+ }
+
+ @Override
+ public String[] getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+ return this.toObject(cs.getString(columnIndex));
+ }
+
+ private String toJson(String[] params) {
+ try {
+ return mapper.writeValueAsString(params);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return "[]";
+ }
+
+ private String[] toObject(String content) {
+ if (content != null && !content.isEmpty()) {
+ try {
+ return (String[]) mapper.readValue(content, String[].class);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ return null;
+ }
+ }
+}
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
index 21a21ab..dbad06b 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
@@ -141,7 +141,8 @@
// 杩欓噷鏄祴璇曞啓娉曪紝鍏蜂綋鐨剉alue鍙互閫氳繃璇锋眰鍙傛暟浼犻�掕繃鏉�
properties.setProperty("druid.enabled",props.getProperty("hisenabled"));
properties.setProperty("druid.driverClassName","com.microsoft.sqlserver.jdbc.SQLServerDriver");
- properties.setProperty("druid.url","jdbc:sqlserver://"+props.getProperty("hisip")+":"+props.getProperty("hisprot")+";DatabaseName="+props.getProperty("hisname"));
+ properties.setProperty("druid.url","jdbc:sqlserver://"+props.getProperty("hisip")+":"+props.getProperty("hisprot")+";DatabaseName="+props.getProperty("hisname")+
+ ";&characterEncoding=utf8");
properties.setProperty("druid.username",props.getProperty("hisusername"));
properties.setProperty("druid.password",props.getProperty("hispassword"));
dataSource.restart(properties);
@@ -174,7 +175,8 @@
// 杩欓噷鏄祴璇曞啓娉曪紝鍏蜂綋鐨剉alue鍙互閫氳繃璇锋眰鍙傛暟浼犻�掕繃鏉�
properties.setProperty("druid.enabled",props.getProperty("lisenabled"));
properties.setProperty("druid.driverClassName","com.microsoft.sqlserver.jdbc.SQLServerDriver");
- properties.setProperty("druid.url","jdbc:sqlserver://"+props.getProperty("lisip")+":"+props.getProperty("lisprot")+";DatabaseName="+props.getProperty("lisname"));
+ properties.setProperty("druid.url","jdbc:sqlserver://"+props.getProperty("lisip")+":"+props.getProperty("lisprot")+";DatabaseName="+props.getProperty("lisname")+
+ ";&characterEncoding=utf8");
properties.setProperty("druid.username",props.getProperty("lisusername"));
properties.setProperty("druid.password",props.getProperty("lispassword"));
dataSource.restart(properties);
@@ -207,7 +209,8 @@
// 杩欓噷鏄祴璇曞啓娉曪紝鍏蜂綋鐨剉alue鍙互閫氳繃璇锋眰鍙傛暟浼犻�掕繃鏉�
properties.setProperty("druid.enabled",props.getProperty("pacsenabled"));
properties.setProperty("druid.driverClassName","com.microsoft.sqlserver.jdbc.SQLServerDriver");
- properties.setProperty("druid.url","jdbc:sqlserver://"+props.getProperty("pacsip")+":"+props.getProperty("pacsprot")+";DatabaseName="+props.getProperty("pacsname"));
+ properties.setProperty("druid.url","jdbc:sqlserver://"+props.getProperty("pacsip")+":"+props.getProperty("pacsprot")+";DatabaseName="+props.getProperty("pacsname")+
+ ";&characterEncoding=utf8");
properties.setProperty("druid.username",props.getProperty("pacsusername"));
properties.setProperty("druid.password",props.getProperty("pacspassword"));
dataSource.restart(properties);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictZhengzhuang.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictZhengzhuang.java
new file mode 100644
index 0000000..ddc6508
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictZhengzhuang.java
@@ -0,0 +1,24 @@
+package com.ltkj.hosp.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ltkj.common.annotation.Excel;
+import lombok.Data;
+
+/**
+ * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
+ * @Author: zjh
+ * @Date: 2023/12/29 0029 15:37
+ */
+
+@Data
+public class DictZhengzhuang {
+ @TableId(type= IdType.AUTO)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @Excel(name = "椤圭洰鍚�")
+ private String proName;
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskHistorys.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskHistorys.java
index f5d7122..15a6952 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskHistorys.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskHistorys.java
@@ -1,6 +1,7 @@
package com.ltkj.hosp.domain;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -14,6 +15,8 @@
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.List;
/**
@@ -82,6 +85,10 @@
private Long icdId;
+ @ApiModelProperty(value = "鐤剧梾绫诲瀷")
+ private String type;
+
+
public void setDiseaseId(Long diseaseId) {
this.diseaseId = diseaseId;
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java
index 3d0d61e..96f523a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java
@@ -9,6 +9,7 @@
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ltkj.common.annotation.Excel;
import com.ltkj.common.core.domain.BaseEntity;
+import com.ltkj.common.mybatis.JsonStringArrayTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -47,6 +48,15 @@
@ApiModelProperty(value = "瀹㈡埛韬唤璇佸彿")
@TableField(exist = false)
private String cusIdCard;
+
+ @ApiModelProperty(value = "瀹㈡埛鎬у埆")
+ @TableField(exist = false)
+ private String cusSex;
+
+
+ @ApiModelProperty(value = "瀹㈡埛浣撴绫诲瀷2=涓汉,1=鍥㈤槦")
+ @TableField(exist = false)
+ private String tjLx;
/**
* 瀹㈡埛鍚�
@@ -107,6 +117,10 @@
@ApiModelProperty(value = "鏈鏈堢粡鎴栧仠缁忓勾榫�")
@Excel(name = "鏈鏈堢粡鎴栧仠缁忓勾榫�")
private String mociage;
+
+
+ @ApiModelProperty(value = "鏈堢粡鏄惁寮傚父")
+ private String yjsfyc;
/**
* 鐜版湁瀛愬コ
@@ -229,10 +243,16 @@
@TableField(exist = false)
private String tjCategory;
+ @ApiModelProperty(value = "鐥囩姸鏁版嵁闆�")
+ @TableField(typeHandler = JsonStringArrayTypeHandler.class)
+ private String[] zzsjj;
+
@ApiModelProperty(value = "宸ョ")
private String gongZhong;
@ApiModelProperty(value = "宸ラ緞")
private String gongLing;
+ @ApiModelProperty(value = "鎺ュ宸ラ緞")
+ private String jhgl;
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
index c66bf04..02a1fa5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -47,10 +47,10 @@
" pat_id price , mobile pacRemark" +
" from histjv_ltkjvtjpat where 1=1 "+
" <when test='pacCode!=null'>" +
- " AND fcard_no = #{pacCode}" +
+ " AND fcard_no like '%'+#{pacCode}+'%'" +
"</when>" +
" <when test='pacName!=null'>" +
- " AND pat_name = #{pacName}" +
+ " AND pat_name like '%'+#{pacName}+'%' " +
"</when>" +
" <when test='pacRemark!=null'>" +
" AND mobile = #{pacRemark}" +
@@ -161,10 +161,10 @@
@Select({"<script> select *"+
" from histjv_Ltkj_hyxm where 1=1 "+
" <when test='pacCode!=null'>" +
- " AND pacCode = #{pacCode}" +
+ " AND pacCode like '%'+#{pacCode}+'%'" +
"</when>" +
" <when test='pacName!=null'>" +
- " AND pacName = #{pacName}" +
+ " AND pacName like '%'+#{pacName}+'%' " +
"</when>" +
" <when test='pacRemark!=null'>" +
" AND pacRemark = #{pacRemark}" +
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAskHistorysMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAskHistorysMapper.java
index d26f34f..64e986f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAskHistorysMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAskHistorysMapper.java
@@ -4,6 +4,10 @@
import com.ltkj.hosp.domain.TjAdvice;
import com.ltkj.hosp.domain.TjAskHistorys;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
* @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
@@ -12,4 +16,12 @@
*/
@Mapper
public interface TjAskHistorysMapper extends BaseMapper<TjAskHistorys> {
+
+
+ @Select({"<script>", "select", "GROUP_CONCAT(pro_name ORDER BY pro_name) AS names", "from dict_zhengzhuang", "where id in",
+ "<foreach collection='ids' item='id' open='(' separator=',' close=')'>",
+ "#{id}",
+ "</foreach>",
+ "</script>" })
+ String getZhengZhuangStr(@Param("ids")List<String> ids);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAskMedicalHistoryMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAskMedicalHistoryMapper.java
index 5da7e32..159ec6b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAskMedicalHistoryMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAskMedicalHistoryMapper.java
@@ -3,11 +3,13 @@
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.DictZhengzhuang;
import com.ltkj.hosp.domain.TjAskMedicalHistory;
import com.ltkj.hosp.domain.TjAskHistorys;
import com.ltkj.hosp.domain.TjCatering;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
/**
@@ -103,4 +105,15 @@
" a.cus_id=#{cusId} \n" +
"AND ISNULL(a.tj_num)")
boolean updateTjAskMedicalHistoryByCusId(@Param("tjNum") String tjNum,@Param("userName") String userName,@Param("userId") String userId,@Param("cusId") String cusId);
+
+
+
+ @Select("SELECT * FROM dict_zhengzhuang")
+ List<DictZhengzhuang> getZhengZhuang();
+
+
+
+// @Select("SELECT * FROM tj_ask_medical_history a WHERE a.deleted=0 AND a.tj_num=#{tjNum}")
+ TjAskMedicalHistory selectTjAskMedicalHistoryByTjNum(String tjNum);
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAskHistorysService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAskHistorysService.java
index 6e957bf..530aff0 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAskHistorysService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAskHistorysService.java
@@ -4,10 +4,13 @@
import com.ltkj.hosp.domain.TjAskHistorys;
import com.ltkj.hosp.domain.TjAskMedicalHistory;
+import java.util.List;
+
/**
* @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
* @Author: lige
* @Date: 2023/4/11 17:48
*/
public interface ITjAskHistorysService extends IService<TjAskHistorys> {
+ String getZhengZhuangStr(List<String> ids);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAskMedicalHistoryService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAskMedicalHistoryService.java
index 5812620..f1f2ecf 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAskMedicalHistoryService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAskMedicalHistoryService.java
@@ -3,6 +3,7 @@
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.DictZhengzhuang;
import com.ltkj.hosp.domain.TjAskMedicalHistory;
import com.ltkj.hosp.domain.TjCatering;
@@ -62,4 +63,10 @@
public int deleteTjAskMedicalHistoryByAskId(Long askId);
boolean updateTjAskMedicalHistoryByCusId(String tjNum,String userName, String userId,String cusId);
+
+
+ List<DictZhengzhuang> getZhengZhuang();
+
+
+ TjAskMedicalHistory selectTjAskMedicalHistoryByTjNum(String tjNum);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/ITjAskHistorysServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/ITjAskHistorysServiceImpl.java
index da40f9c..cc24ec9 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/ITjAskHistorysServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/ITjAskHistorysServiceImpl.java
@@ -9,6 +9,10 @@
import com.ltkj.hosp.service.ITjAskHistorysService;
import com.ltkj.hosp.service.TjSurveyRecordDetailService;
import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
@@ -17,4 +21,11 @@
*/
@Service
public class ITjAskHistorysServiceImpl extends ServiceImpl<TjAskHistorysMapper, TjAskHistorys> implements ITjAskHistorysService {
+ @Resource
+ private TjAskHistorysMapper mapper;
+
+ @Override
+ public String getZhengZhuangStr(List<String> ids) {
+ return mapper.getZhengZhuangStr(ids);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAskMedicalHistoryServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAskMedicalHistoryServiceImpl.java
index 03442f7..2e7d0e4 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAskMedicalHistoryServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAskMedicalHistoryServiceImpl.java
@@ -4,8 +4,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.common.utils.DateUtils;
-import com.ltkj.hosp.domain.TjAskWorkLog;
-import com.ltkj.hosp.domain.TjChargingStandard;
+import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.mapper.TjAskWorkLogMapper;
import com.ltkj.hosp.mapper.TjChargingStandardMapper;
import com.ltkj.hosp.service.ITjAskWorkLogService;
@@ -17,9 +16,7 @@
import com.ltkj.common.utils.StringUtils;
import org.springframework.transaction.annotation.Transactional;
-import com.ltkj.hosp.domain.TjAskHistorys;
import com.ltkj.hosp.mapper.TjAskMedicalHistoryMapper;
-import com.ltkj.hosp.domain.TjAskMedicalHistory;
import com.ltkj.hosp.service.ITjAskMedicalHistoryService;
/**
@@ -120,6 +117,16 @@
return tjAskMedicalHistoryMapper.updateTjAskMedicalHistoryByCusId(tjNum, userName, userId, cusId);
}
+ @Override
+ public List<DictZhengzhuang> getZhengZhuang() {
+ return tjAskMedicalHistoryMapper.getZhengZhuang();
+ }
+
+ @Override
+ public TjAskMedicalHistory selectTjAskMedicalHistoryByTjNum(String tjNum) {
+ return tjAskMedicalHistoryMapper.selectTjAskMedicalHistoryByTjNum(tjNum);
+ }
+
/**
* @param tjAskMedicalHistory 闂瘖瀵硅薄
*/
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
index 1d44351..4d95e98 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
@@ -35,6 +35,7 @@
<result property="updateTime" column="update_time"/>
<result property="deleted" column="deleted"/>
<result property="fromBy" column="from_by"/>
+ <result property="zzsjj" column="zzsjj" typeHandler="com.ltkj.common.mybatis.JsonStringArrayTypeHandler"/>
</resultMap>
<resultMap id="TjAskMedicalHistoryTjAskHistorysResult" type="TjAskMedicalHistory" extends="TjAskMedicalHistoryResult">
@@ -58,7 +59,9 @@
</resultMap>
<sql id="selectTjAskMedicalHistoryVo">
- select ask_id, cus_id, cus_name, work, work_status, medical_history, chuchao, jingqi, zhouqi, mociage, zinv, liuchan, zaochan, sichan, yichangtai, xiyan, xiyanpinlv, xiyanyear, yinjiu, yinjiupinlv, yinjiuyear, qita, remark, create_by, create_time, update_by, update_time, deleted,from_by
+ select ask_id, cus_id, cus_name, work, work_status, medical_history, chuchao, jingqi, zhouqi, mociage, zinv, liuchan,
+ zaochan, sichan, yichangtai, xiyan, xiyanpinlv, xiyanyear, yinjiu, yinjiupinlv, yinjiuyear, qita, remark, create_by,
+ create_time, update_by, update_time, deleted,from_by,zzsjj
from tj_ask_medical_history
</sql>
@@ -347,4 +350,11 @@
})
</foreach>
</insert>
+
+
+ <select id="selectTjAskMedicalHistoryByTjNum" parameterType="String" resultMap="TjAskMedicalHistoryResult">
+ <include refid="selectTjAskMedicalHistoryVo"/>
+ where tj_num = #{tjNum}
+ and deleted=0
+ </select>
</mapper>
--
Gitblit v1.8.0