diff --git a/pom.xml b/pom.xml index 7da2ad94..5cc799e3 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ 2.1.7 3.1.8 3.9 - + 1.18.8 @@ -587,6 +587,13 @@ barcode4j-light 2.0 --> + + + org.projectlombok + lombok + ${lombok.version} + provided + @@ -657,7 +664,7 @@ - + diff --git a/src/main/java/com/emr/controller/medicalOverdueController.java b/src/main/java/com/emr/controller/medicalOverdueController.java index c6d8f8c4..f44eea07 100644 --- a/src/main/java/com/emr/controller/medicalOverdueController.java +++ b/src/main/java/com/emr/controller/medicalOverdueController.java @@ -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 } } diff --git a/src/main/java/com/emr/controller/signListController.java b/src/main/java/com/emr/controller/signListController.java index afddef0e..cca9cf38 100644 --- a/src/main/java/com/emr/controller/signListController.java +++ b/src/main/java/com/emr/controller/signListController.java @@ -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 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 "采集计划已生成！"; } diff --git a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java new file mode 100644 index 00000000..55129b9d --- /dev/null +++ b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java @@ -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 selectByExample(ArchiveOtherExtExample example); + + ArchiveOtherExt selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(ArchiveOtherExt record); + + int updateByPrimaryKey(ArchiveOtherExt record); +} \ No newline at end of file diff --git a/src/main/java/com/emr/entity/ArchiveOtherExt.java b/src/main/java/com/emr/entity/ArchiveOtherExt.java new file mode 100644 index 00000000..4acfeca9 --- /dev/null +++ b/src/main/java/com/emr/entity/ArchiveOtherExt.java @@ -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; + } +} \ No newline at end of file diff --git a/src/main/java/com/emr/entity/ArchiveOtherExtExample.java b/src/main/java/com/emr/entity/ArchiveOtherExtExample.java new file mode 100644 index 00000000..7e17bd9d --- /dev/null +++ b/src/main/java/com/emr/entity/ArchiveOtherExtExample.java @@ -0,0 +1,2342 @@ +package com.emr.entity; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ArchiveOtherExtExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ArchiveOtherExtExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("ID is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("ID is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("ID =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("ID <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("ID >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("ID >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("ID <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("ID <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("ID not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("ID between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("ID not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andSyctimeIsNull() { + addCriterion("SycTime is null"); + return (Criteria) this; + } + + public Criteria andSyctimeIsNotNull() { + addCriterion("SycTime is not null"); + return (Criteria) this; + } + + public Criteria andSyctimeEqualTo(Date value) { + addCriterion("SycTime =", value, "syctime"); + return (Criteria) this; + } + + public Criteria andSyctimeNotEqualTo(Date value) { + addCriterion("SycTime <>", value, "syctime"); + return (Criteria) this; + } + + public Criteria andSyctimeGreaterThan(Date value) { + addCriterion("SycTime >", value, "syctime"); + return (Criteria) this; + } + + public Criteria andSyctimeGreaterThanOrEqualTo(Date value) { + addCriterion("SycTime >=", value, "syctime"); + return (Criteria) this; + } + + public Criteria andSyctimeLessThan(Date value) { + addCriterion("SycTime <", value, "syctime"); + return (Criteria) this; + } + + public Criteria andSyctimeLessThanOrEqualTo(Date value) { + addCriterion("SycTime <=", value, "syctime"); + return (Criteria) this; + } + + public Criteria andSyctimeIn(List values) { + addCriterion("SycTime in", values, "syctime"); + return (Criteria) this; + } + + public Criteria andSyctimeNotIn(List values) { + addCriterion("SycTime not in", values, "syctime"); + return (Criteria) this; + } + + public Criteria andSyctimeBetween(Date value1, Date value2) { + addCriterion("SycTime between", value1, value2, "syctime"); + return (Criteria) this; + } + + public Criteria andSyctimeNotBetween(Date value1, Date value2) { + addCriterion("SycTime not between", value1, value2, "syctime"); + return (Criteria) this; + } + + public Criteria andSycobjIsNull() { + addCriterion("SycObj is null"); + return (Criteria) this; + } + + public Criteria andSycobjIsNotNull() { + addCriterion("SycObj is not null"); + return (Criteria) this; + } + + public Criteria andSycobjEqualTo(String value) { + addCriterion("SycObj =", value, "sycobj"); + return (Criteria) this; + } + + public Criteria andSycobjNotEqualTo(String value) { + addCriterion("SycObj <>", value, "sycobj"); + return (Criteria) this; + } + + public Criteria andSycobjGreaterThan(String value) { + addCriterion("SycObj >", value, "sycobj"); + return (Criteria) this; + } + + public Criteria andSycobjGreaterThanOrEqualTo(String value) { + addCriterion("SycObj >=", value, "sycobj"); + return (Criteria) this; + } + + public Criteria andSycobjLessThan(String value) { + addCriterion("SycObj <", value, "sycobj"); + return (Criteria) this; + } + + public Criteria andSycobjLessThanOrEqualTo(String value) { + addCriterion("SycObj <=", value, "sycobj"); + return (Criteria) this; + } + + public Criteria andSycobjLike(String value) { + addCriterion("SycObj like", value, "sycobj"); + return (Criteria) this; + } + + public Criteria andSycobjNotLike(String value) { + addCriterion("SycObj not like", value, "sycobj"); + return (Criteria) this; + } + + public Criteria andSycobjIn(List values) { + addCriterion("SycObj in", values, "sycobj"); + return (Criteria) this; + } + + public Criteria andSycobjNotIn(List values) { + addCriterion("SycObj not in", values, "sycobj"); + return (Criteria) this; + } + + public Criteria andSycobjBetween(String value1, String value2) { + addCriterion("SycObj between", value1, value2, "sycobj"); + return (Criteria) this; + } + + public Criteria andSycobjNotBetween(String value1, String value2) { + addCriterion("SycObj not between", value1, value2, "sycobj"); + return (Criteria) this; + } + + public Criteria andOtheridIsNull() { + addCriterion("otherID is null"); + return (Criteria) this; + } + + public Criteria andOtheridIsNotNull() { + addCriterion("otherID is not null"); + return (Criteria) this; + } + + public Criteria andOtheridEqualTo(Long value) { + addCriterion("otherID =", value, "otherid"); + return (Criteria) this; + } + + public Criteria andOtheridNotEqualTo(Long value) { + addCriterion("otherID <>", value, "otherid"); + return (Criteria) this; + } + + public Criteria andOtheridGreaterThan(Long value) { + addCriterion("otherID >", value, "otherid"); + return (Criteria) this; + } + + public Criteria andOtheridGreaterThanOrEqualTo(Long value) { + addCriterion("otherID >=", value, "otherid"); + return (Criteria) this; + } + + public Criteria andOtheridLessThan(Long value) { + addCriterion("otherID <", value, "otherid"); + return (Criteria) this; + } + + public Criteria andOtheridLessThanOrEqualTo(Long value) { + addCriterion("otherID <=", value, "otherid"); + return (Criteria) this; + } + + public Criteria andOtheridIn(List values) { + addCriterion("otherID in", values, "otherid"); + return (Criteria) this; + } + + public Criteria andOtheridNotIn(List values) { + addCriterion("otherID not in", values, "otherid"); + return (Criteria) this; + } + + public Criteria andOtheridBetween(Long value1, Long value2) { + addCriterion("otherID between", value1, value2, "otherid"); + return (Criteria) this; + } + + public Criteria andOtheridNotBetween(Long value1, Long value2) { + addCriterion("otherID not between", value1, value2, "otherid"); + return (Criteria) this; + } + + public Criteria andSysflagIsNull() { + addCriterion("sysFlag is null"); + return (Criteria) this; + } + + public Criteria andSysflagIsNotNull() { + addCriterion("sysFlag is not null"); + return (Criteria) this; + } + + public Criteria andSysflagEqualTo(Integer value) { + addCriterion("sysFlag =", value, "sysflag"); + return (Criteria) this; + } + + public Criteria andSysflagNotEqualTo(Integer value) { + addCriterion("sysFlag <>", value, "sysflag"); + return (Criteria) this; + } + + public Criteria andSysflagGreaterThan(Integer value) { + addCriterion("sysFlag >", value, "sysflag"); + return (Criteria) this; + } + + public Criteria andSysflagGreaterThanOrEqualTo(Integer value) { + addCriterion("sysFlag >=", value, "sysflag"); + return (Criteria) this; + } + + public Criteria andSysflagLessThan(Integer value) { + addCriterion("sysFlag <", value, "sysflag"); + return (Criteria) this; + } + + public Criteria andSysflagLessThanOrEqualTo(Integer value) { + addCriterion("sysFlag <=", value, "sysflag"); + return (Criteria) this; + } + + public Criteria andSysflagIn(List values) { + addCriterion("sysFlag in", values, "sysflag"); + return (Criteria) this; + } + + public Criteria andSysflagNotIn(List values) { + addCriterion("sysFlag not in", values, "sysflag"); + return (Criteria) this; + } + + public Criteria andSysflagBetween(Integer value1, Integer value2) { + addCriterion("sysFlag between", value1, value2, "sysflag"); + return (Criteria) this; + } + + public Criteria andSysflagNotBetween(Integer value1, Integer value2) { + addCriterion("sysFlag not between", value1, value2, "sysflag"); + return (Criteria) this; + } + + public Criteria andSysupdatetimeIsNull() { + addCriterion("sysUpdateTime is null"); + return (Criteria) this; + } + + public Criteria andSysupdatetimeIsNotNull() { + addCriterion("sysUpdateTime is not null"); + return (Criteria) this; + } + + public Criteria andSysupdatetimeEqualTo(Date value) { + addCriterion("sysUpdateTime =", value, "sysupdatetime"); + return (Criteria) this; + } + + public Criteria andSysupdatetimeNotEqualTo(Date value) { + addCriterion("sysUpdateTime <>", value, "sysupdatetime"); + return (Criteria) this; + } + + public Criteria andSysupdatetimeGreaterThan(Date value) { + addCriterion("sysUpdateTime >", value, "sysupdatetime"); + return (Criteria) this; + } + + public Criteria andSysupdatetimeGreaterThanOrEqualTo(Date value) { + addCriterion("sysUpdateTime >=", value, "sysupdatetime"); + return (Criteria) this; + } + + public Criteria andSysupdatetimeLessThan(Date value) { + addCriterion("sysUpdateTime <", value, "sysupdatetime"); + return (Criteria) this; + } + + public Criteria andSysupdatetimeLessThanOrEqualTo(Date value) { + addCriterion("sysUpdateTime <=", value, "sysupdatetime"); + return (Criteria) this; + } + + public Criteria andSysupdatetimeIn(List values) { + addCriterion("sysUpdateTime in", values, "sysupdatetime"); + return (Criteria) this; + } + + public Criteria andSysupdatetimeNotIn(List values) { + addCriterion("sysUpdateTime not in", values, "sysupdatetime"); + return (Criteria) this; + } + + public Criteria andSysupdatetimeBetween(Date value1, Date value2) { + addCriterion("sysUpdateTime between", value1, value2, "sysupdatetime"); + return (Criteria) this; + } + + public Criteria andSysupdatetimeNotBetween(Date value1, Date value2) { + addCriterion("sysUpdateTime not between", value1, value2, "sysupdatetime"); + return (Criteria) this; + } + + public Criteria andJzhIsNull() { + addCriterion("jzh is null"); + return (Criteria) this; + } + + public Criteria andJzhIsNotNull() { + addCriterion("jzh is not null"); + return (Criteria) this; + } + + public Criteria andJzhEqualTo(String value) { + addCriterion("jzh =", value, "jzh"); + return (Criteria) this; + } + + public Criteria andJzhNotEqualTo(String value) { + addCriterion("jzh <>", value, "jzh"); + return (Criteria) this; + } + + public Criteria andJzhGreaterThan(String value) { + addCriterion("jzh >", value, "jzh"); + return (Criteria) this; + } + + public Criteria andJzhGreaterThanOrEqualTo(String value) { + addCriterion("jzh >=", value, "jzh"); + return (Criteria) this; + } + + public Criteria andJzhLessThan(String value) { + addCriterion("jzh <", value, "jzh"); + return (Criteria) this; + } + + public Criteria andJzhLessThanOrEqualTo(String value) { + addCriterion("jzh <=", value, "jzh"); + return (Criteria) this; + } + + public Criteria andJzhLike(String value) { + addCriterion("jzh like", value, "jzh"); + return (Criteria) this; + } + + public Criteria andJzhNotLike(String value) { + addCriterion("jzh not like", value, "jzh"); + return (Criteria) this; + } + + public Criteria andJzhIn(List values) { + addCriterion("jzh in", values, "jzh"); + return (Criteria) this; + } + + public Criteria andJzhNotIn(List values) { + addCriterion("jzh not in", values, "jzh"); + return (Criteria) this; + } + + public Criteria andJzhBetween(String value1, String value2) { + addCriterion("jzh between", value1, value2, "jzh"); + return (Criteria) this; + } + + public Criteria andJzhNotBetween(String value1, String value2) { + addCriterion("jzh not between", value1, value2, "jzh"); + return (Criteria) this; + } + + public Criteria andZyhIsNull() { + addCriterion("zyh is null"); + return (Criteria) this; + } + + public Criteria andZyhIsNotNull() { + addCriterion("zyh is not null"); + return (Criteria) this; + } + + public Criteria andZyhEqualTo(String value) { + addCriterion("zyh =", value, "zyh"); + return (Criteria) this; + } + + public Criteria andZyhNotEqualTo(String value) { + addCriterion("zyh <>", value, "zyh"); + return (Criteria) this; + } + + public Criteria andZyhGreaterThan(String value) { + addCriterion("zyh >", value, "zyh"); + return (Criteria) this; + } + + public Criteria andZyhGreaterThanOrEqualTo(String value) { + addCriterion("zyh >=", value, "zyh"); + return (Criteria) this; + } + + public Criteria andZyhLessThan(String value) { + addCriterion("zyh <", value, "zyh"); + return (Criteria) this; + } + + public Criteria andZyhLessThanOrEqualTo(String value) { + addCriterion("zyh <=", value, "zyh"); + return (Criteria) this; + } + + public Criteria andZyhLike(String value) { + addCriterion("zyh like", value, "zyh"); + return (Criteria) this; + } + + public Criteria andZyhNotLike(String value) { + addCriterion("zyh not like", value, "zyh"); + return (Criteria) this; + } + + public Criteria andZyhIn(List values) { + addCriterion("zyh in", values, "zyh"); + return (Criteria) this; + } + + public Criteria andZyhNotIn(List values) { + addCriterion("zyh not in", values, "zyh"); + return (Criteria) this; + } + + public Criteria andZyhBetween(String value1, String value2) { + addCriterion("zyh between", value1, value2, "zyh"); + return (Criteria) this; + } + + public Criteria andZyhNotBetween(String value1, String value2) { + addCriterion("zyh not between", value1, value2, "zyh"); + return (Criteria) this; + } + + public Criteria andStimeIsNull() { + addCriterion("stime is null"); + return (Criteria) this; + } + + public Criteria andStimeIsNotNull() { + addCriterion("stime is not null"); + return (Criteria) this; + } + + public Criteria andStimeEqualTo(Date value) { + addCriterion("stime =", value, "stime"); + return (Criteria) this; + } + + public Criteria andStimeNotEqualTo(Date value) { + addCriterion("stime <>", value, "stime"); + return (Criteria) this; + } + + public Criteria andStimeGreaterThan(Date value) { + addCriterion("stime >", value, "stime"); + return (Criteria) this; + } + + public Criteria andStimeGreaterThanOrEqualTo(Date value) { + addCriterion("stime >=", value, "stime"); + return (Criteria) this; + } + + public Criteria andStimeLessThan(Date value) { + addCriterion("stime <", value, "stime"); + return (Criteria) this; + } + + public Criteria andStimeLessThanOrEqualTo(Date value) { + addCriterion("stime <=", value, "stime"); + return (Criteria) this; + } + + public Criteria andStimeIn(List values) { + addCriterion("stime in", values, "stime"); + return (Criteria) this; + } + + public Criteria andStimeNotIn(List values) { + addCriterion("stime not in", values, "stime"); + return (Criteria) this; + } + + public Criteria andStimeBetween(Date value1, Date value2) { + addCriterion("stime between", value1, value2, "stime"); + return (Criteria) this; + } + + public Criteria andStimeNotBetween(Date value1, Date value2) { + addCriterion("stime not between", value1, value2, "stime"); + return (Criteria) this; + } + + public Criteria andEtimeIsNull() { + addCriterion("eTime is null"); + return (Criteria) this; + } + + public Criteria andEtimeIsNotNull() { + addCriterion("eTime is not null"); + return (Criteria) this; + } + + public Criteria andEtimeEqualTo(Date value) { + addCriterion("eTime =", value, "etime"); + return (Criteria) this; + } + + public Criteria andEtimeNotEqualTo(Date value) { + addCriterion("eTime <>", value, "etime"); + return (Criteria) this; + } + + public Criteria andEtimeGreaterThan(Date value) { + addCriterion("eTime >", value, "etime"); + return (Criteria) this; + } + + public Criteria andEtimeGreaterThanOrEqualTo(Date value) { + addCriterion("eTime >=", value, "etime"); + return (Criteria) this; + } + + public Criteria andEtimeLessThan(Date value) { + addCriterion("eTime <", value, "etime"); + return (Criteria) this; + } + + public Criteria andEtimeLessThanOrEqualTo(Date value) { + addCriterion("eTime <=", value, "etime"); + return (Criteria) this; + } + + public Criteria andEtimeIn(List values) { + addCriterion("eTime in", values, "etime"); + return (Criteria) this; + } + + public Criteria andEtimeNotIn(List values) { + addCriterion("eTime not in", values, "etime"); + return (Criteria) this; + } + + public Criteria andEtimeBetween(Date value1, Date value2) { + addCriterion("eTime between", value1, value2, "etime"); + return (Criteria) this; + } + + public Criteria andEtimeNotBetween(Date value1, Date value2) { + addCriterion("eTime not between", value1, value2, "etime"); + return (Criteria) this; + } + + public Criteria andStatusflagIsNull() { + addCriterion("statusFlag is null"); + return (Criteria) this; + } + + public Criteria andStatusflagIsNotNull() { + addCriterion("statusFlag is not null"); + return (Criteria) this; + } + + public Criteria andStatusflagEqualTo(Integer value) { + addCriterion("statusFlag =", value, "statusflag"); + return (Criteria) this; + } + + public Criteria andStatusflagNotEqualTo(Integer value) { + addCriterion("statusFlag <>", value, "statusflag"); + return (Criteria) this; + } + + public Criteria andStatusflagGreaterThan(Integer value) { + addCriterion("statusFlag >", value, "statusflag"); + return (Criteria) this; + } + + public Criteria andStatusflagGreaterThanOrEqualTo(Integer value) { + addCriterion("statusFlag >=", value, "statusflag"); + return (Criteria) this; + } + + public Criteria andStatusflagLessThan(Integer value) { + addCriterion("statusFlag <", value, "statusflag"); + return (Criteria) this; + } + + public Criteria andStatusflagLessThanOrEqualTo(Integer value) { + addCriterion("statusFlag <=", value, "statusflag"); + return (Criteria) this; + } + + public Criteria andStatusflagIn(List values) { + addCriterion("statusFlag in", values, "statusflag"); + return (Criteria) this; + } + + public Criteria andStatusflagNotIn(List values) { + addCriterion("statusFlag not in", values, "statusflag"); + return (Criteria) this; + } + + public Criteria andStatusflagBetween(Integer value1, Integer value2) { + addCriterion("statusFlag between", value1, value2, "statusflag"); + return (Criteria) this; + } + + public Criteria andStatusflagNotBetween(Integer value1, Integer value2) { + addCriterion("statusFlag not between", value1, value2, "statusflag"); + return (Criteria) this; + } + + public Criteria andPresultIsNull() { + addCriterion("pResult is null"); + return (Criteria) this; + } + + public Criteria andPresultIsNotNull() { + addCriterion("pResult is not null"); + return (Criteria) this; + } + + public Criteria andPresultEqualTo(String value) { + addCriterion("pResult =", value, "presult"); + return (Criteria) this; + } + + public Criteria andPresultNotEqualTo(String value) { + addCriterion("pResult <>", value, "presult"); + return (Criteria) this; + } + + public Criteria andPresultGreaterThan(String value) { + addCriterion("pResult >", value, "presult"); + return (Criteria) this; + } + + public Criteria andPresultGreaterThanOrEqualTo(String value) { + addCriterion("pResult >=", value, "presult"); + return (Criteria) this; + } + + public Criteria andPresultLessThan(String value) { + addCriterion("pResult <", value, "presult"); + return (Criteria) this; + } + + public Criteria andPresultLessThanOrEqualTo(String value) { + addCriterion("pResult <=", value, "presult"); + return (Criteria) this; + } + + public Criteria andPresultLike(String value) { + addCriterion("pResult like", value, "presult"); + return (Criteria) this; + } + + public Criteria andPresultNotLike(String value) { + addCriterion("pResult not like", value, "presult"); + return (Criteria) this; + } + + public Criteria andPresultIn(List values) { + addCriterion("pResult in", values, "presult"); + return (Criteria) this; + } + + public Criteria andPresultNotIn(List values) { + addCriterion("pResult not in", values, "presult"); + return (Criteria) this; + } + + public Criteria andPresultBetween(String value1, String value2) { + addCriterion("pResult between", value1, value2, "presult"); + return (Criteria) this; + } + + public Criteria andPresultNotBetween(String value1, String value2) { + addCriterion("pResult not between", value1, value2, "presult"); + return (Criteria) this; + } + + public Criteria andMidIsNull() { + addCriterion("MID is null"); + return (Criteria) this; + } + + public Criteria andMidIsNotNull() { + addCriterion("MID is not null"); + return (Criteria) this; + } + + public Criteria andMidEqualTo(String value) { + addCriterion("MID =", value, "mid"); + return (Criteria) this; + } + + public Criteria andMidNotEqualTo(String value) { + addCriterion("MID <>", value, "mid"); + return (Criteria) this; + } + + public Criteria andMidGreaterThan(String value) { + addCriterion("MID >", value, "mid"); + return (Criteria) this; + } + + public Criteria andMidGreaterThanOrEqualTo(String value) { + addCriterion("MID >=", value, "mid"); + return (Criteria) this; + } + + public Criteria andMidLessThan(String value) { + addCriterion("MID <", value, "mid"); + return (Criteria) this; + } + + public Criteria andMidLessThanOrEqualTo(String value) { + addCriterion("MID <=", value, "mid"); + return (Criteria) this; + } + + public Criteria andMidLike(String value) { + addCriterion("MID like", value, "mid"); + return (Criteria) this; + } + + public Criteria andMidNotLike(String value) { + addCriterion("MID not like", value, "mid"); + return (Criteria) this; + } + + public Criteria andMidIn(List values) { + addCriterion("MID in", values, "mid"); + return (Criteria) this; + } + + public Criteria andMidNotIn(List values) { + addCriterion("MID not in", values, "mid"); + return (Criteria) this; + } + + public Criteria andMidBetween(String value1, String value2) { + addCriterion("MID between", value1, value2, "mid"); + return (Criteria) this; + } + + public Criteria andMidNotBetween(String value1, String value2) { + addCriterion("MID not between", value1, value2, "mid"); + return (Criteria) this; + } + + public Criteria andDidIsNull() { + addCriterion("DID is null"); + return (Criteria) this; + } + + public Criteria andDidIsNotNull() { + addCriterion("DID is not null"); + return (Criteria) this; + } + + public Criteria andDidEqualTo(String value) { + addCriterion("DID =", value, "did"); + return (Criteria) this; + } + + public Criteria andDidNotEqualTo(String value) { + addCriterion("DID <>", value, "did"); + return (Criteria) this; + } + + public Criteria andDidGreaterThan(String value) { + addCriterion("DID >", value, "did"); + return (Criteria) this; + } + + public Criteria andDidGreaterThanOrEqualTo(String value) { + addCriterion("DID >=", value, "did"); + return (Criteria) this; + } + + public Criteria andDidLessThan(String value) { + addCriterion("DID <", value, "did"); + return (Criteria) this; + } + + public Criteria andDidLessThanOrEqualTo(String value) { + addCriterion("DID <=", value, "did"); + return (Criteria) this; + } + + public Criteria andDidLike(String value) { + addCriterion("DID like", value, "did"); + return (Criteria) this; + } + + public Criteria andDidNotLike(String value) { + addCriterion("DID not like", value, "did"); + return (Criteria) this; + } + + public Criteria andDidIn(List values) { + addCriterion("DID in", values, "did"); + return (Criteria) this; + } + + public Criteria andDidNotIn(List values) { + addCriterion("DID not in", values, "did"); + return (Criteria) this; + } + + public Criteria andDidBetween(String value1, String value2) { + addCriterion("DID between", value1, value2, "did"); + return (Criteria) this; + } + + public Criteria andDidNotBetween(String value1, String value2) { + addCriterion("DID not between", value1, value2, "did"); + return (Criteria) this; + } + + public Criteria andC1IsNull() { + addCriterion("C1 is null"); + return (Criteria) this; + } + + public Criteria andC1IsNotNull() { + addCriterion("C1 is not null"); + return (Criteria) this; + } + + public Criteria andC1EqualTo(String value) { + addCriterion("C1 =", value, "c1"); + return (Criteria) this; + } + + public Criteria andC1NotEqualTo(String value) { + addCriterion("C1 <>", value, "c1"); + return (Criteria) this; + } + + public Criteria andC1GreaterThan(String value) { + addCriterion("C1 >", value, "c1"); + return (Criteria) this; + } + + public Criteria andC1GreaterThanOrEqualTo(String value) { + addCriterion("C1 >=", value, "c1"); + return (Criteria) this; + } + + public Criteria andC1LessThan(String value) { + addCriterion("C1 <", value, "c1"); + return (Criteria) this; + } + + public Criteria andC1LessThanOrEqualTo(String value) { + addCriterion("C1 <=", value, "c1"); + return (Criteria) this; + } + + public Criteria andC1Like(String value) { + addCriterion("C1 like", value, "c1"); + return (Criteria) this; + } + + public Criteria andC1NotLike(String value) { + addCriterion("C1 not like", value, "c1"); + return (Criteria) this; + } + + public Criteria andC1In(List values) { + addCriterion("C1 in", values, "c1"); + return (Criteria) this; + } + + public Criteria andC1NotIn(List values) { + addCriterion("C1 not in", values, "c1"); + return (Criteria) this; + } + + public Criteria andC1Between(String value1, String value2) { + addCriterion("C1 between", value1, value2, "c1"); + return (Criteria) this; + } + + public Criteria andC1NotBetween(String value1, String value2) { + addCriterion("C1 not between", value1, value2, "c1"); + return (Criteria) this; + } + + public Criteria andC2IsNull() { + addCriterion("C2 is null"); + return (Criteria) this; + } + + public Criteria andC2IsNotNull() { + addCriterion("C2 is not null"); + return (Criteria) this; + } + + public Criteria andC2EqualTo(String value) { + addCriterion("C2 =", value, "c2"); + return (Criteria) this; + } + + public Criteria andC2NotEqualTo(String value) { + addCriterion("C2 <>", value, "c2"); + return (Criteria) this; + } + + public Criteria andC2GreaterThan(String value) { + addCriterion("C2 >", value, "c2"); + return (Criteria) this; + } + + public Criteria andC2GreaterThanOrEqualTo(String value) { + addCriterion("C2 >=", value, "c2"); + return (Criteria) this; + } + + public Criteria andC2LessThan(String value) { + addCriterion("C2 <", value, "c2"); + return (Criteria) this; + } + + public Criteria andC2LessThanOrEqualTo(String value) { + addCriterion("C2 <=", value, "c2"); + return (Criteria) this; + } + + public Criteria andC2Like(String value) { + addCriterion("C2 like", value, "c2"); + return (Criteria) this; + } + + public Criteria andC2NotLike(String value) { + addCriterion("C2 not like", value, "c2"); + return (Criteria) this; + } + + public Criteria andC2In(List values) { + addCriterion("C2 in", values, "c2"); + return (Criteria) this; + } + + public Criteria andC2NotIn(List values) { + addCriterion("C2 not in", values, "c2"); + return (Criteria) this; + } + + public Criteria andC2Between(String value1, String value2) { + addCriterion("C2 between", value1, value2, "c2"); + return (Criteria) this; + } + + public Criteria andC2NotBetween(String value1, String value2) { + addCriterion("C2 not between", value1, value2, "c2"); + return (Criteria) this; + } + + public Criteria andC3IsNull() { + addCriterion("C3 is null"); + return (Criteria) this; + } + + public Criteria andC3IsNotNull() { + addCriterion("C3 is not null"); + return (Criteria) this; + } + + public Criteria andC3EqualTo(String value) { + addCriterion("C3 =", value, "c3"); + return (Criteria) this; + } + + public Criteria andC3NotEqualTo(String value) { + addCriterion("C3 <>", value, "c3"); + return (Criteria) this; + } + + public Criteria andC3GreaterThan(String value) { + addCriterion("C3 >", value, "c3"); + return (Criteria) this; + } + + public Criteria andC3GreaterThanOrEqualTo(String value) { + addCriterion("C3 >=", value, "c3"); + return (Criteria) this; + } + + public Criteria andC3LessThan(String value) { + addCriterion("C3 <", value, "c3"); + return (Criteria) this; + } + + public Criteria andC3LessThanOrEqualTo(String value) { + addCriterion("C3 <=", value, "c3"); + return (Criteria) this; + } + + public Criteria andC3Like(String value) { + addCriterion("C3 like", value, "c3"); + return (Criteria) this; + } + + public Criteria andC3NotLike(String value) { + addCriterion("C3 not like", value, "c3"); + return (Criteria) this; + } + + public Criteria andC3In(List values) { + addCriterion("C3 in", values, "c3"); + return (Criteria) this; + } + + public Criteria andC3NotIn(List values) { + addCriterion("C3 not in", values, "c3"); + return (Criteria) this; + } + + public Criteria andC3Between(String value1, String value2) { + addCriterion("C3 between", value1, value2, "c3"); + return (Criteria) this; + } + + public Criteria andC3NotBetween(String value1, String value2) { + addCriterion("C3 not between", value1, value2, "c3"); + return (Criteria) this; + } + + public Criteria andC4IsNull() { + addCriterion("C4 is null"); + return (Criteria) this; + } + + public Criteria andC4IsNotNull() { + addCriterion("C4 is not null"); + return (Criteria) this; + } + + public Criteria andC4EqualTo(String value) { + addCriterion("C4 =", value, "c4"); + return (Criteria) this; + } + + public Criteria andC4NotEqualTo(String value) { + addCriterion("C4 <>", value, "c4"); + return (Criteria) this; + } + + public Criteria andC4GreaterThan(String value) { + addCriterion("C4 >", value, "c4"); + return (Criteria) this; + } + + public Criteria andC4GreaterThanOrEqualTo(String value) { + addCriterion("C4 >=", value, "c4"); + return (Criteria) this; + } + + public Criteria andC4LessThan(String value) { + addCriterion("C4 <", value, "c4"); + return (Criteria) this; + } + + public Criteria andC4LessThanOrEqualTo(String value) { + addCriterion("C4 <=", value, "c4"); + return (Criteria) this; + } + + public Criteria andC4Like(String value) { + addCriterion("C4 like", value, "c4"); + return (Criteria) this; + } + + public Criteria andC4NotLike(String value) { + addCriterion("C4 not like", value, "c4"); + return (Criteria) this; + } + + public Criteria andC4In(List values) { + addCriterion("C4 in", values, "c4"); + return (Criteria) this; + } + + public Criteria andC4NotIn(List values) { + addCriterion("C4 not in", values, "c4"); + return (Criteria) this; + } + + public Criteria andC4Between(String value1, String value2) { + addCriterion("C4 between", value1, value2, "c4"); + return (Criteria) this; + } + + public Criteria andC4NotBetween(String value1, String value2) { + addCriterion("C4 not between", value1, value2, "c4"); + return (Criteria) this; + } + + public Criteria andC5IsNull() { + addCriterion("C5 is null"); + return (Criteria) this; + } + + public Criteria andC5IsNotNull() { + addCriterion("C5 is not null"); + return (Criteria) this; + } + + public Criteria andC5EqualTo(String value) { + addCriterion("C5 =", value, "c5"); + return (Criteria) this; + } + + public Criteria andC5NotEqualTo(String value) { + addCriterion("C5 <>", value, "c5"); + return (Criteria) this; + } + + public Criteria andC5GreaterThan(String value) { + addCriterion("C5 >", value, "c5"); + return (Criteria) this; + } + + public Criteria andC5GreaterThanOrEqualTo(String value) { + addCriterion("C5 >=", value, "c5"); + return (Criteria) this; + } + + public Criteria andC5LessThan(String value) { + addCriterion("C5 <", value, "c5"); + return (Criteria) this; + } + + public Criteria andC5LessThanOrEqualTo(String value) { + addCriterion("C5 <=", value, "c5"); + return (Criteria) this; + } + + public Criteria andC5Like(String value) { + addCriterion("C5 like", value, "c5"); + return (Criteria) this; + } + + public Criteria andC5NotLike(String value) { + addCriterion("C5 not like", value, "c5"); + return (Criteria) this; + } + + public Criteria andC5In(List values) { + addCriterion("C5 in", values, "c5"); + return (Criteria) this; + } + + public Criteria andC5NotIn(List values) { + addCriterion("C5 not in", values, "c5"); + return (Criteria) this; + } + + public Criteria andC5Between(String value1, String value2) { + addCriterion("C5 between", value1, value2, "c5"); + return (Criteria) this; + } + + public Criteria andC5NotBetween(String value1, String value2) { + addCriterion("C5 not between", value1, value2, "c5"); + return (Criteria) this; + } + + public Criteria andC6IsNull() { + addCriterion("C6 is null"); + return (Criteria) this; + } + + public Criteria andC6IsNotNull() { + addCriterion("C6 is not null"); + return (Criteria) this; + } + + public Criteria andC6EqualTo(String value) { + addCriterion("C6 =", value, "c6"); + return (Criteria) this; + } + + public Criteria andC6NotEqualTo(String value) { + addCriterion("C6 <>", value, "c6"); + return (Criteria) this; + } + + public Criteria andC6GreaterThan(String value) { + addCriterion("C6 >", value, "c6"); + return (Criteria) this; + } + + public Criteria andC6GreaterThanOrEqualTo(String value) { + addCriterion("C6 >=", value, "c6"); + return (Criteria) this; + } + + public Criteria andC6LessThan(String value) { + addCriterion("C6 <", value, "c6"); + return (Criteria) this; + } + + public Criteria andC6LessThanOrEqualTo(String value) { + addCriterion("C6 <=", value, "c6"); + return (Criteria) this; + } + + public Criteria andC6Like(String value) { + addCriterion("C6 like", value, "c6"); + return (Criteria) this; + } + + public Criteria andC6NotLike(String value) { + addCriterion("C6 not like", value, "c6"); + return (Criteria) this; + } + + public Criteria andC6In(List values) { + addCriterion("C6 in", values, "c6"); + return (Criteria) this; + } + + public Criteria andC6NotIn(List values) { + addCriterion("C6 not in", values, "c6"); + return (Criteria) this; + } + + public Criteria andC6Between(String value1, String value2) { + addCriterion("C6 between", value1, value2, "c6"); + return (Criteria) this; + } + + public Criteria andC6NotBetween(String value1, String value2) { + addCriterion("C6 not between", value1, value2, "c6"); + return (Criteria) this; + } + + public Criteria andC7IsNull() { + addCriterion("C7 is null"); + return (Criteria) this; + } + + public Criteria andC7IsNotNull() { + addCriterion("C7 is not null"); + return (Criteria) this; + } + + public Criteria andC7EqualTo(String value) { + addCriterion("C7 =", value, "c7"); + return (Criteria) this; + } + + public Criteria andC7NotEqualTo(String value) { + addCriterion("C7 <>", value, "c7"); + return (Criteria) this; + } + + public Criteria andC7GreaterThan(String value) { + addCriterion("C7 >", value, "c7"); + return (Criteria) this; + } + + public Criteria andC7GreaterThanOrEqualTo(String value) { + addCriterion("C7 >=", value, "c7"); + return (Criteria) this; + } + + public Criteria andC7LessThan(String value) { + addCriterion("C7 <", value, "c7"); + return (Criteria) this; + } + + public Criteria andC7LessThanOrEqualTo(String value) { + addCriterion("C7 <=", value, "c7"); + return (Criteria) this; + } + + public Criteria andC7Like(String value) { + addCriterion("C7 like", value, "c7"); + return (Criteria) this; + } + + public Criteria andC7NotLike(String value) { + addCriterion("C7 not like", value, "c7"); + return (Criteria) this; + } + + public Criteria andC7In(List values) { + addCriterion("C7 in", values, "c7"); + return (Criteria) this; + } + + public Criteria andC7NotIn(List values) { + addCriterion("C7 not in", values, "c7"); + return (Criteria) this; + } + + public Criteria andC7Between(String value1, String value2) { + addCriterion("C7 between", value1, value2, "c7"); + return (Criteria) this; + } + + public Criteria andC7NotBetween(String value1, String value2) { + addCriterion("C7 not between", value1, value2, "c7"); + return (Criteria) this; + } + + public Criteria andC8IsNull() { + addCriterion("C8 is null"); + return (Criteria) this; + } + + public Criteria andC8IsNotNull() { + addCriterion("C8 is not null"); + return (Criteria) this; + } + + public Criteria andC8EqualTo(String value) { + addCriterion("C8 =", value, "c8"); + return (Criteria) this; + } + + public Criteria andC8NotEqualTo(String value) { + addCriterion("C8 <>", value, "c8"); + return (Criteria) this; + } + + public Criteria andC8GreaterThan(String value) { + addCriterion("C8 >", value, "c8"); + return (Criteria) this; + } + + public Criteria andC8GreaterThanOrEqualTo(String value) { + addCriterion("C8 >=", value, "c8"); + return (Criteria) this; + } + + public Criteria andC8LessThan(String value) { + addCriterion("C8 <", value, "c8"); + return (Criteria) this; + } + + public Criteria andC8LessThanOrEqualTo(String value) { + addCriterion("C8 <=", value, "c8"); + return (Criteria) this; + } + + public Criteria andC8Like(String value) { + addCriterion("C8 like", value, "c8"); + return (Criteria) this; + } + + public Criteria andC8NotLike(String value) { + addCriterion("C8 not like", value, "c8"); + return (Criteria) this; + } + + public Criteria andC8In(List values) { + addCriterion("C8 in", values, "c8"); + return (Criteria) this; + } + + public Criteria andC8NotIn(List values) { + addCriterion("C8 not in", values, "c8"); + return (Criteria) this; + } + + public Criteria andC8Between(String value1, String value2) { + addCriterion("C8 between", value1, value2, "c8"); + return (Criteria) this; + } + + public Criteria andC8NotBetween(String value1, String value2) { + addCriterion("C8 not between", value1, value2, "c8"); + return (Criteria) this; + } + + public Criteria andC9IsNull() { + addCriterion("C9 is null"); + return (Criteria) this; + } + + public Criteria andC9IsNotNull() { + addCriterion("C9 is not null"); + return (Criteria) this; + } + + public Criteria andC9EqualTo(String value) { + addCriterion("C9 =", value, "c9"); + return (Criteria) this; + } + + public Criteria andC9NotEqualTo(String value) { + addCriterion("C9 <>", value, "c9"); + return (Criteria) this; + } + + public Criteria andC9GreaterThan(String value) { + addCriterion("C9 >", value, "c9"); + return (Criteria) this; + } + + public Criteria andC9GreaterThanOrEqualTo(String value) { + addCriterion("C9 >=", value, "c9"); + return (Criteria) this; + } + + public Criteria andC9LessThan(String value) { + addCriterion("C9 <", value, "c9"); + return (Criteria) this; + } + + public Criteria andC9LessThanOrEqualTo(String value) { + addCriterion("C9 <=", value, "c9"); + return (Criteria) this; + } + + public Criteria andC9Like(String value) { + addCriterion("C9 like", value, "c9"); + return (Criteria) this; + } + + public Criteria andC9NotLike(String value) { + addCriterion("C9 not like", value, "c9"); + return (Criteria) this; + } + + public Criteria andC9In(List values) { + addCriterion("C9 in", values, "c9"); + return (Criteria) this; + } + + public Criteria andC9NotIn(List values) { + addCriterion("C9 not in", values, "c9"); + return (Criteria) this; + } + + public Criteria andC9Between(String value1, String value2) { + addCriterion("C9 between", value1, value2, "c9"); + return (Criteria) this; + } + + public Criteria andC9NotBetween(String value1, String value2) { + addCriterion("C9 not between", value1, value2, "c9"); + return (Criteria) this; + } + + public Criteria andC10IsNull() { + addCriterion("C10 is null"); + return (Criteria) this; + } + + public Criteria andC10IsNotNull() { + addCriterion("C10 is not null"); + return (Criteria) this; + } + + public Criteria andC10EqualTo(String value) { + addCriterion("C10 =", value, "c10"); + return (Criteria) this; + } + + public Criteria andC10NotEqualTo(String value) { + addCriterion("C10 <>", value, "c10"); + return (Criteria) this; + } + + public Criteria andC10GreaterThan(String value) { + addCriterion("C10 >", value, "c10"); + return (Criteria) this; + } + + public Criteria andC10GreaterThanOrEqualTo(String value) { + addCriterion("C10 >=", value, "c10"); + return (Criteria) this; + } + + public Criteria andC10LessThan(String value) { + addCriterion("C10 <", value, "c10"); + return (Criteria) this; + } + + public Criteria andC10LessThanOrEqualTo(String value) { + addCriterion("C10 <=", value, "c10"); + return (Criteria) this; + } + + public Criteria andC10Like(String value) { + addCriterion("C10 like", value, "c10"); + return (Criteria) this; + } + + public Criteria andC10NotLike(String value) { + addCriterion("C10 not like", value, "c10"); + return (Criteria) this; + } + + public Criteria andC10In(List values) { + addCriterion("C10 in", values, "c10"); + return (Criteria) this; + } + + public Criteria andC10NotIn(List values) { + addCriterion("C10 not in", values, "c10"); + return (Criteria) this; + } + + public Criteria andC10Between(String value1, String value2) { + addCriterion("C10 between", value1, value2, "c10"); + return (Criteria) this; + } + + public Criteria andC10NotBetween(String value1, String value2) { + addCriterion("C10 not between", value1, value2, "c10"); + return (Criteria) this; + } + + public Criteria andN1IsNull() { + addCriterion("N1 is null"); + return (Criteria) this; + } + + public Criteria andN1IsNotNull() { + addCriterion("N1 is not null"); + return (Criteria) this; + } + + public Criteria andN1EqualTo(BigDecimal value) { + addCriterion("N1 =", value, "n1"); + return (Criteria) this; + } + + public Criteria andN1NotEqualTo(BigDecimal value) { + addCriterion("N1 <>", value, "n1"); + return (Criteria) this; + } + + public Criteria andN1GreaterThan(BigDecimal value) { + addCriterion("N1 >", value, "n1"); + return (Criteria) this; + } + + public Criteria andN1GreaterThanOrEqualTo(BigDecimal value) { + addCriterion("N1 >=", value, "n1"); + return (Criteria) this; + } + + public Criteria andN1LessThan(BigDecimal value) { + addCriterion("N1 <", value, "n1"); + return (Criteria) this; + } + + public Criteria andN1LessThanOrEqualTo(BigDecimal value) { + addCriterion("N1 <=", value, "n1"); + return (Criteria) this; + } + + public Criteria andN1In(List values) { + addCriterion("N1 in", values, "n1"); + return (Criteria) this; + } + + public Criteria andN1NotIn(List values) { + addCriterion("N1 not in", values, "n1"); + return (Criteria) this; + } + + public Criteria andN1Between(BigDecimal value1, BigDecimal value2) { + addCriterion("N1 between", value1, value2, "n1"); + return (Criteria) this; + } + + public Criteria andN1NotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("N1 not between", value1, value2, "n1"); + return (Criteria) this; + } + + public Criteria andN2IsNull() { + addCriterion("N2 is null"); + return (Criteria) this; + } + + public Criteria andN2IsNotNull() { + addCriterion("N2 is not null"); + return (Criteria) this; + } + + public Criteria andN2EqualTo(BigDecimal value) { + addCriterion("N2 =", value, "n2"); + return (Criteria) this; + } + + public Criteria andN2NotEqualTo(BigDecimal value) { + addCriterion("N2 <>", value, "n2"); + return (Criteria) this; + } + + public Criteria andN2GreaterThan(BigDecimal value) { + addCriterion("N2 >", value, "n2"); + return (Criteria) this; + } + + public Criteria andN2GreaterThanOrEqualTo(BigDecimal value) { + addCriterion("N2 >=", value, "n2"); + return (Criteria) this; + } + + public Criteria andN2LessThan(BigDecimal value) { + addCriterion("N2 <", value, "n2"); + return (Criteria) this; + } + + public Criteria andN2LessThanOrEqualTo(BigDecimal value) { + addCriterion("N2 <=", value, "n2"); + return (Criteria) this; + } + + public Criteria andN2In(List values) { + addCriterion("N2 in", values, "n2"); + return (Criteria) this; + } + + public Criteria andN2NotIn(List values) { + addCriterion("N2 not in", values, "n2"); + return (Criteria) this; + } + + public Criteria andN2Between(BigDecimal value1, BigDecimal value2) { + addCriterion("N2 between", value1, value2, "n2"); + return (Criteria) this; + } + + public Criteria andN2NotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("N2 not between", value1, value2, "n2"); + return (Criteria) this; + } + + public Criteria andN3IsNull() { + addCriterion("N3 is null"); + return (Criteria) this; + } + + public Criteria andN3IsNotNull() { + addCriterion("N3 is not null"); + return (Criteria) this; + } + + public Criteria andN3EqualTo(BigDecimal value) { + addCriterion("N3 =", value, "n3"); + return (Criteria) this; + } + + public Criteria andN3NotEqualTo(BigDecimal value) { + addCriterion("N3 <>", value, "n3"); + return (Criteria) this; + } + + public Criteria andN3GreaterThan(BigDecimal value) { + addCriterion("N3 >", value, "n3"); + return (Criteria) this; + } + + public Criteria andN3GreaterThanOrEqualTo(BigDecimal value) { + addCriterion("N3 >=", value, "n3"); + return (Criteria) this; + } + + public Criteria andN3LessThan(BigDecimal value) { + addCriterion("N3 <", value, "n3"); + return (Criteria) this; + } + + public Criteria andN3LessThanOrEqualTo(BigDecimal value) { + addCriterion("N3 <=", value, "n3"); + return (Criteria) this; + } + + public Criteria andN3In(List values) { + addCriterion("N3 in", values, "n3"); + return (Criteria) this; + } + + public Criteria andN3NotIn(List values) { + addCriterion("N3 not in", values, "n3"); + return (Criteria) this; + } + + public Criteria andN3Between(BigDecimal value1, BigDecimal value2) { + addCriterion("N3 between", value1, value2, "n3"); + return (Criteria) this; + } + + public Criteria andN3NotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("N3 not between", value1, value2, "n3"); + return (Criteria) this; + } + + public Criteria andT1IsNull() { + addCriterion("T1 is null"); + return (Criteria) this; + } + + public Criteria andT1IsNotNull() { + addCriterion("T1 is not null"); + return (Criteria) this; + } + + public Criteria andT1EqualTo(Date value) { + addCriterion("T1 =", value, "t1"); + return (Criteria) this; + } + + public Criteria andT1NotEqualTo(Date value) { + addCriterion("T1 <>", value, "t1"); + return (Criteria) this; + } + + public Criteria andT1GreaterThan(Date value) { + addCriterion("T1 >", value, "t1"); + return (Criteria) this; + } + + public Criteria andT1GreaterThanOrEqualTo(Date value) { + addCriterion("T1 >=", value, "t1"); + return (Criteria) this; + } + + public Criteria andT1LessThan(Date value) { + addCriterion("T1 <", value, "t1"); + return (Criteria) this; + } + + public Criteria andT1LessThanOrEqualTo(Date value) { + addCriterion("T1 <=", value, "t1"); + return (Criteria) this; + } + + public Criteria andT1In(List values) { + addCriterion("T1 in", values, "t1"); + return (Criteria) this; + } + + public Criteria andT1NotIn(List values) { + addCriterion("T1 not in", values, "t1"); + return (Criteria) this; + } + + public Criteria andT1Between(Date value1, Date value2) { + addCriterion("T1 between", value1, value2, "t1"); + return (Criteria) this; + } + + public Criteria andT1NotBetween(Date value1, Date value2) { + addCriterion("T1 not between", value1, value2, "t1"); + return (Criteria) this; + } + + public Criteria andT2IsNull() { + addCriterion("T2 is null"); + return (Criteria) this; + } + + public Criteria andT2IsNotNull() { + addCriterion("T2 is not null"); + return (Criteria) this; + } + + public Criteria andT2EqualTo(Date value) { + addCriterion("T2 =", value, "t2"); + return (Criteria) this; + } + + public Criteria andT2NotEqualTo(Date value) { + addCriterion("T2 <>", value, "t2"); + return (Criteria) this; + } + + public Criteria andT2GreaterThan(Date value) { + addCriterion("T2 >", value, "t2"); + return (Criteria) this; + } + + public Criteria andT2GreaterThanOrEqualTo(Date value) { + addCriterion("T2 >=", value, "t2"); + return (Criteria) this; + } + + public Criteria andT2LessThan(Date value) { + addCriterion("T2 <", value, "t2"); + return (Criteria) this; + } + + public Criteria andT2LessThanOrEqualTo(Date value) { + addCriterion("T2 <=", value, "t2"); + return (Criteria) this; + } + + public Criteria andT2In(List values) { + addCriterion("T2 in", values, "t2"); + return (Criteria) this; + } + + public Criteria andT2NotIn(List values) { + addCriterion("T2 not in", values, "t2"); + return (Criteria) this; + } + + public Criteria andT2Between(Date value1, Date value2) { + addCriterion("T2 between", value1, value2, "t2"); + return (Criteria) this; + } + + public Criteria andT2NotBetween(Date value1, Date value2) { + addCriterion("T2 not between", value1, value2, "t2"); + return (Criteria) this; + } + + public Criteria andT3IsNull() { + addCriterion("T3 is null"); + return (Criteria) this; + } + + public Criteria andT3IsNotNull() { + addCriterion("T3 is not null"); + return (Criteria) this; + } + + public Criteria andT3EqualTo(Date value) { + addCriterion("T3 =", value, "t3"); + return (Criteria) this; + } + + public Criteria andT3NotEqualTo(Date value) { + addCriterion("T3 <>", value, "t3"); + return (Criteria) this; + } + + public Criteria andT3GreaterThan(Date value) { + addCriterion("T3 >", value, "t3"); + return (Criteria) this; + } + + public Criteria andT3GreaterThanOrEqualTo(Date value) { + addCriterion("T3 >=", value, "t3"); + return (Criteria) this; + } + + public Criteria andT3LessThan(Date value) { + addCriterion("T3 <", value, "t3"); + return (Criteria) this; + } + + public Criteria andT3LessThanOrEqualTo(Date value) { + addCriterion("T3 <=", value, "t3"); + return (Criteria) this; + } + + public Criteria andT3In(List values) { + addCriterion("T3 in", values, "t3"); + return (Criteria) this; + } + + public Criteria andT3NotIn(List values) { + addCriterion("T3 not in", values, "t3"); + return (Criteria) this; + } + + public Criteria andT3Between(Date value1, Date value2) { + addCriterion("T3 between", value1, value2, "t3"); + return (Criteria) this; + } + + public Criteria andT3NotBetween(Date value1, Date value2) { + addCriterion("T3 not between", value1, value2, "t3"); + return (Criteria) this; + } + + public Criteria andT4IsNull() { + addCriterion("T4 is null"); + return (Criteria) this; + } + + public Criteria andT4IsNotNull() { + addCriterion("T4 is not null"); + return (Criteria) this; + } + + public Criteria andT4EqualTo(Date value) { + addCriterion("T4 =", value, "t4"); + return (Criteria) this; + } + + public Criteria andT4NotEqualTo(Date value) { + addCriterion("T4 <>", value, "t4"); + return (Criteria) this; + } + + public Criteria andT4GreaterThan(Date value) { + addCriterion("T4 >", value, "t4"); + return (Criteria) this; + } + + public Criteria andT4GreaterThanOrEqualTo(Date value) { + addCriterion("T4 >=", value, "t4"); + return (Criteria) this; + } + + public Criteria andT4LessThan(Date value) { + addCriterion("T4 <", value, "t4"); + return (Criteria) this; + } + + public Criteria andT4LessThanOrEqualTo(Date value) { + addCriterion("T4 <=", value, "t4"); + return (Criteria) this; + } + + public Criteria andT4In(List values) { + addCriterion("T4 in", values, "t4"); + return (Criteria) this; + } + + public Criteria andT4NotIn(List values) { + addCriterion("T4 not in", values, "t4"); + return (Criteria) this; + } + + public Criteria andT4Between(Date value1, Date value2) { + addCriterion("T4 between", value1, value2, "t4"); + return (Criteria) this; + } + + public Criteria andT4NotBetween(Date value1, Date value2) { + addCriterion("T4 not between", value1, value2, "t4"); + return (Criteria) this; + } + + public Criteria andT5IsNull() { + addCriterion("T5 is null"); + return (Criteria) this; + } + + public Criteria andT5IsNotNull() { + addCriterion("T5 is not null"); + return (Criteria) this; + } + + public Criteria andT5EqualTo(Date value) { + addCriterion("T5 =", value, "t5"); + return (Criteria) this; + } + + public Criteria andT5NotEqualTo(Date value) { + addCriterion("T5 <>", value, "t5"); + return (Criteria) this; + } + + public Criteria andT5GreaterThan(Date value) { + addCriterion("T5 >", value, "t5"); + return (Criteria) this; + } + + public Criteria andT5GreaterThanOrEqualTo(Date value) { + addCriterion("T5 >=", value, "t5"); + return (Criteria) this; + } + + public Criteria andT5LessThan(Date value) { + addCriterion("T5 <", value, "t5"); + return (Criteria) this; + } + + public Criteria andT5LessThanOrEqualTo(Date value) { + addCriterion("T5 <=", value, "t5"); + return (Criteria) this; + } + + public Criteria andT5In(List values) { + addCriterion("T5 in", values, "t5"); + return (Criteria) this; + } + + public Criteria andT5NotIn(List values) { + addCriterion("T5 not in", values, "t5"); + return (Criteria) this; + } + + public Criteria andT5Between(Date value1, Date value2) { + addCriterion("T5 between", value1, value2, "t5"); + return (Criteria) this; + } + + public Criteria andT5NotBetween(Date value1, Date value2) { + addCriterion("T5 not between", value1, value2, "t5"); + return (Criteria) this; + } + + public Criteria andT6IsNull() { + addCriterion("T6 is null"); + return (Criteria) this; + } + + public Criteria andT6IsNotNull() { + addCriterion("T6 is not null"); + return (Criteria) this; + } + + public Criteria andT6EqualTo(Date value) { + addCriterion("T6 =", value, "t6"); + return (Criteria) this; + } + + public Criteria andT6NotEqualTo(Date value) { + addCriterion("T6 <>", value, "t6"); + return (Criteria) this; + } + + public Criteria andT6GreaterThan(Date value) { + addCriterion("T6 >", value, "t6"); + return (Criteria) this; + } + + public Criteria andT6GreaterThanOrEqualTo(Date value) { + addCriterion("T6 >=", value, "t6"); + return (Criteria) this; + } + + public Criteria andT6LessThan(Date value) { + addCriterion("T6 <", value, "t6"); + return (Criteria) this; + } + + public Criteria andT6LessThanOrEqualTo(Date value) { + addCriterion("T6 <=", value, "t6"); + return (Criteria) this; + } + + public Criteria andT6In(List values) { + addCriterion("T6 in", values, "t6"); + return (Criteria) this; + } + + public Criteria andT6NotIn(List values) { + addCriterion("T6 not in", values, "t6"); + return (Criteria) this; + } + + public Criteria andT6Between(Date value1, Date value2) { + addCriterion("T6 between", value1, value2, "t6"); + return (Criteria) this; + } + + public Criteria andT6NotBetween(Date value1, Date value2) { + addCriterion("T6 not between", value1, value2, "t6"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/emr/service/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ArchiveOtherExtService.java new file mode 100644 index 00000000..b6b30c74 --- /dev/null +++ b/src/main/java/com/emr/service/ArchiveOtherExtService.java @@ -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 selectExtTaskIsExistOrNot(String masterId); + + /** + * 添加一条记录 + * @param archiveOtherExt + * @return + */ + Integer insertSelective(ArchiveOtherExt archiveOtherExt); + + /** + * 修改一条记录 + * @param archiveOtherExt + * @return + */ + Integer updateByPrimaryKeySelective(ArchiveOtherExt archiveOtherExt); +} diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtServiceImpl.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtServiceImpl.java new file mode 100644 index 00000000..43851d99 --- /dev/null +++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtServiceImpl.java @@ -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 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); + } +} diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index c21c3760..f124b5ac 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -328,48 +328,37 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { List medicalRecordHomepageCacheList = null; - JSONArray powerUsers = powerUserService.getPowerUserList("1"); - List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); - if (powerUserList != null){ - Map mappedMovies = Maps.uniqueIndex(powerUserList, new Function() { - @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); } diff --git a/src/main/resources/config/applicationContext.xml b/src/main/resources/config/applicationContext.xml index 93701740..7c957374 100644 --- a/src/main/resources/config/applicationContext.xml +++ b/src/main/resources/config/applicationContext.xml @@ -54,7 +54,7 @@ - + diff --git a/src/main/resources/config/mybatis-config.xml b/src/main/resources/config/mybatis-config.xml index 1815bb10..a40ef56b 100644 --- a/src/main/resources/config/mybatis-config.xml +++ b/src/main/resources/config/mybatis-config.xml @@ -34,7 +34,7 @@ - - - + + + \ No newline at end of file diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml new file mode 100644 index 00000000..94ec75bf --- /dev/null +++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml @@ -0,0 +1,463 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + 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 + + + + + delete from archive_other_ext + where ID = #{id,jdbcType=BIGINT} + + + 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 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, + + + + + #{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}, + + + + + update archive_other_ext + + + 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 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} + + \ No newline at end of file diff --git a/src/main/resources/mapper/FinishedDateTimeMapper.xml b/src/main/resources/mapper/FinishedDateTimeMapperTest.xml similarity index 100% rename from src/main/resources/mapper/FinishedDateTimeMapper.xml rename to src/main/resources/mapper/FinishedDateTimeMapperTest.xml diff --git a/src/main/resources/mapper/Sign_ListMapper.xml b/src/main/resources/mapper/Sign_ListMapper.xml index 30054815..55844225 100644 --- a/src/main/resources/mapper/Sign_ListMapper.xml +++ b/src/main/resources/mapper/Sign_ListMapper.xml @@ -167,7 +167,7 @@ N2, N3, T1, - T2 + T2, T3, IsFullText,