1747191978@qq.com 1 month ago
parent
commit
0879878d69
  1. 4
      acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java
  2. 4
      acupuncture-generator/src/main/resources/mbg.xml
  3. 5
      acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/ExternalDto.java
  4. 11
      acupuncture-system/src/main/java/com/acupuncture/system/domain/po/HmsWeightHeight.java
  5. 70
      acupuncture-system/src/main/java/com/acupuncture/system/domain/po/HmsWeightHeightExample.java
  6. 11
      acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatient.java
  7. 70
      acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatientExample.java
  8. 3
      acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsPatientVo.java
  9. 2
      acupuncture-system/src/main/java/com/acupuncture/system/service/ExternalService.java
  10. 64
      acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java
  11. 2
      acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsTreatmentServiceImpl.java
  12. 3
      acupuncture-system/src/main/resources/mapper/dao/PmsPatientDao.xml
  13. 29
      acupuncture-system/src/main/resources/mapper/system/HmsWeightHeightMapper.xml
  14. 28
      acupuncture-system/src/main/resources/mapper/system/PmsPatientMapper.xml

4
acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java

@ -237,8 +237,8 @@ public class ExternalController {
@DataSource(DataSourceType.MASTER) @DataSource(DataSourceType.MASTER)
@ApiOperation("查询身高体重") @ApiOperation("查询身高体重")
@PostMapping("/api/http/getWeightHeight") @PostMapping("/api/http/getWeightHeight")
public JsonResponse<HmsWeightHeight> getWeightHeight() { public JsonResponse<HmsWeightHeight> getWeightHeight(@RequestBody @Validated ExternalDto.Weight dto) {
return JsonResponse.ok(externalService.getWeightHeight()); return JsonResponse.ok(externalService.getWeightHeight(dto.getWeightMachineId()));
} }
} }

4
acupuncture-generator/src/main/resources/mbg.xml

@ -80,8 +80,8 @@
<!-- <table tableName="fms_followup_queue" domainObjectName="FmsFollowupQueue" enableDeleteByExample="false"/>--> <!-- <table tableName="fms_followup_queue" domainObjectName="FmsFollowupQueue" enableDeleteByExample="false"/>-->
<!-- <table tableName="fms_followup_task" domainObjectName="FmsFollowupTask" enableDeleteByExample="false"/>--> <!-- <table tableName="fms_followup_task" domainObjectName="FmsFollowupTask" enableDeleteByExample="false"/>-->
<!-- <table tableName="fms_patient_queue_relation" domainObjectName="FmsPatientQueueRelation" enableDeleteByExample="false"/>--> <!-- <table tableName="fms_patient_queue_relation" domainObjectName="FmsPatientQueueRelation" enableDeleteByExample="false"/>-->
<!-- <table tableName="pms_patient" domainObjectName="PmsPatient" enableDeleteByExample="false"/>--> <table tableName="pms_patient" domainObjectName="PmsPatient" enableDeleteByExample="false"/>
<table tableName="hms_weight_height" domainObjectName="HmsWeightHeight" enableDeleteByExample="false"/> <!-- <table tableName="hms_weight_height" domainObjectName="HmsWeightHeight" enableDeleteByExample="false"/>-->
<!-- <table tableName="pms_treatment" domainObjectName="PmsTreatment" enableDeleteByExample="false"/>--> <!-- <table tableName="pms_treatment" domainObjectName="PmsTreatment" enableDeleteByExample="false"/>-->
<!-- <table tableName="pms_treatment_record" domainObjectName="PmsTreatmentRecord" enableDeleteByExample="false"/>--> <!-- <table tableName="pms_treatment_record" domainObjectName="PmsTreatmentRecord" enableDeleteByExample="false"/>-->
<!-- <table tableName="rms_report_type" domainObjectName="RmsReportType" enableDeleteByExample="false"/>--> <!-- <table tableName="rms_report_type" domainObjectName="RmsReportType" enableDeleteByExample="false"/>-->

