bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JSK

This commit is contained in:
jiask 2025-09-11 15:14:14 +08:00
parent 25dde05710
commit 3ab59fae25
7 changed files with 84 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonMedicalReportController.java
View File

@ -3,9 +3,7 @@ package com.bonus.canteen.core.health.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.bonus.canteen.core.health.domain.HealthChronic;
import com.bonus.canteen.core.health.domain.HealthMedicalReportDetails;
import com.bonus.canteen.core.health.domain.HealthPersonMedicalReportDetails;
import com.bonus.canteen.core.health.domain.*;
import com.bonus.common.log.enums.OperaType;
//import com.bonus.canteen.core.health.common.annotation.PreventRepeatSubmit;
import io.swagger.annotations.Api;
@ -21,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.canteen.core.health.domain.HealthPersonMedicalReport;
import com.bonus.canteen.core.health.service.IHealthPersonMedicalReportService;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
@ -47,9 +44,9 @@ public class HealthPersonMedicalReportController extends BaseController {
@ApiOperation(value = "查询人员体检报告列表")
//@RequiresPermissions("health:report:list")
@GetMapping("/list")
public TableDataInfo list(HealthPersonMedicalReport healthPersonMedicalReport) {
public TableDataInfo list(HealthPersonInfo healthPersonMedicalReport) {
startPage();
List<HealthPersonMedicalReport> list = healthPersonMedicalReportService.selectHealthPersonMedicalReportList(healthPersonMedicalReport);
List<HealthPersonInfo> list = healthPersonMedicalReportService.selectHealthPersonMedicalReportList2(healthPersonMedicalReport);
return getDataTable(list);
}

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonMedicalReport.java
View File

@ -49,6 +49,7 @@ public class HealthPersonMedicalReport extends BaseEntity {
@Excel(name = "体检模板id")
@ApiModelProperty(value = "体检模板id")
private Long medicalTemplateId;
private String encryptedSearchValue;
private String articleTitle;
}

7
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/mapper/HealthPersonMedicalReportMapper.java
View File

@ -2,10 +2,7 @@ package com.bonus.canteen.core.health.mapper;
import java.util.List;
import com.bonus.canteen.core.health.domain.HealthMedicalReportDetail;
import com.bonus.canteen.core.health.domain.HealthMedicalReportDetails;
import com.bonus.canteen.core.health.domain.HealthPersonMedicalReport;
import com.bonus.canteen.core.health.domain.HealthPersonMedicalReportDetails;
import com.bonus.canteen.core.health.domain.*;
import org.apache.ibatis.annotations.Param;
/**
@ -30,7 +27,7 @@ public interface HealthPersonMedicalReportMapper {
* @return 人员体检报告集合
*/
public List<HealthPersonMedicalReport> selectHealthPersonMedicalReportList(HealthPersonMedicalReport healthPersonMedicalReport);
public List<HealthPersonInfo> selectHealthPersonMedicalReportList2(HealthPersonInfo healthPersonMedicalReport);
/**
* 新增人员体检报告
*

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/IHealthPersonMedicalReportService.java
View File

@ -3,6 +3,7 @@ package com.bonus.canteen.core.health.service;
import java.util.List;
import com.bonus.canteen.core.health.domain.HealthMedicalReportDetails;
import com.bonus.canteen.core.health.domain.HealthPersonInfo;
import com.bonus.canteen.core.health.domain.HealthPersonMedicalReport;
import com.bonus.canteen.core.health.domain.HealthPersonMedicalReportDetails;
@ -29,7 +30,7 @@ public interface IHealthPersonMedicalReportService {
*/
public List<HealthPersonMedicalReport> selectHealthPersonMedicalReportList(HealthPersonMedicalReport healthPersonMedicalReport);
public List<HealthPersonInfo> selectHealthPersonMedicalReportList2(HealthPersonInfo healthPersonMedicalReport);
/**
* 新增人员体检报告
*

15
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonMedicalReportServiceImpl.java
View File

@ -3,15 +3,13 @@ package com.bonus.canteen.core.health.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.bonus.canteen.core.health.domain.HealthMedicalReportDetail;
import com.bonus.canteen.core.health.domain.HealthMedicalReportDetails;
import com.bonus.canteen.core.health.domain.HealthPersonMedicalReportDetails;
import com.bonus.canteen.core.health.domain.*;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.houqin.utils.SM4EncryptUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.bonus.canteen.core.health.mapper.HealthPersonMedicalReportMapper;
import com.bonus.canteen.core.health.domain.HealthPersonMedicalReport;
import com.bonus.canteen.core.health.service.IHealthPersonMedicalReportService;
/**
@ -44,9 +42,16 @@ public class HealthPersonMedicalReportServiceImpl implements IHealthPersonMedica
*/
@Override
public List<HealthPersonMedicalReport> selectHealthPersonMedicalReportList(HealthPersonMedicalReport healthPersonMedicalReport) {
String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(healthPersonMedicalReport.getArticleTitle());
healthPersonMedicalReport.setEncryptedSearchValue(encryptedSearchValue);
return healthPersonMedicalReportMapper.selectHealthPersonMedicalReportList(healthPersonMedicalReport);
}
@Override
public List<HealthPersonInfo> selectHealthPersonMedicalReportList2(HealthPersonInfo healthPersonMedicalReport) {
String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(healthPersonMedicalReport.getArticleTitle());
healthPersonMedicalReport.setEncryptedSearchValue(encryptedSearchValue);
return healthPersonMedicalReportMapper.selectHealthPersonMedicalReportList2(healthPersonMedicalReport);
}
/**
* 新增人员体检报告
*

15
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsServiceImpl.java
View File

@ -203,13 +203,14 @@ public class OrderGoodsServiceImpl implements IOrderGoodsService {
}
}
}
InspectGoodsSum inspectGoodsSum = inspectGoodsService
.getInspectGoodsListByOrderGoodsCode(orderGoodsVO.getOrderGoodsCode());
if(Objects.nonNull(inspectGoodsSum) && Objects.nonNull(inspectGoodsSum.getTotalQualifiedNum())) {
orderGoodsVO.setTotalQualifiedNum(inspectGoodsSum.getTotalQualifiedNum());
}else{
orderGoodsVO.setTotalQualifiedNum(BigDecimal.ZERO);
}
}
InspectGoodsSum inspectGoodsSum = inspectGoodsService
.getInspectGoodsListByOrderGoodsCode(orderGoodsVO.getOrderGoodsCode());
if(Objects.nonNull(inspectGoodsSum) && Objects.nonNull(inspectGoodsSum.getTotalQualifiedNum())) {
orderGoodsVO.setTotalQualifiedNum(inspectGoodsSum.getTotalQualifiedNum());
}else{
orderGoodsVO.setTotalQualifiedNum(BigDecimal.ZERO);
}
}
}

58
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonMedicalReportMapper.xml
View File

@ -15,6 +15,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<resultMap type="com.bonus.canteen.core.health.domain.HealthPersonInfo" id="HealthPersonInfoResult">
<result property="id" column="id" />
<result property="userId" column="user_id" />
<result property="registerDate" column="register_date" />
<result property="bloodType" column="blood_type" />
<result property="maritalStatus" column="marital_status" />
<result property="pregnantStatus" column="pregnant_status" />
<result property="pregnancyDate" column="pregnancy_date" />
<result property="doctorAdvice" column="doctor_advice" />
<result property="ifHospitalized" column="if_hospitalized" />
<result property="doctorNum" column="doctor_num" />
<result property="hospitalNum" column="hospital_num" />
<result property="inpatientDate" column="inpatient_date" />
<result property="inpatientResult" column="inpatient_result" />
<result property="weightControl" column="weight_control" />
<result property="allergen" column="allergen" />
<result property="labourIntensity" column="labour_intensity" />
<result property="healthState" column="health_state" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="orgFullName" column="dept_name" />
</resultMap>
<sql id="selectHealthPersonMedicalReportVo">
select id, medical_id, user_id, medical_date, medical_mechanism, medical_template_id, create_by, create_time, update_by, update_time from health_person_medical_report
@ -31,7 +55,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
order by create_time desc
</select>
<select id="selectHealthPersonMedicalReportList2" parameterType="com.bonus.canteen.core.health.domain.HealthPersonInfo" resultMap="HealthPersonInfoResult">
SELECT a.user_id,
a.nick_name,
a.phonenumber as mobile,
a.photo_url as custPhotoUrl,
a.sex,
d.height,
d.weight,
d.bmi,
b.doctor_advice,
b.allergen,
b.labour_intensity,
b.pregnant_status,
b.doctor_num,
b.hospital_num,
b.inpatient_date
from sys_user a
left join health_person_info b on a.user_id = b.user_id
left join health_person_body_record d on a.user_id = d.user_id and d.if_latest = 1
where 1=1
<if test="articleTitle != null and articleTitle != ''">
and(a.nick_name like concat('%', #{articleTitle}, '%') or a.phonenumber like concat('%', #{encryptedSearchValue}, '%') or b.doctor_num like concat('%', #{articleTitle}, '%'))
</if>
<if test="chronicIds != null and chronicIds != ''">
and c.chronic_id in (${chronicIds})
</if>
<if test="doctorAdvices != null and doctorAdvices != ''">
and b.doctor_advice in (${doctorAdvices})
</if>
<if test="deptIds != null and deptIds != ''">
and a.dept_id in (${deptIds})
</if>
</select>
<select id="selectHealthPersonMedicalReportById" parameterType="Long" resultMap="HealthPersonMedicalReportResult">
<include refid="selectHealthPersonMedicalReportVo"/>
where id = #{id}