修改初审页面按需采集代码 9/28 wzq

master
wzqgit 4 years ago
parent 732c8cee49
commit cc9cafa7dc

@ -69,7 +69,7 @@
<image2pdf.version>2.1.7</image2pdf.version>
<cxf.version>3.1.8</cxf.version>
<poi.version>3.9</poi.version>
<lombok.version>1.18.8</lombok.version>
</properties>
<!-- maven依赖 -->
@ -587,6 +587,13 @@
<artifactId>barcode4j-light</artifactId>
<version>2.0</version>
</dependency>-->
<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
@ -657,7 +664,7 @@
</configuration>
</plugin>
</plugins>
<!--<resources>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
@ -674,7 +681,7 @@
</includes>
<filtering>false</filtering>
</resource>
</resources>-->
</resources>
</build>
</project>

@ -54,8 +54,8 @@ public class medicalOverdueController {
@RequestMapping(value = "/exportExcel")
public void exportExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception {
response.setContentType("application/vnd.ms-excel;charset=UTF-8");
String[] header = {"住院号","住院次数","姓名","入院科室","出院科室","出院日期","科室提交","初审人","主管医生","间隔天数","超期天数"};
String[] fileNames = {"inpNo","visitId","name","deptAdmissionTo","deptName","dischargeDateTime","createTime","firstInstance","doctorInCharge","overdue","score"};
String[] header = {"住院号","住院次数","姓名","入院科室","出院科室","出院日期","科室提交","初审人","主管医生","是否死亡","间隔天数","超期天数"};
String[] fileNames = {"inpNo","visitId","name","deptAdmissionTo","deptName","dischargeDateTime","createTime","firstInstance","doctorInCharge","deathFlag","overdue","score"};
//文件名
String fileName = "首次签收超期列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
//构造excel的数据overdueDays
@ -66,12 +66,21 @@ public class medicalOverdueController {
if(archiveMasterVo.getOverdueDays()!=null && archiveMasterVo.getOverdueDays()!="") {
if (list != null && list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
if (list.get(i).getOverdue() != null && list.get(i).getOverdue() != "" ) {
if (list.get(i).getOverdue() != null && !list.get(i).getOverdue().equals("")) {
int score = Integer.parseInt(list.get(i).getOverdue()) - Integer.parseInt(archiveMasterVo.getOverdueDays());
list.get(i).setScore("" + score);
}
if (list.get(i).getDeathFlag() != null && !list.get(i).getDeathFlag().equals("")){
if (list.get(i).getDeathFlag().equals("0")){
list.get(i).setDeathFlag("否");
}else {
list.get(i).setDeathFlag("是");
}
}
//2021-09-17
String doctorInChargeInHomePage = "";
String directorDoctorInHomePage = "";
//根据masterId查出该条首页缓存表中content内容
MedicalRecordHomepageCacheExample medicalRecordHomepageCacheExample = new MedicalRecordHomepageCacheExample();
@ -84,15 +93,22 @@ public class medicalOverdueController {
if (medicalRecordHomepageCacheList.size()>0){
//查出content
String content = medicalRecordHomepageCacheList.get(0).getContent();
//根据content内容获取首页中主治医生name
//根据content内容获取首页中主治医生name、主任副主任医生name
doctorInChargeInHomePage = JSONObject.parseObject(content).getJSONObject("commonTable").getString("yZY054");
directorDoctorInHomePage = JSONObject.parseObject(content).getJSONObject("commonTable1").getString("yZY052");
}
//重新赋值主管医生
//重新赋值主管医生、主任(副主任)医生
if (doctorInChargeInHomePage != null && !doctorInChargeInHomePage.equals("")){
list.get(i).setDoctorInCharge(doctorInChargeInHomePage);
}else {
list.get(i).setDoctorInCharge("首页尚未填写主治医生!");
}
if (directorDoctorInHomePage != null && !directorDoctorInHomePage.equals("")){
list.get(i).setFirstInstance(directorDoctorInHomePage);
}else {
list.get(i).setFirstInstance("首页尚未填写主任(副主任)医生!");
}
//2021-09-17
}
}

@ -40,6 +40,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.rmi.RemoteException;
import java.text.SimpleDateFormat;
import java.util.Date;
@ -72,6 +73,12 @@ public class signListController {
@Autowired(required = false)
private Archive_Master_FollowingService archive_master_followingService;
@Autowired
private ArchiveOtherExtService archiveOtherExtService;
@Autowired
private FinishedDateTimeService finishedDateTimeService;
@RequestMapping(value = "/signLists")
public String faults(Model model) {
return "signListDir/signList";
@ -656,9 +663,96 @@ public class signListController {
// 从session获取用户名
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
String username = user.getUserName();//工号
String result = "";
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date_1801 = sdf.parse("1801-02-03 00:00:00");
//新增ext表数据逻辑
Archive_Master archive_master = archiveMasterService.selectById(id);
if (archive_master != null){
//查ext表有无任务
List<ArchiveOtherExt> extList = archiveOtherExtService.selectExtTaskIsExistOrNot(id);
if (!extList.isEmpty() && extList.size()==1){
//有任务则ext表更新statusFlag=0对应C3-C8置空T1-T6置空其他不变
//1.statusFlag=0
extList.get(0).setStatusflag(0);
//2.对应C3-C8置空T1-T6置空
switch (flagNum){
//体温单
case 1:
extList.get(0).setC5("");
extList.get(0).setT3(date_1801);
break;
//护理记录
case 2:
extList.get(0).setC6("");
extList.get(0).setT4(date_1801);
break;
//首页
case 3:
extList.get(0).setC3("");
extList.get(0).setT1(date_1801);
break;
//医生文书
case 4:
extList.get(0).setC4("");
extList.get(0).setT2(date_1801);
break;
//评估单
case 5:
extList.get(0).setC8("");
extList.get(0).setT6(date_1801);
break;
//护士文书
case 6:
extList.get(0).setC7("");
extList.get(0).setT5(date_1801);
break;
}
archiveOtherExtService.updateByPrimaryKeySelective(extList.get(0));
}else {
//无任务,则新增
OracleDateVo doctorNurseFinishedDatetime = finishedDateTimeService.findByID(Long.valueOf(archive_master.getInpNo()), Long.valueOf(archive_master.getVisitId()));
//V6医生最后完成时间
String doctorFinishedDateTime = sdf.format(doctorNurseFinishedDatetime.getFinishedDateTime());
//V6护士最后完成时间
String nurseFinishedDateTime = sdf.format(doctorNurseFinishedDatetime.getMrCommitNurseDateTime());
ArchiveOtherExt archiveOtherExt = new ArchiveOtherExt(IDHelper.NewID(),new Date(),"按需采集",0L,-300,date_1801,pid,
archive_master.getInpNo(),date_1801,date_1801,0,"",id,archive_master.getVisitId(),
doctorFinishedDateTime,nurseFinishedDateTime,"Done","Done","Done","Done","Done","Done","",archive_master.getName(),
BigDecimal.valueOf(0.0000),BigDecimal.valueOf(0.0000),BigDecimal.valueOf(0.0000),
date_1801,date_1801,date_1801,date_1801,date_1801,date_1801);
//对应C3-C8置空,T无需置空
switch (flagNum){
//体温单
case 1:
archiveOtherExt.setC5("");
break;
//护理记录
case 2:
archiveOtherExt.setC6("");
break;
//首页
case 3:
archiveOtherExt.setC3("");
break;
//医生文书
case 4:
archiveOtherExt.setC4("");
break;
//评估单
case 5:
archiveOtherExt.setC8("");
break;
//护士文书
case 6:
archiveOtherExt.setC7("");
break;
}
archiveOtherExtService.insertSelective(archiveOtherExt);
}
}
//新增other表数据逻辑
Sign_List signList = new Sign_List();
signList.setPid(pid);
signList.setMasterID(id);
@ -699,6 +793,18 @@ public class signListController {
signList.setCreatedtime(sdf.format(new Date()));
signList.setC1(username);
signList.setIsFullText("0");
signList.setOtherInfo("");
signList.setDetailID("");
signList.setdTime(sdf.format(sdf.parse("1801-02-03 00:00:00")));
signList.setC2("");
signList.setC3("");
signList.setC4("");
signList.setN1(BigDecimal.valueOf(0.0000));
signList.setN2(BigDecimal.valueOf(0.0000));
signList.setN3(BigDecimal.valueOf(0.0000));
signList.setT1(sdf.format(sdf.parse("1801-02-03 00:00:00")));
signList.setT2(sdf.format(sdf.parse("1801-02-03 00:00:00")));
signList.setT3(sdf.format(sdf.parse("1801-02-03 00:00:00")));
signListService.insertSignList(signList);
return "采集计划已生成!";
}

@ -0,0 +1,21 @@
package com.emr.dao;
import com.emr.entity.ArchiveOtherExt;
import com.emr.entity.ArchiveOtherExtExample;
import java.util.List;
public interface ArchiveOtherExtMapper {
int deleteByPrimaryKey(Long id);
int insert(ArchiveOtherExt record);
int insertSelective(ArchiveOtherExt record);
List<ArchiveOtherExt> selectByExample(ArchiveOtherExtExample example);
ArchiveOtherExt selectByPrimaryKey(Long id);
int updateByPrimaryKeySelective(ArchiveOtherExt record);
int updateByPrimaryKey(ArchiveOtherExt record);
}

@ -0,0 +1,375 @@
package com.emr.entity;
import java.math.BigDecimal;
import java.util.Date;
public class ArchiveOtherExt {
private Long id;
private Date syctime;
private String sycobj;
private Long otherid;
private Integer sysflag;
private Date sysupdatetime;
private String jzh;
private String zyh;
private Date stime;
private Date etime;
private Integer statusflag;
private String presult;
private String mid;
private String did;
private String c1;
private String c2;
private String c3;
private String c4;
private String c5;
private String c6;
private String c7;
private String c8;
private String c9;
private String c10;
private BigDecimal n1;
private BigDecimal n2;
private BigDecimal n3;
private Date t1;
private Date t2;
private Date t3;
private Date t4;
private Date t5;
private Date t6;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Date getSyctime() {
return syctime;
}
public void setSyctime(Date syctime) {
this.syctime = syctime;
}
public String getSycobj() {
return sycobj;
}
public void setSycobj(String sycobj) {
this.sycobj = sycobj == null ? null : sycobj.trim();
}
public Long getOtherid() {
return otherid;
}
public void setOtherid(Long otherid) {
this.otherid = otherid;
}
public Integer getSysflag() {
return sysflag;
}
public void setSysflag(Integer sysflag) {
this.sysflag = sysflag;
}
public Date getSysupdatetime() {
return sysupdatetime;
}
public void setSysupdatetime(Date sysupdatetime) {
this.sysupdatetime = sysupdatetime;
}
public String getJzh() {
return jzh;
}
public void setJzh(String jzh) {
this.jzh = jzh == null ? null : jzh.trim();
}
public String getZyh() {
return zyh;
}
public void setZyh(String zyh) {
this.zyh = zyh == null ? null : zyh.trim();
}
public Date getStime() {
return stime;
}
public void setStime(Date stime) {
this.stime = stime;
}
public Date getEtime() {
return etime;
}
public void setEtime(Date etime) {
this.etime = etime;
}
public Integer getStatusflag() {
return statusflag;
}
public void setStatusflag(Integer statusflag) {
this.statusflag = statusflag;
}
public String getPresult() {
return presult;
}
public void setPresult(String presult) {
this.presult = presult == null ? null : presult.trim();
}
public String getMid() {
return mid;
}
public void setMid(String mid) {
this.mid = mid == null ? null : mid.trim();
}
public String getDid() {
return did;
}
public void setDid(String did) {
this.did = did == null ? null : did.trim();
}
public String getC1() {
return c1;
}
public void setC1(String c1) {
this.c1 = c1 == null ? null : c1.trim();
}
public String getC2() {
return c2;
}
public void setC2(String c2) {
this.c2 = c2 == null ? null : c2.trim();
}
public String getC3() {
return c3;
}
public void setC3(String c3) {
this.c3 = c3 == null ? null : c3.trim();
}
public String getC4() {
return c4;
}
public void setC4(String c4) {
this.c4 = c4 == null ? null : c4.trim();
}
public String getC5() {
return c5;
}
public void setC5(String c5) {
this.c5 = c5 == null ? null : c5.trim();
}
public String getC6() {
return c6;
}
public void setC6(String c6) {
this.c6 = c6 == null ? null : c6.trim();
}
public String getC7() {
return c7;
}
public void setC7(String c7) {
this.c7 = c7 == null ? null : c7.trim();
}
public String getC8() {
return c8;
}
public void setC8(String c8) {
this.c8 = c8 == null ? null : c8.trim();
}
public String getC9() {
return c9;
}
public void setC9(String c9) {
this.c9 = c9 == null ? null : c9.trim();
}
public String getC10() {
return c10;
}
public void setC10(String c10) {
this.c10 = c10 == null ? null : c10.trim();
}
public BigDecimal getN1() {
return n1;
}
public void setN1(BigDecimal n1) {
this.n1 = n1;
}
public BigDecimal getN2() {
return n2;
}
public void setN2(BigDecimal n2) {
this.n2 = n2;
}
public BigDecimal getN3() {
return n3;
}
public void setN3(BigDecimal n3) {
this.n3 = n3;
}
public Date getT1() {
return t1;
}
public void setT1(Date t1) {
this.t1 = t1;
}
public Date getT2() {
return t2;
}
public void setT2(Date t2) {
this.t2 = t2;
}
public Date getT3() {
return t3;
}
public void setT3(Date t3) {
this.t3 = t3;
}
public Date getT4() {
return t4;
}
public void setT4(Date t4) {
this.t4 = t4;
}
public Date getT5() {
return t5;
}
public void setT5(Date t5) {
this.t5 = t5;
}
public Date getT6() {
return t6;
}
public void setT6(Date t6) {
this.t6 = t6;
}
public ArchiveOtherExt() {
}
public ArchiveOtherExt(Long id, Date syctime, String sycobj, Long otherid, Integer sysflag, Date sysupdatetime, String jzh, String zyh, Date stime, Date etime, Integer statusflag, String presult, String mid, String did, String c1, String c2, String c3, String c4, String c5, String c6, String c7, String c8, String c9, String c10, BigDecimal n1, BigDecimal n2, BigDecimal n3, Date t1, Date t2, Date t3, Date t4, Date t5, Date t6) {
this.id = id;
this.syctime = syctime;
this.sycobj = sycobj;
this.otherid = otherid;
this.sysflag = sysflag;
this.sysupdatetime = sysupdatetime;
this.jzh = jzh;
this.zyh = zyh;
this.stime = stime;
this.etime = etime;
this.statusflag = statusflag;
this.presult = presult;
this.mid = mid;
this.did = did;
this.c1 = c1;
this.c2 = c2;
this.c3 = c3;
this.c4 = c4;
this.c5 = c5;
this.c6 = c6;
this.c7 = c7;
this.c8 = c8;
this.c9 = c9;
this.c10 = c10;
this.n1 = n1;
this.n2 = n2;
this.n3 = n3;
this.t1 = t1;
this.t2 = t2;
this.t3 = t3;
this.t4 = t4;
this.t5 = t5;
this.t6 = t6;
}
}

File diff suppressed because it is too large Load Diff

@ -0,0 +1,28 @@
package com.emr.service;
import com.emr.entity.ArchiveOtherExt;
import java.util.List;
public interface ArchiveOtherExtService {
/**
* ext
* @param masterId
* @return
*/
List<ArchiveOtherExt> selectExtTaskIsExistOrNot(String masterId);
/**
*
* @param archiveOtherExt
* @return
*/
Integer insertSelective(ArchiveOtherExt archiveOtherExt);
/**
*
* @param archiveOtherExt
* @return
*/
Integer updateByPrimaryKeySelective(ArchiveOtherExt archiveOtherExt);
}

@ -0,0 +1,52 @@
package com.emr.service.ipml;
import com.emr.dao.ArchiveOtherExtMapper;
import com.emr.entity.ArchiveOtherExt;
import com.emr.entity.ArchiveOtherExtExample;
import com.emr.service.ArchiveOtherExtService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class ArchiveOtherExtServiceImpl implements ArchiveOtherExtService {
@Autowired
private ArchiveOtherExtMapper archiveOtherExtMapper;
/**
* ext
* @param masterId
* @return
*/
public List<ArchiveOtherExt> selectExtTaskIsExistOrNot(String masterId){
ArchiveOtherExtExample archiveOtherExtExample = new ArchiveOtherExtExample();
ArchiveOtherExtExample.Criteria criteria = archiveOtherExtExample.createCriteria();
if (!StringUtils.isEmpty(masterId)){
criteria.andMidEqualTo(masterId);
}
return archiveOtherExtMapper.selectByExample(archiveOtherExtExample);
}
/**
*
* @param archiveOtherExt
* @return
*/
@Override
public Integer insertSelective(ArchiveOtherExt archiveOtherExt) {
return archiveOtherExtMapper.insertSelective(archiveOtherExt);
}
/**
*
* @param archiveOtherExt
* @return
*/
@Override
public Integer updateByPrimaryKeySelective(ArchiveOtherExt archiveOtherExt) {
return archiveOtherExtMapper.updateByPrimaryKeySelective(archiveOtherExt);
}
}

@ -328,48 +328,37 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
List<MedicalRecordHomepageCache> medicalRecordHomepageCacheList = null;
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
if (powerUserList != null){
Map<String,JSONObject> mappedMovies = Maps.uniqueIndex(powerUserList, new Function<JSONObject,String>() {
@Override
public String apply(JSONObject temp) {
return temp.getString("userName");
}});
for (Archive_Master_Vo archive_master : list) {
String doctorInChargeInHomePage = "";
//根据masterId查出该条首页缓存表中content内容
MedicalRecordHomepageCacheExample medicalRecordHomepageCacheExample = new MedicalRecordHomepageCacheExample();
MedicalRecordHomepageCacheExample.Criteria criteria = medicalRecordHomepageCacheExample.createCriteria();
if (!StringUtils.isEmpty(archive_master.getId())){
criteria.andMasterIdEqualTo(archive_master.getId());
}
medicalRecordHomepageCacheList = medicalRecordHomepageCacheMapper.selectByExample(medicalRecordHomepageCacheExample);
if (medicalRecordHomepageCacheList.size()>0){
//查出content
String content = medicalRecordHomepageCacheList.get(0).getContent();
//根据content内容获取首页中主治医生name
doctorInChargeInHomePage = JSONObject.parseObject(content).getJSONObject("commonTable").getString("yZY054");
}
//重新赋值主管医生
if (doctorInChargeInHomePage != null && !doctorInChargeInHomePage.equals("")){
archive_master.setDoctorInCharge(doctorInChargeInHomePage);
}else {
archive_master.setDoctorInCharge("首页尚未填写主治医生!");
}
JSONObject userInfo = mappedMovies.get(archive_master.getFirstInstance());
if (userInfo==null){
archive_master.setFirstInstance(archive_master.getFirstInstance());
}else {
archive_master.setFirstInstance(userInfo.getString("name"));
}
for (Archive_Master_Vo archive_master : list) {
String doctorInChargeInHomePage = "";
String directorDoctorInHomePage = "";
//根据masterId查出该条首页缓存表中content内容
MedicalRecordHomepageCacheExample medicalRecordHomepageCacheExample = new MedicalRecordHomepageCacheExample();
MedicalRecordHomepageCacheExample.Criteria criteria = medicalRecordHomepageCacheExample.createCriteria();
if (!StringUtils.isEmpty(archive_master.getId())){
criteria.andMasterIdEqualTo(archive_master.getId());
}
medicalRecordHomepageCacheList = medicalRecordHomepageCacheMapper.selectByExample(medicalRecordHomepageCacheExample);
if (medicalRecordHomepageCacheList.size()>0){
//查出content
String content = medicalRecordHomepageCacheList.get(0).getContent();
//根据content内容获取首页中主治医生name、主任副主任医生name
doctorInChargeInHomePage = JSONObject.parseObject(content).getJSONObject("commonTable").getString("yZY054");
directorDoctorInHomePage = JSONObject.parseObject(content).getJSONObject("commonTable1").getString("yZY052");
}
//重新赋值主管医生、主任(副主任)医生
if (doctorInChargeInHomePage != null && !doctorInChargeInHomePage.equals("")){
archive_master.setDoctorInCharge(doctorInChargeInHomePage);
}else {
archive_master.setDoctorInCharge("首页尚未填写主治医生!");
}
if (directorDoctorInHomePage != null && !directorDoctorInHomePage.equals("")){
archive_master.setFirstInstance(directorDoctorInHomePage);
}else {
archive_master.setFirstInstance("首页尚未填写主任(副主任)医生!");
}
}
return new OffsetLimitPage((Page) list);
}

@ -54,7 +54,7 @@
<property name="dataSource" ref="dataSource"></property>
<!-- 指定mybatis,mapper文件的位置 -->
<property name="mapperLocations" value="classpath*:mapper/**/*.xml"/>
<property name="mapperLocations" value="classpath*:mapper/**/*Mapper.xml"/>
</bean>

@ -34,7 +34,7 @@
</environment>
</environments>
<!-- Oracle的mapper文件扫描 ,单独测试使用-->
<!-- <mappers>-->
<!-- <mapper resource="mapper/FinishedDateTimeMapper.xml"></mapper>-->
<!-- </mappers>-->
<mappers>
<mapper resource="mapper/FinishedDateTimeMapperTest.xml"></mapper>
</mappers>
</configuration>

@ -0,0 +1,463 @@
<?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.emr.dao.ArchiveOtherExtMapper">
<resultMap id="BaseResultMap" type="com.emr.entity.ArchiveOtherExt">
<id column="ID" jdbcType="BIGINT" property="id" />
<result column="SycTime" jdbcType="TIMESTAMP" property="syctime" />
<result column="SycObj" jdbcType="NVARCHAR" property="sycobj" />
<result column="otherID" jdbcType="BIGINT" property="otherid" />
<result column="sysFlag" jdbcType="INTEGER" property="sysflag" />
<result column="sysUpdateTime" jdbcType="TIMESTAMP" property="sysupdatetime" />
<result column="jzh" jdbcType="NVARCHAR" property="jzh" />
<result column="zyh" jdbcType="NVARCHAR" property="zyh" />
<result column="stime" jdbcType="TIMESTAMP" property="stime" />
<result column="eTime" jdbcType="TIMESTAMP" property="etime" />
<result column="statusFlag" jdbcType="INTEGER" property="statusflag" />
<result column="pResult" jdbcType="NVARCHAR" property="presult" />
<result column="MID" jdbcType="NVARCHAR" property="mid" />
<result column="DID" jdbcType="NVARCHAR" property="did" />
<result column="C1" jdbcType="NVARCHAR" property="c1" />
<result column="C2" jdbcType="NVARCHAR" property="c2" />
<result column="C3" jdbcType="NVARCHAR" property="c3" />
<result column="C4" jdbcType="NVARCHAR" property="c4" />
<result column="C5" jdbcType="NVARCHAR" property="c5" />
<result column="C6" jdbcType="NVARCHAR" property="c6" />
<result column="C7" jdbcType="NVARCHAR" property="c7" />
<result column="C8" jdbcType="NVARCHAR" property="c8" />
<result column="C9" jdbcType="NVARCHAR" property="c9" />
<result column="C10" jdbcType="NVARCHAR" property="c10" />
<result column="N1" jdbcType="DECIMAL" property="n1" />
<result column="N2" jdbcType="DECIMAL" property="n2" />
<result column="N3" jdbcType="DECIMAL" property="n3" />
<result column="T1" jdbcType="TIMESTAMP" property="t1" />
<result column="T2" jdbcType="TIMESTAMP" property="t2" />
<result column="T3" jdbcType="TIMESTAMP" property="t3" />
<result column="T4" jdbcType="TIMESTAMP" property="t4" />
<result column="T5" jdbcType="TIMESTAMP" property="t5" />
<result column="T6" jdbcType="TIMESTAMP" property="t6" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
ID, SycTime, SycObj, otherID, sysFlag, sysUpdateTime, jzh, zyh, stime, eTime, statusFlag,
pResult, MID, DID, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, N1, N2, N3, T1, T2, T3,
T4, T5, T6
</sql>
<select id="selectByExample" parameterType="com.emr.entity.ArchiveOtherExtExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
'false' as QUERYID,
<include refid="Base_Column_List" />
from archive_other_ext
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from archive_other_ext
where ID = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from archive_other_ext
where ID = #{id,jdbcType=BIGINT}
</delete>
<insert id="insert" parameterType="com.emr.entity.ArchiveOtherExt">
insert into archive_other_ext (ID, SycTime, SycObj,
otherID, sysFlag, sysUpdateTime,
jzh, zyh, stime,
eTime, statusFlag, pResult,
MID, DID, C1, C2,
C3, C4, C5, C6,
C7, C8, C9, C10,
N1, N2, N3, T1,
T2, T3, T4, T5,
T6)
values (#{id,jdbcType=BIGINT}, #{syctime,jdbcType=TIMESTAMP}, #{sycobj,jdbcType=NVARCHAR},
#{otherid,jdbcType=BIGINT}, #{sysflag,jdbcType=INTEGER}, #{sysupdatetime,jdbcType=TIMESTAMP},
#{jzh,jdbcType=NVARCHAR}, #{zyh,jdbcType=NVARCHAR}, #{stime,jdbcType=TIMESTAMP},
#{etime,jdbcType=TIMESTAMP}, #{statusflag,jdbcType=INTEGER}, #{presult,jdbcType=NVARCHAR},
#{mid,jdbcType=NVARCHAR}, #{did,jdbcType=NVARCHAR}, #{c1,jdbcType=NVARCHAR}, #{c2,jdbcType=NVARCHAR},
#{c3,jdbcType=NVARCHAR}, #{c4,jdbcType=NVARCHAR}, #{c5,jdbcType=NVARCHAR}, #{c6,jdbcType=NVARCHAR},
#{c7,jdbcType=NVARCHAR}, #{c8,jdbcType=NVARCHAR}, #{c9,jdbcType=NVARCHAR}, #{c10,jdbcType=NVARCHAR},
#{n1,jdbcType=DECIMAL}, #{n2,jdbcType=DECIMAL}, #{n3,jdbcType=DECIMAL}, #{t1,jdbcType=TIMESTAMP},
#{t2,jdbcType=TIMESTAMP}, #{t3,jdbcType=TIMESTAMP}, #{t4,jdbcType=TIMESTAMP}, #{t5,jdbcType=TIMESTAMP},
#{t6,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.emr.entity.ArchiveOtherExt">
insert into archive_other_ext
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
ID,
</if>
<if test="syctime != null">
SycTime,
</if>
<if test="sycobj != null">
SycObj,
</if>
<if test="otherid != null">
otherID,
</if>
<if test="sysflag != null">
sysFlag,
</if>
<if test="sysupdatetime != null">
sysUpdateTime,
</if>
<if test="jzh != null">
jzh,
</if>
<if test="zyh != null">
zyh,
</if>
<if test="stime != null">
stime,
</if>
<if test="etime != null">
eTime,
</if>
<if test="statusflag != null">
statusFlag,
</if>
<if test="presult != null">
pResult,
</if>
<if test="mid != null">
MID,
</if>
<if test="did != null">
DID,
</if>
<if test="c1 != null">
C1,
</if>
<if test="c2 != null">
C2,
</if>
<if test="c3 != null">
C3,
</if>
<if test="c4 != null">
C4,
</if>
<if test="c5 != null">
C5,
</if>
<if test="c6 != null">
C6,
</if>
<if test="c7 != null">
C7,
</if>
<if test="c8 != null">
C8,
</if>
<if test="c9 != null">
C9,
</if>
<if test="c10 != null">
C10,
</if>
<if test="n1 != null">
N1,
</if>
<if test="n2 != null">
N2,
</if>
<if test="n3 != null">
N3,
</if>
<if test="t1 != null">
T1,
</if>
<if test="t2 != null">
T2,
</if>
<if test="t3 != null">
T3,
</if>
<if test="t4 != null">
T4,
</if>
<if test="t5 != null">
T5,
</if>
<if test="t6 != null">
T6,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="syctime != null">
#{syctime,jdbcType=TIMESTAMP},
</if>
<if test="sycobj != null">
#{sycobj,jdbcType=NVARCHAR},
</if>
<if test="otherid != null">
#{otherid,jdbcType=BIGINT},
</if>
<if test="sysflag != null">
#{sysflag,jdbcType=INTEGER},
</if>
<if test="sysupdatetime != null">
#{sysupdatetime,jdbcType=TIMESTAMP},
</if>
<if test="jzh != null">
#{jzh,jdbcType=NVARCHAR},
</if>
<if test="zyh != null">
#{zyh,jdbcType=NVARCHAR},
</if>
<if test="stime != null">
#{stime,jdbcType=TIMESTAMP},
</if>
<if test="etime != null">
#{etime,jdbcType=TIMESTAMP},
</if>
<if test="statusflag != null">
#{statusflag,jdbcType=INTEGER},
</if>
<if test="presult != null">
#{presult,jdbcType=NVARCHAR},
</if>
<if test="mid != null">
#{mid,jdbcType=NVARCHAR},
</if>
<if test="did != null">
#{did,jdbcType=NVARCHAR},
</if>
<if test="c1 != null">
#{c1,jdbcType=NVARCHAR},
</if>
<if test="c2 != null">
#{c2,jdbcType=NVARCHAR},
</if>
<if test="c3 != null">
#{c3,jdbcType=NVARCHAR},
</if>
<if test="c4 != null">
#{c4,jdbcType=NVARCHAR},
</if>
<if test="c5 != null">
#{c5,jdbcType=NVARCHAR},
</if>
<if test="c6 != null">
#{c6,jdbcType=NVARCHAR},
</if>
<if test="c7 != null">
#{c7,jdbcType=NVARCHAR},
</if>
<if test="c8 != null">
#{c8,jdbcType=NVARCHAR},
</if>
<if test="c9 != null">
#{c9,jdbcType=NVARCHAR},
</if>
<if test="c10 != null">
#{c10,jdbcType=NVARCHAR},
</if>
<if test="n1 != null">
#{n1,jdbcType=DECIMAL},
</if>
<if test="n2 != null">
#{n2,jdbcType=DECIMAL},
</if>
<if test="n3 != null">
#{n3,jdbcType=DECIMAL},
</if>
<if test="t1 != null">
#{t1,jdbcType=TIMESTAMP},
</if>
<if test="t2 != null">
#{t2,jdbcType=TIMESTAMP},
</if>
<if test="t3 != null">
#{t3,jdbcType=TIMESTAMP},
</if>
<if test="t4 != null">
#{t4,jdbcType=TIMESTAMP},
</if>
<if test="t5 != null">
#{t5,jdbcType=TIMESTAMP},
</if>
<if test="t6 != null">
#{t6,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.emr.entity.ArchiveOtherExt">
update archive_other_ext
<set>
<if test="syctime != null">
SycTime = #{syctime,jdbcType=TIMESTAMP},
</if>
<if test="sycobj != null">
SycObj = #{sycobj,jdbcType=NVARCHAR},
</if>
<if test="otherid != null">
otherID = #{otherid,jdbcType=BIGINT},
</if>
<if test="sysflag != null">
sysFlag = #{sysflag,jdbcType=INTEGER},
</if>
<if test="sysupdatetime != null">
sysUpdateTime = #{sysupdatetime,jdbcType=TIMESTAMP},
</if>
<if test="jzh != null">
jzh = #{jzh,jdbcType=NVARCHAR},
</if>
<if test="zyh != null">
zyh = #{zyh,jdbcType=NVARCHAR},
</if>
<if test="stime != null">
stime = #{stime,jdbcType=TIMESTAMP},
</if>
<if test="etime != null">
eTime = #{etime,jdbcType=TIMESTAMP},
</if>
<if test="statusflag != null">
statusFlag = #{statusflag,jdbcType=INTEGER},
</if>
<if test="presult != null">
pResult = #{presult,jdbcType=NVARCHAR},
</if>
<if test="mid != null">
MID = #{mid,jdbcType=NVARCHAR},
</if>
<if test="did != null">
DID = #{did,jdbcType=NVARCHAR},
</if>
<if test="c1 != null">
C1 = #{c1,jdbcType=NVARCHAR},
</if>
<if test="c2 != null">
C2 = #{c2,jdbcType=NVARCHAR},
</if>
<if test="c3 != null">
C3 = #{c3,jdbcType=NVARCHAR},
</if>
<if test="c4 != null">
C4 = #{c4,jdbcType=NVARCHAR},
</if>
<if test="c5 != null">
C5 = #{c5,jdbcType=NVARCHAR},
</if>
<if test="c6 != null">
C6 = #{c6,jdbcType=NVARCHAR},
</if>
<if test="c7 != null">
C7 = #{c7,jdbcType=NVARCHAR},
</if>
<if test="c8 != null">
C8 = #{c8,jdbcType=NVARCHAR},
</if>
<if test="c9 != null">
C9 = #{c9,jdbcType=NVARCHAR},
</if>
<if test="c10 != null">
C10 = #{c10,jdbcType=NVARCHAR},
</if>
<if test="n1 != null">
N1 = #{n1,jdbcType=DECIMAL},
</if>
<if test="n2 != null">
N2 = #{n2,jdbcType=DECIMAL},
</if>
<if test="n3 != null">
N3 = #{n3,jdbcType=DECIMAL},
</if>
<if test="t1 != null">
T1 = #{t1,jdbcType=TIMESTAMP},
</if>
<if test="t2 != null">
T2 = #{t2,jdbcType=TIMESTAMP},
</if>
<if test="t3 != null">
T3 = #{t3,jdbcType=TIMESTAMP},
</if>
<if test="t4 != null">
T4 = #{t4,jdbcType=TIMESTAMP},
</if>
<if test="t5 != null">
T5 = #{t5,jdbcType=TIMESTAMP},
</if>
<if test="t6 != null">
T6 = #{t6,jdbcType=TIMESTAMP},
</if>
</set>
where ID = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.emr.entity.ArchiveOtherExt">
update archive_other_ext
set SycTime = #{syctime,jdbcType=TIMESTAMP},
SycObj = #{sycobj,jdbcType=NVARCHAR},
otherID = #{otherid,jdbcType=BIGINT},
sysFlag = #{sysflag,jdbcType=INTEGER},
sysUpdateTime = #{sysupdatetime,jdbcType=TIMESTAMP},
jzh = #{jzh,jdbcType=NVARCHAR},
zyh = #{zyh,jdbcType=NVARCHAR},
stime = #{stime,jdbcType=TIMESTAMP},
eTime = #{etime,jdbcType=TIMESTAMP},
statusFlag = #{statusflag,jdbcType=INTEGER},
pResult = #{presult,jdbcType=NVARCHAR},
MID = #{mid,jdbcType=NVARCHAR},
DID = #{did,jdbcType=NVARCHAR},
C1 = #{c1,jdbcType=NVARCHAR},
C2 = #{c2,jdbcType=NVARCHAR},
C3 = #{c3,jdbcType=NVARCHAR},
C4 = #{c4,jdbcType=NVARCHAR},
C5 = #{c5,jdbcType=NVARCHAR},
C6 = #{c6,jdbcType=NVARCHAR},
C7 = #{c7,jdbcType=NVARCHAR},
C8 = #{c8,jdbcType=NVARCHAR},
C9 = #{c9,jdbcType=NVARCHAR},
C10 = #{c10,jdbcType=NVARCHAR},
N1 = #{n1,jdbcType=DECIMAL},
N2 = #{n2,jdbcType=DECIMAL},
N3 = #{n3,jdbcType=DECIMAL},
T1 = #{t1,jdbcType=TIMESTAMP},
T2 = #{t2,jdbcType=TIMESTAMP},
T3 = #{t3,jdbcType=TIMESTAMP},
T4 = #{t4,jdbcType=TIMESTAMP},
T5 = #{t5,jdbcType=TIMESTAMP},
T6 = #{t6,jdbcType=TIMESTAMP}
where ID = #{id,jdbcType=BIGINT}
</update>
</mapper>

@ -167,7 +167,7 @@
<if test="n2 != null and n2 != ''">N2,</if>
<if test="n3 != null and n3 != ''">N3,</if>
<if test="t1 != null and t1 != ''">T1,</if>
<if test="t2 != null and t2 != ''">T2</if>
<if test="t2 != null and t2 != ''">T2,</if>
<if test="t3 != null and t3 != ''">T3,</if>
<if test="isFullText != null and isFullText != ''">IsFullText,</if>
</trim>

Loading…
Cancel
Save