修改医疗机构问题
This commit is contained in:
parent
9517d9a3ed
commit
3fdfe4163c
2
.gitignore
vendored
2
.gitignore
vendored
@ -8,6 +8,8 @@ target/
|
||||
.idea/jarRepositories.xml
|
||||
.idea/compiler.xml
|
||||
.idea/libraries/
|
||||
.idea/misc.xml
|
||||
.idea/sqldialects.xml
|
||||
*.iws
|
||||
*.iml
|
||||
*.ipr
|
||||
|
||||
@ -37,4 +37,5 @@ public class RegHospital extends BaseEntity {
|
||||
@Excel(name = "状态", readConverterExp = "0=正常,1=停用")
|
||||
private String status;
|
||||
private String hospital_type;
|
||||
private String dept;
|
||||
}
|
||||
|
||||
@ -0,0 +1,65 @@
|
||||
package com.transitPlatForm.common.core.domain.entity.reg;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class RegPatMain {
|
||||
private String ReportNo;
|
||||
private String HospCode;
|
||||
private String HospName;
|
||||
private String PatId;
|
||||
private String PatCardType;
|
||||
private String PatCardNo;
|
||||
private String PatType;
|
||||
private String RegNo;
|
||||
private String PatName;
|
||||
private String PatSex;
|
||||
private String PatAge;
|
||||
private String AgeUnit;
|
||||
private Date PatBirthday;
|
||||
private String PatIdentity;
|
||||
private String Phone;
|
||||
private String Address;
|
||||
private String PatFeeType;
|
||||
private String DepartCode;
|
||||
private String DepartName;
|
||||
private String AreaCode;
|
||||
private String AreaName;
|
||||
private String PatBed;
|
||||
private String DiagnosisCode;
|
||||
private String DiagnosisName;
|
||||
private String OrderPatId;
|
||||
private String OrderUserCode;
|
||||
private String OrderUserName;
|
||||
private Date OrderTime;
|
||||
private String SrcHospCode;
|
||||
private String SrcHospName;
|
||||
private String Barcode;
|
||||
private String TubeCode;
|
||||
private String TubeName;
|
||||
private String SampleTypeCode;
|
||||
private String SampleTypeName;
|
||||
private String IsER;
|
||||
private String OrderItemCodes;
|
||||
private String OrderItemNames;
|
||||
private Date CollectDate;
|
||||
private Date SignInDate;
|
||||
private Date TestDate;
|
||||
private Date ReportTime;
|
||||
private String ReportUserCode;
|
||||
private String ReportUserName;
|
||||
private String SampleTrait;
|
||||
private String ReportKindCode;
|
||||
private String ReportKindName;
|
||||
private String ReportDescrpt;
|
||||
private String LisGroupCode;
|
||||
private String LisGroupName;
|
||||
private String DstHospCode;
|
||||
private String DstHospName;
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
package com.transitPlatForm.common.core.domain.entity.reg;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class RegReportFile {
|
||||
private String ReportNo;
|
||||
private String ReportFileName;
|
||||
private String ReportFormat;
|
||||
private String Report;
|
||||
private String HospCode;
|
||||
private String HospName;
|
||||
private Date OperateTime;
|
||||
private String UserCode;
|
||||
private String UserName;
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
package com.transitPlatForm.common.core.domain.entity.reg;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class RegResult {
|
||||
private String ReportNo;
|
||||
private String PatId;
|
||||
private String HospCode;
|
||||
private String HospName;
|
||||
private String ItemResultNo;
|
||||
private Date TestTime;
|
||||
private String TestUserCode;
|
||||
private String TestUserName;
|
||||
private Date AuditTime;
|
||||
private String AuditUserCode;
|
||||
private String AuditUserName;
|
||||
private String ItemCode;
|
||||
private String ItemName;
|
||||
private String ItemNameCn;
|
||||
private String ItemCodeSB;
|
||||
private String ItemNameSB;
|
||||
private String Lonic;
|
||||
private String ItemMethodCode;
|
||||
private String ItemMethodName;
|
||||
private String EquipmentCode;
|
||||
private String TestInstCode;
|
||||
private String TestInstCodeSB;
|
||||
private String TestInstName;
|
||||
private BigDecimal ItemResult;
|
||||
private String ItemResultText;
|
||||
private String ResultRemark;
|
||||
private String ItemUnit;
|
||||
private String ItemRef;
|
||||
private String ItemRefMin;
|
||||
private String ItemRefMax;
|
||||
private String ItemFlag;
|
||||
private String ItemFlagStr;
|
||||
private String CheckFlag;
|
||||
private String CrtFlag;
|
||||
private String CrtRef;
|
||||
private String OrderItemCode;
|
||||
private String OrderItemName;
|
||||
private String PrintSort;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
package com.transitPlatForm.common.core.domain.entity.reg;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class RegResultGerm {
|
||||
private String ReportNo;
|
||||
private String PatId;
|
||||
private String HospCode;
|
||||
private String HospName;
|
||||
private String GermResultNo;
|
||||
private String GermCode;
|
||||
private String GermName;
|
||||
private String GermNameCn;
|
||||
private String GermCodeSB;
|
||||
private String GermNameSB;
|
||||
private String ColonyCounting;
|
||||
private String ColonyRatio;
|
||||
private String MediumName;
|
||||
private String CultureTime;
|
||||
private String CultureNeed;
|
||||
private String DiscoveryMode;
|
||||
private String EquipmentCode;
|
||||
private String TestInstCode;
|
||||
private String TestInstCodeSB;
|
||||
private String TestInstName;
|
||||
private String TestResult;
|
||||
private String ItemResultText;
|
||||
private String IsMultidrugR;
|
||||
private String MultidrugRName;
|
||||
private String CrtFlag;
|
||||
private String IsInfectious;
|
||||
private String IsBiohazard;
|
||||
private String PrintSort;
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package com.transitPlatForm.common.core.domain.entity.reg;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class RegResultMed {
|
||||
private String ReportNo;
|
||||
private String PatId;
|
||||
private String HospCode;
|
||||
private String HospName;
|
||||
private String SensResultNo;
|
||||
private String GermResultNo;
|
||||
private String AntiCode;
|
||||
private String AntiName;
|
||||
private String AntiNameCn;
|
||||
private String AntiCodeSB;
|
||||
private String AntiNameSB;
|
||||
private String TestMethodCode;
|
||||
private String TestMethodName;
|
||||
private String TestResult;
|
||||
private String ResistantCode;
|
||||
private String ResistantName;
|
||||
private String ItemRef;
|
||||
private BigDecimal Dosage;
|
||||
private String Mic;
|
||||
private BigDecimal DiameterOfInhibitionRing;
|
||||
private String SensRemark;
|
||||
private String PrintSort;
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package com.transitPlatForm.system.mapper;
|
||||
package com.transitPlatForm.interfaceCommon.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -15,10 +15,11 @@
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="dept" column="dept" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selecthospitalVo">
|
||||
select hospital_id, hospital_code, hospital_name, hospital_userinfo, status, create_by, create_time, remark,hospital_type
|
||||
select hospital_id, hospital_code, hospital_name, hospital_userinfo, status, create_by, create_time, remark,hospital_type,dept
|
||||
from Reg_hospital
|
||||
</sql>
|
||||
|
||||
@ -34,6 +35,9 @@
|
||||
<if test="hospitalName != null and hospitalName != ''">
|
||||
AND hospital_name like '%'+#{hospitalName}+'%'
|
||||
</if>
|
||||
<if test="dept != null and dept != ''">
|
||||
AND dept = #{dept}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
@ -70,6 +74,7 @@
|
||||
<if test="hospital_type != null and hospital_type != ''">hospital_type = #{hospital_type},</if>
|
||||
<if test="status != null and status != ''">status = #{status},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="dept != null and dept !=''">dept = #{dept},</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
update_time = getdate()
|
||||
</set>
|
||||
@ -85,6 +90,7 @@
|
||||
<if test="remark != null and remark != ''">remark,</if>
|
||||
<if test="hospital_type != null and hospital_type != ''">hospital_type,</if>
|
||||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
<if test="dept != null and dept != ''">dept,</if>
|
||||
create_time
|
||||
)values(
|
||||
<if test="hospitalCode != null and hospitalCode != ''">#{hospitalCode},</if>
|
||||
@ -94,6 +100,7 @@
|
||||
<if test="remark != null and remark != ''">#{remark},</if>
|
||||
<if test="hospital_type != null and hospital_type != ''">#{hospital_type},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
<if test="dept != null and dept != ''">#{dept},</if>
|
||||
getdate()
|
||||
)
|
||||
</insert>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.transitPlatForm.system.mapper.SysDeptMapper">
|
||||
<mapper namespace="com.transitPlatForm.interfaceCommon.mapper.SysDeptMapper">
|
||||
|
||||
<resultMap type="SysDept" id="SysDeptResult">
|
||||
<id property="deptId" column="dept_id" />
|
||||
@ -88,9 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0'
|
||||
</select>
|
||||
|
||||
<insert id="insertDept" parameterType="SysDept">
|
||||
<insert id="insertDept" parameterType="SysDept" useGeneratedKeys="true" keyProperty="deptId" keyColumn="dept_id">
|
||||
insert into sys_dept(
|
||||
<if test="deptId != null and deptId != 0">dept_id,</if>
|
||||
<if test="parentId != null and parentId != 0">parent_id,</if>
|
||||
<if test="deptName != null and deptName != ''">dept_name,</if>
|
||||
<if test="ancestors != null and ancestors != ''">ancestors,</if>
|
||||
@ -102,7 +101,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
create_time
|
||||
)values(
|
||||
<if test="deptId != null and deptId != 0">#{deptId},</if>
|
||||
<if test="parentId != null and parentId != 0">#{parentId},</if>
|
||||
<if test="deptName != null and deptName != ''">#{deptName},</if>
|
||||
<if test="ancestors != null and ancestors != ''">#{ancestors},</if>
|
||||
@ -11,7 +11,7 @@ import com.transitPlatForm.common.exception.ServiceException;
|
||||
import com.transitPlatForm.common.utils.SecurityUtils;
|
||||
import com.transitPlatForm.common.utils.StringUtils;
|
||||
import com.transitPlatForm.common.utils.spring.SpringUtils;
|
||||
import com.transitPlatForm.system.mapper.SysDeptMapper;
|
||||
import com.transitPlatForm.interfaceCommon.mapper.SysDeptMapper;
|
||||
import com.transitPlatForm.system.mapper.SysRoleMapper;
|
||||
import com.transitPlatForm.system.service.ISysDeptService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
@ -8,11 +8,13 @@ import com.transitPlatForm.common.core.domain.Result;
|
||||
import com.transitPlatForm.common.core.domain.entity.SysDept;
|
||||
import com.transitPlatForm.common.core.domain.entity.SysRole;
|
||||
import com.transitPlatForm.common.core.domain.entity.SysUser;
|
||||
import com.transitPlatForm.common.core.domain.entity.reg.RegHospital;
|
||||
import com.transitPlatForm.common.core.page.TableDataInfo;
|
||||
import com.transitPlatForm.common.enums.BusinessType;
|
||||
import com.transitPlatForm.common.utils.SecurityUtils;
|
||||
import com.transitPlatForm.common.utils.StringUtils;
|
||||
import com.transitPlatForm.common.utils.poi.ExcelUtil;
|
||||
import com.transitPlatForm.interfaceCommon.mapper.RegHospitalMapper;
|
||||
import com.transitPlatForm.system.service.ISysDeptService;
|
||||
import com.transitPlatForm.system.service.ISysPostService;
|
||||
import com.transitPlatForm.system.service.ISysRoleService;
|
||||
@ -50,6 +52,8 @@ public class SysUserController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private ISysPostService postService;
|
||||
@Autowired
|
||||
private RegHospitalMapper regHospitalMapper;
|
||||
|
||||
/**
|
||||
* 获取用户列表
|
||||
@ -127,6 +131,12 @@ public class SysUserController extends BaseController {
|
||||
}
|
||||
user.setCreateBy(getUsername());
|
||||
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
||||
RegHospital regHospital = new RegHospital();
|
||||
regHospital.setDept(user.getDept().toString());
|
||||
List<RegHospital> regHospitalList = regHospitalMapper.selectHospitalList(regHospital);
|
||||
if(regHospitalList.size() <= 0) return error("没有找到机构ID");
|
||||
String yljg = regHospitalList.get(0).getHospitalId().toString();
|
||||
user.setYljg(yljg);
|
||||
return toAjax(userService.insertUser(user));
|
||||
}
|
||||
|
||||
|
||||
@ -152,7 +152,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
|
||||
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
|
||||
insert into sys_user(
|
||||
<if test="userId != null and userId != 0">user_id,</if>
|
||||
<if test="deptId != null and deptId != 0">dept_id,</if>
|
||||
<if test="userName != null and userName != ''">user_name,</if>
|
||||
<if test="nickName != null and nickName != ''">nick_name,</if>
|
||||
@ -164,9 +163,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="status != null and status != ''">status,</if>
|
||||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
<if test="remark != null and remark != ''">remark,</if>
|
||||
<if test="yljg != null and yljg != ''">yljg,</if>
|
||||
create_time
|
||||
)values(
|
||||
<if test="userId != null and userId != ''">#{userId},</if>
|
||||
<if test="deptId != null and deptId != ''">#{deptId},</if>
|
||||
<if test="userName != null and userName != ''">#{userName},</if>
|
||||
<if test="nickName != null and nickName != ''">#{nickName},</if>
|
||||
@ -178,6 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="status != null and status != ''">#{status},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
<if test="remark != null and remark != ''">#{remark},</if>
|
||||
<if test="yljg != null and yljg != ''">#{yljg},</if>
|
||||
getdate()
|
||||
)
|
||||
</insert>
|
||||
@ -197,6 +197,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="loginDate != null">login_date = #{loginDate},</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="yljg != null and yljg != ''">yljg = #{yljg},</if>
|
||||
update_time = getdate()
|
||||
</set>
|
||||
where user_id = #{userId}
|
||||
|
||||
@ -3,6 +3,7 @@ package com.transitPlatForm.transitPF.controller;
|
||||
import com.transitPlatForm.common.annotation.Log;
|
||||
import com.transitPlatForm.common.core.controller.BaseController;
|
||||
import com.transitPlatForm.common.core.domain.Result;
|
||||
import com.transitPlatForm.common.core.domain.entity.reg.RegApply;
|
||||
import com.transitPlatForm.common.enums.BusinessType;
|
||||
import com.transitPlatForm.interfaceCommon.constants.SysLogConstants;
|
||||
import com.transitPlatForm.transitPF.pojo.DTO.reqinfo.RegRequestInfoDTO;
|
||||
@ -99,5 +100,11 @@ public class RegRequestInfoController extends BaseController {
|
||||
return regRequestInfoService.printcheck();
|
||||
}
|
||||
|
||||
@ApiOperation("获取病人信息")
|
||||
@GetMapping("/patInfo")
|
||||
public Result getPatInfo(RegRequestInfoDTO regRequestInfoDTO){
|
||||
return regRequestInfoService.getPatInfo(regRequestInfoDTO);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -17,4 +17,6 @@ public interface RegRequestInfoMapper {
|
||||
List<Map<String,Object>> getItemInfo(String hospitalType);
|
||||
|
||||
List<RegTransitSampleDetail> existSQD(@Param("applyId") String applyId, @Param("applyDetailId") String applyDetailId);
|
||||
|
||||
RegApply getPatInfo(@Param("patId")String patId,@Param("srcHospCode") String srcHospCode);
|
||||
}
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
package com.transitPlatForm.transitPF.mapper;
|
||||
|
||||
import com.transitPlatForm.common.core.domain.entity.reg.*;
|
||||
|
||||
public interface RegResultMapper {
|
||||
void insertRegPatMain(RegPatMain regPatMain);
|
||||
void deleteRegPatMain(String reportNo);
|
||||
void insertRegResult(RegResult regResult);
|
||||
void deleteRegResult(String reportNo);
|
||||
void insertRegResultGerm(RegResultGerm regResultGerm);
|
||||
void deleteRegResultGerm(String reportNo);
|
||||
void insertRegResultMed(RegResultMed regResultMed);
|
||||
void deleteRegResultMed(String reportNo);
|
||||
void insertRegReportFile(RegReportFile regReportFile);
|
||||
void deleteRegReportFile(String reportNo);
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
package com.transitPlatForm.transitPF.pojo.DTO;
|
||||
|
||||
import com.transitPlatForm.common.core.domain.entity.reg.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class LisReportDTO {
|
||||
private RegPatMain regPatMain;
|
||||
private List<RegResult> regResultList;
|
||||
private List<RegResultGerm> regResultGermList;
|
||||
private List<RegResultMed> regResultMedList;
|
||||
private RegReportFile regReportFile;
|
||||
}
|
||||
@ -1,6 +1,7 @@
|
||||
package com.transitPlatForm.transitPF.service;
|
||||
|
||||
import com.transitPlatForm.common.core.domain.Result;
|
||||
import com.transitPlatForm.common.core.domain.entity.reg.RegApply;
|
||||
import com.transitPlatForm.transitPF.pojo.DTO.reqinfo.RegRequestInfoDTO;
|
||||
import com.transitPlatForm.transitPF.pojo.DTO.ReqApplyInfoDTO;
|
||||
import com.transitPlatForm.transitPF.pojo.DTO.reqinfo.printDTO;
|
||||
@ -21,4 +22,6 @@ public interface RegRequestInfoService {
|
||||
Result cancelReq(String applyId);
|
||||
Result printcheck();
|
||||
Result printsetup();
|
||||
|
||||
Result getPatInfo(RegRequestInfoDTO regRequestInfoDTO);
|
||||
}
|
||||
|
||||
@ -6,10 +6,12 @@ import com.transitPlatForm.common.utils.StringUtils;
|
||||
import com.transitPlatForm.interfaceCommon.mapper.RegHospitalMapper;
|
||||
import com.transitPlatForm.common.core.domain.entity.reg.RegHospital;
|
||||
import com.transitPlatForm.transitPF.service.RegHospitalService;
|
||||
import com.transitPlatForm.transitPF.service.util.RegHospitalUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@ -17,6 +19,8 @@ import java.util.List;
|
||||
public class RegHospitalServiceImpl implements RegHospitalService {
|
||||
@Autowired
|
||||
RegHospitalMapper hospitalMapper;
|
||||
@Resource
|
||||
RegHospitalUtil regHospitalUtil;
|
||||
|
||||
/**
|
||||
* 查询医疗机构信息集合
|
||||
@ -135,12 +139,12 @@ public class RegHospitalServiceImpl implements RegHospitalService {
|
||||
/**
|
||||
* 新增保存医疗机构信息
|
||||
*
|
||||
* @param Hospital 医疗机构信息
|
||||
* @param hospital 医疗机构信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertHospital(RegHospital Hospital) {
|
||||
return hospitalMapper.insertHospital(Hospital);
|
||||
public int insertHospital(RegHospital hospital) {
|
||||
return regHospitalUtil.updateHospital(hospital);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -8,6 +8,7 @@ import com.transitPlatForm.common.core.domain.entity.reg.RegApply;
|
||||
import com.transitPlatForm.interfaceCommon.mapper.RegApplyMapper;
|
||||
import com.transitPlatForm.interfaceCommon.utils.CommonUtil;
|
||||
import com.transitPlatForm.transitPF.mapper.RegTransitSampleMapper;
|
||||
import com.transitPlatForm.transitPF.pojo.DTO.LisReportDTO;
|
||||
import com.transitPlatForm.transitPF.pojo.DTO.SampleSignVO;
|
||||
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample;
|
||||
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSampleDetail;
|
||||
@ -288,6 +289,37 @@ public class RegInterfaceImpl {
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
*{
|
||||
* "method":"addReport",
|
||||
* "req":{
|
||||
* "regPatMain":{},
|
||||
* "regResultList":[{}],
|
||||
* "regResultGermList":[{}],
|
||||
* "regResultMedList":[{}],
|
||||
* "regReportFile":{}
|
||||
* }
|
||||
* }
|
||||
* 添加报告
|
||||
* @param jsonStr
|
||||
* @return
|
||||
*/
|
||||
public Result addReport(String jsonStr){
|
||||
JSONObject jsonObject = JSONUtil.parseObj(jsonStr).getJSONObject("req");
|
||||
LisReportDTO lisReportDTO = jsonObject.toBean(LisReportDTO.class);
|
||||
requestInfoUtil.addLisReport(lisReportDTO);
|
||||
return new Result("0","添加报告成功!");
|
||||
}
|
||||
|
||||
|
||||
public Result delReport(String jsonStr){
|
||||
JSONObject jsonObject = JSONUtil.parseObj(jsonStr).getJSONObject("req");
|
||||
String reportNo = jsonObject.getStr("reportNo");
|
||||
requestInfoUtil.delLisReport(reportNo);
|
||||
return new Result("0","删除成功!");
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -549,6 +549,14 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
|
||||
return sendprintmsg(JSONUtil.toJsonStr(wsMessage));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result getPatInfo(RegRequestInfoDTO regRequestInfoDTO) {
|
||||
String patId = regRequestInfoDTO.getPatId();
|
||||
String srcHospCode = regRequestInfoDTO.getSrcHospCode();
|
||||
RegApply regApply = regRequestInfoMapper.getPatInfo(patId, srcHospCode);
|
||||
return new Result("0","查询数据成功!",regApply);
|
||||
}
|
||||
|
||||
private String getLocalid() {
|
||||
SysLoginParam user = SecurityUtils.getLoginUser().getSysLoginParam();
|
||||
if (user != null) {
|
||||
|
||||
@ -63,6 +63,10 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService {
|
||||
return regInterfaceImpl.queryTransitSample(jsonStr);
|
||||
case "update": //修改状态, 目前只写了送检状态的
|
||||
return regInterfaceImpl.updateStatus(jsonStr);
|
||||
case "addReport":
|
||||
return regInterfaceImpl.addReport(jsonStr);
|
||||
case "delReport":
|
||||
return regInterfaceImpl.delReport(jsonStr);
|
||||
// case "test":
|
||||
// return test();
|
||||
default:
|
||||
|
||||
@ -0,0 +1,42 @@
|
||||
package com.transitPlatForm.transitPF.service.util;
|
||||
|
||||
import com.transitPlatForm.common.core.domain.entity.SysDept;
|
||||
import com.transitPlatForm.common.core.domain.entity.reg.RegHospital;
|
||||
import com.transitPlatForm.interfaceCommon.mapper.RegHospitalMapper;
|
||||
import com.transitPlatForm.interfaceCommon.mapper.SysDeptMapper;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
@Component
|
||||
public class RegHospitalUtil {
|
||||
|
||||
@Resource
|
||||
private RegHospitalMapper hospitalMapper;
|
||||
@Resource
|
||||
private SysDeptMapper deptMapper;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public int updateHospital(RegHospital hospital){
|
||||
//新增部门数据
|
||||
SysDept sysDept = new SysDept();
|
||||
sysDept.setParentId(202L);
|
||||
sysDept.setDeptName(hospital.getHospitalName());
|
||||
sysDept.setOrderNum(0);
|
||||
sysDept.setStatus("0");
|
||||
sysDept.setDelFlag("0");
|
||||
sysDept.setAncestors("0,100,202");
|
||||
deptMapper.insertDept(sysDept);
|
||||
Long deptId = sysDept.getDeptId();
|
||||
hospital.setDept(deptId.toString());
|
||||
//保存医疗机构数据
|
||||
return hospitalMapper.insertHospital(hospital);
|
||||
|
||||
}
|
||||
|
||||
|
||||
// public String getDeptId(String hospitalName){
|
||||
// deptMapper.selectDeptList()
|
||||
// }
|
||||
}
|
||||
@ -1,10 +1,10 @@
|
||||
package com.transitPlatForm.transitPF.service.util;
|
||||
|
||||
import com.transitPlatForm.common.core.domain.entity.reg.RegApply;
|
||||
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample;
|
||||
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSampleDetail;
|
||||
import com.transitPlatForm.common.core.domain.entity.reg.*;
|
||||
import com.transitPlatForm.interfaceCommon.mapper.RegApplyMapper;
|
||||
import com.transitPlatForm.transitPF.mapper.RegResultMapper;
|
||||
import com.transitPlatForm.transitPF.mapper.RegTransitSampleMapper;
|
||||
import com.transitPlatForm.transitPF.pojo.DTO.LisReportDTO;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
@ -20,6 +20,8 @@ public class RequestInfoUtil {
|
||||
private RegApplyMapper regApplyMapper;
|
||||
@Resource
|
||||
private RegTransitSampleMapper regTransitSampleMapper;
|
||||
@Resource
|
||||
RegResultMapper regResultMapper;
|
||||
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
@ -59,4 +61,42 @@ public class RequestInfoUtil {
|
||||
}
|
||||
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void addLisReport(LisReportDTO lisReportDTO){
|
||||
RegPatMain regPatMain = lisReportDTO.getRegPatMain();
|
||||
String reportNo = regPatMain.getReportNo();
|
||||
List<RegResult> regResultList = lisReportDTO.getRegResultList();
|
||||
List<RegResultGerm> regResultGermList = lisReportDTO.getRegResultGermList();
|
||||
List<RegResultMed> regResultMedList = lisReportDTO.getRegResultMedList();
|
||||
RegReportFile regReportFile = lisReportDTO.getRegReportFile();
|
||||
regResultMapper.deleteRegPatMain(reportNo);
|
||||
regResultMapper.deleteRegResult(reportNo);
|
||||
regResultMapper.deleteRegResultMed(reportNo);
|
||||
regResultMapper.deleteRegResultGerm(reportNo);
|
||||
regResultMapper.deleteRegReportFile(reportNo);
|
||||
|
||||
regResultMapper.insertRegPatMain(regPatMain);
|
||||
for (RegResult regResult : regResultList) {
|
||||
regResultMapper.insertRegResult(regResult);
|
||||
}
|
||||
for (RegResultGerm regResultGerm : regResultGermList) {
|
||||
regResultMapper.insertRegResultGerm(regResultGerm);
|
||||
}
|
||||
for (RegResultMed regResultMed : regResultMedList) {
|
||||
regResultMapper.insertRegResultMed(regResultMed);
|
||||
}
|
||||
|
||||
regResultMapper.insertRegReportFile(regReportFile);
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void delLisReport(String reportNo){
|
||||
regResultMapper.deleteRegPatMain(reportNo);
|
||||
regResultMapper.deleteRegResult(reportNo);
|
||||
regResultMapper.deleteRegResultMed(reportNo);
|
||||
regResultMapper.deleteRegResultGerm(reportNo);
|
||||
regResultMapper.deleteRegReportFile(reportNo);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -29,4 +29,9 @@
|
||||
select * from reg_TransitSample_detail where applyid = #{applyId} and applyDetailId = #{applyDetailId}
|
||||
</select>
|
||||
|
||||
|
||||
<select id="getPatInfo" resultType="com.transitPlatForm.common.core.domain.entity.reg.RegApply">
|
||||
select * from reg_apply where PatId = #{patId} and SrcHospCode = #{srcHospCode}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
219
pf_transitPF/src/main/resources/mapper/RegResultMapper.xml
Normal file
219
pf_transitPF/src/main/resources/mapper/RegResultMapper.xml
Normal file
@ -0,0 +1,219 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.transitPlatForm.transitPF.mapper.RegResultMapper">
|
||||
<insert id="insertRegPatMain">
|
||||
insert into reg_pat_main(reportno, hospcode, hospname, patid, patcardtype, patcardno, pattype, regno, patname,
|
||||
patsex, patage, ageunit, patbirthday, patidentity, phone, address, patfeetype,
|
||||
departcode, departname, areacode, areaname, patbed, diagnosiscode, diagnosisname,
|
||||
orderpatid, orderusercode, orderusername, ordertime, srchospcode, srchospname, barcode,
|
||||
tubecode, tubename, sampletypecode, sampletypename, iser, orderitemcodes,
|
||||
orderitemnames, collectdate, signindate, testdate, reporttime, reportusercode,
|
||||
reportusername, sampletrait, reportkindcode, reportkindname, reportdescrpt,
|
||||
lisgroupcode, lisgroupname, dsthospcode, dsthospname)
|
||||
values( #{reportno},
|
||||
#{hospcode},
|
||||
#{hospname},
|
||||
#{patid},
|
||||
#{patcardtype},
|
||||
#{patcardno},
|
||||
#{pattype},
|
||||
#{regno},
|
||||
#{patname},
|
||||
#{patsex},
|
||||
#{patage},
|
||||
#{ageunit},
|
||||
#{patbirthday},
|
||||
#{patidentity},
|
||||
#{phone},
|
||||
#{address},
|
||||
#{patfeetype},
|
||||
#{departcode},
|
||||
#{departname},
|
||||
#{areacode},
|
||||
#{areaname},
|
||||
#{patbed},
|
||||
#{diagnosiscode},
|
||||
#{diagnosisname},
|
||||
#{orderpatid},
|
||||
#{orderusercode},
|
||||
#{orderusername},
|
||||
#{ordertime},
|
||||
#{srchospcode},
|
||||
#{srchospname},
|
||||
#{barcode},
|
||||
#{tubecode},
|
||||
#{tubename},
|
||||
#{sampletypecode},
|
||||
#{sampletypename},
|
||||
#{iser},
|
||||
#{orderitemcodes},
|
||||
#{orderitemnames},
|
||||
#{collectdate},
|
||||
#{signindate},
|
||||
#{testdate},
|
||||
#{reporttime},
|
||||
#{reportusercode},
|
||||
#{reportusername},
|
||||
#{sampletrait},
|
||||
#{reportkindcode},
|
||||
#{reportkindname},
|
||||
#{reportdescrpt},
|
||||
#{lisgroupcode},
|
||||
#{lisgroupname},
|
||||
#{dsthospcode},
|
||||
#{dsthospname}
|
||||
|
||||
)
|
||||
</insert>
|
||||
|
||||
<delete id="deleteRegPatMain">
|
||||
delete from reg_pat_main where reportno=#{reportno}
|
||||
</delete>
|
||||
|
||||
<insert id="insertRegResult">
|
||||
insert into reg_result(reportno, patid, hospcode, hospname, itemresultno, testtime, testusercode, testusername,
|
||||
audittime, auditusercode, auditusername, itemcode, itemname, itemnamecn, itemcodesb,
|
||||
itemnamesb, lonic, itemmethodcode, itemmethodname, equipmentcode, testinstcode,
|
||||
testinstcodesb, testinstname, itemresult, itemresulttext, resultremark, itemunit,
|
||||
itemref, itemrefmin, itemrefmax, itemflag, itemflagstr, checkflag, crtflag, crtref,
|
||||
orderitemcode, orderitemname, printsort)
|
||||
values (#{reportno},
|
||||
#{patid},
|
||||
#{hospcode},
|
||||
#{hospname},
|
||||
#{itemresultno},
|
||||
#{testtime},
|
||||
#{testusercode},
|
||||
#{testusername},
|
||||
#{audittime},
|
||||
#{auditusercode},
|
||||
#{auditusername},
|
||||
#{itemcode},
|
||||
#{itemname},
|
||||
#{itemnamecn},
|
||||
#{itemcodesb},
|
||||
#{itemnamesb},
|
||||
#{lonic},
|
||||
#{itemmethodcode},
|
||||
#{itemmethodname},
|
||||
#{equipmentcode},
|
||||
#{testinstcode},
|
||||
#{testinstcodesb},
|
||||
#{testinstname},
|
||||
#{itemresult},
|
||||
#{itemresulttext},
|
||||
#{resultremark},
|
||||
#{itemunit},
|
||||
#{itemref},
|
||||
#{itemrefmin},
|
||||
#{itemrefmax},
|
||||
#{itemflag},
|
||||
#{itemflagstr},
|
||||
#{checkflag},
|
||||
#{crtflag},
|
||||
#{crtref},
|
||||
#{orderitemcode},
|
||||
#{orderitemname},
|
||||
#{printsort}
|
||||
)
|
||||
</insert>
|
||||
|
||||
<delete id="deleteRegResult">
|
||||
delete from reg_result where reportno = #{reportno}
|
||||
</delete>
|
||||
|
||||
<insert id="insertRegResultGerm">
|
||||
insert into reg_result_germ(reportno, patid, hospcode, hospname, germresultno, germcode, germname, germnamecn, germcodesb, germnamesb, colonycounting, colonyratio, mediumname, culturetime, cultureneed, discoverymode, equipmentcode, testinstcode, testinstcodesb, testinstname, testresult, itemresulttext, ismultidrugr, multidrugrname, crtflag, isinfectious, isbiohazard, printsort)
|
||||
values (
|
||||
#{reportno},
|
||||
#{patid},
|
||||
#{hospcode},
|
||||
#{hospname},
|
||||
#{germresultno},
|
||||
#{germcode},
|
||||
#{germname},
|
||||
#{germnamecn},
|
||||
#{germcodesb},
|
||||
#{germnamesb},
|
||||
#{colonycounting},
|
||||
#{colonyratio},
|
||||
#{mediumname},
|
||||
#{culturetime},
|
||||
#{cultureneed},
|
||||
#{discoverymode},
|
||||
#{equipmentcode},
|
||||
#{testinstcode},
|
||||
#{testinstcodesb},
|
||||
#{testinstname},
|
||||
#{testresult},
|
||||
#{itemresulttext},
|
||||
#{ismultidrugr},
|
||||
#{multidrugrname},
|
||||
#{crtflag},
|
||||
#{isinfectious},
|
||||
#{isbiohazard},
|
||||
#{printsort}
|
||||
|
||||
)
|
||||
</insert>
|
||||
|
||||
<delete id="deleteRegResultGerm">
|
||||
delete from reg_result_germ where reportno = #{reportno}
|
||||
</delete>
|
||||
|
||||
<insert id="insertRegResultMed">
|
||||
insert into reg_result_med(reportno, patid, hospcode, hospname, sensresultno, germresultno, anticode, antiname,
|
||||
antinamecn, anticodesb, antinamesb, testmethodcode, testmethodname, testresult,
|
||||
resistantcode, resistantname, itemref, dosage, mic, diameterofinhibitionring,
|
||||
sensremark, printsort)
|
||||
values (#{reportno},
|
||||
#{patid},
|
||||
#{hospcode},
|
||||
#{hospname},
|
||||
#{sensresultno},
|
||||
#{germresultno},
|
||||
#{anticode},
|
||||
#{antiname},
|
||||
#{antinamecn},
|
||||
#{anticodesb},
|
||||
#{antinamesb},
|
||||
#{testmethodcode},
|
||||
#{testmethodname},
|
||||
#{testresult},
|
||||
#{resistantcode},
|
||||
#{resistantname},
|
||||
#{itemref},
|
||||
#{dosage},
|
||||
#{mic},
|
||||
#{diameterofinhibitionring},
|
||||
#{sensremark},
|
||||
#{printsort}
|
||||
)
|
||||
</insert>
|
||||
|
||||
<delete id="deleteRegResultMed">
|
||||
delete from reg_result_med where reportno = #{reportno}
|
||||
</delete>
|
||||
|
||||
<insert id="insertRegReportFile">
|
||||
insert into reg_report_file(reportno, reportfilename, reportformat, report, hospcode, hospname, operatetime, usercode, username)
|
||||
values(
|
||||
#{reportno},
|
||||
#{reportfilename},
|
||||
#{reportformat},
|
||||
#{report},
|
||||
#{hospcode},
|
||||
#{hospname},
|
||||
#{operatetime},
|
||||
#{usercode},
|
||||
#{username}
|
||||
)
|
||||
</insert>
|
||||
|
||||
<delete id="deleteRegReportFile">
|
||||
delete from reg_report_file where reportno = #{reportno}
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
Loading…
x
Reference in New Issue
Block a user