5
acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/ExternalDto.java

@ -29,6 +29,11 @@ public class ExternalDto {
private Long id; private Long id;
} }
@Data
public static class Weight{
private String weightMachineId;
}
@Data @Data
@ApiModel("人体成分数据上传") @ApiModel("人体成分数据上传")
public static class RtcfInfoDto{ public static class RtcfInfoDto{

11
acupuncture-system/src/main/java/com/acupuncture/system/domain/po/HmsWeightHeight.java

@ -9,6 +9,8 @@ public class HmsWeightHeight implements Serializable {
private String weight; private String weight;
private String testId;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public Long getId() { public Long getId() {
@ -35,6 +37,14 @@ public class HmsWeightHeight implements Serializable {
this.weight = weight == null ? null : weight.trim(); this.weight = weight == null ? null : weight.trim();
} }
public String getTestId() {
return testId;
}
public void setTestId(String testId) {
this.testId = testId == null ? null : testId.trim();
}
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@ -44,6 +54,7 @@ public class HmsWeightHeight implements Serializable {
sb.append(", id=").append(id); sb.append(", id=").append(id);
sb.append(", height=").append(height); sb.append(", height=").append(height);
sb.append(", weight=").append(weight); sb.append(", weight=").append(weight);
sb.append(", testId=").append(testId);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }

70
acupuncture-system/src/main/java/com/acupuncture/system/domain/po/HmsWeightHeightExample.java

@ -303,6 +303,76 @@ public class HmsWeightHeightExample {
addCriterion("weight not between", value1, value2, "weight"); addCriterion("weight not between", value1, value2, "weight");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestIdIsNull() {
addCriterion("test_id is null");
return (Criteria) this;
}
public Criteria andTestIdIsNotNull() {
addCriterion("test_id is not null");
return (Criteria) this;
}
public Criteria andTestIdEqualTo(String value) {
addCriterion("test_id =", value, "testId");
return (Criteria) this;
}
public Criteria andTestIdNotEqualTo(String value) {
addCriterion("test_id <>", value, "testId");
return (Criteria) this;
}
public Criteria andTestIdGreaterThan(String value) {
addCriterion("test_id >", value, "testId");
return (Criteria) this;
}
public Criteria andTestIdGreaterThanOrEqualTo(String value) {
addCriterion("test_id >=", value, "testId");
return (Criteria) this;
}
public Criteria andTestIdLessThan(String value) {
addCriterion("test_id <", value, "testId");
return (Criteria) this;
}
public Criteria andTestIdLessThanOrEqualTo(String value) {
addCriterion("test_id <=", value, "testId");
return (Criteria) this;
}
public Criteria andTestIdLike(String value) {
addCriterion("test_id like", value, "testId");
return (Criteria) this;
}
public Criteria andTestIdNotLike(String value) {
addCriterion("test_id not like", value, "testId");
return (Criteria) this;
}
public Criteria andTestIdIn(List<String> values) {
addCriterion("test_id in", values, "testId");
return (Criteria) this;
}
public Criteria andTestIdNotIn(List<String> values) {
addCriterion("test_id not in", values, "testId");
return (Criteria) this;
}
public Criteria andTestIdBetween(String value1, String value2) {
addCriterion("test_id between", value1, value2, "testId");
return (Criteria) this;
}
public Criteria andTestIdNotBetween(String value1, String value2) {
addCriterion("test_id not between", value1, value2, "testId");
return (Criteria) this;
}
} }
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {

11
acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatient.java

@ -50,6 +50,8 @@ public class PmsPatient implements Serializable {
private String currentIllnessHistoryQt; private String currentIllnessHistoryQt;
private String weightId;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public Long getId() { public Long getId() {
@ -236,6 +238,14 @@ public class PmsPatient implements Serializable {
this.currentIllnessHistoryQt = currentIllnessHistoryQt == null ? null : currentIllnessHistoryQt.trim(); this.currentIllnessHistoryQt = currentIllnessHistoryQt == null ? null : currentIllnessHistoryQt.trim();
} }
public String getWeightId() {
return weightId;
}
public void setWeightId(String weightId) {
this.weightId = weightId == null ? null : weightId.trim();
}
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@ -265,6 +275,7 @@ public class PmsPatient implements Serializable {
sb.append(", updateTime=").append(updateTime); sb.append(", updateTime=").append(updateTime);
sb.append(", remark=").append(remark); sb.append(", remark=").append(remark);
sb.append(", currentIllnessHistoryQt=").append(currentIllnessHistoryQt); sb.append(", currentIllnessHistoryQt=").append(currentIllnessHistoryQt);
sb.append(", weightId=").append(weightId);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }

70
acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatientExample.java

@ -1641,6 +1641,76 @@ public class PmsPatientExample {
addCriterion("current_illness_history_qt not between", value1, value2, "currentIllnessHistoryQt"); addCriterion("current_illness_history_qt not between", value1, value2, "currentIllnessHistoryQt");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWeightIdIsNull() {
addCriterion("weight_id is null");
return (Criteria) this;
}
public Criteria andWeightIdIsNotNull() {
addCriterion("weight_id is not null");
return (Criteria) this;
}
public Criteria andWeightIdEqualTo(String value) {
addCriterion("weight_id =", value, "weightId");
return (Criteria) this;
}
public Criteria andWeightIdNotEqualTo(String value) {
addCriterion("weight_id <>", value, "weightId");
return (Criteria) this;
}
public Criteria andWeightIdGreaterThan(String value) {
addCriterion("weight_id >", value, "weightId");
return (Criteria) this;
}
public Criteria andWeightIdGreaterThanOrEqualTo(String value) {
addCriterion("weight_id >=", value, "weightId");
return (Criteria) this;
}
public Criteria andWeightIdLessThan(String value) {
addCriterion("weight_id <", value, "weightId");
return (Criteria) this;
}
public Criteria andWeightIdLessThanOrEqualTo(String value) {
addCriterion("weight_id <=", value, "weightId");
return (Criteria) this;
}
public Criteria andWeightIdLike(String value) {
addCriterion("weight_id like", value, "weightId");
return (Criteria) this;
}
public Criteria andWeightIdNotLike(String value) {
addCriterion("weight_id not like", value, "weightId");
return (Criteria) this;
}
public Criteria andWeightIdIn(List<String> values) {
addCriterion("weight_id in", values, "weightId");
return (Criteria) this;
}
public Criteria andWeightIdNotIn(List<String> values) {
addCriterion("weight_id not in", values, "weightId");
return (Criteria) this;
}
public Criteria andWeightIdBetween(String value1, String value2) {
addCriterion("weight_id between", value1, value2, "weightId");
return (Criteria) this;
}
public Criteria andWeightIdNotBetween(String value1, String value2) {
addCriterion("weight_id not between", value1, value2, "weightId");
return (Criteria) this;
}
} }
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {

3
acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsPatientVo.java

@ -54,6 +54,9 @@ public class PmsPatientVo {
private String remark; private String remark;
private String tenantName; private String tenantName;
@ApiModelProperty("身高体重机器ID")
private String weightMachineId;
} }
} }

2
acupuncture-system/src/main/java/com/acupuncture/system/service/ExternalService.java

@ -61,5 +61,5 @@ public interface ExternalService {
*/ */
void dmh(String str); void dmh(String str);
HmsWeightHeight getWeightHeight(); HmsWeightHeight getWeightHeight(String weightMachineId);
} }

64
acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java

@ -10,12 +10,10 @@ import com.acupuncture.system.domain.po.*;
import com.acupuncture.system.domain.vo.ExternalVo; import com.acupuncture.system.domain.vo.ExternalVo;
import com.acupuncture.system.domain.vo.UplRtcfInfoVo; import com.acupuncture.system.domain.vo.UplRtcfInfoVo;
import com.acupuncture.system.persist.dao.ExternalDao; import com.acupuncture.system.persist.dao.ExternalDao;
import com.acupuncture.system.persist.mapper.HmsWeightHeightMapper; import com.acupuncture.system.persist.mapper.*;
import com.acupuncture.system.persist.mapper.PmsTreatmentMapper;
import com.acupuncture.system.persist.mapper.UplReportImageMapper;
import com.acupuncture.system.persist.mapper.UplRtcfInfoMapper;
import com.acupuncture.system.service.ExternalService; import com.acupuncture.system.service.ExternalService;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import org.apache.ibatis.ognl.ASTInstanceof;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -45,6 +43,8 @@ public class ExternalServiceImpl implements ExternalService {
private PmsTreatmentMapper pmsTreatmentMapper; private PmsTreatmentMapper pmsTreatmentMapper;
@Resource @Resource
private HmsWeightHeightMapper hmsWeightHeightMapper; private HmsWeightHeightMapper hmsWeightHeightMapper;
@Resource
private PmsPatientMapper patientMapper;
@Override @Override
public ExternalVo.Result query(String from, String memberid) { public ExternalVo.Result query(String from, String memberid) {
@ -230,39 +230,51 @@ public class ExternalServiceImpl implements ExternalService {
@Override @Override
public void dmh(String str) { public void dmh(String str) {
// 1. 去除首尾空格和换行符 // 1. 去除首尾空格和换行符
String trimmedInput = str.trim(); String input = str.trim();
// 2. 定义正则表达式匹配模式 // // 2. 定义正则表达式匹配模式
Pattern pattern = Pattern.compile("W:(\\d+\\.\\d+)\\s+H:(\\d+\\.\\d+)"); // Pattern pattern = Pattern.compile("W:(\\d+\\.\\d+)\\s+H:(\\d+\\.\\d+)");
Matcher matcher = pattern.matcher(trimmedInput); // Matcher matcher = pattern.matcher(trimmedInput);
// 3. 提取并处理匹配结果 // 3. 提取并处理匹配结果
if (matcher.find()) { // if (matcher.find()) {
String wValue = matcher.group(1); // 提取 W 的数值部分 // String wValue = matcher.group(1); // 提取 W 的数值部分
String hValue = matcher.group(2); // 提取 H 的数值部分 // String hValue = matcher.group(2); // 提取 H 的数值部分
// 提取ID部分(去掉开头的"RD")
String testId = input.substring(2, input.indexOf("W:"));
// 转换为 Double(自动忽略前导零) // 提取体重和身高
double width = Double.parseDouble(wValue); String width = input.substring(input.indexOf("W:") + 2, input.indexOf(" H:"));
double height = Double.parseDouble(hValue); String height = input.substring(input.indexOf("H:") + 2);
HmsWeightHeight hmsWeightHeight = new HmsWeightHeight(); // // 转换为 Double(自动忽略前导零)
hmsWeightHeight.setHeight(height + ""); // double width = Double.parseDouble(wValue);
hmsWeightHeight.setWeight(width + ""); // double height = Double.parseDouble(hValue);
hmsWeightHeight.setId(IdUtil.getSnowflakeNextId());
hmsWeightHeightMapper.insertSelective(hmsWeightHeight);
// 输出结果(或按需处理) HmsWeightHeight hmsWeightHeight = new HmsWeightHeight();
System.out.println("W: " + width); // 输出: W: 66.5 hmsWeightHeight.setHeight(height + "");
System.out.println("H: " + height); // 输出: H: 173.5 hmsWeightHeight.setWeight(width + "");
} else { hmsWeightHeight.setId(IdUtil.getSnowflakeNextId());
System.out.println("未找到有效的 W 或 H 值"); hmsWeightHeight.setTestId(testId);
} hmsWeightHeightMapper.insertSelective(hmsWeightHeight);
// 输出结果(或按需处理)
System.out.println("W: " + width); // 输出: W: 66.5
System.out.println("H: " + height); // 输出: H: 173.5
System.out.println("id: " + testId);
// } else {
// System.out.println("未找到有效的 W 或 H 值");
// }
} }
@Override @Override
public HmsWeightHeight getWeightHeight() { public HmsWeightHeight getWeightHeight(String weightMachineId) {
PageHelper.startPage(1, 1); PageHelper.startPage(1, 1);
HmsWeightHeightExample hmsWeightHeightExample = new HmsWeightHeightExample(); HmsWeightHeightExample hmsWeightHeightExample = new HmsWeightHeightExample();
HmsWeightHeightExample.Criteria criteria = hmsWeightHeightExample.createCriteria();
if (StrUtil.isNotEmpty(weightMachineId)) {
criteria.andTestIdEqualTo(weightMachineId);
}
hmsWeightHeightExample.setOrderByClause("id desc"); hmsWeightHeightExample.setOrderByClause("id desc");
List<HmsWeightHeight> hmsWeightHeights = hmsWeightHeightMapper.selectByExample(hmsWeightHeightExample); List<HmsWeightHeight> hmsWeightHeights = hmsWeightHeightMapper.selectByExample(hmsWeightHeightExample);
if (CollectionUtil.isNotEmpty(hmsWeightHeights)) { if (CollectionUtil.isNotEmpty(hmsWeightHeights)) {

2
acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsTreatmentServiceImpl.java

@ -323,7 +323,7 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService {
patientQueueRelation.setDelFlag((byte) 0); patientQueueRelation.setDelFlag((byte) 0);
patientQueueRelation.setIdCard(pmsTreatment.getIdCard()); patientQueueRelation.setIdCard(pmsTreatment.getIdCard());
patientQueueRelation.setDischargeTime(pmsTreatment.getDischargeTime()); patientQueueRelation.setDischargeTime(pmsTreatment.getDischargeTime());
patientQueueRelation.setIdCardType(pmsTreatment.getIdCardType().byteValue()); patientQueueRelation.setIdCardType(pmsTreatment.getIdCardType() == null ? null : pmsTreatment.getIdCardType().byteValue());
patientQueueRelation.setCreateBy(SecurityUtils.getUsername()); patientQueueRelation.setCreateBy(SecurityUtils.getUsername());
patientQueueRelation.setPatientId(pmsTreatment.getPatientId()); patientQueueRelation.setPatientId(pmsTreatment.getPatientId());
patientQueueRelation.setQueueId(Long.parseLong(queueId)); patientQueueRelation.setQueueId(Long.parseLong(queueId));

3
acupuncture-system/src/main/resources/mapper/dao/PmsPatientDao.xml

@ -23,7 +23,8 @@
p.create_time as createTime, p.create_time as createTime,
p.weight, p.weight,
p.height, p.height,
t.name as tenantName t.name as tenantName,
p.weight_id as weightMachineId
FROM FROM
pms_patient p pms_patient p
left join left join

29
acupuncture-system/src/main/resources/mapper/system/HmsWeightHeightMapper.xml

@ -5,6 +5,7 @@
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="height" jdbcType="VARCHAR" property="height" /> <result column="height" jdbcType="VARCHAR" property="height" />
<result column="weight" jdbcType="VARCHAR" property="weight" /> <result column="weight" jdbcType="VARCHAR" property="weight" />
<result column="test_id" jdbcType="VARCHAR" property="testId" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<where> <where>
@ -65,7 +66,7 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, height, weight id, height, weight, test_id
</sql> </sql>
<select id="selectByExample" parameterType="com.acupuncture.system.domain.po.HmsWeightHeightExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.acupuncture.system.domain.po.HmsWeightHeightExample" resultMap="BaseResultMap">
select select
@ -92,10 +93,10 @@
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</delete> </delete>
<insert id="insert" parameterType="com.acupuncture.system.domain.po.HmsWeightHeight"> <insert id="insert" parameterType="com.acupuncture.system.domain.po.HmsWeightHeight">
insert into hms_weight_height (id, height, weight insert into hms_weight_height (id, height, weight,
) test_id)
values (#{id,jdbcType=BIGINT}, #{height,jdbcType=VARCHAR}, #{weight,jdbcType=VARCHAR} values (#{id,jdbcType=BIGINT}, #{height,jdbcType=VARCHAR}, #{weight,jdbcType=VARCHAR},
) #{testId,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.acupuncture.system.domain.po.HmsWeightHeight"> <insert id="insertSelective" parameterType="com.acupuncture.system.domain.po.HmsWeightHeight">
insert into hms_weight_height insert into hms_weight_height
@ -109,6 +110,9 @@
<if test="weight != null"> <if test="weight != null">
weight, weight,
</if> </if>
<if test="testId != null">
test_id,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
@ -120,6 +124,9 @@
<if test="weight != null"> <if test="weight != null">
#{weight,jdbcType=VARCHAR}, #{weight,jdbcType=VARCHAR},
</if> </if>
<if test="testId != null">
#{testId,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.acupuncture.system.domain.po.HmsWeightHeightExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.acupuncture.system.domain.po.HmsWeightHeightExample" resultType="java.lang.Long">
@ -140,6 +147,9 @@
<if test="record.weight != null"> <if test="record.weight != null">
weight = #{record.weight,jdbcType=VARCHAR}, weight = #{record.weight,jdbcType=VARCHAR},
</if> </if>
<if test="record.testId != null">
test_id = #{record.testId,jdbcType=VARCHAR},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
@ -149,7 +159,8 @@
update hms_weight_height update hms_weight_height
set id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
height = #{record.height,jdbcType=VARCHAR}, height = #{record.height,jdbcType=VARCHAR},
weight = #{record.weight,jdbcType=VARCHAR} weight = #{record.weight,jdbcType=VARCHAR},
test_id = #{record.testId,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
@ -163,13 +174,17 @@
<if test="weight != null"> <if test="weight != null">
weight = #{weight,jdbcType=VARCHAR}, weight = #{weight,jdbcType=VARCHAR},
</if> </if>
<if test="testId != null">
test_id = #{testId,jdbcType=VARCHAR},
</if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.acupuncture.system.domain.po.HmsWeightHeight"> <update id="updateByPrimaryKey" parameterType="com.acupuncture.system.domain.po.HmsWeightHeight">
update hms_weight_height update hms_weight_height
set height = #{height,jdbcType=VARCHAR}, set height = #{height,jdbcType=VARCHAR},
weight = #{weight,jdbcType=VARCHAR} weight = #{weight,jdbcType=VARCHAR},
test_id = #{testId,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>

28
acupuncture-system/src/main/resources/mapper/system/PmsPatientMapper.xml

@ -25,6 +25,7 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="remark" jdbcType="VARCHAR" property="remark" /> <result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="current_illness_history_qt" jdbcType="VARCHAR" property="currentIllnessHistoryQt" /> <result column="current_illness_history_qt" jdbcType="VARCHAR" property="currentIllnessHistoryQt" />
<result column="weight_id" jdbcType="VARCHAR" property="weightId" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<where> <where>
@ -87,7 +88,8 @@
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, name, pinyin_full, pinyin_simple, gender, birth_date, ethnicity, education_years, id, name, pinyin_full, pinyin_simple, gender, birth_date, ethnicity, education_years,
phone, id_card_type, id_card, source, current_illness_history, weight, height, del_flag, phone, id_card_type, id_card, source, current_illness_history, weight, height, del_flag,
tenant_id, create_by, create_time, update_by, update_time, remark, current_illness_history_qt tenant_id, create_by, create_time, update_by, update_time, remark, current_illness_history_qt,
weight_id
</sql> </sql>
<select id="selectByExample" parameterType="com.acupuncture.system.domain.po.PmsPatientExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.acupuncture.system.domain.po.PmsPatientExample" resultMap="BaseResultMap">
select select
@ -121,7 +123,8 @@
current_illness_history, weight, height, current_illness_history, weight, height,
del_flag, tenant_id, create_by, del_flag, tenant_id, create_by,
create_time, update_by, update_time, create_time, update_by, update_time,
remark, current_illness_history_qt) remark, current_illness_history_qt, weight_id
)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{pinyinFull,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{pinyinFull,jdbcType=VARCHAR},
#{pinyinSimple,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT}, #{birthDate,jdbcType=DATE}, #{pinyinSimple,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT}, #{birthDate,jdbcType=DATE},
#{ethnicity,jdbcType=VARCHAR}, #{educationYears,jdbcType=INTEGER}, #{phone,jdbcType=VARCHAR}, #{ethnicity,jdbcType=VARCHAR}, #{educationYears,jdbcType=INTEGER}, #{phone,jdbcType=VARCHAR},
@ -129,7 +132,8 @@
#{currentIllnessHistory,jdbcType=VARCHAR}, #{weight,jdbcType=VARCHAR}, #{height,jdbcType=VARCHAR}, #{currentIllnessHistory,jdbcType=VARCHAR}, #{weight,jdbcType=VARCHAR}, #{height,jdbcType=VARCHAR},
#{delFlag,jdbcType=TINYINT}, #{tenantId,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, #{delFlag,jdbcType=TINYINT}, #{tenantId,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
#{remark,jdbcType=VARCHAR}, #{currentIllnessHistoryQt,jdbcType=VARCHAR}) #{remark,jdbcType=VARCHAR}, #{currentIllnessHistoryQt,jdbcType=VARCHAR}, #{weightId,jdbcType=VARCHAR}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.acupuncture.system.domain.po.PmsPatient"> <insert id="insertSelective" parameterType="com.acupuncture.system.domain.po.PmsPatient">
insert into pms_patient insert into pms_patient
@ -203,6 +207,9 @@
<if test="currentIllnessHistoryQt != null"> <if test="currentIllnessHistoryQt != null">
current_illness_history_qt, current_illness_history_qt,
</if> </if>
<if test="weightId != null">
weight_id,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
@ -274,6 +281,9 @@
<if test="currentIllnessHistoryQt != null"> <if test="currentIllnessHistoryQt != null">
#{currentIllnessHistoryQt,jdbcType=VARCHAR}, #{currentIllnessHistoryQt,jdbcType=VARCHAR},
</if> </if>
<if test="weightId != null">
#{weightId,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.acupuncture.system.domain.po.PmsPatientExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.acupuncture.system.domain.po.PmsPatientExample" resultType="java.lang.Long">
@ -354,6 +364,9 @@
<if test="record.currentIllnessHistoryQt != null"> <if test="record.currentIllnessHistoryQt != null">
current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR}, current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR},
</if> </if>
<if test="record.weightId != null">
weight_id = #{record.weightId,jdbcType=VARCHAR},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
@ -383,7 +396,8 @@
update_by = #{record.updateBy,jdbcType=VARCHAR}, update_by = #{record.updateBy,jdbcType=VARCHAR},
update_time = #{record.updateTime,jdbcType=TIMESTAMP}, update_time = #{record.updateTime,jdbcType=TIMESTAMP},
remark = #{record.remark,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR},
current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR} current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR},
weight_id = #{record.weightId,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
@ -457,6 +471,9 @@
<if test="currentIllnessHistoryQt != null"> <if test="currentIllnessHistoryQt != null">
current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR}, current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR},
</if> </if>
<if test="weightId != null">
weight_id = #{weightId,jdbcType=VARCHAR},
</if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
@ -483,7 +500,8 @@
update_by = #{updateBy,jdbcType=VARCHAR}, update_by = #{updateBy,jdbcType=VARCHAR},
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR} current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR},
weight_id = #{weightId,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
Loading…
Cancel
Save