jiangs/transitPlatForm
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

自助开单界面，登录修改

Browse Source
This commit is contained in:
jiangs 2026-03-12 16:59:25 +08:00
parent 5505e1d0c2
commit 35cd338a6c
12 changed files with 211 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/SysLoginParam.java
View File

@ -21,6 +21,10 @@ public class SysLoginParam {
* 登录的医疗机构 * 登录的医疗机构
*/ */
private String loginYLJG; private String loginYLJG;
/**
* 登录的医疗机构名称
*/
private String loginYLJGName;
/** /**
* 默认仪器 * 默认仪器
*/ */

1
pf_common/src/main/java/com/transitPlatForm/common/core/domain/model/LoginParam.java
View File

@ -9,5 +9,6 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
public class LoginParam { public class LoginParam {
private String loginYLJG; private String loginYLJG;
private String loginYLJGName;
private String localid; private String localid;
} }

2
pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegApplyMapper.java
View File

@ -4,7 +4,7 @@ import com.transitPlatForm.common.core.domain.entity.reg.RegApply;
public interface RegApplyMapper { public interface RegApplyMapper {
void insert(RegApply regApply); void insert(RegApply regApply);
RegApply queryOne(RegApply regApply); RegApply queryOne(String applyid);
void update(RegApply regApply); void update(RegApply regApply);
void delete(String applyid); void delete(String applyid);
} }

2
pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java
View File

@ -70,7 +70,7 @@ public class CommonUtil {
*/ */
public synchronized String getMaxNo(String seqid) { public synchronized String getMaxNo(String seqid) {
RegSeq seqOne = regSeqMapper.getSeqOne(seqid); RegSeq seqOne = regSeqMapper.getSeqOne(seqid);
if (seqOne != null) return ""; if (seqOne == null) return "";
long maxno = seqOne.getMaxno() + 1; long maxno = seqOne.getMaxno() + 1;
seqOne.setMaxno(maxno); seqOne.setMaxno(maxno);
regSeqMapper.update(seqOne); regSeqMapper.update(seqOne);

126
pf_interfaceCommon/src/main/resources/mapper/RegApplyMapper.xml
View File

@ -3,49 +3,88 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" > "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.transitPlatForm.interfaceCommon.mapper.RegApplyMapper"> <mapper namespace="com.transitPlatForm.interfaceCommon.mapper.RegApplyMapper">
<insert id="insert"> <insert id="insert">
insert into reg_apply(PatId, PatCardType, PatCardNo, PatType, RegNo, PatName, PatSex, PatAge, AgeUnit, insert into reg_apply(
PatAgeShow, PatBirthday, PatIdentity, Phone, Address, PatFeeType, DepartCode, <if test="PatId != null and PatId !=''">PatId,</if>
DepartName, AreaCode, AreaName, PatBed, DiagnosisCode, DiagnosisName, ReciNumber, <if test="PatCardType != null and PatCardType !=''">PatCardType,</if>
DoctorCode, DoctorName, OrderTime, ExecDeptCode, ExecDeptName, SrcHospCode, SrcHospName, <if test="PatCardNo != null and PatCardNo !=''">PatCardNo,</if>
Amount, ChargeState, PatInvoiceNum, UserCode, UserName, DataSource, applyid, Status) <if test="PatType != null and PatType !=''">PatType,</if>
values (#{PatId}, <if test="RegNo != null and RegNo !=''">RegNo,</if>
#{PatCardType}, <if test="PatName != null and PatName !=''">PatName,</if>
#{PatCardNo}, <if test="PatSex != null and PatSex !=''">PatSex,</if>
#{PatType}, <if test="PatAge != null and PatAge !=''">PatAge,</if>
#{RegNo}, <if test="AgeUnit != null and AgeUnit !=''">AgeUnit,</if>
#{PatName}, <if test="PatAgeShow != null and PatAgeShow !=''">PatAgeShow,</if>
#{PatSex}, <if test="PatBirthday != null">PatBirthday,</if>
#{PatAge}, <if test="PatIdentity != null and PatIdentity !=''">PatIdentity,</if>
#{AgeUnit}, <if test="Phone != null and Phone !=''">Phone,</if>
#{PatAgeShow}, <if test="Address != null and Address !=''">Address,</if>
#{PatBirthday}, <if test="PatFeeType != null and PatFeeType !=''">PatFeeType,</if>
#{PatIdentity}, <if test="DepartCode != null and DepartCode !=''">DepartCode,</if>
#{Phone}, <if test="DepartName != null and DepartName !=''">DepartName,</if>
#{Address}, <if test="AreaCode != null and AreaCode !=''">AreaCode,</if>
#{PatFeeType}, <if test="AreaName != null and AreaName !=''">AreaName,</if>
#{DepartCode}, <if test="PatBed != null and PatBed !=''">PatBed,</if>
#{DepartName}, <if test="DiagnosisCode != null and DiagnosisCode !=''">DiagnosisCode,</if>
#{AreaCode}, <if test="DiagnosisName != null and DiagnosisName !=''">DiagnosisName,</if>
#{AreaName}, <if test="ReciNumber != null and ReciNumber !=''">ReciNumber,</if>
#{PatBed}, <if test="DoctorCode != null and DoctorCode !=''">DoctorCode,</if>
#{DiagnosisCode}, <if test="DoctorName != null and DoctorName !=''">DoctorName,</if>
#{DiagnosisName}, <if test="OrderTime != null">OrderTime,</if>
#{ReciNumber}, <if test="ExecDeptCode != null and ExecDeptCode !=''">ExecDeptCode,</if>
#{DoctorCode}, <if test="ExecDeptName != null and ExecDeptName !=''">ExecDeptName,</if>
#{DoctorName}, <if test="SrcHospCode != null and SrcHospCode !=''">SrcHospCode,</if>
#{OrderTime}, <if test="SrcHospName != null and SrcHospName !=''">SrcHospName,</if>
#{ExecDeptCode}, <if test="Amount != null">Amount,</if>
#{ExecDeptName}, <if test="ChargeState != null and ChargeState !=''">ChargeState,</if>
#{SrcHospCode}, <if test="PatInvoiceNum != null and PatInvoiceNum !=''">PatInvoiceNum,</if>
#{SrcHospName}, <if test="UserCode != null and UserCode !=''">UserCode,</if>
#{Amount}, <if test="UserName != null and UserName !=''">UserName,</if>
#{ChargeState}, <if test="DataSource != null and DataSource !=''">DataSource,</if>
#{PatInvoiceNum}, <if test="applyid != null and applyid !=''">applyid,</if>
#{UserCode}, <if test="Status != null and Status !=''">Status,</if>
#{UserName}, create_by,create_time
#{DataSource}, )
#{applyid}, values (
#{Status}) <if test="PatId != null and PatId != ''">#{PatId},</if>
<if test="PatCardType != null and PatCardType !=''">#{PatCardType},</if>
<if test="PatCardNo != null and PatCardNo !=''">#{PatCardNo},</if>
<if test="PatType != null and PatType !=''">#{PatType},</if>
<if test="RegNo != null and RegNo !=''">#{RegNo},</if>
<if test="PatName != null and PatName !=''">#{PatName},</if>
<if test="PatSex != null and PatSex !=''">#{PatSex},</if>
<if test="PatAge != null and PatAge !=''">#{PatAge},</if>
<if test="AgeUnit != null and AgeUnit !=''">#{AgeUnit},</if>
<if test="PatAgeShow != null and PatAgeShow !=''">#{PatAgeShow},</if>
<if test="PatBirthday != null">#{PatBirthday},</if>
<if test="PatIdentity != null and PatIdentity !=''">#{PatIdentity},</if>
<if test="Phone != null and Phone !=''">#{Phone},</if>
<if test="Address != null and Address !=''">#{Address},</if>
<if test="PatFeeType != null and PatFeeType !=''">#{PatFeeType},</if>
<if test="DepartCode != null and DepartCode !=''">#{DepartCode},</if>
<if test="DepartName != null and DepartName !=''">#{DepartName},</if>
<if test="AreaCode != null and AreaCode !=''">#{AreaCode},</if>
<if test="AreaName != null and AreaName !=''">#{AreaName},</if>
<if test="PatBed != null and PatBed !=''">#{PatBed},</if>
<if test="DiagnosisCode != null and DiagnosisCode !=''">#{DiagnosisCode},</if>
<if test="DiagnosisName != null and DiagnosisName !=''">#{DiagnosisName},</if>
<if test="ReciNumber != null and ReciNumber !=''">#{ReciNumber},</if>
<if test="DoctorCode != null and DoctorCode !=''">#{DoctorCode},</if>
<if test="DoctorName != null and DoctorName !=''">#{DoctorName},</if>
<if test="OrderTime != null">#{OrderTime},</if>
<if test="ExecDeptCode != null and ExecDeptCode !=''">#{ExecDeptCode},</if>
<if test="ExecDeptName != null and ExecDeptName !=''">#{ExecDeptName},</if>
<if test="SrcHospCode != null and SrcHospCode !=''">#{SrcHospCode},</if>
<if test="SrcHospName != null and SrcHospName !=''">#{SrcHospName},</if>
<if test="Amount != null">#{Amount},</if>
<if test="ChargeState != null and ChargeState !=''">#{ChargeState},</if>
<if test="PatInvoiceNum != null and PatInvoiceNum !=''">#{PatInvoiceNum},</if>
<if test="UserCode != null and UserCode !=''">#{UserCode},</if>
<if test="UserName != null and UserName !=''">#{UserName},</if>
<if test="DataSource != null and DataSource !=''">#{DataSource},</if>
<if test="applyid != null and applyid !=''">#{applyid},</if>
<if test="Status != null and Status !=''">#{Status},</if>
#{create_by},#{create_time}
)
</insert> </insert>
<select id="queryOne" resultType="com.transitPlatForm.common.core.domain.entity.reg.RegApply"> <select id="queryOne" resultType="com.transitPlatForm.common.core.domain.entity.reg.RegApply">
@ -88,7 +127,6 @@
<if test="ExecDeptName != null and ExecDeptName != ''">ExecDeptName = #{ExecDeptName},</if> <if test="ExecDeptName != null and ExecDeptName != ''">ExecDeptName = #{ExecDeptName},</if>
<if test="SrcHospCode != null and SrcHospCode != ''">SrcHospCode = #{SrcHospCode},</if> <if test="SrcHospCode != null and SrcHospCode != ''">SrcHospCode = #{SrcHospCode},</if>
<if test="SrcHospName != null and SrcHospName != ''">SrcHospName = #{SrcHospName},</if> <if test="SrcHospName != null and SrcHospName != ''">SrcHospName = #{SrcHospName},</if>
<if test="SrcHospName != null and SrcHospName != ''">SrcHospName = #{SrcHospName},</if>
<if test="Amount != null">Amount = #{Amount},</if> <if test="Amount != null">Amount = #{Amount},</if>
<if test="ChargeState != null and ChargeState != ''">ChargeState = #{ChargeState},</if> <if test="ChargeState != null and ChargeState != ''">ChargeState = #{ChargeState},</if>
<if test="PatInvoiceNum != null and PatInvoiceNum != ''">PatInvoiceNum = #{PatInvoiceNum},</if> <if test="PatInvoiceNum != null and PatInvoiceNum != ''">PatInvoiceNum = #{PatInvoiceNum},</if>

25
pf_system/src/main/java/com/transitPlatForm/system/web/service/SysLoginService.java
View File

@ -10,8 +10,10 @@ import com.transitPlatForm.common.core.domain.entity.SysLoginParam;
import com.transitPlatForm.common.core.domain.entity.SysUser; import com.transitPlatForm.common.core.domain.entity.SysUser;
import com.transitPlatForm.common.core.domain.entity.reg.RegHospital; import com.transitPlatForm.common.core.domain.entity.reg.RegHospital;
import com.transitPlatForm.common.core.domain.model.LoginBody; import com.transitPlatForm.common.core.domain.model.LoginBody;
import com.transitPlatForm.common.core.domain.model.LoginParam;
import com.transitPlatForm.common.core.domain.model.LoginUser; import com.transitPlatForm.common.core.domain.model.LoginUser;
import com.transitPlatForm.common.core.redis.RedisCache; import com.transitPlatForm.common.core.redis.RedisCache;
import com.transitPlatForm.common.exception.GlobalException;
import com.transitPlatForm.common.exception.ServiceException; import com.transitPlatForm.common.exception.ServiceException;
import com.transitPlatForm.common.exception.user.*; import com.transitPlatForm.common.exception.user.*;
import com.transitPlatForm.common.utils.DateUtils; import com.transitPlatForm.common.utils.DateUtils;
@ -86,6 +88,7 @@ public class SysLoginService {
} }
return map; return map;
} }
public Map<String, String> getOEM() { public Map<String, String> getOEM() {
Map<String, String> oem = new HashMap<>(); Map<String, String> oem = new HashMap<>();
oem.put("compay", ruoyiConfig.getCompay()); oem.put("compay", ruoyiConfig.getCompay());
@ -96,6 +99,7 @@ public class SysLoginService {
oem.put("copyrightyear", ruoyiConfig.getCopyrightYear()); oem.put("copyrightyear", ruoyiConfig.getCopyrightYear());
return oem; return oem;
} }
public Object gethospList() { public Object gethospList() {
List<RegHospital> regHospitalList = regHospitalMapper.selectHospitalAll(); List<RegHospital> regHospitalList = regHospitalMapper.selectHospitalAll();
List<Map<String, Object>> comDictlist0 = new ArrayList<>(); List<Map<String, Object>> comDictlist0 = new ArrayList<>();
@ -107,8 +111,10 @@ public class SysLoginService {
} }
return comDictlist0; return comDictlist0;
} }
/** /**
* 登录验证 * 登录验证
*
* @return 结果 * @return 结果
*/ */
public String login(LoginBody loginBody) { public String login(LoginBody loginBody) {
@ -117,11 +123,15 @@ public class SysLoginService {
String code = ""; String code = "";
String uuid = ""; String uuid = "";
String loginYLJG = ""; String loginYLJG = "";
String loginYLJGName = "";
String localid = ""; String localid = "";
LoginParam loginParam = null;
try { try {
code = loginBody.getCode(); code = loginBody.getCode();
uuid = loginBody.getUuid(); uuid = loginBody.getUuid();
loginParam = loginBody.getLoginParam();
loginYLJG = loginBody.getLoginParam().getLoginYLJG(); //登录的医疗机构 loginYLJG = loginBody.getLoginParam().getLoginYLJG(); //登录的医疗机构
loginYLJGName = loginBody.getLoginParam().getLoginYLJGName(); //登录的医疗机构名称
localid = loginBody.getLoginParam().getLocalid(); localid = loginBody.getLoginParam().getLocalid();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -130,7 +140,7 @@ public class SysLoginService {
// 验证码校验 // 验证码校验
validateCaptcha(username, code, uuid); validateCaptcha(username, code, uuid);
// 登录前置校验 // 登录前置校验
loginPreCheck(username, password); loginPreCheck(username, password,loginParam);
// 用户验证 // 用户验证
Authentication authentication = null; Authentication authentication = null;
try { try {
@ -156,6 +166,7 @@ public class SysLoginService {
SysLoginParam sysLoginParam = new SysLoginParam(); SysLoginParam sysLoginParam = new SysLoginParam();
sysLoginParam.setLoginYLJG(loginYLJG); sysLoginParam.setLoginYLJG(loginYLJG);
sysLoginParam.setLocalid(localid); sysLoginParam.setLocalid(localid);
sysLoginParam.setLoginYLJGName(loginYLJGName);
// Map<String, Object> map=getLocalconfig(localid,IpUtils.getIpAddr()); // Map<String, Object> map=getLocalconfig(localid,IpUtils.getIpAddr());
// if(map!=null) { // if(map!=null) {
// Object value =map.get("defaultinstr"); // Object value =map.get("defaultinstr");
@ -200,7 +211,7 @@ public class SysLoginService {
* @param username 用户名 * @param username 用户名
* @param password 用户密码 * @param password 用户密码
*/ */
public void loginPreCheck(String username, String password) { public void loginPreCheck(String username, String password,LoginParam loginParam) {
// 用户名或密码为空 错误 // 用户名或密码为空 错误
if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) { if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("not.null"))); AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("not.null")));
@ -224,6 +235,16 @@ public class SysLoginService {
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("login.blocked"))); AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("login.blocked")));
throw new BlackListException(); throw new BlackListException();
} }
//判断用户名是否在登录的医疗机构中
SysUser sysUser = userService.selectUserByUserName(username);
if (sysUser == null) throw new UserNotExistsException();
//管理员不判断
if (!username.equals("admin")){
if(!sysUser.getYljg().equals(loginParam.getLoginYLJG())) throw new GlobalException("医疗机构代码："+loginParam.getLoginYLJG()+"不存在该用户！"+username+","+sysUser.getNickName());
}
} }
/** /**

1
pf_system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectUserVo"> <sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
u.vshisuser, u.vshisuser1, u.vshisuser2, u.yljg, u.sn, u.snid, u.signCert,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u from sys_user u

5
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java
View File

@ -46,6 +46,11 @@ public class RegRequestInfoController extends BaseController {
@ApiOperation("保存申请单信息") @ApiOperation("保存申请单信息")
@PostMapping("/saveReqInfo") @PostMapping("/saveReqInfo")
public Result saveReqInfo(@RequestBody ReqApplyInfoDTO reqApplyInfoDTO){ public Result saveReqInfo(@RequestBody ReqApplyInfoDTO reqApplyInfoDTO){
//设置操作员和登录机构
reqApplyInfoDTO.getRegApply().setUserCode(getUsername());
reqApplyInfoDTO.getRegApply().setUserName(getLoginUser().getUser().getNickName());
reqApplyInfoDTO.getRegApply().setSrcHospCode(getLoginUser().getSysLoginParam().getLoginYLJG());
reqApplyInfoDTO.getRegApply().setSrcHospName(getLoginUser().getSysLoginParam().getLoginYLJGName());
return regRequestInfoService.saveReqInfo(reqApplyInfoDTO); return regRequestInfoService.saveReqInfo(reqApplyInfoDTO);
} }

5
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegRequestInfoMapper.java
View File

@ -2,8 +2,9 @@ package com.transitPlatForm.transitPF.mapper;
import com.transitPlatForm.common.core.domain.entity.reg.RegApply; import com.transitPlatForm.common.core.domain.entity.reg.RegApply;
import com.transitPlatForm.common.core.domain.entity.reg.RegApplyDetail; import com.transitPlatForm.common.core.domain.entity.reg.RegApplyDetail;
import com.transitPlatForm.common.core.domain.entity.reg.RegItem; import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSampleDetail;
import com.transitPlatForm.transitPF.pojo.DTO.RegRequestInfoDTO; import com.transitPlatForm.transitPF.pojo.DTO.RegRequestInfoDTO;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -14,4 +15,6 @@ public interface RegRequestInfoMapper {
List<RegApplyDetail> queryReqDetail(String applyId); List<RegApplyDetail> queryReqDetail(String applyId);
List<Map<String,Object>> getItemInfo(); List<Map<String,Object>> getItemInfo();
List<RegTransitSampleDetail> existSQD(@Param("applyId") String applyId, @Param("applyDetailId") String applyDetailId);
} }

56
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java
View File

@ -2,15 +2,13 @@ package com.transitPlatForm.transitPF.service.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.transitPlatForm.common.core.domain.Result; import com.transitPlatForm.common.core.domain.Result;
import com.transitPlatForm.common.core.domain.entity.reg.RegApply; import com.transitPlatForm.common.core.domain.entity.reg.*;
import com.transitPlatForm.common.core.domain.entity.reg.RegApplyDetail;
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample;
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSampleDetail;
import com.transitPlatForm.interfaceCommon.mapper.CommonMapper; import com.transitPlatForm.interfaceCommon.mapper.CommonMapper;
import com.transitPlatForm.interfaceCommon.mapper.RegApplyDetailMapper; import com.transitPlatForm.interfaceCommon.mapper.RegApplyDetailMapper;
import com.transitPlatForm.interfaceCommon.mapper.RegApplyMapper; import com.transitPlatForm.interfaceCommon.mapper.RegApplyMapper;
import com.transitPlatForm.interfaceCommon.utils.CommonUtil; import com.transitPlatForm.interfaceCommon.utils.CommonUtil;
import com.transitPlatForm.interfaceCommon.utils.LisUtil; import com.transitPlatForm.interfaceCommon.utils.LisUtil;
import com.transitPlatForm.interfaceCommon.utils.LoginConfigParamUtil;
import com.transitPlatForm.transitPF.mapper.RegRequestInfoMapper; import com.transitPlatForm.transitPF.mapper.RegRequestInfoMapper;
import com.transitPlatForm.transitPF.mapper.RegTransitSampleMapper; import com.transitPlatForm.transitPF.mapper.RegTransitSampleMapper;
import com.transitPlatForm.transitPF.pojo.DTO.RegRequestInfoDTO; import com.transitPlatForm.transitPF.pojo.DTO.RegRequestInfoDTO;
@ -86,17 +84,20 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
String status = regApply.getStatus(); String status = regApply.getStatus();
if(status == null) status = ""; if(status == null) status = "";
//修改数据 //修改数据
if(status.equals("")){ if(!status.equals("")){
applicationContext.getBean(RegRequestInfoServiceImpl.class).updateApply(regApply,regApplyDetailList); applicationContext.getBean(RegRequestInfoServiceImpl.class).updateApply(regApply,regApplyDetailList);
} }else{
//申请单号 //申请单号
String applyId = "PT"+regApply.getSrcHospCode()+DateUtil.format(commonUtil.getCurrentTime(),"yyyyMMdd")+commonUtil.getNextSeq_pro("applyno",4); String applyId = "PT"+regApply.getSrcHospCode()+DateUtil.format(commonUtil.getCurrentTime(),"yyyyMMdd")+commonUtil.getNextSeq_pro("applyno",4);
regApply.setApplyid(applyId); regApply.setApplyid(applyId);
regApply.setStatus("1"); regApply.setStatus("1");
regApply.setCreate_by(regApply.getUserCode()); regApply.setCreate_by(regApply.getUserCode());
regApply.setCreate_time(commonUtil.getCurrentTime()); regApply.setCreate_time(commonUtil.getCurrentTime());
regApply.setOrderTime(commonUtil.getCurrentTime());
//病人生日
Date birthDayFromAge = LisUtil.getBirthDayFromAge(Integer.parseInt(regApply.getPatAge()), regApply.getAgeUnit());
regApply.setPatBirthday(birthDayFromAge);
for (RegApplyDetail regApplyDetail : regApplyDetailList) { for (RegApplyDetail regApplyDetail : regApplyDetailList) {
regApplyDetail.setApplyid(applyId); regApplyDetail.setApplyid(applyId);
@ -104,13 +105,10 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
//保存申请单信息 //保存申请单信息
applicationContext.getBean(RegRequestInfoServiceImpl.class).saveReqInfo(regApply,regApplyDetailList); applicationContext.getBean(RegRequestInfoServiceImpl.class).saveReqInfo(regApply,regApplyDetailList);
}
//生成条码信息 //生成条码信息
regApply = regApplyMapper.queryOne(regApply); Result result = createBarcode(regApply.getApplyid());
RegApplyDetail regApplyDetail = new RegApplyDetail();
regApplyDetail.setApplyid(regApply.getApplyid());
regApplyDetailList = regApplyDetailMapper.queryList(regApplyDetail);
Result result = createBarcode(regApply, regApplyDetailList);
if(!result.getCode().equals("0")) return result; if(!result.getCode().equals("0")) return result;
return new Result("0","保存成功！"); return new Result("0","保存成功！");
@ -125,21 +123,36 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
} }
public Result createBarcode(RegApply regApply,List<RegApplyDetail> regApplyDetailList){ /**
* 产生条码信息
* @param applyId
* @return
*/
public Result createBarcode(String applyId){
String ls_nopriceitems = ""; String ls_nopriceitems = "";
RegApply regApply = regApplyMapper.queryOne(applyId);
if(regApply == null) return new Result("0","没有找到申请单信息！");
RegApplyDetail regApplyDetail1 = new RegApplyDetail();
regApplyDetail1.setApplyid(applyId);
List<RegApplyDetail> regApplyDetailList = regApplyDetailMapper.queryList(regApplyDetail1);
if(regApplyDetailList.size() <= 0) return new Result("0","没有找到申请单明细信息！");
List<RegTransitSample> regTransitSampleList = new ArrayList<>(); List<RegTransitSample> regTransitSampleList = new ArrayList<>();
List<RegTransitSampleDetail> regTransitSampleDetailList = new ArrayList<>(); List<RegTransitSampleDetail> regTransitSampleDetailList = new ArrayList<>();
List<Map<String,Object>> reqSqdInfoList = new ArrayList<>(); List<Map<String,Object>> reqSqdInfoList = new ArrayList<>();
//获取项目的对照信息列表 //获取项目的对照信息列表
List<Map<String, Object>> feeClassList = commonMapper.getFeeClassList(); List<Map<String, Object>> feeClassList = commonMapper.getFeeClassList();
for (RegApplyDetail regApplyDetail : regApplyDetailList) { for (RegApplyDetail regApplyDetail : regApplyDetailList) {
String orderItemCode = regApplyDetail.getOrderItemCode(); String orderItemCode = regApplyDetail.getOrderItemCode();
String orderItemName = regApplyDetail.getOrderItemName(); String orderItemName = regApplyDetail.getOrderItemName();
//判断申请单是否已经产生条码
List<RegTransitSampleDetail> regItemList = regRequestInfoMapper.existSQD(regApplyDetail.getApplyid(), String.valueOf(regApplyDetail.getUid()));
if(regItemList.size() > 0) continue;
//判断是否对照 //判断是否对照
Map<String, Object> feeClass = commonUtil.getFeeClass(feeClassList,orderItemCode); Map<String, Object> feeClass = commonUtil.getFeeClass(feeClassList,orderItemCode);
if(feeClass.size() <= 0) { if(feeClass.size() <= 0) {
@ -149,7 +162,6 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
String itemClass = LisUtil.isBank(feeClass.get("itemclass")); String itemClass = LisUtil.isBank(feeClass.get("itemclass"));
Map<String,Object> reqSqdInfo = new HashMap<>(); Map<String,Object> reqSqdInfo = new HashMap<>();
reqSqdInfo.put("sample_PatId",regApply.getPatId()); reqSqdInfo.put("sample_PatId",regApply.getPatId());
reqSqdInfo.put("sample_PatCardType",regApply.getPatCardType()); reqSqdInfo.put("sample_PatCardType",regApply.getPatCardType());
@ -175,7 +187,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
reqSqdInfo.put("sample_DiagnosisName",regApply.getDiagnosisName()); reqSqdInfo.put("sample_DiagnosisName",regApply.getDiagnosisName());
reqSqdInfo.put("sample_OrderUserCode",regApply.getDoctorCode()); reqSqdInfo.put("sample_OrderUserCode",regApply.getDoctorCode());
reqSqdInfo.put("sample_OrderUserName",regApply.getDoctorName()); reqSqdInfo.put("sample_OrderUserName",regApply.getDoctorName());
reqSqdInfo.put("sample_OrderTime",regApply.getOrderTime()); reqSqdInfo.put("sample_OrderTime",DateUtil.format(regApply.getOrderTime(),"yyyy-MM-dd HH:mm:ss"));
reqSqdInfo.put("sample_SrcHospCode",regApply.getSrcHospCode()); reqSqdInfo.put("sample_SrcHospCode",regApply.getSrcHospCode());
reqSqdInfo.put("sample_SrcHospName",regApply.getSrcHospName()); reqSqdInfo.put("sample_SrcHospName",regApply.getSrcHospName());
reqSqdInfo.put("sample_SampleTypeCode",regApplyDetail.getSampleTypeCode()); reqSqdInfo.put("sample_SampleTypeCode",regApplyDetail.getSampleTypeCode());
@ -223,7 +235,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
stringObjectMap.put("detail_OrderItemSerial", xh); stringObjectMap.put("detail_OrderItemSerial", xh);
jymd = LisUtil.isBank(stringObjectMap.get("detail_OrderItemName")); jymd = LisUtil.isBank(stringObjectMap.get("detail_OrderItemName"));
regTransitSample.setCheckPUR(jymd); regTransitSample.setCheckPUR(jymd);
regTransitSampleList.add(k, regTransitSample); regTransitSampleList.set(k, regTransitSample);
//写条码明细表 //写条码明细表
regTransitSampleDetail.setBarcode(barcode); regTransitSampleDetail.setBarcode(barcode);
@ -232,7 +244,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
regTransitSampleDetail.setOrderItemName(LisUtil.isBank(stringObjectMap.get("detail_OrderItemName"))); regTransitSampleDetail.setOrderItemName(LisUtil.isBank(stringObjectMap.get("detail_OrderItemName")));
regTransitSampleDetail.setCost(new BigDecimal(stringObjectMap.get("detail_cost").toString())); regTransitSampleDetail.setCost(new BigDecimal(stringObjectMap.get("detail_cost").toString()));
regTransitSampleDetail.setApplyid(LisUtil.isBank(stringObjectMap.get("detail_applyid"))); regTransitSampleDetail.setApplyid(LisUtil.isBank(stringObjectMap.get("detail_applyid")));
regTransitSampleDetail.setApplyDetailId(String.valueOf(xh)); regTransitSampleDetail.setApplyDetailId(LisUtil.isBank(stringObjectMap.get("detail_applyDetailId")));
regTransitSampleDetailList.add(regTransitSampleDetail); regTransitSampleDetailList.add(regTransitSampleDetail);
continue; continue;
} else { } else {
@ -252,7 +264,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
regTransitSampleDetail.setOrderItemName(LisUtil.isBank(stringObjectMap.get("detail_OrderItemName"))); regTransitSampleDetail.setOrderItemName(LisUtil.isBank(stringObjectMap.get("detail_OrderItemName")));
regTransitSampleDetail.setCost(new BigDecimal(stringObjectMap.get("detail_cost").toString())); regTransitSampleDetail.setCost(new BigDecimal(stringObjectMap.get("detail_cost").toString()));
regTransitSampleDetail.setApplyid(LisUtil.isBank(stringObjectMap.get("detail_applyid"))); regTransitSampleDetail.setApplyid(LisUtil.isBank(stringObjectMap.get("detail_applyid")));
regTransitSampleDetail.setApplyDetailId(String.valueOf(xh)); regTransitSampleDetail.setApplyDetailId(LisUtil.isBank(stringObjectMap.get("detail_applyDetailId")));
regTransitSampleDetailList.add(regTransitSampleDetail); regTransitSampleDetailList.add(regTransitSampleDetail);
jymd = stringObjectMap.get("detail_OrderItemName").toString(); jymd = stringObjectMap.get("detail_OrderItemName").toString();
@ -270,7 +282,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
regTransitSample.setPatAge(LisUtil.isBank(stringObjectMap.get("sample_PatAge"))); regTransitSample.setPatAge(LisUtil.isBank(stringObjectMap.get("sample_PatAge")));
regTransitSample.setAgeUnit(LisUtil.isBank(stringObjectMap.get("sample_AgeUnit"))); regTransitSample.setAgeUnit(LisUtil.isBank(stringObjectMap.get("sample_AgeUnit")));
regTransitSample.setPatAgeShow(LisUtil.isBank(stringObjectMap.get("sample_PatAgeShow"))); regTransitSample.setPatAgeShow(LisUtil.isBank(stringObjectMap.get("sample_PatAgeShow")));
regTransitSample.setPatBirthday(DateUtil.parse(LisUtil.isBank(stringObjectMap.get("sample_PatBirthday")), "yyyy-MM-dd HH:mm:ss")); regTransitSample.setPatBirthday(DateUtil.parse(LisUtil.isBank(stringObjectMap.get("sample_PatBirthday")), "yyyy-MM-dd"));
regTransitSample.setPatIdentity(LisUtil.isBank(stringObjectMap.get("sample_PatIdentity"))); regTransitSample.setPatIdentity(LisUtil.isBank(stringObjectMap.get("sample_PatIdentity")));
regTransitSample.setPhone(LisUtil.isBank(stringObjectMap.get("sample_Phone"))); regTransitSample.setPhone(LisUtil.isBank(stringObjectMap.get("sample_Phone")));
regTransitSample.setAddress(LisUtil.isBank(stringObjectMap.get("sample_Address"))); regTransitSample.setAddress(LisUtil.isBank(stringObjectMap.get("sample_Address")));
@ -295,7 +307,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
regTransitSample.setCheckPUR(jymd); regTransitSample.setCheckPUR(jymd);
regTransitSample.setCreate_by(LisUtil.isBank(stringObjectMap.get("sample_UserCode"))); regTransitSample.setCreate_by(LisUtil.isBank(stringObjectMap.get("sample_UserCode")));
regTransitSample.setCreate_time(commonUtil.getCurrentTime()); regTransitSample.setCreate_time(commonUtil.getCurrentTime());
regTransitSampleList.add(regTransitSample); regTransitSampleList.add(k,regTransitSample);
} }
//保存数据 //保存数据

6
pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml
View File

@ -15,7 +15,11 @@
</select> </select>
<select id="getItemInfo" resultType="map"> <select id="getItemInfo" resultType="map">
select b.classid, a.* from reg_item a,reg_itemclass b where a.itemclass = b.itemclass_code and a.status = '0' select b.classid,(case when isnull(a.yblx,'') = '' then b.itemclass_yblx else a.yblx end) as itemclass_yblx, a.* from reg_item a,reg_itemclass b where a.itemclass = b.itemclass_code and a.status = '0'
</select>
<select id="existSQD" resultType="com.transitPlatForm.common.core.domain.entity.reg.RegTransitSampleDetail">
select * from reg_TransitSample_detail where applyid = #{applyId} and applyDetailId = #{applyDetailId}
</select> </select>
</mapper> </mapper>

12
pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml
View File

@ -43,7 +43,7 @@
<if test="PatAge != null and PatAge != ''">PatAge,</if> <if test="PatAge != null and PatAge != ''">PatAge,</if>
<if test="AgeUnit != null and AgeUnit != ''">AgeUnit,</if> <if test="AgeUnit != null and AgeUnit != ''">AgeUnit,</if>
<if test="PatAgeShow != null and PatAgeShow != ''">PatAgeShow,</if> <if test="PatAgeShow != null and PatAgeShow != ''">PatAgeShow,</if>
<if test="PatBirthday != null and PatBirthday != ''">PatBirthday,</if> <if test="PatBirthday != null">PatBirthday,</if>
<if test="PatIdentity != null and PatIdentity != ''">PatIdentity,</if> <if test="PatIdentity != null and PatIdentity != ''">PatIdentity,</if>
<if test="Phone != null and Phone != ''">Phone,</if> <if test="Phone != null and Phone != ''">Phone,</if>
<if test="Address != null and Address != ''">Address,</if> <if test="Address != null and Address != ''">Address,</if>
@ -99,7 +99,7 @@
<if test="PatAge != null and PatAge != ''">#{PatAge},</if> <if test="PatAge != null and PatAge != ''">#{PatAge},</if>
<if test="AgeUnit != null and AgeUnit != ''">#{AgeUnit},</if> <if test="AgeUnit != null and AgeUnit != ''">#{AgeUnit},</if>
<if test="PatAgeShow != null and PatAgeShow != ''">#{PatAgeShow},</if> <if test="PatAgeShow != null and PatAgeShow != ''">#{PatAgeShow},</if>
<if test="PatBirthday != null and PatBirthday != ''">#{PatBirthday},</if> <if test="PatBirthday != null">#{PatBirthday},</if>
<if test="PatIdentity != null and PatIdentity != ''">#{PatIdentity},</if> <if test="PatIdentity != null and PatIdentity != ''">#{PatIdentity},</if>
<if test="Phone != null and Phone != ''">#{Phone},</if> <if test="Phone != null and Phone != ''">#{Phone},</if>
<if test="Address != null and Address != ''">#{Address},</if> <if test="Address != null and Address != ''">#{Address},</if>
@ -159,6 +159,10 @@
<if test="FeeName != null and FeeName != ''">FeeName,</if> <if test="FeeName != null and FeeName != ''">FeeName,</if>
<if test="Cost != null">Cost,</if> <if test="Cost != null">Cost,</if>
<if test="Status != null and Status != ''">Status,</if> <if test="Status != null and Status != ''">Status,</if>
<if test="applyid != null and applyid != ''">applyid,</if>
<if test="applyDetailId != null and applyDetailId != ''">applyDetailId,</if>
<if test="bz1 != null and bz1 != ''">bz1,</if>
<if test="bz2 != null and bz2 != ''">bz2,</if>
Barcode,OrderItemSerial,create_by,create_time,update_by,update_time Barcode,OrderItemSerial,create_by,create_time,update_by,update_time
)values( )values(
<if test="OrderItemCode != null and OrderItemCode != ''">#{OrderItemCode},</if> <if test="OrderItemCode != null and OrderItemCode != ''">#{OrderItemCode},</if>
@ -171,6 +175,10 @@
<if test="FeeName != null and FeeName != ''">#{FeeName},</if> <if test="FeeName != null and FeeName != ''">#{FeeName},</if>
<if test="Cost != null">#{Cost},</if> <if test="Cost != null">#{Cost},</if>
<if test="Status != null and Status != ''">#{Status},</if> <if test="Status != null and Status != ''">#{Status},</if>
<if test="applyid != null and applyid != ''">#{applyid},</if>
<if test="applyDetailId != null and applyDetailId != ''">#{applyDetailId},</if>
<if test="bz1 != null and bz1 != ''">#{bz1},</if>
<if test="bz2 != null and bz2 != ''">#{bz2},</if>
#{Barcode},#{OrderItemSerial},#{create_by},#{create_time},#{update_by},#{update_time} #{Barcode},#{OrderItemSerial},#{create_by},#{create_time},#{update_by},#{update_time}
) )
</insert> </insert>