修改

src/main/java/com/spk/zyse/project/entity/ProjectApply.java

@@ -118,13 +118,16 @@ public class ProjectApply extends BaseEntity{
     private Date createTime ;
 	
     //修改时间
-
     private Date updateTime ;
     @Dict(type="yesNo")
     private String  lixiang;
-	
+	//专业类别
+    @Dict(type="speciality_category")
+    private String  specialityCt;
+    
     public ProjectApply()
     {
+    	
     }
 
     /**主键
@@ -466,5 +469,13 @@ public class ProjectApply extends BaseEntity{
 	public void setLixiang(String lixiang) {
 		this.lixiang = lixiang;
 	}
+
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
 	
 }

src/main/java/com/spk/zyse/project/entity/ProjectApproval.java

@@ -127,6 +127,10 @@ public class ProjectApproval extends BaseEntity{
 
     private Date updateTime ;
 	
+  //专业类别
+    @Dict(type="speciality_category")
+    private String  specialityCt;
+    
     public ProjectApproval()
     {
     }
@@ -433,4 +437,14 @@ public class ProjectApproval extends BaseEntity{
 	public void setIsGain(String isGain) {
 		this.isGain = isGain;
 	}
+
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+	
+	
 }

src/main/java/com/spk/zyse/project/web/ProjectApplyController.java

@@ -178,6 +178,9 @@ public class ProjectApplyController{
 		if (!StringUtils.isEmpty(condtion.getLixiang())) {
 			keyUpperCase.append("and  servicetable.LIXIANG = '").append(condtion.getLixiang()).append("'"); 
 		}
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
         PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);
         return JsonResult.success(page);
@@ -321,6 +324,9 @@ public class ProjectApplyController{
 		if (!StringUtils.isEmpty(condtion.getLixiang())) {
 			keyUpperCase.append("and  servicetable.LIXIANG = '").append(condtion.getLixiang()).append("'"); 
 		}
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
         PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);
         /*//取出全部符合条件的

src/main/java/com/spk/zyse/project/web/ProjectApprovalController.java

@@ -236,6 +236,9 @@ public class ProjectApprovalController{
 		if (!StringUtils.isEmpty(condtion.getReportName())) {
 			keyUpperCase.append("and  pi.USER_NAME like  '%").append(condtion.getReportName()).append("%'"); 
 		}
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
         PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);
         return JsonResult.success(page);
@@ -405,6 +408,9 @@ public class ProjectApprovalController{
 		if (!StringUtils.isEmpty(condtion.getBelongDept())) {
 			keyUpperCase.append("and  servicetable.BELONG_DEPT = '").append(condtion.getBelongDept()).append("'"); 
 		}
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
         PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);
         /*//取出全部符合条件的

src/main/java/com/spk/zyse/project/web/query/ProjectApplyQuery.java

@@ -44,11 +44,19 @@ public class ProjectApplyQuery extends ProUwfActivityInstQuery {
     @Query(name = "是否立项",  display = true,type=Query.TYPE_DICT,dict="yesNo")    
     private String lixiang; 
     
+    @Query(name = "专业类别",  display = true,type=Query.TYPE_DICT,dict="speciality_category")    
+    private String specialityCt;
+    
     @Query(name = "科室", display = true,type=Query.TYPE_CONTROL,control="org")    
     private String bearDept;
     
+    private String yeraTimeMin;
+    
+    private String yeraTimeMax;
     
     private Long administrative;
+    
+    private String userId;
 //    public String getApplyTime() {
 //		return applyTime;
 //	}
@@ -183,6 +191,38 @@ public class ProjectApplyQuery extends ProUwfActivityInstQuery {
 		this.lixiang = lixiang;
 	}
 
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+
+	public String getYeraTimeMin() {
+		return yeraTimeMin;
+	}
+
+	public void setYeraTimeMin(String yeraTimeMin) {
+		this.yeraTimeMin = yeraTimeMin;
+	}
+
+	public String getYeraTimeMax() {
+		return yeraTimeMax;
+	}
+
+	public void setYeraTimeMax(String yeraTimeMax) {
+		this.yeraTimeMax = yeraTimeMax;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
 
 	
 }

src/main/java/com/spk/zyse/project/web/query/ProjectApprovalQuery.java

@@ -44,6 +44,15 @@ public class ProjectApprovalQuery extends ProUwfActivityInstQuery {
     @Query(name = "提交人", display = true)
     private String reportName;
     
+    @Query(name = "专业类别",  display = true,type=Query.TYPE_DICT,dict="speciality_category")    
+    private String specialityCt;
+    
+    private String yeraTimeMin;
+    
+    private String yeraTimeMax;
+    
+    private String userId;
+    
 	public String getProjectName() {
 		return projectName;
 	}
@@ -129,4 +138,29 @@ public class ProjectApprovalQuery extends ProUwfActivityInstQuery {
 	public void setReportName(String reportName) {
 		this.reportName = reportName;
 	}
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	public String getYeraTimeMin() {
+		return yeraTimeMin;
+	}
+	public void setYeraTimeMin(String yeraTimeMin) {
+		this.yeraTimeMin = yeraTimeMin;
+	}
+	public String getYeraTimeMax() {
+		return yeraTimeMax;
+	}
+	public void setYeraTimeMax(String yeraTimeMax) {
+		this.yeraTimeMax = yeraTimeMax;
+	}
+	
 }

src/main/java/com/spk/zyse/result/dao/ResultPaperDao.java

@@ -8,6 +8,8 @@ import org.beetl.sql.core.mapper.BaseMapper;
 import org.beetl.sql.core.engine.PageQuery;
 
 import com.spk.admin.core.entity.CoreDict;
+import com.spk.zyse.project.entity.ProjectApply;
+import com.spk.zyse.project.entity.ProjectApproval;
 import  com.spk.zyse.result.entity.*;
 
 /**
@@ -25,4 +27,18 @@ public interface ResultPaperDao extends BaseMapper<ResultPaper>{
 	public ResultPaper queryByTitle(String paperTitle);
 	public PageQuery synList(PageQuery page);
 	public void deleteResultPaper(String id,String processinstId);
+	public PageQuery queryByTongJiCondition(PageQuery query);
+	public PageQuery<ResultPaper> queryBylistLunWenCondition(PageQuery page);
+	public PageQuery<ResultWork> queryBylistShuZuoCondition(PageQuery page);
+	public PageQuery<ResultPrize> queryBylistHuoJiangCondition(PageQuery page);
+	public PageQuery<ResultPatent> queryBylistShenQingCondition(PageQuery page);
+	public PageQuery<PatentAuth> queryBylistShouQuanCondition(PageQuery page);
+	public PageQuery<ResultSoftware> queryBylistRuanJianCondition(PageQuery page);
+	public PageQuery<ResultStandard> queryBylistBiaoZhenCondition(PageQuery page);
+	public PageQuery<ResultYaozheng> queryBylistYaoZhengCondition(PageQuery page);
+	public PageQuery queryByDepartmentTongJiCondition(PageQuery query);
+	public PageQuery queryByHospitalCondition(PageQuery page);
+	public PageQuery<ProjectApply> queryBylistXmShenbaoCondition(PageQuery page);
+	public PageQuery<ProjectApproval> queryBylistXmLixiangCondition(PageQuery page);
+	
 }
\ No newline at end of file

src/main/java/com/spk/zyse/result/entity/PatentAuth.java

@@ -106,6 +106,10 @@ public class PatentAuth extends BaseEntity{
     private Long belongDept ;
     
     private Date patentTime;
+    
+    //专业类别
+    @Dict(type="speciality_category")
+    private String  specialityCt;
 	
     public PatentAuth()
     {
@@ -397,4 +401,12 @@ public class PatentAuth extends BaseEntity{
 		this.patentTime = patentTime;
 	}
 
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+
 }

src/main/java/com/spk/zyse/result/entity/ResultPaper.java

@@ -168,6 +168,10 @@ public class ResultPaper extends BaseEntity{
     private String fundType ;
     
     private Long belongDept;
+    
+    //专业类别
+    @Dict(type="speciality_category")
+    private String  specialityCt;
 	
     public ResultPaper()
     {
@@ -647,5 +651,13 @@ public class ResultPaper extends BaseEntity{
 	public void setFundType(String fundType) {
 		this.fundType = fundType;
 	}
+
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
 	
 }

src/main/java/com/spk/zyse/result/entity/ResultPatent.java

@@ -83,6 +83,10 @@ public class ResultPatent extends BaseEntity{
     //修改时间
 
     private Date updateTime ;
+    
+    //专业类别
+    @Dict(type="speciality_category")
+    private String  specialityCt;
 	
     public ResultPatent()
     {
@@ -286,4 +290,12 @@ public class ResultPatent extends BaseEntity{
 		this.attachmentId = attachmentId;
 	}
 
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+
 }

src/main/java/com/spk/zyse/result/entity/ResultPrize.java

@@ -81,7 +81,7 @@ public class ResultPrize extends BaseEntity{
 	
     //非第1医院科室
 
-    private String finishDept ;
+    private Long finishDept ;
 	
     //是否是第1完成科室
     @Dict(type="is_no")
@@ -110,6 +110,10 @@ public class ResultPrize extends BaseEntity{
     //修改时间
 
     private Date updateTime ;
+    
+    //专业类别
+    @Dict(type="speciality_category")
+    private String  specialityCt;
 	
     public ResultPrize()
     {
@@ -287,13 +291,13 @@ public class ResultPrize extends BaseEntity{
     /**完成科室
     *@return 
     */
-    public String getFinishDept(){
+    public Long getFinishDept(){
 	    return  finishDept;
     }
     /**完成科室
     *@param  finishDept
     */
-    public void setFinishDept(String finishDept){
+    public void setFinishDept(Long finishDept){
         this.finishDept = finishDept;
     }
 
@@ -407,4 +411,12 @@ public class ResultPrize extends BaseEntity{
 		this.attachmentId = attachmentId;
 	}
 
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+
 }

src/main/java/com/spk/zyse/result/entity/ResultSoftware.java

@@ -82,6 +82,10 @@ public class ResultSoftware extends BaseEntity{
     //修改时间
 
     private Date updateTime ;
+    
+    //专业类别
+    @Dict(type="speciality_category")
+    private String  specialityCt;
 	
     public ResultSoftware()
     {
@@ -259,4 +263,12 @@ public class ResultSoftware extends BaseEntity{
 		this.registerTime = registerTime;
 	}
 
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+
 }

src/main/java/com/spk/zyse/result/entity/ResultStandard.java

@@ -98,6 +98,10 @@ public class ResultStandard extends BaseEntity{
 	
     private String courtName;
     
+    //专业类别
+    @Dict(type="speciality_category")
+    private String  specialityCt;
+    
     public ResultStandard()
     {
     }
@@ -365,4 +369,12 @@ public class ResultStandard extends BaseEntity{
 		this.level = level;
 	}
 
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+
 }

src/main/java/com/spk/zyse/result/entity/ResultWork.java

@@ -112,6 +112,10 @@ public class ResultWork extends BaseEntity{
     private Date updateTime;
     
     private String attachmentId;
+    
+    //专业类别
+    @Dict(type="speciality_category")
+    private String  specialityCt;
 	
     public ResultWork()
     {
@@ -422,4 +426,12 @@ public class ResultWork extends BaseEntity{
 		this.attachmentId = attachmentId;
 	}
 
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+
 }

src/main/java/com/spk/zyse/result/service/ResultPaperService.java

@@ -14,8 +14,17 @@ import com.spk.admin.core.entity.CoreUser;
 import com.spk.admin.core.service.BaseService;
 import com.spk.admin.core.service.CorePlatformService;
 import com.spk.admin.core.util.PlatformException;
+import com.spk.zyse.project.entity.ProjectApply;
+import com.spk.zyse.project.entity.ProjectApproval;
 import com.spk.zyse.result.dao.ResultPaperDao;
+import com.spk.zyse.result.entity.PatentAuth;
 import com.spk.zyse.result.entity.ResultPaper;
+import com.spk.zyse.result.entity.ResultPatent;
+import com.spk.zyse.result.entity.ResultPrize;
+import com.spk.zyse.result.entity.ResultSoftware;
+import com.spk.zyse.result.entity.ResultStandard;
+import com.spk.zyse.result.entity.ResultWork;
+import com.spk.zyse.result.entity.ResultYaozheng;
 import com.spk.zyse.uwf.entity.ProUwfActivitydef;
 import com.spk.zyse.uwf.service.ProUwfActivityInstService;
 import com.spk.zyse.uwf.service.ProUwfProcessInstService;
@@ -42,7 +51,94 @@ public class ResultPaperService extends BaseService<ResultPaper>{
         queryListAfter(ret.getList());
         return ret;
     }
+    
+    public PageQuery queryByTongJiCondition(PageQuery query){
+        PageQuery ret =  resultPaperDao.queryByTongJiCondition(query);
+        queryListAfter(ret.getList());
+        return ret;
+    }
+    
+    public PageQuery queryByDepartmentTongJiCondition(PageQuery query){
+        PageQuery ret =  resultPaperDao.queryByDepartmentTongJiCondition(query);
+        queryListAfter(ret.getList());
+        return ret;
+    }
+    
+	public PageQuery queryByHospitalCondition(PageQuery page) {
+	    PageQuery ret =  resultPaperDao.queryByHospitalCondition(page);
+	    queryListAfter(ret.getList());
+	    return ret;
+	}
+	
+	public PageQuery<ProjectApply> queryBylistXmShenbaoCondition(PageQuery page) {
+		PageQuery ret =  resultPaperDao.queryBylistXmShenbaoCondition(page);
+	     queryListAfter(ret.getList());
+	     return ret;
+		
+	}
 
+	public PageQuery<ProjectApproval> queryBylistXmLixiangCondition(PageQuery page) {
+		PageQuery ret =  resultPaperDao.queryBylistXmLixiangCondition(page);
+	     queryListAfter(ret.getList());
+	     return ret;
+		
+	}
+
+	public PageQuery<ResultPaper> queryBylistLunWenCondition(PageQuery page) {
+		 PageQuery ret =  resultPaperDao.queryBylistLunWenCondition(page);
+	     queryListAfter(ret.getList());
+	     return ret;
+	}
+
+	public PageQuery<ResultWork> queryBylistShuZuoCondition(PageQuery page) {
+		 PageQuery ret =  resultPaperDao.queryBylistShuZuoCondition(page);
+	     queryListAfter(ret.getList());
+	     return ret;
+		
+	}
+	
+	public PageQuery<ResultPrize> queryBylistHuoJiangCondition(PageQuery page) {
+		 PageQuery ret =  resultPaperDao.queryBylistHuoJiangCondition(page);
+	     queryListAfter(ret.getList());
+	     return ret;
+		
+	}
+	
+	public PageQuery<ResultPatent> queryBylistShenQingCondition(PageQuery page) {
+		PageQuery ret =  resultPaperDao.queryBylistShenQingCondition(page);
+	    queryListAfter(ret.getList());
+	    return ret;
+		
+	}
+
+	public PageQuery<PatentAuth> queryBylistShouQuanCondition(PageQuery page) {
+		PageQuery ret =  resultPaperDao.queryBylistShouQuanCondition(page);
+	    queryListAfter(ret.getList());
+	    return ret;
+		
+	}
+	
+	public PageQuery<ResultSoftware> queryBylistRuanJianCondition(PageQuery page) {
+		PageQuery ret =  resultPaperDao.queryBylistRuanJianCondition(page);
+	    queryListAfter(ret.getList());
+	    return ret;
+		
+	}
+
+	public PageQuery<ResultStandard> queryBylistBiaoZhenCondition(PageQuery page) {
+		PageQuery ret =  resultPaperDao.queryBylistBiaoZhenCondition(page);
+	    queryListAfter(ret.getList());
+	    return ret;
+		
+	}
+
+	public PageQuery<ResultYaozheng> queryBylistYaoZhengCondition(PageQuery page) {
+		PageQuery ret =  resultPaperDao.queryBylistYaoZhengCondition(page);
+	    queryListAfter(ret.getList());
+	    return ret;
+		
+	}
+	
     public void batchDelResultPaper(List<Long> ids){
         try {
             resultPaperDao.batchDelResultPaperByIds(ids);
@@ -163,4 +259,12 @@ public class ResultPaperService extends BaseService<ResultPaper>{
 		resultPaperDao.deleteResultPaper(id,processinstId);
 	}
 
+
+
+
+
+
+	
+
+
 }
\ No newline at end of file

src/main/java/com/spk/zyse/result/web/PatentAuthController.java

@@ -166,6 +166,9 @@ public class PatentAuthController{
 		if (!StringUtils.isEmpty(condtion.getDeptId())) {
 			keyUpperCase.append("and  servicetable.belong_dept = '").append(condtion.getDeptId()).append("'"); 
 		}
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
         PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);
         return JsonResult.success(page);
@@ -181,7 +184,7 @@ public class PatentAuthController{
    		query.setMagazineName(condtion.getPatentName());
    		ResultKeepOnRecord  AALOAD =resultKeepOnRecordService.stateList(query);
    		if(AALOAD ==null) {
-   			return   JsonResult.failMessage("专利名称不存在");
+   			return   JsonResult.failMessage("此专利名称还未进行发表前备案，请先到【成果发表前备案】进行备案");
    		}
    		return JsonResult.success("成功");	
    	}
@@ -303,6 +306,9 @@ public class PatentAuthController{
 		if (!StringUtils.isEmpty(condtion.getDeptId())) {
 			keyUpperCase.append("and  servicetable.belong_dept = '").append(condtion.getDeptId()).append("'"); 
 		}
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
         condtion.setQuerysql(keyUpperCase.toString());
 		
         PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);

src/main/java/com/spk/zyse/result/web/ResultPaperController.java

@@ -307,6 +307,9 @@ public class ResultPaperController {
 		if (!StringUtils.isEmpty(condtion.getImpactFactor())) {
 			keyUpperCase.append("and  servicetable.IMPACT_FACTOR ").append(condtion.getImpactFactor()).append("");
 		}
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
 		PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);
 		return JsonResult.success(page);
@@ -507,6 +510,9 @@ public class ResultPaperController {
 		if (!StringUtils.isEmpty(condtion.getImpactFactor())) {
 			keyUpperCase.append("and  servicetable.IMPACT_FACTOR ").append(condtion.getImpactFactor()).append("");
 		}
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
 		PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);
 		/*

src/main/java/com/spk/zyse/result/web/ResultPatentController.java

@@ -155,6 +155,9 @@ public class ResultPatentController{
 		if (!StringUtils.isEmpty(condtion.getDeptId())) {
 			keyUpperCase.append("and  servicetable.dept_id = '").append(condtion.getDeptId()).append("'"); 
 		}
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
         PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);
         return JsonResult.success(page);
@@ -288,7 +291,9 @@ public class ResultPatentController{
 		if (!StringUtils.isEmpty(condtion.getDeptId())) {
 			keyUpperCase.append("and  servicetable.dept_id = '").append(condtion.getDeptId()).append("'"); 
 		}
-		
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
 		
         PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);

src/main/java/com/spk/zyse/result/web/ResultPrizeController.java

@@ -148,7 +148,10 @@ public class ResultPrizeController{
 		} 
 		if (!StringUtils.isEmpty(condtion.getPrizeTime())) {
 			keyUpperCase.append("and  servicetable.prize_time like '%").append(condtion.getPrizeTime()).append("%'"); 
-		} 
+		}
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
         PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);
         return JsonResult.success(page);
@@ -259,7 +262,10 @@ public class ResultPrizeController{
 		} 
 		if (!StringUtils.isEmpty(condtion.getPrizeTime())) {
 			keyUpperCase.append("and  servicetable.prize_time like '%").append(condtion.getPrizeTime()).append("%'"); 
-		} 
+		}
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
 		
         PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);

src/main/java/com/spk/zyse/result/web/ResultSoftwareController.java

@@ -158,6 +158,9 @@ public class ResultSoftwareController{
 //		if (!StringUtils.isEmpty(condtion.getTopicType())) {
 //			keyUpperCase.append("and  servicetable.topic_type like '%").append(condtion.getTopicType()).append("%'"); 
 //		} 
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
         PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);
         return JsonResult.success(page);
@@ -273,6 +276,9 @@ public class ResultSoftwareController{
 		if (!StringUtils.isEmpty(condtion.getDeptId())) {
 			keyUpperCase.append("and  servicetable.dept_id = '").append(condtion.getDeptId()).append("'"); 
 		} 
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
 		
         PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);

src/main/java/com/spk/zyse/result/web/ResultStandardController.java

@@ -162,6 +162,9 @@ public class ResultStandardController{
 		if (!StringUtils.isEmpty(condtion.getDeptId())) {
 			keyUpperCase.append("and  servicetable.dept_id = '").append(condtion.getDeptId()).append("'"); 
 		}  
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
         PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);
         return JsonResult.success(page);
@@ -284,6 +287,9 @@ public class ResultStandardController{
 		if (!StringUtils.isEmpty(condtion.getDeptId())) {
 			keyUpperCase.append("and  servicetable.dept_id = '").append(condtion.getDeptId()).append("'"); 
 		}
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
 		
         PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);

src/main/java/com/spk/zyse/result/web/ResultTongJiController.java

+package com.spk.zyse.result.web;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.beetl.sql.core.TailBean;
+import org.beetl.sql.core.engine.PageQuery;
+import org.jxls.common.Context;
+import org.jxls.util.JxlsHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.spk.admin.core.annotation.Function;
+import com.spk.admin.core.entity.CoreOrg;
+import com.spk.admin.core.entity.CoreUser;
+import com.spk.admin.core.file.FileItem;
+import com.spk.admin.core.file.FileService;
+import com.spk.admin.core.service.CorePlatformService;
+import com.spk.admin.core.util.DateUtil;
+import com.spk.admin.core.util.PlatformException;
+import com.spk.admin.core.web.JsonResult;
+import com.spk.zyse.project.web.query.ProjectApplyQuery;
+import com.spk.zyse.project.web.query.ProjectApprovalQuery;
+import com.spk.zyse.result.service.ResultPaperService;
+import com.spk.zyse.result.web.query.PatentAuthQuery;
+import com.spk.zyse.result.web.query.ResultDeptTongJiQuery;
+import com.spk.zyse.result.web.query.ResultHospitalTongJiQuery;
+import com.spk.zyse.result.web.query.ResultPaperQuery;
+import com.spk.zyse.result.web.query.ResultPatentQuery;
+import com.spk.zyse.result.web.query.ResultPrizeQuery;
+import com.spk.zyse.result.web.query.ResultSoftwareQuery;
+import com.spk.zyse.result.web.query.ResultStandardQuery;
+import com.spk.zyse.result.web.query.ResultTongJiQuery;
+import com.spk.zyse.result.web.query.ResultWorkQuery;
+import com.spk.zyse.result.web.query.ResultYaozhengQuery;
+
+/**
+ * ResultPaper 接口
+ */
+@Controller
+public class ResultTongJiController {
+
+	private final Log log = LogFactory.getLog(this.getClass());
+	private static final String MODEL = "/result/resultTongJi";
+
+	@Autowired
+	private ResultPaperService resultPaperService;
+
+	@Autowired
+	private CorePlatformService corePlatformService;
+
+	@Autowired
+	FileService fileService;
+
+	@GetMapping(MODEL + "/indexPerson.do")
+	@Function("resultTongJi.query")
+	@ResponseBody
+	public ModelAndView index(String type,Long  deptId) {
+		ModelAndView view = new ModelAndView();
+		view.addObject("search", ResultTongJiQuery.class.getName());
+		if("1".equals(type) || "2".equals(type) ) {
+           view.setViewName("/result/resultTongJi/index.html");
+		}else {
+		   view.setViewName("/result/resultTongJi/indexGR.html");
+		}
+        view.addObject("type", type);
+        view.addObject("deptId", deptId);
+		return view;
+	}
+	
+	@GetMapping(MODEL + "/indexDepartment.do")
+	@Function("resultTongJi.indexDepartment")
+	@ResponseBody
+	public ModelAndView indexDepartment(String type) {
+		ModelAndView view = new ModelAndView();
+		view.addObject("search", ResultDeptTongJiQuery.class.getName());
+		if("1".equals(type)) {
+			 view.setViewName("/result/resultTongJi/indexDepartment.html");
+		}else {
+			 view.setViewName("/result/resultTongJi/indexKZDepartment.html");
+		}
+        view.addObject("type", type);
+		return view;
+	}
+	
+	@GetMapping(MODEL + "/indexHospital.do")
+	@Function("resultTongJi.indexDepartment")
+	@ResponseBody
+	public ModelAndView indexHospital(String type) {
+		ModelAndView view = new ModelAndView();
+		view.addObject("search", ResultHospitalTongJiQuery.class.getName());
+        view.setViewName("/result/resultTongJi/indexHospital.html");
+        view.addObject("type", type);
+		return view;
+	}
+	
+	@GetMapping(MODEL + "/indexXmShenbao.do")
+	@Function("resultTongJi.query")
+	@ResponseBody
+	public ModelAndView indexXmShenbao(String userId,String type,Long bearDept,String yeraTimeMin,String yeraTimeMax) {
+		ModelAndView view = new ModelAndView();
+//		if("1".equals(type)) {
+//			view.addObject("search", ProjectApplyQuery.class.getName());
+//		}else if("2".equals(type)){
+//			view.addObject("search", ProjectApplyQuery.class.getName());
+//		}
+		view.addObject("search", ProjectApplyQuery.class.getName());
+        view.setViewName("/result/resultTongJi/indexXmShenbao.html");
+        if(!"".equals(yeraTimeMin)) {
+        	view.addObject("yeraTimeMin", yeraTimeMin);
+        }else {
+        	view.addObject("yeraTimeMin", "");
+        }
+        if(!"".equals(yeraTimeMax)) {
+        	view.addObject("yeraTimeMax", yeraTimeMax);
+        }else {
+        	view.addObject("yeraTimeMax", "");
+        }
+        if(!"".equals(userId) && !"null".equals(userId)) {
+        	 view.addObject("userId", userId);
+        }else {
+        	view.addObject("userId", "");
+        }
+        view.addObject("type", type);
+        view.addObject("bearDept", bearDept);
+		return view;
+	}
+	
+	@GetMapping(MODEL + "/indexXmLixiang.do")
+	@Function("resultTongJi.query")
+	@ResponseBody
+	public ModelAndView indexXmLixiang(String userId,String type,Long belongDept,String yeraTimeMin,String yeraTimeMax) {
+		ModelAndView view = new ModelAndView();
+//		if("1".equals(type)) {
+//			view.addObject("search", ProjectApprovalQuery.class.getName());
+//		}else if("2".equals(type)){
+//			view.addObject("search", ProjectApprovalQuery.class.getName());
+//		}
+		view.addObject("search", ProjectApprovalQuery.class.getName());
+        view.setViewName("/result/resultTongJi/indexXmLixiang.html");
+        if(!"".equals(yeraTimeMin)) {
+        	view.addObject("yeraTimeMin", yeraTimeMin);
+        }else {
+        	view.addObject("yeraTimeMin", "");
+        }
+        if(!"".equals(yeraTimeMax)) {
+        	view.addObject("yeraTimeMax", yeraTimeMax);
+        }else {
+        	view.addObject("yeraTimeMax", "");
+        }
+        if(!"".equals(userId)&& !"null".equals(userId)) {
+       	 view.addObject("userId", userId);
+        }else {
+       	 view.addObject("userId", "");
+        }
+        view.addObject("type", type);
+        view.addObject("belongDept", belongDept);
+		return view;
+	}
+	
+	@GetMapping(MODEL + "/indexLunWen.do")
+	@Function("resultTongJi.query")
+	@ResponseBody
+	public ModelAndView indexLunWen(String userId,String type,Long belongDept,String yeraTimeMin,String yeraTimeMax) {
+		ModelAndView view = new ModelAndView();
+//		if("1".equals(type)) {
+//			view.addObject("search", ResultPaperQuery.class.getName());
+//		}else if("2".equals(type)){
+//			view.addObject("search", ResultPaperQuery2.class.getName());
+//		}
+		view.addObject("search", ResultPaperQuery.class.getName());
+        view.setViewName("/result/resultTongJi/indexLunWen.html");
+        if(!"".equals(yeraTimeMin)) {
+        	view.addObject("yeraTimeMin", yeraTimeMin);
+        }else {
+        	view.addObject("yeraTimeMin", "");
+        }
+        if(!"".equals(yeraTimeMax)) {
+        	view.addObject("yeraTimeMax", yeraTimeMax);
+        }else {
+        	view.addObject("yeraTimeMax", "");
+        }
+        if(!"".equals(userId) && !"null".equals(userId)) {
+       	 view.addObject("userId", userId);
+        }else {
+       	 view.addObject("userId", "");
+        }
+        view.addObject("type", type);
+        view.addObject("belongDept", belongDept);
+		return view;
+	}
+	
+	@GetMapping(MODEL + "/indexShuZuo.do")
+	@Function("resultTongJi.query")
+	@ResponseBody
+	public ModelAndView indexShuZuo(String userId,String type,Long deptId,String yeraTimeMin,String yeraTimeMax) {
+		ModelAndView view = new ModelAndView();
+//		if("1".equals(type)) {
+//			view.addObject("search", ResultWorkQuery.class.getName());
+//		}else if("2".equals(type)){
+//			view.addObject("search", ResultWorkQuery2.class.getName());
+//		}
+		view.addObject("search", ResultWorkQuery.class.getName());
+        view.setViewName("/result/resultTongJi/indexShuZuo.html");
+        if(!"".equals(yeraTimeMin)) {
+        	view.addObject("yeraTimeMin", yeraTimeMin);
+        }else {
+        	view.addObject("yeraTimeMin", "");
+        }
+        if(!"".equals(yeraTimeMax)) {
+        	view.addObject("yeraTimeMax", yeraTimeMax);
+        }else {
+        	view.addObject("yeraTimeMax", "");
+        }
+        if(!"".equals(userId) && !"null".equals(userId)) {
+       	 view.addObject("userId", userId);
+        }else {
+       	 view.addObject("userId", "");
+        }
+        view.addObject("type", type);
+        view.addObject("deptId", deptId);
+		return view;
+	}
+	
+	@GetMapping(MODEL + "/indexHuoJiang.do")
+	@Function("resultTongJi.query")
+	@ResponseBody
+	public ModelAndView indexHuoJiang(String userId,String type,Long deptId,String yeraTimeMin,String yeraTimeMax) {
+		ModelAndView view = new ModelAndView();
+//		if("1".equals(type)) {
+//			view.addObject("search", ResultPrizeQuery.class.getName());
+//		}else if("2".equals(type)){
+//			view.addObject("search", ResultPrizeQuery2.class.getName());
+//		}
+		view.addObject("search", ResultPrizeQuery.class.getName());
+        view.setViewName("/result/resultTongJi/indexHuoJiang.html");
+        if(!"".equals(yeraTimeMin)) {
+        	view.addObject("yeraTimeMin", yeraTimeMin);
+        }else {
+        	view.addObject("yeraTimeMin", "");
+        }
+        if(!"".equals(yeraTimeMax)) {
+        	view.addObject("yeraTimeMax", yeraTimeMax);
+        }else {
+        	view.addObject("yeraTimeMax", "");
+        }
+        if(!"".equals(userId)&& !"null".equals(userId)) {
+       	 view.addObject("userId", userId);
+        }else {
+       	 view.addObject("userId", "");
+        }
+        view.addObject("type", type);
+        view.addObject("deptId", deptId);
+		return view;
+	}
+	
+	@GetMapping(MODEL + "/indexShenQing.do")
+	@Function("resultTongJi.query")
+	@ResponseBody
+	public ModelAndView indexShenQing(String userId,String type,Long deptId,String yeraTimeMin,String yeraTimeMax) {
+		ModelAndView view = new ModelAndView();
+//		if("1".equals(type)) {
+//			view.addObject("search", ResultPatentQuery.class.getName());
+//		}else if("2".equals(type)){
+//			view.addObject("search", ResultPatentQuery2.class.getName());
+//		}
+		view.addObject("search", ResultPatentQuery.class.getName());
+        view.setViewName("/result/resultTongJi/indexShenQing.html");
+        if(!"".equals(yeraTimeMin)) {
+        	view.addObject("yeraTimeMin", yeraTimeMin);
+        }else {
+        	view.addObject("yeraTimeMin", "");
+        }
+        if(!"".equals(yeraTimeMax)) {
+        	view.addObject("yeraTimeMax", yeraTimeMax);
+        }else {
+        	view.addObject("yeraTimeMax", "");
+        }
+        if(!"".equals(userId)&& !"null".equals(userId)) {
+       	 view.addObject("userId", userId);
+        }else {
+       	 view.addObject("userId", "");
+        }
+        view.addObject("type", type);
+        view.addObject("deptId", deptId);
+		return view;
+	}
+	
+	@GetMapping(MODEL + "/indexShouQuan.do")
+	@Function("resultTongJi.query")
+	@ResponseBody
+	public ModelAndView indexShouQuan(String userId,String type,Long belongDept,String yeraTimeMin,String yeraTimeMax) {
+		ModelAndView view = new ModelAndView();
+//		if("1".equals(type)) {
+//			view.addObject("search", PatentAuthQuery.class.getName());
+//		}else if("2".equals(type)){
+//			view.addObject("search", PatentAuthQuery2.class.getName());
+//		}
+		view.addObject("search", PatentAuthQuery.class.getName());
+        view.setViewName("/result/resultTongJi/indexShouQuan.html");
+        if(!"".equals(yeraTimeMin)) {
+        	view.addObject("yeraTimeMin", yeraTimeMin);
+        }else {
+        	view.addObject("yeraTimeMin", "");
+        }
+        if(!"".equals(yeraTimeMax)) {
+        	view.addObject("yeraTimeMax", yeraTimeMax);
+        }else {
+        	view.addObject("yeraTimeMax", "");
+        }
+        if(!"".equals(userId)&& !"null".equals(userId)) {
+       	 view.addObject("userId", userId);
+        }else {
+       	 view.addObject("userId", "");
+        }
+        view.addObject("type", type);
+        view.addObject("belongDept", belongDept);
+		return view;
+	}
+	
+	@GetMapping(MODEL + "/indexRuanJian.do")
+	@Function("resultTongJi.query")
+	@ResponseBody
+	public ModelAndView indexRuanJian(String userId,String type,Long deptId,String yeraTimeMin,String yeraTimeMax) {
+		ModelAndView view = new ModelAndView();
+//		if("1".equals(type)) {
+//			view.addObject("search", ResultSoftwareQuery.class.getName());
+//		}else if("2".equals(type)){
+//			view.addObject("search", ResultSoftwareQuery2.class.getName());
+//		}
+		view.addObject("search", ResultSoftwareQuery.class.getName());
+        view.setViewName("/result/resultTongJi/indexRuanJian.html");
+        if(!"".equals(yeraTimeMin)) {
+        	view.addObject("yeraTimeMin", yeraTimeMin);
+        }else {
+        	view.addObject("yeraTimeMin", "");
+        }
+        if(!"".equals(yeraTimeMax)) {
+        	view.addObject("yeraTimeMax", yeraTimeMax);
+        }else {
+        	view.addObject("yeraTimeMax", "");
+        }
+        if(!"".equals(userId)&& !"null".equals(userId)) {
+       	 view.addObject("userId", userId);
+        }else {
+       	 view.addObject("userId", "");
+        }
+        view.addObject("type", type);
+        view.addObject("deptId", deptId);
+		return view;
+	}
+	
+	@GetMapping(MODEL + "/indexBiaoZhen.do")
+	@Function("resultTongJi.query")
+	@ResponseBody
+	public ModelAndView indexBiaoZhen(String userId,String type,Long deptId,String yeraTimeMin,String yeraTimeMax) {
+		ModelAndView view = new ModelAndView();
+//		if("1".equals(type)) {
+//			view.addObject("search", ResultStandardQuery.class.getName());
+//		}else if("2".equals(type)){
+//			view.addObject("search", ResultStandardQuery2.class.getName());
+//		}
+		view.addObject("search", ResultStandardQuery.class.getName());
+        view.setViewName("/result/resultTongJi/indexBiaoZhen.html");
+        if(!"".equals(yeraTimeMin)) {
+        	view.addObject("yeraTimeMin", yeraTimeMin);
+        }else {
+        	view.addObject("yeraTimeMin", "");
+        }
+        if(!"".equals(yeraTimeMax)) {
+        	view.addObject("yeraTimeMax", yeraTimeMax);
+        }else {
+        	view.addObject("yeraTimeMax", "");
+        }
+        if(!"".equals(userId)&& !"null".equals(userId)) {
+       	 view.addObject("userId", userId);
+        }else {
+       	 view.addObject("userId", "");
+        }
+        view.addObject("type", type);
+        view.addObject("deptId", deptId);
+		return view;
+	}
+	
+	@GetMapping(MODEL + "/indexYaoZheng.do")
+	@Function("resultTongJi.query")
+	@ResponseBody
+	public ModelAndView indexYaoZheng(String userId,String type,Long deptId,String yeraTimeMin,String yeraTimeMax) {
+		ModelAndView view = new ModelAndView();
+		view.addObject("search", ResultYaozhengQuery.class.getName());
+        view.setViewName("/result/resultTongJi/indexYaoZheng.html");
+        if(!"".equals(yeraTimeMin)) {
+        	view.addObject("yeraTimeMin", yeraTimeMin);
+        }else {
+        	view.addObject("yeraTimeMin", "");
+        }
+        if(!"".equals(yeraTimeMax)) {
+        	view.addObject("yeraTimeMax", yeraTimeMax);
+        }else {
+        	view.addObject("yeraTimeMax", "");
+        }
+        if(!"".equals(userId)&& !"null".equals(userId)) {
+       	 view.addObject("userId", userId);
+        }else {
+       	 view.addObject("userId", "");
+        }
+        view.addObject("type", type);
+        view.addObject("deptId", deptId);
+		return view;
+	}
+
+
+	
+	@PostMapping(MODEL + "/list.json")
+	@Function("resultPaper.query")
+	@ResponseBody
+	public JsonResult<PageQuery> list(ResultTongJiQuery condtion) {
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryByTongJiCondition(page);
+		return JsonResult.success(page);
+	}
+	
+	@PostMapping(MODEL + "/listGR.json")
+	@Function("resultPaper.query")
+	@ResponseBody
+	public JsonResult<PageQuery> listGR(ResultTongJiQuery condtion) {
+		CoreUser currentUser = corePlatformService.getCurrentUser();
+		condtion.setUserId(currentUser.getId());
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryByTongJiCondition(page);
+		return JsonResult.success(page);
+	}
+
+	@PostMapping(MODEL + "/listDepartment.json")
+	@Function("resultPaper.query")
+	@ResponseBody
+	public JsonResult<PageQuery> listDepartment(ResultDeptTongJiQuery condtion) {
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryByDepartmentTongJiCondition(page);
+		return JsonResult.success(page);
+	}
+	
+	@PostMapping(MODEL + "/listKZDepartment.json")
+	@Function("resultPaper.query")
+	@ResponseBody
+	public JsonResult<PageQuery> listKZDepartment(ResultDeptTongJiQuery condtion) {
+		CoreOrg currentOrg = corePlatformService.getCurrentOrg();
+		condtion.setDeptId(currentOrg.getId());
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryByDepartmentTongJiCondition(page);
+		return JsonResult.success(page);
+	}
+	
+	@PostMapping(MODEL + "/listHospital.json")
+	@Function("resultPaper.query")
+	@ResponseBody
+	public JsonResult<PageQuery> listHospital(ResultHospitalTongJiQuery condtion) {
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryByHospitalCondition(page);
+		return JsonResult.success(page);
+	}
+	
+	@PostMapping(MODEL + "/listXmShenbao.json")
+	@Function("resultPaper.query")
+	@ResponseBody
+	public JsonResult<PageQuery> listXmShenbao(ProjectApplyQuery condtion) {
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryBylistXmShenbaoCondition(page);
+		return JsonResult.success(page);
+	}
+	
+	@PostMapping(MODEL + "/listXmLixiang.json")
+	@Function("resultPaper.query")
+	@ResponseBody
+	public JsonResult<PageQuery> listXmLixiang(ProjectApprovalQuery condtion) {
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryBylistXmLixiangCondition(page);
+		return JsonResult.success(page);
+	}
+	
+	@PostMapping(MODEL + "/listLunWen.json")
+	@Function("resultPaper.query")
+	@ResponseBody
+	public JsonResult<PageQuery> listLunWen(ResultPaperQuery condtion) {
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryBylistLunWenCondition(page);
+		return JsonResult.success(page);
+	}
+	
+	@PostMapping(MODEL + "/listShuZuo.json")
+	@Function("resultPaper.query")
+	@ResponseBody
+	public JsonResult<PageQuery> listShuZuo(ResultWorkQuery condtion) {
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryBylistShuZuoCondition(page);
+		return JsonResult.success(page);
+	}
+	
+	@PostMapping(MODEL + "/listHuoJiang.json")
+	@Function("resultPaper.query")
+	@ResponseBody
+	public JsonResult<PageQuery> listHuoJiang(ResultPrizeQuery condtion) {
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryBylistHuoJiangCondition(page);
+		return JsonResult.success(page);
+	}
+	
+	@PostMapping(MODEL + "/listShenQing.json")
+	@Function("resultPaper.query")
+	@ResponseBody
+	public JsonResult<PageQuery> listShenQing(ResultPatentQuery condtion) {
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryBylistShenQingCondition(page);
+		return JsonResult.success(page);
+	}
+	
+	@PostMapping(MODEL + "/listShouQuan.json")
+	@Function("resultPaper.query")
+	@ResponseBody
+	public JsonResult<PageQuery> listShouQuan(PatentAuthQuery condtion) {
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryBylistShouQuanCondition(page);
+		return JsonResult.success(page);
+	}
+	
+	@PostMapping(MODEL + "/listRuanJian.json")
+	@Function("resultPaper.query")
+	@ResponseBody
+	public JsonResult<PageQuery> listRuanJian(ResultSoftwareQuery condtion) {
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryBylistRuanJianCondition(page);
+		return JsonResult.success(page);
+	}
+	
+	@PostMapping(MODEL + "/listBiaoZhen.json")
+	@Function("resultPaper.query")
+	@ResponseBody
+	public JsonResult<PageQuery> listBiaoZhen(ResultStandardQuery condtion) {
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryBylistBiaoZhenCondition(page);
+		return JsonResult.success(page);
+	}
+	
+	@PostMapping(MODEL + "/listYaoZheng.json")
+	@Function("resultPaper.query")
+	@ResponseBody
+	public JsonResult<PageQuery> listYaoZheng(ResultYaozhengQuery condtion) {
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryBylistYaoZhengCondition(page);
+		return JsonResult.success(page);
+	}
+
+	@PostMapping(MODEL + "/export.json")
+	@Function("resultTongJi.export")
+	@ResponseBody
+	public JsonResult<String> export(HttpServletResponse response, ResultTongJiQuery condtion) {
+		/**
+		 * 1)需要用你自己编写一个的excel模板
+		 * 2)通常excel导出需要关联更多数据，因此resultPaperService.queryByCondition方法经常不符合需求，需要重写一个为模板导出的查询
+		 * 3)参考ConsoleDictController来实现模板导入导出
+		 */
+		String excelTemplate = "excelTemplates/result/result_geren_tongji.xls";
+		condtion.setPage(1);
+		condtion.setLimit(Integer.MAX_VALUE);
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryByTongJiCondition(page);
+		// 本次导出需要的数据
+		List list = page.getList();
+		for (int i = 0; i < list.size(); i++) {
+			((TailBean) list.get(i)).set("serialNumber", i + 1);
+		}
+		try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(excelTemplate)) {
+			if (is == null) {
+				throw new PlatformException("模板资源不存在：" + excelTemplate);
+			}
+			FileItem item = fileService.createFileTemp("个人统计_" + DateUtil.now("yyyyMMddHHmmss") + ".xls");
+			OutputStream os = item.openOutpuStream();
+			Context context = new Context();
+			context.putVar("list", list);
+			JxlsHelper.getInstance().processTemplate(is, os, context);
+			os.close();
+			// 下载参考FileSystemContorller
+			return JsonResult.success(item.getPath());
+		} catch (IOException e) {
+			throw new PlatformException(e.getMessage());
+		}
+
+	}
+	
+	@PostMapping(MODEL + "/exportGR.json")
+	@Function("resultTongJi.export")
+	@ResponseBody
+	public JsonResult<String> exportGR(HttpServletResponse response, ResultTongJiQuery condtion) {
+		/**
+		 * 1)需要用你自己编写一个的excel模板
+		 * 2)通常excel导出需要关联更多数据，因此resultPaperService.queryByCondition方法经常不符合需求，需要重写一个为模板导出的查询
+		 * 3)参考ConsoleDictController来实现模板导入导出
+		 */
+		String excelTemplate = "excelTemplates/result/result_geren_tongji.xls";
+		CoreUser currentUser = corePlatformService.getCurrentUser();
+		condtion.setUserId(currentUser.getId());
+		condtion.setPage(1);
+		condtion.setLimit(Integer.MAX_VALUE);
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryByTongJiCondition(page);
+		// 本次导出需要的数据
+		List list = page.getList();
+		for (int i = 0; i < list.size(); i++) {
+			((TailBean) list.get(i)).set("serialNumber", i + 1);
+		}
+		try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(excelTemplate)) {
+			if (is == null) {
+				throw new PlatformException("模板资源不存在：" + excelTemplate);
+			}
+			FileItem item = fileService.createFileTemp("个人统计_" + DateUtil.now("yyyyMMddHHmmss") + ".xls");
+			OutputStream os = item.openOutpuStream();
+			Context context = new Context();
+			context.putVar("list", list);
+			JxlsHelper.getInstance().processTemplate(is, os, context);
+			os.close();
+			// 下载参考FileSystemContorller
+			return JsonResult.success(item.getPath());
+		} catch (IOException e) {
+			throw new PlatformException(e.getMessage());
+		}
+
+	}
+
+	@PostMapping(MODEL + "/exportDepartment.json")
+	@Function("resultTongJi.export")
+	@ResponseBody
+	public JsonResult<String> exportDepartment(HttpServletResponse response, ResultDeptTongJiQuery condtion) {
+		/**
+		 * 1)需要用你自己编写一个的excel模板
+		 * 2)通常excel导出需要关联更多数据，因此resultPaperService.queryByCondition方法经常不符合需求，需要重写一个为模板导出的查询
+		 * 3)参考ConsoleDictController来实现模板导入导出
+		 */
+		String excelTemplate = "excelTemplates/result/result_keshi_tongji.xls";
+		condtion.setPage(1);
+		condtion.setLimit(Integer.MAX_VALUE);
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryByDepartmentTongJiCondition(page);
+		// 本次导出需要的数据
+		List list = page.getList();
+		for (int i = 0; i < list.size(); i++) {
+			((TailBean) list.get(i)).set("serialNumber", i + 1);
+		}
+		try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(excelTemplate)) {
+			if (is == null) {
+				throw new PlatformException("模板资源不存在：" + excelTemplate);
+			}
+			FileItem item = fileService.createFileTemp("科室统计_" + DateUtil.now("yyyyMMddHHmmss") + ".xls");
+			OutputStream os = item.openOutpuStream();
+			Context context = new Context();
+			context.putVar("list", list);
+			JxlsHelper.getInstance().processTemplate(is, os, context);
+			os.close();
+			// 下载参考FileSystemContorller
+			return JsonResult.success(item.getPath());
+		} catch (IOException e) {
+			throw new PlatformException(e.getMessage());
+		}
+
+	}
+	
+	@PostMapping(MODEL + "/exportKZDepartment.json")
+	@Function("resultTongJi.export")
+	@ResponseBody
+	public JsonResult<String> exportKZDepartment(HttpServletResponse response, ResultDeptTongJiQuery condtion) {
+		/**
+		 * 1)需要用你自己编写一个的excel模板
+		 * 2)通常excel导出需要关联更多数据，因此resultPaperService.queryByCondition方法经常不符合需求，需要重写一个为模板导出的查询
+		 * 3)参考ConsoleDictController来实现模板导入导出
+		 */
+		String excelTemplate = "excelTemplates/result/result_keshi_tongji.xls";
+		CoreOrg currentOrg = corePlatformService.getCurrentOrg();
+		condtion.setPage(1);
+		condtion.setLimit(Integer.MAX_VALUE);
+		condtion.setDeptId(currentOrg.getId());
+		PageQuery page = condtion.getPageQuery();
+		resultPaperService.queryByDepartmentTongJiCondition(page);
+		// 本次导出需要的数据
+		List list = page.getList();
+		for (int i = 0; i < list.size(); i++) {
+			((TailBean) list.get(i)).set("serialNumber", i + 1);
+		}
+		try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(excelTemplate)) {
+			if (is == null) {
+				throw new PlatformException("模板资源不存在：" + excelTemplate);
+			}
+			FileItem item = fileService.createFileTemp("科室统计_" + DateUtil.now("yyyyMMddHHmmss") + ".xls");
+			OutputStream os = item.openOutpuStream();
+			Context context = new Context();
+			context.putVar("list", list);
+			JxlsHelper.getInstance().processTemplate(is, os, context);
+			os.close();
+			// 下载参考FileSystemContorller
+			return JsonResult.success(item.getPath());
+		} catch (IOException e) {
+			throw new PlatformException(e.getMessage());
+		}
+
+	}
+}

src/main/java/com/spk/zyse/result/web/ResultWorkController.java

@@ -159,6 +159,9 @@ public class ResultWorkController{
 		if (!StringUtils.isEmpty(condtion.getAuthor())) {
 			keyUpperCase.append("or  servicetable.subeditor like '%").append(condtion.getAuthor()).append("%')"); 
 		} 
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
         PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);
         return JsonResult.success(page);
@@ -299,6 +302,9 @@ public class ResultWorkController{
 		if (!StringUtils.isEmpty(condtion.getAuthor())) {
 			keyUpperCase.append("or  servicetable.subeditor like '%").append(condtion.getAuthor()).append("%')"); 
 		} 
+		if (!StringUtils.isEmpty(condtion.getSpecialityCt())) {
+			keyUpperCase.append("and  servicetable.SPECIALITY_CT = '").append(condtion.getSpecialityCt()).append("'"); 
+		}
 		condtion.setQuerysql(keyUpperCase.toString());
 		
         PageQuery page = proUwfActivityInstService.waitinglist(condtion, coreUser);

src/main/java/com/spk/zyse/result/web/query/PatentAuthQuery.java

@@ -32,6 +32,18 @@ public class PatentAuthQuery extends ProUwfActivityInstQuery{
     private String deptId;
     
     private Long administrative;
+    
+    @Query(name = "专业类别",  display = true,type=Query.TYPE_DICT,dict="speciality_category")    
+    private String specialityCt;
+    
+    private String userId;
+    
+    private Long belongDept ;
+    
+    private String yeraTimeMin;
+    
+    private String yeraTimeMax;
+    
     public String getPatentName(){
         return  patentName;
     }
@@ -92,5 +104,36 @@ public class PatentAuthQuery extends ProUwfActivityInstQuery{
 	public void setAdministrative(Long administrative) {
 		this.administrative = administrative;
 	}
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	public Long getBelongDept() {
+		return belongDept;
+	}
+	public void setBelongDept(Long belongDept) {
+		this.belongDept = belongDept;
+	}
+	public String getYeraTimeMin() {
+		return yeraTimeMin;
+	}
+	public void setYeraTimeMin(String yeraTimeMin) {
+		this.yeraTimeMin = yeraTimeMin;
+	}
+	public String getYeraTimeMax() {
+		return yeraTimeMax;
+	}
+	public void setYeraTimeMax(String yeraTimeMax) {
+		this.yeraTimeMax = yeraTimeMax;
+	}
+
  
 }

src/main/java/com/spk/zyse/result/web/query/ResultDeptTongJiQuery.java

+package com.spk.zyse.result.web.query;
+
+import com.spk.admin.core.annotation.Query;
+import com.spk.zyse.uwf.web.query.ProUwfActivityInstQuery;
+/**
+ *ResultPrize查询
+ */
+public class ResultDeptTongJiQuery extends ProUwfActivityInstQuery {
+//	@Query(name = "年度", display = true,type=Query.DATE_YEAR)
+//	 private String yera;
+	 @Query(name = "年度起", display = true,type=Query.DATE_YEAR)
+	 private String yeraTimeMin;
+
+	 @Query(name = "年度止", display = true,type=Query.DATE_YEAR)
+	 private String yeraTimeMax;
+	 @Query(name = "科室", display = true,type=Query.TYPE_CONTROL,control="org")    
+	 private Long deptId;
+
+	public String getYeraTimeMin() {
+		return yeraTimeMin;
+	}
+
+	public void setYeraTimeMin(String yeraTimeMin) {
+		this.yeraTimeMin = yeraTimeMin;
+	}
+
+	public String getYeraTimeMax() {
+		return yeraTimeMax;
+	}
+
+	public void setYeraTimeMax(String yeraTimeMax) {
+		this.yeraTimeMax = yeraTimeMax;
+	}
+
+	public Long getDeptId() {
+		return deptId;
+	}
+
+	public void setDeptId(Long deptId) {
+		this.deptId = deptId;
+	}
+
+
+    
+
+
+}

src/main/java/com/spk/zyse/result/web/query/ResultHospitalTongJiQuery.java

+package com.spk.zyse.result.web.query;
+
+import com.spk.admin.core.annotation.Query;
+import com.spk.zyse.uwf.web.query.ProUwfActivityInstQuery;
+/**
+ *ResultPrize查询
+ */
+public class ResultHospitalTongJiQuery extends ProUwfActivityInstQuery {
+	 @Query(name = "年度起", display = true,type=Query.DATE_YEAR)
+	 private String yeraTimeMin;
+
+	 @Query(name = "年度止", display = true,type=Query.DATE_YEAR)
+	 private String yeraTimeMax;
+
+	public String getYeraTimeMin() {
+		return yeraTimeMin;
+	}
+
+	public void setYeraTimeMin(String yeraTimeMin) {
+		this.yeraTimeMin = yeraTimeMin;
+	}
+
+	public String getYeraTimeMax() {
+		return yeraTimeMax;
+	}
+
+	public void setYeraTimeMax(String yeraTimeMax) {
+		this.yeraTimeMax = yeraTimeMax;
+	}
+	 
+}

src/main/java/com/spk/zyse/result/web/query/ResultPaperQuery.java

@@ -38,8 +38,17 @@ public class ResultPaperQuery extends ProUwfActivityInstQuery {
     @Query(name = "科室", display = true,type=Query.TYPE_CONTROL,control="org")    
     private String deptId;
     
+    @Query(name = "专业类别",  display = true,type=Query.TYPE_DICT,dict="speciality_category")    
+    private String specialityCt;
+    
     private Long belongDept;
     
+    private String userId;
+    
+    private String yeraTimeMin;
+    
+    private String yeraTimeMax;
+    
 	public String getPaperTitle() {
 		return paperTitle;
 	}
@@ -127,5 +136,38 @@ public class ResultPaperQuery extends ProUwfActivityInstQuery {
 	public void setBelongDept(Long belongDept) {
 		this.belongDept = belongDept;
 	}
+
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public String getYeraTimeMin() {
+		return yeraTimeMin;
+	}
+
+	public void setYeraTimeMin(String yeraTimeMin) {
+		this.yeraTimeMin = yeraTimeMin;
+	}
+
+	public String getYeraTimeMax() {
+		return yeraTimeMax;
+	}
+
+	public void setYeraTimeMax(String yeraTimeMax) {
+		this.yeraTimeMax = yeraTimeMax;
+	}
+
 	
 }

src/main/java/com/spk/zyse/result/web/query/ResultPatentQuery.java

@@ -20,8 +20,18 @@ public class ResultPatentQuery extends ProUwfActivityInstQuery {
     
     @Query(name = "科室", display = true,type=Query.TYPE_CONTROL,control="org")    
     private String deptId;
+    
+    @Query(name = "专业类别",  display = true,type=Query.TYPE_DICT,dict="speciality_category")    
+    private String specialityCt;
 
     private Long administrative;
+    
+    private String userId;
+    
+    private String yeraTimeMin;
+    
+    private String yeraTimeMax;
+    
 	public String getPatentName() {
 		return patentName;
 	}
@@ -69,5 +79,39 @@ public class ResultPatentQuery extends ProUwfActivityInstQuery {
 	public void setAdministrative(Long administrative) {
 		this.administrative = administrative;
 	}
+
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public String getYeraTimeMin() {
+		return yeraTimeMin;
+	}
+
+	public void setYeraTimeMin(String yeraTimeMin) {
+		this.yeraTimeMin = yeraTimeMin;
+	}
+
+	public String getYeraTimeMax() {
+		return yeraTimeMax;
+	}
+
+	public void setYeraTimeMax(String yeraTimeMax) {
+		this.yeraTimeMax = yeraTimeMax;
+	}
+
+
 	
 }

src/main/java/com/spk/zyse/result/web/query/ResultPrizeQuery.java

@@ -17,8 +17,17 @@ public class ResultPrizeQuery extends ProUwfActivityInstQuery {
     
     @Query(name = "科室", display = true,type=Query.TYPE_CONTROL,control="org")    
     private String deptId;
+    
+    @Query(name = "专业类别",  display = true,type=Query.TYPE_DICT,dict="speciality_category")    
+    private String specialityCt;
 
     private Long administrative;
+    
+    private String userId;
+    
+    private String yeraTimeMin;
+    
+    private String yeraTimeMax;
 	public String getPrizeName() {
 		return prizeName;
 	}
@@ -58,5 +67,38 @@ public class ResultPrizeQuery extends ProUwfActivityInstQuery {
 	public void setAdministrative(Long administrative) {
 		this.administrative = administrative;
 	}
- 
+
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public String getYeraTimeMin() {
+		return yeraTimeMin;
+	}
+
+	public void setYeraTimeMin(String yeraTimeMin) {
+		this.yeraTimeMin = yeraTimeMin;
+	}
+
+	public String getYeraTimeMax() {
+		return yeraTimeMax;
+	}
+
+	public void setYeraTimeMax(String yeraTimeMax) {
+		this.yeraTimeMax = yeraTimeMax;
+	}
+
+
 }

src/main/java/com/spk/zyse/result/web/query/ResultSoftwareQuery.java

@@ -30,7 +30,17 @@ public class ResultSoftwareQuery extends ProUwfActivityInstQuery {
     @Query(name = "科室", display = true,type=Query.TYPE_CONTROL,control="org")    
     private String deptId;
     
+    @Query(name = "专业类别",  display = true,type=Query.TYPE_DICT,dict="speciality_category")    
+    private String specialityCt;
+    
     private Long administrative;
+    
+    private String userId;
+    
+    private String yeraTimeMin;
+    
+    private String yeraTimeMax;
+    
 	public String getSoftwareName() {
 		return softwareName;
 	}
@@ -100,5 +110,37 @@ public class ResultSoftwareQuery extends ProUwfActivityInstQuery {
 	public void setAdministrative(Long administrative) {
 		this.administrative = administrative;
 	}
+
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+
+	public String getYeraTimeMin() {
+		return yeraTimeMin;
+	}
+
+	public void setYeraTimeMin(String yeraTimeMin) {
+		this.yeraTimeMin = yeraTimeMin;
+	}
+
+	public String getYeraTimeMax() {
+		return yeraTimeMax;
+	}
+
+	public void setYeraTimeMax(String yeraTimeMax) {
+		this.yeraTimeMax = yeraTimeMax;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
  
 }

src/main/java/com/spk/zyse/result/web/query/ResultStandardQuery.java

@@ -32,8 +32,17 @@ public class ResultStandardQuery extends ProUwfActivityInstQuery {
     
     @Query(name = "科室", display = true,type=Query.TYPE_CONTROL,control="org")    
     private String deptId;
+    
+    @Query(name = "专业类别",  display = true,type=Query.TYPE_DICT,dict="speciality_category")    
+    private String specialityCt;
 	
     private Long administrative;
+    
+    private String userId;
+    
+    private String yeraTimeMin;
+    
+    private String yeraTimeMax;
     public String getStandardName() {
 		return standardName;
 	}
@@ -111,6 +120,37 @@ public class ResultStandardQuery extends ProUwfActivityInstQuery {
 	public void setAdministrative(Long administrative) {
 		this.administrative = administrative;
 	}
-	
-	
+
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public String getYeraTimeMin() {
+		return yeraTimeMin;
+	}
+
+	public void setYeraTimeMin(String yeraTimeMin) {
+		this.yeraTimeMin = yeraTimeMin;
+	}
+
+	public String getYeraTimeMax() {
+		return yeraTimeMax;
+	}
+
+	public void setYeraTimeMax(String yeraTimeMax) {
+		this.yeraTimeMax = yeraTimeMax;
+	}
+
 }

src/main/java/com/spk/zyse/result/web/query/ResultTongJiQuery.java

+package com.spk.zyse.result.web.query;
+
+import com.spk.admin.core.annotation.Query;
+import com.spk.zyse.uwf.web.query.ProUwfActivityInstQuery;
+/**
+ *ResultPrize查询
+ */
+public class ResultTongJiQuery extends ProUwfActivityInstQuery {
+    @Query(name = "姓名", display = true)        
+    private String name;
+
+//    @Query(name = "年度", display = true,type=Query.DATE_YEAR)
+//	private String yera;
+    @Query(name = "年度起", display = true,type=Query.DATE_YEAR)
+	 private String yeraTimeMin;
+
+	 @Query(name = "年度止", display = true,type=Query.DATE_YEAR)
+	 private String yeraTimeMax;
+    
+    @Query(name = "专业类别", display = true,type=Query.TYPE_DICT,dict="speciality_category")
+   	private String specialityCt;
+    
+    private Long deptId;
+    
+    private Long userId ;
+    
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Long getDeptId() {
+		return deptId;
+	}
+
+	public void setDeptId(Long deptId) {
+		this.deptId = deptId;
+	}
+
+	public String getYeraTimeMin() {
+		return yeraTimeMin;
+	}
+
+	public void setYeraTimeMin(String yeraTimeMin) {
+		this.yeraTimeMin = yeraTimeMin;
+	}
+
+	public String getYeraTimeMax() {
+		return yeraTimeMax;
+	}
+
+	public void setYeraTimeMax(String yeraTimeMax) {
+		this.yeraTimeMax = yeraTimeMax;
+	}
+
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+    
+
+
+}

src/main/java/com/spk/zyse/result/web/query/ResultWorkQuery.java

@@ -16,8 +16,17 @@ public class ResultWorkQuery extends ProUwfActivityInstQuery {
     private String publisher;
     @Query(name = "科室", display = true,type=Query.TYPE_CONTROL,control="org")    
     private String deptId;
+    @Query(name = "专业类别",  display = true,type=Query.TYPE_DICT,dict="speciality_category")    
+    private String specialityCt;
 
     private Long administrative;
+    
+    private String userId;
+    
+    private String yeraTimeMin;
+    
+    private String yeraTimeMax;
+    
 	public String getWorkName() {
 		return workName;
 	}
@@ -65,5 +74,39 @@ public class ResultWorkQuery extends ProUwfActivityInstQuery {
 	public void setAdministrative(Long administrative) {
 		this.administrative = administrative;
 	}
+
+	public String getSpecialityCt() {
+		return specialityCt;
+	}
+
+	public void setSpecialityCt(String specialityCt) {
+		this.specialityCt = specialityCt;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public String getYeraTimeMin() {
+		return yeraTimeMin;
+	}
+
+	public void setYeraTimeMin(String yeraTimeMin) {
+		this.yeraTimeMin = yeraTimeMin;
+	}
+
+	public String getYeraTimeMax() {
+		return yeraTimeMax;
+	}
+
+	public void setYeraTimeMax(String yeraTimeMax) {
+		this.yeraTimeMax = yeraTimeMax;
+	}
+
+
 	
 }

src/main/java/com/spk/zyse/result/web/query/ResultYaozhengQuery.java

@@ -14,6 +14,13 @@ public class ResultYaozhengQuery extends ProUwfActivityInstQuery {
     private String yaozhengName;
     
     private Long administrative;
+    
+    private String userId;
+    
+    private String yeraTimeMin;
+    
+    private String yeraTimeMax;
+    
     public String getYaozhengName(){
         return  yaozhengName;
     }
@@ -26,5 +33,24 @@ public class ResultYaozhengQuery extends ProUwfActivityInstQuery {
 	public void setAdministrative(Long administrative) {
 		this.administrative = administrative;
 	}
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	public String getYeraTimeMin() {
+		return yeraTimeMin;
+	}
+	public void setYeraTimeMin(String yeraTimeMin) {
+		this.yeraTimeMin = yeraTimeMin;
+	}
+	public String getYeraTimeMax() {
+		return yeraTimeMax;
+	}
+	public void setYeraTimeMax(String yeraTimeMax) {
+		this.yeraTimeMax = yeraTimeMax;
+	}
+
  
 }

src/main/resources/application.properties

@@ -12,7 +12,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 
 spring.mail.host=smtphz.qiye.163.com
-spring.mail.username=xitongyoujian@bjzhongyi.com
+spring.mail.username=xitongyoujian111@bjzhongyi.com
 spring.mail.password=Cn89mx3Xhy99E2A4
 spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true

src/main/resources/sql/project/projectApply.md

@@ -84,7 +84,9 @@ synList
 	@if(!isEmpty(lixiang)){
         and  a.LIXIANG = #lixiang#
     @}
-	
+	@if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+    @}
 	
 	
 	
\ No newline at end of file

src/main/resources/sql/project/projectApproval.md

@@ -118,3 +118,6 @@ synList
     @if(!isEmpty(administrative)){
         and  a.BELONG_DEPT = #administrative#
     @}
+    @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+    @}

src/main/resources/sql/result/patentAuth.md

@@ -74,4 +74,7 @@ synList
     @}
 	@if(!isEmpty(administrative)){
         and  a.belong_dept = #administrative#
+    @}
+    @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
     @}
\ No newline at end of file

src/main/resources/sql/result/resultPaper.md

@@ -84,3 +84,1046 @@ synList
     @if(!isEmpty(belongDept)){
         and  a.belong_dept = #belongDept#
     @}
+    @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+    @}
+
+queryByTongJiCondition
+===
+
+    select 
+    @pageTag(){
+    * 
+    @}
+    from (
+	SELECT 
+	u.id
+	,u.`NAME`
+	,u.ORG_ID
+	,sum(case when  u.ID = a.USER_ID  then 1 else 0 end) xmshenbao
+	,sum(case when  u.ID = a2.USER_ID  then 1 else 0 end) xmlixiang
+	,sum(case when  u.ID = p.USER_ID  then 1 else 0 end) lunwen
+	,sum(case when  u.ID = w.USER_ID  then 1 else 0 end) shuzuo
+	,sum(case when  u.ID = p2.USER_ID  then 1 else 0 end) huojiang
+	,sum(case when  u.ID = p3.USER_ID  then 1 else 0 end) shenqing
+	,sum(case when  u.ID = au.USER_ID  then 1 else 0 end) shouquan
+	,sum(case when  u.ID = s.USER_ID  then 1 else 0 end) ruanjian
+	,sum(case when  u.ID = s2.USER_ID  then 1 else 0 end) biaozhen
+	,sum(case when  u.ID = y.USER_ID  then 1 else 0 end) yaozheng
+	FROM core_user u 
+	left join(
+	SELECT
+     a.*,o.name as deptname,i.user_name as username
+	FROM
+     project_apply a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.BEAR_DEPT 
+	WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0" 
+	@if(!isEmpty(yeraTimeMin)){
+    and   DATE_FORMAT(a.APPLY_TIME,'%Y')  >= #yeraTimeMin#
+    @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.APPLY_TIME,'%Y') <= #yeraTimeMax#
+    @}
+     @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+     @}
+	) a on u.ID = a.USER_ID 
+	left join(
+	SELECT
+	a.*,o.name as deptname,i.user_name as username
+	FROM
+	project_approval a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.BELONG_DEPT 
+	WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+	@if(!isEmpty(yeraTimeMin)){
+    and  DATE_FORMAT(a.RATIFY_TIME,'%Y') >= #yeraTimeMin#
+    @}
+    @if(!isEmpty(yeraTimeMax)){
+     and DATE_FORMAT(a.RATIFY_TIME,'%Y') <= #yeraTimeMax#
+    @}
+      @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+     @}
+	) a2 on u.ID = a2.USER_ID 
+	LEFT JOIN (SELECT
+	a.*,o.name as deptname,i.user_name as username
+	from
+	result_paper a 
+	left join pro_uwf_process_inst i on a.PROCESSINST_ID = i.PROCESSINST_ID 
+	left join core_org o on o.id=a.belong_dept 
+	where i.PROCESS_STATE="end" and i.APPROVAL_STATE="0" 
+	@if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.PUBLISH_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.PUBLISH_TIME,'%Y') <= #yeraTimeMax#
+    @}
+      @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+     @}
+	) p on u.ID = p.USER_ID 
+	LEFT JOIN (
+	SELECT
+	a.*,o.name as deptname,i.user_name as username
+	from
+	result_work a 
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.DEPT_ID
+	WHERE i.PROCESS_STATE="end" and i.APPROVAL_STATE="0"
+	@if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.PUBLISH_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.PUBLISH_TIME,'%Y') <= #yeraTimeMax#
+    @}
+      @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+     @}
+	) w on u.ID = w.USER_ID 
+	LEFT JOIN (
+	SELECT
+	a.*,o.name as deptname,i.user_name as username
+	from
+	result_prize a 
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.DEPT_ID 
+	WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+	@if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.PRIZE_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.PRIZE_TIME,'%Y') <= #yeraTimeMax#
+    @}
+      @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+     @}
+	) p2 on u.ID = p2.USER_ID 
+	LEFT JOIN (
+	SELECT
+	a.*,o.name as deptname,i.user_name as username
+	from
+	result_patent a 
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.DEPT_ID 
+	WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+	@if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.APPLY_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.APPLY_TIME,'%Y') <= #yeraTimeMax#
+    @}
+      @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+     @}
+	) p3 on u.ID = p3.USER_ID 
+	LEFT JOIN (
+	SELECT
+	a.*,o.name as deptname,i.user_name as username
+	from
+	patent_auth a 
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.belong_dept 
+	WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+	@if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.PATENT_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.PATENT_TIME,'%Y') <= #yeraTimeMax#
+    @}
+     @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+     @} 
+	) au on u.ID = au.USER_ID 
+	LEFT JOIN (
+	SELECT
+	a.*,o.name as deptname,i.user_name as username
+	from
+	result_software a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.dept_id 
+	WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+	@if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.FINISH_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.FINISH_TIME,'%Y') <= #yeraTimeMax#
+    @}
+     @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+     @} 
+	) s on u.ID = s.USER_ID 
+	LEFT JOIN (
+	SELECT
+	a.*,o.name as deptname,i.user_name as username
+	from
+	result_standard a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.dept_id 
+	WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"    
+	@if(!isEmpty(yeraTimeMin)){
+     and   DATE_FORMAT(a.PUBLISH_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and   DATE_FORMAT(a.PUBLISH_TIME,'%Y') <= #yeraTimeMax#
+    @}
+     @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+     @} 
+	) s2 on u.ID = s2.USER_ID 
+	LEFT JOIN (
+	SELECT
+	a.*,o.name as deptname,i.user_name as username
+	from
+	result_yaozheng a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.dept_id   
+	wHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0" 
+	 @if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.REGISTER_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.REGISTER_TIME,'%Y') <= #yeraTimeMax#
+    @} 
+	) y on u.ID = y.USER_ID 
+	WHERE u.`NAME` NOT IN ('-', '0', 'app',"") 
+	@if(!isEmpty(name)){
+        and  u.name = #name#
+    @}
+    @if(!isEmpty(userId)){
+        and  u.id = #userId#
+    @}
+    @if(!isEmpty(deptId)){
+        and u.ORG_ID =#deptId#
+    @}
+	group by u.name 
+    ) a
+    
+queryByDepartmentTongJiCondition
+===
+
+     select 
+     @pageTag(){
+     *
+     @} 
+    from (
+	SELECT 
+	u.id
+	,u.`NAME`
+	,sum(case when  u.ID = a.BEAR_DEPT  then 1 else 0 end) xmshenbao
+	,sum(case when  u.ID = a2.BELONG_DEPT  then 1 else 0 end) xmlixiang
+	,sum(case when  u.ID = p.BELONG_DEPT  then 1 else 0 end) lunwen
+	,sum(case when  u.ID = w.DEPT_ID  then 1 else 0 end) shuzuo
+	,sum(case when  u.ID = p2.DEPT_ID  then 1 else 0 end) huojiang
+	,sum(case when  u.ID = p3.DEPT_ID  then 1 else 0 end) shenqing
+	,sum(case when  u.ID = au.BELONG_DEPT  then 1 else 0 end) shouquan
+	,sum(case when  u.ID = s.DEPT_ID  then 1 else 0 end) ruanjian
+	,sum(case when  u.ID = s2.DEPT_ID  then 1 else 0 end) biaozhen
+	,sum(case when  u.ID = y.DEPT_ID  then 1 else 0 end) yaozheng
+	FROM core_org u 
+	LEFT JOIN (SELECT
+	a.*,o.name as deptname,i.user_name as username
+	from
+	result_paper a 
+	left join pro_uwf_process_inst i on a.PROCESSINST_ID = i.PROCESSINST_ID 
+	left join core_org o on o.id=a.belong_dept 
+	where i.PROCESS_STATE="end" and i.APPROVAL_STATE="0" 
+	@if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.PUBLISH_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.PUBLISH_TIME,'%Y') <= #yeraTimeMax#
+    @}
+	) p on u.ID = p.BELONG_DEPT 
+	left join(
+	SELECT
+     a.*,o.name as deptname,i.user_name as username
+	FROM
+     project_apply a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.BEAR_DEPT 
+	WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0" 
+	@if(!isEmpty(yeraTimeMin)){
+     and   DATE_FORMAT(a.APPLY_TIME,'%Y')  >= #yeraTimeMin#
+    @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.APPLY_TIME,'%Y') <= #yeraTimeMax#
+    @}
+	) a on u.ID = a.BEAR_DEPT 
+	left join(
+	SELECT
+	a.*,o.name as deptname,i.user_name as username
+	FROM
+	project_approval a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.BELONG_DEPT 
+	WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+	@if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.RATIFY_TIME,'%Y') >= #yeraTimeMin#
+    @}
+    @if(!isEmpty(yeraTimeMax)){
+     and DATE_FORMAT(a.RATIFY_TIME,'%Y') <= #yeraTimeMax#
+    @}
+	) a2 on u.ID = a2.BELONG_DEPT 
+	LEFT JOIN (
+	SELECT
+	a.*,o.name as deptname,i.user_name as username
+	from
+	result_work a 
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.DEPT_ID
+	WHERE i.PROCESS_STATE="end" and i.APPROVAL_STATE="0"
+	@if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.PUBLISH_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.PUBLISH_TIME,'%Y') <= #yeraTimeMax#
+    @}
+	) w on u.ID = w.DEPT_ID 
+	LEFT JOIN (
+	SELECT
+	a.*,o.name as deptname,i.user_name as username
+	from
+	result_prize a 
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.DEPT_ID 
+	WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+	@if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.PRIZE_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.PRIZE_TIME,'%Y') <= #yeraTimeMax#
+    @}
+	) p2 on u.ID = p2.DEPT_ID 
+	LEFT JOIN (
+	SELECT
+	a.*,o.name as deptname,i.user_name as username
+	from
+	result_patent a 
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.DEPT_ID 
+	WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+	@if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.APPLY_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.APPLY_TIME,'%Y') <= #yeraTimeMax#
+    @}
+	) p3 on u.ID = p3.DEPT_ID 
+	LEFT JOIN (
+	SELECT
+	a.*,o.name as deptname,i.user_name as username
+	from
+	patent_auth a 
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.belong_dept 
+	WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+	@if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.PATENT_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.PATENT_TIME,'%Y') <= #yeraTimeMax#
+    @}
+	) au on u.ID = au.BELONG_DEPT 
+	LEFT JOIN (
+	SELECT
+	a.*,o.name as deptname,i.user_name as username
+	from
+	result_software a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.dept_id 
+	WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+	 @if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.FINISH_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.FINISH_TIME,'%Y') <= #yeraTimeMax#
+    @}
+	) s on u.ID = s.DEPT_ID 
+	LEFT JOIN (
+	SELECT
+	a.*,o.name as deptname,i.user_name as username
+	from
+	result_standard a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.dept_id 
+	WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"    
+	@if(!isEmpty(yeraTimeMin)){
+     and   DATE_FORMAT(a.PUBLISH_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and   DATE_FORMAT(a.PUBLISH_TIME,'%Y') <= #yeraTimeMax#
+    @}
+	) s2 on u.ID = s2.DEPT_ID 
+	LEFT JOIN (
+	SELECT
+	a.*,o.name as deptname,i.user_name as username
+	from
+	result_yaozheng a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.dept_id   
+	wHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0" 
+	@if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.REGISTER_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.REGISTER_TIME,'%Y') <= #yeraTimeMax#
+    @} 
+	) y on u.ID = y.DEPT_ID 
+	WHERE u.`NAME` NOT IN ('北京中医医院顺义医院',"") 
+	@if(!isEmpty(deptId)){
+        and  u.id = #deptId#
+    @}
+	group by u.id 
+    ) a
+
+queryByHospitalCondition
+===
+ 
+    select 
+     @pageTag(){
+    '北京中医医院顺义医院' as yiyua, 
+	  (SELECT
+		 COUNT(*)
+	   FROM
+		project_apply a
+		LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+		LEFT JOIN core_org o ON o.id = a.BEAR_DEPT 
+	  WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0" 
+	  @if(!isEmpty(yeraTimeMin)){
+        and   DATE_FORMAT(a.APPLY_TIME,'%Y')  >= #yeraTimeMin#
+       @}
+       @if(!isEmpty(yeraTimeMax)){
+        and  DATE_FORMAT(a.APPLY_TIME,'%Y') <= #yeraTimeMax#
+       @}
+	  ) as xmshenbao,
+		(SELECT
+		COUNT(*)
+	    FROM
+		project_approval a
+		LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+		LEFT JOIN core_org o ON o.id = a.BELONG_DEPT 
+	  WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+       @if(!isEmpty(yeraTimeMin)){
+        and  DATE_FORMAT(a.RATIFY_TIME,'%Y') >= #yeraTimeMin#
+       @}
+       @if(!isEmpty(yeraTimeMax)){
+        and DATE_FORMAT(a.RATIFY_TIME,'%Y') <= #yeraTimeMax#
+       @}
+		) as xmlixiang,
+	  (SELECT
+		COUNT(*)
+		from
+		result_paper a 
+		left join pro_uwf_process_inst i on a.PROCESSINST_ID = i.PROCESSINST_ID 
+		left join core_org o on o.id=a.belong_dept 
+		where i.PROCESS_STATE="end" and i.APPROVAL_STATE="0" 
+         @if(!isEmpty(yeraTimeMin)){
+         and  DATE_FORMAT(a.PUBLISH_TIME,'%Y') >= #yeraTimeMin#
+         @}
+        @if(!isEmpty(yeraTimeMax)){
+         and  DATE_FORMAT(a.PUBLISH_TIME,'%Y') <= #yeraTimeMax#
+        @}
+		) as lunwen, 
+		(
+		SELECT
+		COUNT(*)
+		from
+		result_work a 
+		LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+		LEFT JOIN core_org o ON o.id = a.DEPT_ID
+		WHERE i.PROCESS_STATE="end" and i.APPROVAL_STATE="0"
+          @if(!isEmpty(yeraTimeMin)){
+         and  DATE_FORMAT(a.PUBLISH_TIME,'%Y') >= #yeraTimeMin#
+         @}
+        @if(!isEmpty(yeraTimeMax)){
+         and  DATE_FORMAT(a.PUBLISH_TIME,'%Y') <= #yeraTimeMax#
+        @}
+		) as shuzuo, 
+		(
+		SELECT
+	    COUNT(*)
+		from
+		result_prize a 
+		LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+		LEFT JOIN core_org o ON o.id = a.DEPT_ID 
+		WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+          @if(!isEmpty(yeraTimeMin)){
+         and  DATE_FORMAT(a.PRIZE_TIME,'%Y') >= #yeraTimeMin#
+         @}
+        @if(!isEmpty(yeraTimeMax)){
+         and  DATE_FORMAT(a.PRIZE_TIME,'%Y') <= #yeraTimeMax#
+        @}
+		) as huojiang, 
+		(
+		SELECT
+		COUNT(*)
+		from
+		result_patent a 
+		LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+		LEFT JOIN core_org o ON o.id = a.DEPT_ID 
+		WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+         @if(!isEmpty(yeraTimeMin)){
+         and  DATE_FORMAT(a.APPLY_TIME,'%Y') >= #yeraTimeMin#
+         @}
+        @if(!isEmpty(yeraTimeMax)){
+         and  DATE_FORMAT(a.APPLY_TIME,'%Y') <= #yeraTimeMax#
+        @}
+		) as shenqing, 
+		(
+		SELECT
+		COUNT(*)
+		from
+		patent_auth a 
+		LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+		LEFT JOIN core_org o ON o.id = a.belong_dept 
+		WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+          @if(!isEmpty(yeraTimeMin)){
+         and  DATE_FORMAT(a.PATENT_TIME,'%Y') >= #yeraTimeMin#
+         @}
+        @if(!isEmpty(yeraTimeMax)){
+         and  DATE_FORMAT(a.PATENT_TIME,'%Y') <= #yeraTimeMax#
+        @}
+		) as shouquan, 
+		(
+		SELECT
+		COUNT(*)
+		from
+		result_software a
+		LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+		LEFT JOIN core_org o ON o.id = a.dept_id 
+		WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+          @if(!isEmpty(yeraTimeMin)){
+         and  DATE_FORMAT(a.FINISH_TIME,'%Y') >= #yeraTimeMin#
+         @}
+        @if(!isEmpty(yeraTimeMax)){
+         and  DATE_FORMAT(a.FINISH_TIME,'%Y') <= #yeraTimeMax#
+        @}
+		) as ruanjian, 
+		(
+		SELECT
+		COUNT(*)
+		from
+		result_standard a
+		LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+		LEFT JOIN core_org o ON o.id = a.dept_id 
+		WHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"  
+          @if(!isEmpty(yeraTimeMin)){
+         and   DATE_FORMAT(a.PUBLISH_TIME,'%Y') >= #yeraTimeMin#
+         @}
+        @if(!isEmpty(yeraTimeMax)){
+         and   DATE_FORMAT(a.PUBLISH_TIME,'%Y') <= #yeraTimeMax#
+        @}
+		) as biaozhen, 
+		(
+		SELECT
+		COUNT(*)
+		from
+		result_yaozheng a
+		LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+		LEFT JOIN core_org o ON o.id = a.dept_id   
+		wHERE i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0" 
+           @if(!isEmpty(yeraTimeMin)){
+         and  DATE_FORMAT(a.REGISTER_TIME,'%Y') >= #yeraTimeMin#
+         @}
+        @if(!isEmpty(yeraTimeMax)){
+         and  DATE_FORMAT(a.REGISTER_TIME,'%Y') <= #yeraTimeMax#
+        @} 
+		) as yaozheng         
+          @} 
+          
+queryBylistXmShenbaoCondition
+===
+
+    SELECT
+    @pageTag(){
+	a.*,
+	o.NAME AS deptname,
+	i.user_name AS username,
+	i.APPROVAL_STATE As approvalstate 
+	@}
+    FROM
+	project_apply a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.BEAR_DEPT 
+    WHERE
+	i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+	@if(!isEmpty(querysql)){
+       #text(querysql)#
+	@}
+	@if(!isEmpty(userId)){
+	and a.USER_ID = #userId#
+	@}
+	@if(!isEmpty(projectName)){
+        and  a.PROJECT_NAME like #"%"+projectName+"%"#
+    @}
+    @if(!isEmpty(applyTime)){
+        and  a.APPLY_TIME like #"%"+applyTime+"%"#
+    @}
+    @if(!isEmpty(level)){
+        and  a.LEVEL like #"%"+level+"%"#
+    @}
+    @if(!isEmpty(projectSource)){
+        and  a.PROJECT_SOURCE like #"%"+projectSource+"%"#
+    @}
+    @if(!isEmpty(projectCategory)){
+        and  a.PROJECT_CATEGORY like #"%"+projectCategory+"%"#
+    @}
+    @if(!isEmpty(topicType)){
+        and  a.TOPIC_TYPE like #"%"+topicType+"%"#
+    @}
+    @if(!isEmpty(principal)){
+        and  a.PRINCIPAL like #"%"+principal+"%"#
+    @}
+     @if(!isEmpty(fundingLevel)){
+        and  a.FUNDING_LEVEL like #"%"+fundingLevel+"%"#
+    @}
+    @if(!isEmpty(isEthic)){
+        and  a.IS_ETHIC like #"%"+isEthic+"%"#
+    @}
+	@if(!isEmpty(bearDept)){
+        and  a.BEAR_DEPT = #bearDept#
+    @}
+	@if(!isEmpty(administrative)){
+        and  a.BEAR_DEPT = #administrative#
+    @}
+	@if(!isEmpty(lixiang)){
+        and  a.LIXIANG = #lixiang#
+    @}
+	@if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+    @}
+	@if(!isEmpty(yeraTimeMin)){
+        and   DATE_FORMAT(a.APPLY_TIME,'%Y')  >= #yeraTimeMin#
+     @}
+     @if(!isEmpty(yeraTimeMax)){
+        and  DATE_FORMAT(a.APPLY_TIME,'%Y') <= #yeraTimeMax#
+     @}       
+          
+queryBylistXmLixiangCondition
+===
+
+     SELECT
+    @pageTag(){
+	a.*,
+	o.NAME AS deptname,
+	i.user_name AS username, 
+	i.APPROVAL_STATE AS approvalstate
+	@}
+    FROM
+	project_approval a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.BELONG_DEPT 
+    WHERE
+	i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+	@if(!isEmpty(querysql)){
+       #text(querysql)#
+	@}
+	@if(!isEmpty(userId)){
+	and a.USER_ID = #userId#
+	@}
+	@if(!isEmpty(projectName)){
+        and  a.PROJECT_NAME like #"%"+projectName+"%"#
+    @}
+    @if(!isEmpty(ratifyTime)){
+        and  a.RATIFY_TIME like #"%"+ratifyTime+"%"#
+    @}
+    @if(!isEmpty(endTime)){
+        and  a.END_TIME like #"%"+endTime+"%"#
+    @}
+    @if(!isEmpty(projectLevel)){
+        and  a.PROJECT_LEVEL like #"%"+projectLevel+"%"#
+    @}
+    @if(!isEmpty(projectSource)){
+        and  a.project_source like #"%"+projectSource+"%"#
+    @}
+    @if(!isEmpty(isEthic)){
+        and  a.IS_ETHIC like #"%"+isEthic+"%"#
+    @}
+	@if(!isEmpty(belongDept)){
+        and  a.BELONG_DEPT = #belongDept#
+    @}
+    @if(!isEmpty(administrative)){
+        and  a.BELONG_DEPT = #administrative#
+    @}
+    @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+    @}          
+    @if(!isEmpty(yeraTimeMin)){
+        and  DATE_FORMAT(a.RATIFY_TIME,'%Y') >= #yeraTimeMin#
+    @}
+    @if(!isEmpty(yeraTimeMax)){
+       and DATE_FORMAT(a.RATIFY_TIME,'%Y') <= #yeraTimeMax#
+    @}      
+queryBylistLunWenCondition
+===
+
+     select 
+    @pageTag(){
+    a.*,o.name as deptname,i.user_name as username
+    @}
+    from result_paper a 
+	left join pro_uwf_process_inst i on a.PROCESSINST_ID = i.PROCESSINST_ID 
+	left join core_org o on o.id=a.belong_dept 
+	where i.PROCESS_STATE="end" and i.APPROVAL_STATE="0" 
+	@if(!isEmpty(userId)){
+	and a.USER_ID = #userId#
+	@}
+	@if(!isEmpty(belongDept)){
+	and a.BELONG_DEPT = #belongDept#
+	@}
+	@if(!isEmpty(paperTitle)){
+        and  a.paper_title like #"%"+paperTitle+"%"#
+    @}
+	@if(!isEmpty(textType)){
+        and  a.text_type = #textType#
+    @}
+	@if(!isEmpty(paperType)){
+        and  a.paper_type = #paperType#
+    @}
+	@if(!isEmpty(periodicalType)){
+        and  a.periodical_Type like #"%"+periodicalType+"%"#
+    @}
+    @if(!isEmpty(jcrSubarea)){
+        and  a.jcr_subarea = #jcrSubarea#
+    @}
+    @if(!isEmpty(publishTime)){
+        and  a.publish_time like #"%"+publishTime+"%"#
+    @}
+    @if(!isEmpty(firstAuthor)){
+        and  a.first_Author like #"%"+firstAuthor+"%"#
+    @}
+    @if(!isEmpty(txAuthor)){
+        and  a.tx_Author like #"%"+txAuthor+"%"#
+    @}
+    @if(!isEmpty(querysql)){
+       #text(querysql)#
+	@}
+    @if(!isEmpty(deptId)){
+        and  a.belong_dept = #deptId#
+    @}
+    @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+    @}
+    @if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.PUBLISH_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.PUBLISH_TIME,'%Y') <= #yeraTimeMax#
+    @}
+queryBylistShuZuoCondition
+===
+
+     SELECT
+    @pageTag(){
+	a.*,o.name as deptname,i.user_name as username 
+	@}
+    FROM
+	result_work a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.DEPT_ID
+	WHERE i.PROCESS_STATE="end" and i.APPROVAL_STATE="0"
+	@if(!isEmpty(userId)){
+	and a.USER_ID = #userId#
+	@}
+	@if(!isEmpty(workName)){
+        and  a.work_name like #"%"+workName+"%"#
+    @}
+	@if(!isEmpty(deptId)){
+        and  a.dept_id = #deptId#
+    @}
+    @if(!isEmpty(publishTime)){
+        and  a.publish_time like #"%"+publishTime+"%"#
+    @}
+    @if(!isEmpty(publisher)){
+        and  a.publisher like #"%"+publisher+"%"#
+    @}
+    @if(!isEmpty(author)){
+        AND (a.editor_chief LIKE #"%"+author+"%"# or a.subeditor like #"%"+author+"%"# or a.all_author like #"%"+author+"%"#  )
+    @}
+    @if(!isEmpty(administrative)){
+        and  a.dept_id = #administrative#
+    @}
+     @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+    @}
+    @if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.PUBLISH_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.PUBLISH_TIME,'%Y') <= #yeraTimeMax#
+    @}
+queryBylistHuoJiangCondition
+===  
+
+
+    SELECT
+    @pageTag(){
+	a.*,
+	o.NAME AS deptname,
+	i.user_name AS username 
+	@}
+    FROM
+	result_prize a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.DEPT_ID 
+    WHERE
+	i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+	@if(!isEmpty(userId)){
+	and a.USER_ID = #userId#
+	@}
+	@if(!isEmpty(prizeName)){
+        and  a.PRIZE_NAME like #"%"+prizeName+"%"#
+    @}
+    @if(!isEmpty(prizeTime)){
+        and  a.PRIZE_TIME like #"%"+prizeTime+"%"#
+    @}
+    @if(!isEmpty(finishPerson)){
+        and  a.finish_person like #"%"+finishPerson+"%"#
+    @}
+	@if(!isEmpty(deptId)){
+        and  a.dept_id = #deptId#
+    @}
+    @if(!isEmpty(administrative)){
+        and  a.dept_id = #administrative#
+    @}
+        @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+    @}
+    @if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.PRIZE_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.PRIZE_TIME,'%Y') <= #yeraTimeMax#
+    @}
+queryBylistShenQingCondition
+===
+
+
+    SELECT
+    @pageTag(){
+	a.*,
+	o.NAME AS deptname,
+	i.user_name AS username 
+	@}
+    FROM
+	result_patent a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.DEPT_ID 
+    WHERE
+	i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+	@if(!isEmpty(userId)){
+	and a.USER_ID = #userId#
+	@}
+    @if(!isEmpty(patentName)){
+        and  a.PATENT_NAME like #"%"+patentName+"%"#
+    @}
+    @if(!isEmpty(patentCategory)){
+        and  a.PATENT_CATEGORY like #"%"+patentCategory+"%"#
+    @}
+    @if(!isEmpty(inventPerson)){
+        and  a.INVENT_PERSON like #"%"+inventPerson+"%"#
+    @}
+    @if(!isEmpty(applyTime)){
+        and  a.APPLY_TIME like #"%"+applyTime+"%"#
+    @}
+	@if(!isEmpty(deptId)){
+        and  a.dept_id = #deptId#
+    @}
+    @if(!isEmpty(administrative)){
+        and  a.dept_id = #administrative#
+    @}
+    @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+    @}
+     @if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.APPLY_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.APPLY_TIME,'%Y') <= #yeraTimeMax#
+    @}
+queryBylistShouQuanCondition
+===
+
+    SELECT
+    @pageTag(){
+	a.*,
+	o.NAME AS deptname,
+	i.user_name AS username 
+	@}
+    FROM
+	patent_auth a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.belong_dept 
+    WHERE
+	i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+	@if(!isEmpty(userId)){
+	and a.USER_ID = #userId#
+	@}
+	@if(!isEmpty(belongDept)){
+	and a.BELONG_DEPT = #belongDept#
+	@}
+	@if(!isEmpty(patentName)){
+        and  a.PATENT_NAME like #"%"+patentName+"%"#
+    @}
+    @if(!isEmpty(authNoticeYear)){
+        and  a.auth_notice_day like #"%"+authNoticeYear+"%"#
+    @}
+    @if(!isEmpty(patentCategory)){
+        and  a.patent_category = #patentCategory#
+    @}
+    @if(!isEmpty(startDateMin)){
+        and  a.AUTH_NOTICE_DAY >= #startDateMin#
+    @}
+    @if(!isEmpty(startDateMax)){
+        and  a.AUTH_NOTICE_DAY <= #startDateMax#
+    @}
+     @if(!isEmpty(inventPerson)){
+        and  a.INVENT_PERSON like #"%"+inventPerson+"%"#
+    @}
+	@if(!isEmpty(deptId)){
+        and  a.belong_dept = #deptId#
+    @}
+	@if(!isEmpty(administrative)){
+        and  a.belong_dept = #administrative#
+    @}
+    @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+    @}      
+    @if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.PATENT_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.PATENT_TIME,'%Y') <= #yeraTimeMax#
+    @} 
+queryBylistRuanJianCondition
+===
+
+     SELECT
+    @pageTag(){
+	a.*,
+	o.NAME AS deptname,
+	i.user_name AS username 
+	@}
+    FROM
+	result_software a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.dept_id 
+    WHERE
+	i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"
+	@if(!isEmpty(userId)){
+	and a.USER_ID = #userId#
+	@}
+	@if(!isEmpty(softwareName)){
+        and  a.SOFTWARE_NAME like #"%"+softwareName+"%"#
+    @}
+    @if(!isEmpty(finishTimeMin)){
+        and  a.FINISH_TIME >= #finishTimeMin#
+    @}
+    @if(!isEmpty(finishTimeMax)){
+        and  a.FINISH_TIME <= #finishTimeMax#
+    @}
+    @if(!isEmpty(copyrightOwner)){
+        and  a.COPYRIGHT_OWNER like #"%"+copyrightOwner+"%"#
+    @}
+    @if(!isEmpty(designer)){
+        and  a.DESIGNER like #"%"+designer+"%"#
+    @}
+    @if(!isEmpty(deptId)){
+        and  a.dept_id = #deptId#
+    @}
+    @if(!isEmpty(administrative)){
+        and  a.dept_id = #administrative#
+    @}
+     @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+    @}     
+    @if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.FINISH_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.FINISH_TIME,'%Y') <= #yeraTimeMax#
+    @}
+queryBylistBiaoZhenCondition
+===
+
+
+    SELECT
+    @pageTag(){
+	a.*,
+	o.NAME AS deptname,
+	i.user_name AS username 
+	@}
+    FROM
+	result_standard a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.dept_id 
+    WHERE
+	i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"  
+	@if(!isEmpty(userId)){
+	and a.USER_ID = #userId#
+	@}
+	@if(!isEmpty(standardName)){
+        and  a.STANDARD_NAME like #"%"+standardName+"%"#
+    @}
+     @if(!isEmpty(publishTimeMin)){
+        and  a.PUBLISH_TIME >= #publishTimeMin#
+    @}
+    @if(!isEmpty(publishTimeMax)){
+        and  a.PUBLISH_TIME <= #publishTimeMax#
+    @}
+    @if(!isEmpty(standardGuide)){
+        and  a.STANDARD_GUIDE like #"%"+standardGuide+"%"#
+    @}
+    @if(!isEmpty(leadJoin)){
+        and  a.LEAD_JOIN like #"%"+leadJoin+"%"#
+    @}
+    @if(!isEmpty(staff)){
+        AND (a.DRAFT_OUT_PERSON LIKE #"%"+staff+"%"# or a.COURT_NAME like #"%"+staff+"%"#  )
+    @}
+    @if(!isEmpty(deptId)){
+        and  a.dept_id = #deptId#
+    @}
+    @if(!isEmpty(administrative)){
+        and  a.dept_id = #administrative#
+    @}
+    @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
+    @}  
+     @if(!isEmpty(yeraTimeMin)){
+     and   DATE_FORMAT(a.PUBLISH_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and   DATE_FORMAT(a.PUBLISH_TIME,'%Y') <= #yeraTimeMax#
+    @}
+queryBylistYaoZhengCondition
+===
+
+    SELECT
+    @pageTag(){
+	a.*,
+	o.NAME AS deptname,
+	i.user_name AS username 
+	@}
+    FROM
+	result_yaozheng a
+	LEFT JOIN pro_uwf_process_inst i ON a.PROCESSINST_ID = i.PROCESSINST_ID
+	LEFT JOIN core_org o ON o.id = a.dept_id 
+    WHERE
+	i.PROCESS_STATE = "end" AND i.APPROVAL_STATE = "0"      
+	@if(!isEmpty(userId)){
+	and a.USER_ID = #userId#
+	@}  
+	@if(!isEmpty(yaozhengName)){
+        and  a.YAOZHENG_NAME like #"%"+yaozhengName+"%"#
+    @}
+    @if(!isEmpty(administrative)){
+        and  a.dept_id = #administrative#
+    @}  
+     @if(!isEmpty(yeraTimeMin)){
+     and  DATE_FORMAT(a.REGISTER_TIME,'%Y') >= #yeraTimeMin#
+     @}
+    @if(!isEmpty(yeraTimeMax)){
+     and  DATE_FORMAT(a.REGISTER_TIME,'%Y') <= #yeraTimeMax#
+    @}     
\ No newline at end of file

src/main/resources/sql/result/resultPatent.md

@@ -66,4 +66,7 @@ synList
     @}
     @if(!isEmpty(administrative)){
         and  a.dept_id = #administrative#
+    @}
+    @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
     @}
\ No newline at end of file

src/main/resources/sql/result/resultPrize.md

@@ -62,4 +62,7 @@ synList
     @}
     @if(!isEmpty(administrative)){
         and  a.dept_id = #administrative#
+    @}
+        @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
     @}
\ No newline at end of file

src/main/resources/sql/result/resultSoftware.md

@@ -70,4 +70,7 @@ synList
     @}
     @if(!isEmpty(administrative)){
         and  a.dept_id = #administrative#
+    @}
+     @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
     @}
\ No newline at end of file

src/main/resources/sql/result/resultStandard.md

@@ -72,4 +72,7 @@ synList
     @}
     @if(!isEmpty(administrative)){
         and  a.dept_id = #administrative#
+    @}
+    @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
     @}
\ No newline at end of file

src/main/resources/sql/result/resultWork.md

@@ -63,4 +63,7 @@ synList
     @}
     @if(!isEmpty(administrative)){
         and  a.dept_id = #administrative#
+    @}
+     @if(!isEmpty(specialityCt)){
+        and  a.SPECIALITY_CT = #specialityCt#
     @}
\ No newline at end of file

src/main/resources/static/js/project/projectApply/index.js

@@ -72,6 +72,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     field : 'deptname', 
                         title : '承担科室',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
 
                     field : 'startTime', 

src/main/resources/static/js/project/projectApply/synIndex.js

@@ -73,6 +73,11 @@ layui.define([ 'form', 'laydate', 'table','projectApplyApi' ], function(exports)
                     field : 'deptname', 
                         title : '承担科室',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
 
                     field : 'startTime', 

src/main/resources/static/js/project/projectApproval/index.js

@@ -91,6 +91,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     field : 'ratifyTotalFunds', 
                         title : '批准总经费（含匹配经费）',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                     field : 'createTime', 
                     title : '提交时间',

src/main/resources/static/js/project/projectApproval/synIndex.js

@@ -92,6 +92,11 @@ layui.define([ 'form', 'laydate', 'table','projectApprovalApi'], function(export
                     field : 'ratifyTotalFunds', 
                         title : '批准总经费（含匹配经费）',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                     field : 'createTime', 
                     title : '提交时间',

src/main/resources/static/js/result/patentAuth/index.js

@@ -95,6 +95,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                 	field : 'username', 
                 	title : '申请人',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	field : 'deptname', 
                 	title : '科室',

src/main/resources/static/js/result/patentAuth/synIndex.js

@@ -96,6 +96,11 @@ layui.define([ 'form', 'laydate', 'table','patentAuthApi'], function(exports) {
                 	field : 'username', 
                 	title : '申请人',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	field : 'deptname', 
                 	title : '科室',

src/main/resources/static/js/result/resultPaper/index.js

@@ -82,6 +82,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                         	}
                         }
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultPaper/kymsIndex.js

@@ -74,6 +74,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     field : 'researchAreaText', 
                         title : '研究领域',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultPaper/synIndex.js

@@ -80,6 +80,11 @@ layui.define([ 'form', 'laydate', 'table','resultPaperApi' ], function(exports)
                         	}
                         }
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultPatent/index.js

@@ -60,6 +60,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     field : 'applyPerson', 
                         title : '申请人(单位)',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultPatent/kymsIndex.js

@@ -67,6 +67,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     field : 'patentProxyCompany', 
                         title : '专利代理公司名称',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultPatent/synIndex.js

@@ -71,6 +71,11 @@ layui.define([ 'form', 'laydate', 'table','resultPatentApi' ], function(exports)
                     field : 'patentProxyCompany', 
                         title : '专利代理公司名称',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultPrize/index.js

@@ -77,6 +77,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     field : 'areaText', 
                         title : '领域',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultPrize/kymsIndex.js

@@ -62,6 +62,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     field : 'area', 
                         title : '领域',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultPrize/synIndex.js

@@ -78,6 +78,11 @@ layui.define([ 'form', 'laydate', 'table','resultPrizeApi' ], function(exports)
                     field : 'areaText', 
                         title : '领域',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultSoftware/index.js

@@ -65,6 +65,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     field : 'designer', 
                         title : '设计人',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultSoftware/kymsIndex.js

@@ -62,6 +62,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     field : 'designer', 
                         title : '设计人',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultSoftware/synIndex.js

@@ -66,6 +66,11 @@ layui.define([ 'form', 'laydate', 'table','resultSoftwareApi' ], function(export
                     field : 'designer', 
                         title : '设计人',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultStandard/index.js

@@ -75,6 +75,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     field : 'draftOutPerson', 
                         title : '主要起草人',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultStandard/kymsIndex.js

@@ -92,6 +92,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     field : 'draftOutPerson', 
                         title : '主要起草人',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultStandard/synIndex.js

@@ -96,6 +96,11 @@ layui.define([ 'form', 'laydate', 'table','resultStandardApi' ], function(export
                     field : 'draftOutPerson', 
                         title : '主要起草人',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultTongJi/index.js

+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var resultStandardTable = null;
+    var view ={
+        init:function(){
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),resultStandardTable)
+            }
+        },
+        initTable:function(){
+            resultStandardTable = table.render({
+                elem : '#resultStandardTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/result/resultTongJi/list.json?deptId='+ $("#deptId").val() // 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,limit : 20,
+                cols : [ [ // 表头
+                {
+
+                    field : 'name', 
+                        title : '姓名',
+                },
+                {
+
+                    field : 'xmshenbao', 
+                        title : '项目申报',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instXmShenbao">'+d.xmshenbao+'</a>'
+                        },
+                },
+                {
+
+                    field : 'xmlixiang', 
+                        title : '项目立项',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instXmLixiang">'+d.xmlixiang+'</a>'
+                        },
+                },
+                {
+
+                    field : 'lunwen', 
+                        title : '论文',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instLunwen">'+d.lunwen+'</a>'
+                        },
+                },
+                {
+
+                    field : 'shuzuo', 
+                        title : '著作',
+                         templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instShuzuo">'+d.shuzuo+'</a>'
+                        },
+                },
+                {
+
+                    field : 'huojiang', 
+                        title : '获奖',
+                         templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instHuojiang">'+d.huojiang+'</a>'
+                        },
+                },
+                {
+
+                    field : 'shenqing', 
+                        title : '申请专利',
+                         templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instShenQing">'+d.shenqing+'</a>'
+                        },
+                },
+                {
+
+                    field : 'shouquan', 
+                        title : '授权专利',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instShouQuan">'+d.shouquan+'</a>'
+                        },
+                },
+                {
+
+                    field : 'ruanjian', 
+                        title : '软件著作',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instRuanJian">'+d.ruanjian+'</a>'
+                        },
+                },
+                {
+
+                    field : 'biaozhen', 
+                        title : '标准指南',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instBiaoZhen">'+d.biaozhen+'</a>'
+                        },
+                },
+                {
+
+                    field : 'yaozheng', 
+                        title : '药证',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instYaoZheng">'+d.yaozheng+'</a>'
+                        },
+                }
+
+        ] ]
+
+        });
+
+            table.on('tool(resultStandardTable)', function(obj){
+            	var data = obj.data;
+                var da= obj.event;
+                if (da=="instXmShenbao") { 
+             	 var url = "/result/resultTongJi/indexXmShenbao.do?userId="+data.id+'&type='+$("#type").val()+'&yera='+$("#dateYear").val()
+                 Common.openDlg(url, "项目申报查看"); 
+				}else if (da=="instXmLixiang") { 
+             	 var url = "/result/resultTongJi/indexXmLixiang.do?userId="+data.id+'&type='+$("#type").val()+'&yera='+$("#dateYear").val()
+                 Common.openDlg(url, "项目立项查看"); 
+				}else if (da=="instLunwen") { 
+             	 var url = "/result/resultTongJi/indexLunWen.do?userId="+data.id+'&type='+$("#type").val()+'&yera='+$("#dateYear").val()
+                 Common.openDlg(url, "论文查看"); 
+				}else if (da=="instShuzuo") { 
+             	 var url = "/result/resultTongJi/indexShuZuo.do?userId="+data.id+'&type='+$("#type").val()+'&yera='+$("#dateYear").val()
+                 Common.openDlg(url, "著作查看"); 
+				}else if (da=="instHuojiang") { 
+             	 var url = "/result/resultTongJi/indexHuoJiang.do?userId="+data.id+'&type='+$("#type").val()+'&yera='+$("#dateYear").val()
+                 Common.openDlg(url, "获奖查看"); 
+				}else if (da=="instShenQing") { 
+             	 var url = "/result/resultTongJi/indexShenQing.do?userId="+data.id+'&type='+$("#type").val()+'&yera='+$("#dateYear").val()
+                 Common.openDlg(url, "申请专利查看"); 
+				}else if (da=="instShouQuan") { 
+             	 var url = "/result/resultTongJi/indexShouQuan.do?userId="+data.id+'&type='+$("#type").val()+'&yera='+$("#dateYear").val()
+                 Common.openDlg(url, "授权专利查看"); 
+				}else if (da=="instRuanJian") { 
+             	 var url = "/result/resultTongJi/indexRuanJian.do?userId="+data.id+'&type='+$("#type").val()+'&yera='+$("#dateYear").val()
+                 Common.openDlg(url, "软件著作查看"); 
+				}else if (da=="instBiaoZhen") { 
+             	 var url = "/result/resultTongJi/indexBiaoZhen.do?userId="+data.id+'&type='+$("#type").val()+'&yera='+$("#dateYear").val()
+                 Common.openDlg(url, "标准指南查看"); 
+				}else if (da=="instYaoZheng") { 
+             	 var url = "/result/resultTongJi/indexYaoZheng.do?userId="+data.id+'&type='+$("#type").val()+'&yera='+$("#dateYear").val()
+                 Common.openDlg(url, "药证查看"); 
+				}
+            })
+        },
+
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),resultStandardTable,form);
+        },
+        initToolBar:function(){
+            toolbar = {
+                exportDocument : function() {
+                    layui.use([ 'resultTongJiApi' ], function() {
+                        var resultTongJiApi = layui.resultTongJiApi
+                        Common.openConfirm("确认导出?", function() {
+                        	resultTongJiApi.exportExcel($("#searchForm"), function(fileId) {
+                                Lib.download(fileId);
+                            })
+                        })
+                    });
+                }
+        };
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+        }
+    }
+    exports('index',view);
+
+});
\ No newline at end of file

src/main/resources/static/js/result/resultTongJi/indexBiaoZhen.js

+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var resultBiaoZhenTable = null;
+    var view ={
+        init:function(){
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),resultBiaoZhenTable)
+            }
+        },
+        initTable:function(){
+            resultBiaoZhenTable = table.render({
+                elem : '#resultBiaoZhenTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/result/resultTongJi/listBiaoZhen.json?userId='+$("#userId").val()+'&deptId='+ $("#deptId").val()+'&yeraTimeMin='+ $("#yeraTimeMin").val()+'&yeraTimeMax='+ $("#yeraTimeMax").val()// 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,limit : 10,
+                cols : [ [ // 表头
+                    {
+                        type : 'checkbox',
+                    },
+                {
+
+                    field : 'standardName', 
+                        title : '名称',
+                },
+                {
+
+                    field : 'standardSource', 
+                        title : '来源',
+                },
+                {
+
+                    field : 'standardNumber', 
+                        title : '标准号',
+                },
+                {
+
+                    field : 'standardGuideText', 
+                        title : '类型',
+                },
+                {
+
+                    field : 'standardNature', 
+                        title : '性质',
+                },
+                {
+
+                    field : 'publishOrg', 
+                        title : '发布机构',
+                },
+                {
+
+                    field : 'publishTime', 
+                        title : '发布时间',
+                        templet:function(d){
+                        	if(d.publishTime!=null && d.publishTime!=""){
+                        		return d.publishTime.substring(0,11);
+                        	}
+                        }
+                },
+                {
+
+                    field : 'implementTime', 
+                        title : '实施时间',
+                        templet:function(d){
+                        	if(d.implementTime!=null && d.implementTime!=""){
+                        		return d.implementTime.substring(0,11);
+                        	}
+                        }
+                },
+                {
+
+                    field : 'ccsCategory', 
+                        title : 'ccs分类',
+                },
+                {
+
+                    field : 'icsCategory', 
+                        title : 'ics分类',
+                },
+                {
+
+                    field : 'leadJoinText', 
+                        title : '参与方式',
+                },
+                {
+
+                    field : 'draftOutPerson', 
+                        title : '主要起草人',
+                },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
+                {
+                	
+                	field : 'deptname', 
+                	title : '所属科室',
+                },
+                {
+                	
+                	field : 'username', 
+                	title : '提交人',
+                },
+                {
+                    field : 'createTime', 
+                    title : '提交时间',
+                    hide : !$("#isCheck").val()
+                },
+                {
+                	toolbar : '#bar', 
+                	title : '操作',
+                }
+
+        ] ]
+
+        });
+
+            table.on('tool(resultBiaoZhenTable)', function(obj){
+            	var data = obj.data;
+            	if(obj.event=== 'view'){
+                	var url = "/result/resultStandard/edit.do?id="+data.id+"&status=view&approvalstate="+data.approvalstate;
+                    Common.openDlg(url,"标准指南>查看");
+                }
+            })
+        },
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),resultBiaoZhenTable,form);
+        },
+        initToolBar:function(){
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+        }
+    }
+    exports('indexBiaoZhen',view);
+
+});
\ No newline at end of file

src/main/resources/static/js/result/resultTongJi/indexDepartment.js

+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var resultDepartmentTable = null;
+    var view ={
+        init:function(){
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),resultDepartmentTable)
+            }
+        },
+        initTable:function(){
+            resultDepartmentTable = table.render({
+                elem : '#resultDepartmentTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/result/resultTongJi/listDepartment.json' // 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,limit : 20,
+                cols : [ [ // 表头
+                {
+
+                    field : 'name', 
+                        title : '科室',
+                          templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instName">'+d.name+'</a>'
+                        },
+                },
+                {
+
+                    field : 'xmshenbao', 
+                        title : '项目申报',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instXmShenbao">'+d.xmshenbao+'</a>'
+                        },
+                },
+                {
+
+                    field : 'xmlixiang', 
+                        title : '项目立项',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instXmLixiang">'+d.xmlixiang+'</a>'
+                        },
+                },
+                {
+
+                    field : 'lunwen', 
+                        title : '论文',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instLunwen">'+d.lunwen+'</a>'
+                        },
+                },
+                {
+
+                    field : 'shuzuo', 
+                        title : '著作',
+                         templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instShuzuo">'+d.shuzuo+'</a>'
+                        },
+                },
+                {
+
+                    field : 'huojiang', 
+                        title : '获奖',
+                         templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instHuojiang">'+d.huojiang+'</a>'
+                        },
+                },
+                {
+
+                    field : 'shenqing', 
+                        title : '申请专利',
+                         templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instShenQing">'+d.shenqing+'</a>'
+                        },
+                },
+                {
+
+                    field : 'shouquan', 
+                        title : '授权专利',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instShouQuan">'+d.shouquan+'</a>'
+                        },
+                },
+                {
+
+                    field : 'ruanjian', 
+                        title : '软件著作',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instRuanJian">'+d.ruanjian+'</a>'
+                        },
+                },
+                {
+
+                    field : 'biaozhen', 
+                        title : '标准指南',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instBiaoZhen">'+d.biaozhen+'</a>'
+                        },
+                },
+                {
+
+                    field : 'yaozheng', 
+                        title : '药证',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instYaoZheng">'+d.yaozheng+'</a>'
+                        },
+                }
+
+        ] ]
+
+        });
+
+            table.on('tool(resultDepartmentTable)', function(obj){
+            	var data = obj.data;
+                var da= obj.event;
+                if (da=="instName") { 
+             	 var url = "/result/resultTongJi/indexPerson.do?deptId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "个人统计"); 
+				}else if (da=="instXmShenbao") { 
+             	 var url = "/result/resultTongJi/indexXmShenbao.do?bearDept="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "项目申报查看"); 
+				}else if (da=="instXmLixiang") { 
+             	 var url = "/result/resultTongJi/indexXmLixiang.do?belongDept="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "项目立项查看"); 
+				} else if (da=="instLunwen") { 
+             	 var url = "/result/resultTongJi/indexLunWen.do?belongDept="+data.id +'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "论文查看"); 
+				}else if (da=="instShuzuo") { 
+             	 var url = "/result/resultTongJi/indexShuZuo.do?deptId="+data.id +'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "著作查看"); 
+				}else if (da=="instHuojiang") { 
+             	 var url = "/result/resultTongJi/indexHuoJiang.do?deptId="+data.id +'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "获奖查看"); 
+				}else if (da=="instShenQing") { 
+             	 var url = "/result/resultTongJi/indexShenQing.do?deptId="+data.id +'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "申请专利查看"); 
+				}else if (da=="instShouQuan") { 
+             	 var url = "/result/resultTongJi/indexShouQuan.do?belongDept="+data.id +'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "授权专利查看"); 
+				}else if (da=="instRuanJian") { 
+             	 var url = "/result/resultTongJi/indexRuanJian.do?deptId="+data.id +'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "软件著作查看"); 
+				}else if (da=="instBiaoZhen") { 
+             	 var url = "/result/resultTongJi/indexBiaoZhen.do?deptId="+data.id +'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "标准指南查看"); 
+				}else if (da=="instYaoZheng") { 
+             	 var url = "/result/resultTongJi/indexYaoZheng.do?deptId="+data.id +'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "药证查看"); 
+				}
+            })
+        },
+
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),resultDepartmentTable,form);
+        },
+        initToolBar:function(){
+            toolbar = {
+                exportDocument : function() {
+                    layui.use([ 'resultTongJiApi' ], function() {
+                        var resultTongJiApi = layui.resultTongJiApi
+                        Common.openConfirm("确认导出?", function() {
+                        	resultTongJiApi.exportExcelDepartment($("#searchForm"), function(fileId) {
+                                Lib.download(fileId);
+                            })
+                        })
+                    });
+                }
+        };
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+        }
+    }
+    exports('indexDepartment',view);
+
+});
\ No newline at end of file

src/main/resources/static/js/result/resultTongJi/indexGR.js

+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var resultGRTable = null;
+    var view ={
+        init:function(){
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),resultGRTable)
+            }
+        },
+        initTable:function(){
+            resultGRTable = table.render({
+                elem : '#resultGRTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/result/resultTongJi/listGR.json?deptId='+ $("#deptId").val() // 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,limit : 20,
+                cols : [ [ // 表头
+                {
+
+                    field : 'name', 
+                        title : '姓名',
+                },
+                {
+
+                    field : 'xmshenbao', 
+                        title : '项目申报',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instXmShenbao">'+d.xmshenbao+'</a>'
+                        },
+                },
+                {
+
+                    field : 'xmlixiang', 
+                        title : '项目立项',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instXmLixiang">'+d.xmlixiang+'</a>'
+                        },
+                },
+                {
+
+                    field : 'lunwen', 
+                        title : '论文',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instLunwen">'+d.lunwen+'</a>'
+                        },
+                },
+                {
+
+                    field : 'shuzuo', 
+                        title : '著作',
+                         templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instShuzuo">'+d.shuzuo+'</a>'
+                        },
+                },
+                {
+
+                    field : 'huojiang', 
+                        title : '获奖',
+                         templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instHuojiang">'+d.huojiang+'</a>'
+                        },
+                },
+                {
+
+                    field : 'shenqing', 
+                        title : '申请专利',
+                         templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instShenQing">'+d.shenqing+'</a>'
+                        },
+                },
+                {
+
+                    field : 'shouquan', 
+                        title : '授权专利',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instShouQuan">'+d.shouquan+'</a>'
+                        },
+                },
+                {
+
+                    field : 'ruanjian', 
+                        title : '软件著作',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instRuanJian">'+d.ruanjian+'</a>'
+                        },
+                },
+                {
+
+                    field : 'biaozhen', 
+                        title : '标准指南',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instBiaoZhen">'+d.biaozhen+'</a>'
+                        },
+                },
+                {
+
+                    field : 'yaozheng', 
+                        title : '药证',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instYaoZheng">'+d.yaozheng+'</a>'
+                        },
+                }
+
+        ] ]
+
+        });
+
+            table.on('tool(resultGRTable)', function(obj){
+            	var data = obj.data;
+                var da= obj.event;
+                if (da=="instXmShenbao") { 
+             	 var url = "/result/resultTongJi/indexXmShenbao.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "项目申报查看"); 
+				}else if (da=="instXmLixiang") { 
+             	 var url = "/result/resultTongJi/indexXmLixiang.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "项目立项查看"); 
+				}else if (da=="instLunwen") { 
+             	 var url = "/result/resultTongJi/indexLunWen.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "论文查看"); 
+				}else if (da=="instShuzuo") { 
+             	 var url = "/result/resultTongJi/indexShuZuo.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "著作查看"); 
+				}else if (da=="instHuojiang") { 
+             	 var url = "/result/resultTongJi/indexHuoJiang.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "获奖查看"); 
+				}else if (da=="instShenQing") { 
+             	 var url = "/result/resultTongJi/indexShenQing.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "申请专利查看"); 
+				}else if (da=="instShouQuan") { 
+             	 var url = "/result/resultTongJi/indexShouQuan.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "授权专利查看"); 
+				}else if (da=="instRuanJian") { 
+             	 var url = "/result/resultTongJi/indexRuanJian.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "软件著作查看"); 
+				}else if (da=="instBiaoZhen") { 
+             	 var url = "/result/resultTongJi/indexBiaoZhen.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "标准指南查看"); 
+				}else if (da=="instYaoZheng") { 
+             	 var url = "/result/resultTongJi/indexYaoZheng.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "药证查看"); 
+				}
+            })
+        },
+
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),resultGRTable,form);
+        },
+        initToolBar:function(){
+            toolbar = {
+                exportDocument : function() {
+                    layui.use([ 'resultTongJiApi' ], function() {
+                        var resultTongJiApi = layui.resultTongJiApi
+                        Common.openConfirm("确认导出?", function() {
+                        	resultTongJiApi.exportExcelGR($("#searchForm"), function(fileId) {
+                                Lib.download(fileId);
+                            })
+                        })
+                    });
+                }
+        };
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+        }
+    }
+    exports('indexGR',view);
+
+});
\ No newline at end of file

src/main/resources/static/js/result/resultTongJi/indexHospital.js

+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var resultHospitalTable = null;
+    var view ={
+        init:function(){
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),resultHospitalTable)
+            }
+        },
+        initTable:function(){
+            resultHospitalTable = table.render({
+                elem : '#resultHospitalTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/result/resultTongJi/listHospital.json' // 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,limit : 20,
+                cols : [ [ // 表头
+                {
+                    field : 'yiyua', 
+                        title : '医院',
+                        width: 200,
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instYiYua">'+d.yiyua+'</a>'
+                        },
+                },
+                {
+
+                    field : 'xmshenbao', 
+                        title : '项目申报',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instXmShenbao">'+d.xmshenbao+'</a>'
+                        },
+                },
+                {
+
+                    field : 'xmlixiang', 
+                        title : '项目立项',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instXmLixiang">'+d.xmlixiang+'</a>'
+                        },
+                },
+                {
+
+                    field : 'lunwen', 
+                        title : '论文',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instLunwen">'+d.lunwen+'</a>'
+                        },
+                },
+                {
+
+                    field : 'shuzuo', 
+                        title : '著作',
+                         templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instShuzuo">'+d.shuzuo+'</a>'
+                        },
+                },
+                {
+
+                    field : 'huojiang', 
+                        title : '获奖',
+                         templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instHuojiang">'+d.huojiang+'</a>'
+                        },
+                },
+                {
+
+                    field : 'shenqing', 
+                        title : '申请专利',
+                         templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instShenQing">'+d.shenqing+'</a>'
+                        },
+                },
+                {
+
+                    field : 'shouquan', 
+                        title : '授权专利',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instShouQuan">'+d.shouquan+'</a>'
+                        },
+                },
+                {
+
+                    field : 'ruanjian', 
+                        title : '软件著作',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instRuanJian">'+d.ruanjian+'</a>'
+                        },
+                },
+                {
+
+                    field : 'biaozhen', 
+                        title : '标准指南',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instBiaoZhen">'+d.biaozhen+'</a>'
+                        },
+                },
+                {
+
+                    field : 'yaozheng', 
+                        title : '药证',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instYaoZheng">'+d.yaozheng+'</a>'
+                        },
+                }
+
+        ] ]
+
+        });
+
+            table.on('tool(resultHospitalTable)', function(obj){
+            	var data = obj.data;
+                var da= obj.event;
+                if (da=="instYiYua") { 
+             	 var url = "/result/resultTongJi/indexDepartment.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "科室统计"); 
+				}else if (da=="instXmShenbao") { 
+             	 var url = "/result/resultTongJi/indexXmShenbao.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "项目申报查看"); 
+				}else if (da=="instXmLixiang") { 
+             	 var url = "/result/resultTongJi/indexXmLixiang.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "项目立项查看"); 
+				} else if (da=="instLunwen") { 
+             	 var url = "/result/resultTongJi/indexLunWen.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "论文查看"); 
+				}else if (da=="instShuzuo") { 
+             	 var url = "/result/resultTongJi/indexShuZuo.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "著作查看"); 
+				}else if (da=="instHuojiang") { 
+             	 var url = "/result/resultTongJi/indexHuoJiang.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "获奖查看"); 
+				}else if (da=="instShenQing") { 
+             	 var url = "/result/resultTongJi/indexShenQing.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "申请专利查看"); 
+				}else if (da=="instShouQuan") { 
+             	 var url = "/result/resultTongJi/indexShouQuan.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "授权专利查看"); 
+				}else if (da=="instRuanJian") { 
+             	 var url = "/result/resultTongJi/indexRuanJian.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "软件著作查看"); 
+				}else if (da=="instBiaoZhen") { 
+             	 var url = "/result/resultTongJi/indexBiaoZhen.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "标准指南查看"); 
+				}else if (da=="instYaoZheng") { 
+             	 var url = "/result/resultTongJi/indexYaoZheng.do?userId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "药证查看"); 
+				}
+            })
+        },
+
+        initSearchForm:function(){
+			console.log($("#searchForm"));
+			console.log(resultHospitalTable);
+			console.log(form);
+            Lib.initSearchForm( $("#searchForm"),resultHospitalTable,form);
+        },
+        initToolBar:function(){
+            toolbar = {
+                exportDocument : function() {
+                    layui.use([ 'resultTongJiApi' ], function() {
+                        var resultTongJiApi = layui.resultTongJiApi
+                        Common.openConfirm("确认导出?", function() {
+                        	resultTongJiApi.exportExcel($("#searchForm"), function(fileId) {
+                                Lib.download(fileId);
+                            })
+                        })
+                    });
+                }
+        };
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+        }
+    }
+    exports('indexHospital',view);
+
+});
\ No newline at end of file

src/main/resources/static/js/result/resultTongJi/indexHuoJiang.js

+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var resultHuoJiangTable = null;
+    var view ={
+        init:function(){
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),resultHuoJiangTable)
+            }
+        },
+        initTable:function(){
+            resultHuoJiangTable = table.render({
+                elem : '#resultHuoJiangTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/result/resultTongJi/listHuoJiang.json?userId='+$("#userId").val()+'&deptId='+ $("#deptId").val()+'&yeraTimeMin='+ $("#yeraTimeMin").val()+'&yeraTimeMax='+ $("#yeraTimeMax").val() // 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,limit : 10,
+                 cols : [ [ // 表头
+                    {
+                        type : 'checkbox',
+                    },
+                {
+
+                    field : 'projectName', 
+                        title : '项目名称',
+                },
+                {
+
+                    field : 'prizeName', 
+                        title : '获奖名称',
+                },
+                {
+                	
+                	field : 'finishPerson', 
+                	title : '获奖人',
+                },
+                {
+
+                    field : 'prizeLevelText', 
+                        title : '获奖级别',
+                },
+                {
+
+                    field : 'prizeGradeText', 
+                        title : '获奖等级',
+                },
+                {
+
+                    field : 'prizeCompany', 
+                        title : '授奖单位',
+                },
+                {
+
+                    field : 'prizeNumber', 
+                        title : '奖励证书编号',
+                },
+                {
+
+                    field : 'prizeTime', 
+                        title : '证书颁发时间',
+                        templet:function(d){
+                        	if(d.prizeTime!=null && d.prizeTime!=""){
+                        		return d.prizeTime.substring(0,10);
+                        	}else{
+                        		return "";
+                        	}
+                        }
+                },
+                {
+
+                    field : 'areaText', 
+                        title : '领域',
+                },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
+                {
+                	
+                	field : 'deptname', 
+                	title : '完成科室',
+                },
+                {
+                	
+                	field : 'username', 
+                	title : '提交人',
+                },
+                {
+                    field : 'createTime', 
+                    title : '提交时间',
+                    hide : !$("#isCheck").val()
+                },
+                {
+                	
+                	toolbar : '#bar', 
+                	title : '操作',
+                }
+        ] ]
+
+        });
+
+            table.on('tool(resultHuoJiangTable)', function(obj){
+            	var data = obj.data;
+            	if(obj.event=== 'view'){
+                	var url = "/result/resultPrize/edit.do?id="+data.id+"&status=view&approvalstate="+data.approvalstate;
+                    Common.openDlg(url,"获奖>查看");
+                }
+            })
+        },
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),resultHuoJiangTable,form);
+        },
+        initToolBar:function(){
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+        }
+    }
+    exports('indexHuoJiang',view);
+
+});
\ No newline at end of file

src/main/resources/static/js/result/resultTongJi/indexKZDepartment.js

+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var resultKZDepartmentTable = null;
+    var view ={
+        init:function(){
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),resultKZDepartmentTable)
+            }
+        },
+        initTable:function(){
+            resultKZDepartmentTable = table.render({
+                elem : '#resultKZDepartmentTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/result/resultTongJi/listKZDepartment.json' // 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,limit : 20,
+                cols : [ [ // 表头
+                {
+
+                    field : 'name', 
+                        title : '科室',
+                          templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instName">'+d.name+'</a>'
+                        },
+                },
+                {
+
+                    field : 'xmshenbao', 
+                        title : '项目申报',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instXmShenbao">'+d.xmshenbao+'</a>'
+                        },
+                },
+                {
+
+                    field : 'xmlixiang', 
+                        title : '项目立项',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instXmLixiang">'+d.xmlixiang+'</a>'
+                        },
+                },
+                {
+
+                    field : 'lunwen', 
+                        title : '论文',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instLunwen">'+d.lunwen+'</a>'
+                        },
+                },
+                {
+
+                    field : 'shuzuo', 
+                        title : '著作',
+                         templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instShuzuo">'+d.shuzuo+'</a>'
+                        },
+                },
+                {
+
+                    field : 'huojiang', 
+                        title : '获奖',
+                         templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instHuojiang">'+d.huojiang+'</a>'
+                        },
+                },
+                {
+
+                    field : 'shenqing', 
+                        title : '申请专利',
+                         templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instShenQing">'+d.shenqing+'</a>'
+                        },
+                },
+                {
+
+                    field : 'shouquan', 
+                        title : '授权专利',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instShouQuan">'+d.shouquan+'</a>'
+                        },
+                },
+                {
+
+                    field : 'ruanjian', 
+                        title : '软件著作',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instRuanJian">'+d.ruanjian+'</a>'
+                        },
+                },
+                {
+
+                    field : 'biaozhen', 
+                        title : '标准指南',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instBiaoZhen">'+d.biaozhen+'</a>'
+                        },
+                },
+                {
+
+                    field : 'yaozheng', 
+                        title : '药证',
+                        templet:function(d){
+                    			return '<a class="layui-table-link"  lay-event="instYaoZheng">'+d.yaozheng+'</a>'
+                        },
+                }
+
+        ] ]
+
+        });
+
+            table.on('tool(resultKZDepartmentTable)', function(obj){
+            	var data = obj.data;
+                var da= obj.event;
+                if (da=="instName") { 
+             	 var url = "/result/resultTongJi/indexPerson.do?deptId="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "个人统计"); 
+				}else if (da=="instXmShenbao") { 
+             	 var url = "/result/resultTongJi/indexXmShenbao.do?bearDept="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "项目申报查看"); 
+				}else if (da=="instXmLixiang") { 
+             	 var url = "/result/resultTongJi/indexXmLixiang.do?belongDept="+data.id+'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "项目立项查看"); 
+				} else if (da=="instLunwen") { 
+             	 var url = "/result/resultTongJi/indexLunWen.do?belongDept="+data.id +'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "论文查看"); 
+				}else if (da=="instShuzuo") { 
+             	 var url = "/result/resultTongJi/indexShuZuo.do?deptId="+data.id +'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "著作查看"); 
+				}else if (da=="instHuojiang") { 
+             	 var url = "/result/resultTongJi/indexHuoJiang.do?deptId="+data.id +'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "获奖查看"); 
+				}else if (da=="instShenQing") { 
+             	 var url = "/result/resultTongJi/indexShenQing.do?deptId="+data.id +'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "申请专利查看"); 
+				}else if (da=="instShouQuan") { 
+             	 var url = "/result/resultTongJi/indexShouQuan.do?belongDept="+data.id +'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "授权专利查看"); 
+				}else if (da=="instRuanJian") { 
+             	 var url = "/result/resultTongJi/indexRuanJian.do?deptId="+data.id +'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "软件著作查看"); 
+				}else if (da=="instBiaoZhen") { 
+             	 var url = "/result/resultTongJi/indexBiaoZhen.do?deptId="+data.id +'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "标准指南查看"); 
+				}else if (da=="instYaoZheng") { 
+             	 var url = "/result/resultTongJi/indexYaoZheng.do?deptId="+data.id +'&type='+$("#type").val()+'&yeraTimeMin='+$("input[name='yeraTimeMin']").val()+'&yeraTimeMax='+$("input[name='yeraTimeMax']").val()
+                 Common.openDlg(url, "药证查看"); 
+				}
+            })
+        },
+
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),resultKZDepartmentTable,form);
+        },
+        initToolBar:function(){
+            toolbar = {
+                exportDocument : function() {
+                    layui.use([ 'resultTongJiApi' ], function() {
+                        var resultTongJiApi = layui.resultTongJiApi
+                        Common.openConfirm("确认导出?", function() {
+                        	resultTongJiApi.exportExcelKZDepartment($("#searchForm"), function(fileId) {
+                                Lib.download(fileId);
+                            })
+                        })
+                    });
+                }
+        };
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+        }
+    }
+    exports('indexKZDepartment',view);
+
+});
\ No newline at end of file

src/main/resources/static/js/result/resultTongJi/indexLunWen.js

+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var resultPaperTable = null;
+    var view ={
+        init:function(){
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),resultPaperTable)
+            }
+        },
+        initTable:function(){
+            resultPaperTable = table.render({
+                elem : '#resultPaperTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/result/resultTongJi/listLunWen.json?userId='+$("#userId").val()+'&belongDept='+ $("#belongDept").val()+'&yeraTimeMin='+ $("#yeraTimeMin").val()+'&yeraTimeMax='+ $("#yeraTimeMax").val() // 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,limit : 10,
+                cols : [ [ // 表头
+                {
+
+                    field : 'textTypeText', 
+                        title : '文章类型',
+                },
+                {
+
+                    field : 'paperTitle', 
+                        title : '论文题目',
+                },
+                {
+                	
+                	field : 'paperTypeText', 
+                	title : '论文分类',
+                },
+                {
+
+                    field : 'periodicalName', 
+                        title : '刊物名称',
+                },
+                {
+                	
+                	field : 'periodicalType', 
+                	title : '期刊类别',
+                },
+                {
+                	
+                	field : 'jcrSubareaText', 
+                	title : 'JCR分区',
+                },
+                {
+
+                    field : 'firstAuthor', 
+                        title : '第一作者',
+                },
+                {
+                	
+                	field : 'txAuthor', 
+                	title : '通讯作者',
+                },
+                {
+
+                    field : 'impactFactor', 
+                        title : '影响因子',
+                },
+                {
+
+                    field : 'publishTime', 
+                        title : '发表日期',
+                        templet:function(d){
+                        	if(d.publishTime!=null && d.publishTime!=""){
+                        		return d.publishTime.substring(0,10);
+                        	}else{
+                        		return "";
+                        	}
+                        }
+                },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
+                {
+                	
+                	field : 'deptname', 
+                	title : '所属科室',
+                },
+                {
+                    field : 'createTime', 
+                    title : '提交时间',
+                    hide : !$("#isCheck").val()
+                },
+                {
+                	field : 'username', 
+                	title : '提交人',
+                },
+                {
+                	
+                	toolbar : '#bar', 
+                	title : '操作',
+                },
+
+        ] ]
+
+        });
+
+            table.on('tool(resultPaperTable)', function(obj){
+            	var data = obj.data;
+            	if(obj.event=== 'view'){
+                	var url = "/result/resultPaper/edit.do?id="+data.id+"&status=view&approvalstate="+data.approvalstate+"&textType="+data.textType;
+                    Common.openDlg(url,"论文>查看");
+                }
+            })
+        },
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),resultPaperTable,form);
+        },
+        initToolBar:function(){
+            toolbar = {
+                add : function() { // 获取选中数据
+                    /*var url = "/result/resultPaper/add.do";
+                    Common.openDlg(url,"论文>新增");*/
+                	var box=layer.open({
+	            		  type: 2,
+	            		  area: ['800px', '400px'], //宽高
+	            		  content: Common.ctxPath+'/result/resultPaper/select.do',
+	            		  btn:['确定','取消'],
+	            		  title:"请选择文章类型",
+	            		  id : 'LAY_radio', //设定一个id，防止重复弹出
+	            		  success : function(layero, index) {
+	            			var body = layer.getChildFrame('body', index);
+							//获取content的窗口
+	            			var iframeWin = layero.find('iframe')[0].contentWindow;
+	            			iframeWin.layui.form.render();
+	            		  },
+	            		  yes:function(index, layero){
+	            			  var body = layer.getChildFrame('body', index); //得到iframe页的body内容
+	            			  var textType=body.find("#textType").val();
+	            			  if(textType==null || textType==""){
+	            				  Common.info("请选择文章类型");
+	            				  return false;
+	            			  }
+	            			  layer.close(box);
+	            			  var url = "/result/resultPaper/add.do?textType="+textType;
+	                          Common.openDlg(url,"论文>新增");
+	            		  }
+                	});
+                },
+                edit : function() { // 获取选中数目
+                    var data = Common.getOneFromTable(table,"resultPaperTable");
+                    if(data==null){
+                        return ;
+                    }
+                    var url = "/result/resultPaper/edit.do?id="+data.id;
+                    Common.openDlg(url,"论文>"+data.paperName+">编辑");
+                },
+                del : function() {
+                    layui.use(['del'], function(){
+                        var delView = layui.del
+                        delView.delBatch();
+                    });
+                },
+                back : function() {
+                	var data = Common.getMoreDataFromTable(table,"resultPaperTable");
+                	if(data==null){
+                        return ;
+                    }
+                	var ids =Common.concatBatchId(data,"id");
+                	layer.prompt({title: '请输入退回原因:', formType: 2}, function(text, index){
+            		    $.ajax({
+            		    	url:Common.ctxPath+ '/result/resultPaper/batchBack.json', 
+            		        method:'post',
+            		        data:{"returnReason":text,"ids":ids},
+            		        dataType:'JSON',
+            		        success:function(res){
+            		        	dataReload();
+                				Common.info("退回成功");
+                				layer.close(index);
+            		        },             
+            		        error:function (data) {
+            		        	
+            		        }
+            		    })
+            		});
+                }
+        };
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+        }
+    }
+    exports('indexLunWen',view);
+
+});
\ No newline at end of file

src/main/resources/static/js/result/resultTongJi/indexRuanJian.js

+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var resultRuanJianTable = null;
+    var view ={
+        init:function(){
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),resultRuanJianTable)
+            }
+        },
+        initTable:function(){
+            resultRuanJianTable = table.render({
+                elem : '#resultRuanJianTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/result/resultTongJi/listRuanJian.json?userId='+$("#userId").val()+'&deptId='+ $("#deptId").val()+'&yeraTimeMin='+ $("#yeraTimeMin").val()+'&yeraTimeMax='+ $("#yeraTimeMax").val() // 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,limit : 10,
+                cols : [ [ // 表头
+                    {
+                        type : 'checkbox',
+                    },
+                {
+
+                    field : 'registerNumber', 
+                        title : '登记号',
+                },
+                {
+
+                    field : 'softwareName', 
+                        title : '软件名称',
+                },
+                {
+
+                    field : 'finishTime', 
+                        title : '开发完成日期',
+                        templet:function(d){
+                        	if(d.finishTime!=null && d.finishTime!=""){
+                        		return d.finishTime.substring(0,11);
+                        	}
+                        }
+                },
+                {
+
+                    field : 'firstPiblishTime', 
+                        title : '首次发表日期',
+                        templet:function(d){
+                        	if(d.firstPiblishTime!=null && d.firstPiblishTime!=""){
+                        		return d.firstPiblishTime.substring(0,11);
+                        	}
+                        }
+                },
+                {
+
+                    field : 'copyrightOwner', 
+                        title : '著作权人',
+                },
+                {
+
+                    field : 'designer', 
+                        title : '设计人',
+                },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
+                {
+                	
+                	field : 'deptname', 
+                	title : '所属科室',
+                },
+                {
+                	
+                	field : 'username', 
+                	title : '提交人',
+                },
+                {
+                    field : 'createTime', 
+                    title : '提交时间',
+                    hide : !$("#isCheck").val()
+                },
+                {
+                	toolbar : '#bar', 
+                	title : '操作',
+                }
+
+        ] ]
+
+        });
+
+            table.on('tool(resultRuanJianTable)', function(obj){
+            	var data = obj.data;
+            	if(obj.event=== 'view'){
+                	var url = "/result/resultSoftware/edit.do?id="+data.id+"&status=view&approvalstate="+data.approvalstate;
+                    Common.openDlg(url,"软件著作权>查看");
+                }
+            })
+        },
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),resultRuanJianTable,form);
+        },
+        initToolBar:function(){
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+        }
+    }
+    exports('indexRuanJian',view);
+
+});
\ No newline at end of file

src/main/resources/static/js/result/resultTongJi/indexShenQing.js

+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var resultShenQingTable = null;
+    var view ={
+        init:function(){
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),resultShenQingTable)
+            }
+        },
+        initTable:function(){
+            resultShenQingTable = table.render({
+                elem : '#resultShenQingTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/result/resultTongJi/listShenQing.json?userId='+$("#userId").val()+'&deptId='+ $("#deptId").val()+'&yeraTimeMin='+ $("#yeraTimeMin").val()+'&yeraTimeMax='+ $("#yeraTimeMax").val()// 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,limit : 10,
+                 cols : [ [ // 表头
+                    {
+                        type : 'checkbox',
+                    },
+                {
+
+                    field : 'applyNumber', 
+                        title : '申请号',
+                },
+                {
+
+                    field : 'patentName', 
+                        title : '专利名称',
+                },
+                {
+
+                    field : 'patentCategoryText', //数据字典类型为 petent_category
+                        title : '专利类别',
+                },
+                {
+
+                    field : 'applyTime', 
+                        title : '申请时间',
+                        templet:function(d){
+                        	if(d.applyTime!=null && d.applyTime!=""){
+                        		return d.applyTime.substring(0,11);
+                        	}
+                        }
+                },
+                {
+
+                    field : 'inventPerson', 
+                        title : '发明人/设计人',
+                },
+                {
+
+                    field : 'applyPerson', 
+                        title : '申请人(单位)',
+                },
+                {
+
+                    field : 'patentProxyOrgText', 
+                        title : '专利代理机构',
+                },
+                {
+
+                    field : 'patentProxyCompany', 
+                        title : '专利代理公司名称',
+                },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
+                {
+                	
+                	field : 'deptname', 
+                	title : '所属科室',
+                },
+                {
+                	
+                	field : 'username', 
+                	title : '提交人',
+                },
+                {
+                    field : 'createTime', 
+                    title : '提交时间',
+                    hide : !$("#isCheck").val()
+                },
+                {
+                	
+                	toolbar : '#bar', 
+                	title : '操作',
+                }
+
+        ] ]
+
+        });
+
+            table.on('tool(resultShenQingTable)', function(obj){
+            	var data = obj.data;
+            	if(obj.event=== 'view'){
+                	var url = "/result/resultPatent/edit.do?id="+data.id+"&status=view&approvalstate="+data.approvalstate;
+                    Common.openDlg(url,"专利>查看");
+                }
+            })
+        },
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),resultShenQingTable,form);
+        },
+        initToolBar:function(){
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+        }
+    }
+    exports('indexShenQing',view);
+
+});
\ No newline at end of file

src/main/resources/static/js/result/resultTongJi/indexShouQuan.js

+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var resultShouQuanTable = null;
+    var view ={
+        init:function(){
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),resultShouQuanTable)
+            }
+        },
+        initTable:function(){
+            resultShouQuanTable = table.render({
+                elem : '#resultShouQuanTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/result/resultTongJi/listShouQuan.json?userId='+$("#userId").val() +'&belongDept='+ $("#belongDept").val()+'&yeraTimeMin='+ $("#yeraTimeMin").val()+'&yeraTimeMax='+ $("#yeraTimeMax").val()// 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,limit : 10,
+                 cols : [ [ // 表头
+                {
+                    type : 'checkbox',
+                },
+                {
+
+                    field : 'patentName', 
+                        title : '专利名称',
+                },
+                {
+                	
+                	field : 'patentCategoryText', 
+                	title : '专利类别',
+                },
+                {
+
+                    field : 'patentee', 
+                        title : '专利权人',
+                },
+                {
+
+                    field : 'belongUnit', 
+                        title : '所属单位',
+                },
+                {
+                	
+                	field : 'authNoticeDay', 
+                	title : '授权日期',
+                	templet:function(d){
+                		if(d.authNoticeDay!=null && d.authNoticeDay!=""){
+                			return d.authNoticeDay.substring(0,10);
+                		}else{
+                			return "";
+                		}
+                	}
+                },
+                {
+
+                    field : 'patentDuration', 
+                        title : '专利权期限',
+                },
+                {
+                	
+                	field : 'patentTime', 
+                	title : '专利申请日',
+                	templet:function(d){
+                		if(d.patentTime!=null && d.patentTime!=""){
+                			return d.patentTime.substring(0,10);
+                		}else{
+                			return "";
+                		}
+                	}
+                },
+                {
+
+                    field : 'overTime', 
+                        title : '失效日期',
+                        templet:function(d){
+                    		if(d.overTime!=null && d.overTime!=""){
+                    			return d.overTime.substring(0,10);
+                    		}else{
+                    			return "";
+                    		}
+                    	}
+                },
+                {
+                    field : 'createTime', 
+                    title : '提交时间',
+                    hide : !$("#isCheck").val()
+                },
+                {
+                	field : 'username', 
+                	title : '申请人',
+                },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
+                {
+                	field : 'deptname', 
+                	title : '科室',
+                },
+                {
+                	
+                	title : '操作',
+                	toolbar:"#bar"
+                }
+
+        ] ]
+
+        });
+
+            table.on('tool(resultShouQuanTable)', function(obj){
+            	var data = obj.data;
+            	if(obj.event=== 'view'){
+                	var url = "/result/patentAuth/edit.do?id="+data.id+"&status=view&approvalstate="+data.approvalstate;
+                    Common.openDlg(url,"授权专利>查看");
+                }
+            })
+        },
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),resultShouQuanTable,form);
+        },
+        initToolBar:function(){
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+        }
+    }
+    exports('indexShouQuan',view);
+
+});
\ No newline at end of file

src/main/resources/static/js/result/resultTongJi/indexShuZuo.js

+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var resultShuZuoTable = null;
+    var view ={
+        init:function(){
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),resultShuZuoTable)
+            }
+        },
+        initTable:function(){
+            resultShuZuoTable = table.render({
+                elem : '#resultShuZuoTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/result/resultTongJi/listShuZuo.json?userId='+$("#userId").val()+'&deptId='+ $("#deptId").val()+'&yeraTimeMin='+ $("#yeraTimeMin").val()+'&yeraTimeMax='+ $("#yeraTimeMax").val() // 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,limit : 10,
+                 cols : [ [ // 表头
+                    {
+                        type : 'checkbox',
+                    },
+                {
+
+                    field : 'workName', 
+                        title : '著作名称',
+                },
+                {
+
+                    field : 'workCategoryText', //数据字典类型为 work_category
+                        title : '著作类别',
+                },
+                {
+
+                    field : 'editorChief', 
+                        title : '主编',
+                },
+                
+                {
+
+                    field : 'subeditor', 
+                        title : '副主编',
+                },
+                {
+
+                    field : 'publisher', 
+                        title : '出版单位',
+                },
+                {
+
+                    field : 'publishTime', 
+                        title : '出版日期',
+                        templet:function(d){
+                        	if(d.publishTime!=null && d.publishTime!=""){
+                        		return d.publishTime.substring(0,10);
+                        	}else{
+                        		return "";
+                        	}
+                        }
+                },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
+                {
+                	
+                	field : 'deptname', 
+                	title : '所属科室',
+                },
+                {
+                	
+                	field : 'username', 
+                	title : '提交人',
+                },
+                {
+                    field : 'createTime', 
+                    title : '提交时间',
+                    hide : !$("#isCheck").val()
+                },
+                {
+                	toolbar : '#bar', 
+                	title : '操作',
+                }
+
+        ] ]
+
+        });
+
+            table.on('tool(resultShuZuoTable)', function(obj){
+            	var data = obj.data;
+            	 if(obj.event=== 'view'){
+                	var url = "/result/resultWork/edit.do?id="+data.id+"&status=view&approvalstate="+data.approvalstate;
+                    Common.openDlg(url,"著作成果>查看");
+                }
+            })
+        },
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),resultShuZuoTable,form);
+        },
+        initToolBar:function(){
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+        }
+    }
+    exports('indexShuZuo',view);
+
+});
\ No newline at end of file

src/main/resources/static/js/result/resultTongJi/indexXmLixiang.js

+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var resultXmLixiangTable = null;
+    var view ={
+        init:function(){
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),resultXmLixiangTable)
+            }
+        },
+        initTable:function(){
+            resultXmLixiangTable = table.render({
+                elem : '#resultXmLixiangTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/result/resultTongJi/listXmLixiang.json?userId='+$("#userId").val()+'&belongDept='+ $("#belongDept").val()+'&yeraTimeMin='+ $("#yeraTimeMin").val()+'&yeraTimeMax='+ $("#yeraTimeMax").val() // 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,limit : 10,
+                 cols : [ [ // 表头
+                    {
+                        type : 'checkbox',
+                    },
+                {
+
+                    field : 'projectName', 
+                        title : '项目名称',
+                },
+                {
+
+                    field : 'ratifyTime', 
+                        title : '项目批准(合同签字)时间',
+                        templet:function(d){
+                    		if(d.ratifyTime!=null && d.ratifyTime!=""){
+    	            			return d.ratifyTime.substring(0,10);
+    	            		}else{
+    	            			return "";
+    	            		}
+                    	}
+                },
+                {
+
+                    field : 'projectCode', 
+                        title : '项目编号',
+                },
+                {
+
+                    field : 'startTime', 
+                        title : '开始时间(年月)',
+                        templet:function(d){
+                    		if(d.startTime!=null && d.startTime!=""){
+    	            			return d.startTime.substring(0,7);
+    	            		}else{
+    	            			return "";
+    	            		}
+                    	}
+                },
+                {
+
+                    field : 'endTime', 
+                        title : '结束时间(年月)',
+                        templet:function(d){
+                    		if(d.endTime!=null && d.endTime!=""){
+    	            			return d.endTime.substring(0,7);
+    	            		}else{
+    	            			return "";
+    	            		}
+                    	}
+                },
+                {
+
+                    field : 'isLeading', 
+                        title : '是否牵头单位',
+                },
+                {
+                	
+                	field : 'projectSourceText', 
+                	title : '项目来源',
+                },
+                {
+
+                    field : 'projectTypeText', 
+                        title : '项目类型',
+                },
+                {
+
+                    field : 'ratifyTotalFunds', 
+                        title : '批准总经费（含匹配经费）',
+                },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
+                {
+                    field : 'createTime', 
+                    title : '提交时间',
+                    hide : !$("#isCheck").val()
+                },
+                {
+                	
+                	field : 'activityinstIsReturn', 
+                	title : '状态',
+                	templet:function(d){
+                		if(d.activityinstIsReturn=='1' || d.activityinstIsReturn=='2'){
+                			return "退回";
+                		}else if(d.approvalstate=='0'){
+                			return "通过";
+                		}else{
+                			return "";
+                		}
+                	}
+                },
+                {
+                	field : 'username', 
+                	title : '提交人',
+                },
+                {
+
+                    toolbar : '#bar', 
+                    title : '操作',
+                },
+
+        ] ]
+
+        });
+
+            table.on('tool(resultXmLixiangTable)', function(obj){
+            	var data = obj.data;
+            	if(obj.event=== 'view'){
+                	var url = "/project/projectApproval/edit.do?id="+data.id+"&status=view&approvalstate="+data.approvalstate;
+                    Common.openDlg(url,"项目立项>查看");
+                }
+            })
+        },
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),resultXmLixiangTable,form);
+        },
+        initToolBar:function(){
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+        }
+    }
+    exports('indexXmLixiang',view);
+
+});
\ No newline at end of file

src/main/resources/static/js/result/resultTongJi/indexXmShenbao.js

+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var resultXmShenbaoTable = null;
+    var view ={
+        init:function(){
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),resultXmShenbaoTable)
+            }
+        },
+        initTable:function(){
+            resultXmShenbaoTable = table.render({
+                elem : '#resultXmShenbaoTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/result/resultTongJi/listXmShenbao.json?userId='+$("#userId").val()+'&bearDept='+ $("#bearDept").val()+'&yeraTimeMin='+ $("#yeraTimeMin").val()+'&yeraTimeMax='+ $("#yeraTimeMax").val() // 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,limit : 10,
+                  cols : [ [ // 表头
+                    {
+                        type : 'checkbox',
+                    },
+                {
+
+                        title : '序号',
+                        type:'numbers'
+                },
+                {
+
+                    field : 'projectName', 
+                        title : '项目名称',
+                },
+                {
+
+                    field : 'applyTime', 
+                        title : '申报日期',
+                        templet:function(d){
+                    		if(d.applyTime!=null && d.applyTime!=""){
+    	            			return d.applyTime.substring(0,10);
+    	            		}else{
+    	            			return "";
+    	            		}
+                    	}
+                },
+                {
+
+                    field : 'levelText', 
+                        title : '级别',
+                },
+                {
+
+                    field : 'projectSourceText', 
+                        title : '项目来源',
+                },
+                {
+
+                    field : 'projectCategoryText', 
+                        title : '项目类别',
+                },
+                {
+
+                    field : 'principal', 
+                        title : '负责人',
+                },
+                {
+
+                    field : 'deptname', 
+                        title : '承担科室',
+                },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
+                {
+
+                    field : 'startTime', 
+                        title : '开始时间',
+                        templet:function(d){
+                    		if(d.startTime!=null && d.startTime!=""){
+    	            			return d.startTime.substring(0,7);
+    	            		}else{
+    	            			return "";
+    	            		}
+                    	}
+                },
+                {
+
+                    field : 'endTime', 
+                        title : '结束时间',
+                        templet:function(d){
+                    		if(d.endTime!=null && d.endTime!=""){
+    	            			return d.endTime.substring(0,7);
+    	            		}else{
+    	            			return "";
+    	            		}
+                    	}
+                },
+                /*{
+
+                    field : 'applyFunds', 
+                        title : '申请经费(上级拨款)',
+                },
+                {
+
+                    field : 'matchingFunds', 
+                        title : '匹配经费',
+                },
+                {
+
+                    field : 'isEthic', 
+                        title : '是否需过伦理',
+                },
+                {
+
+                    field : 'belongDiscipline', 
+                        title : '所属学科',
+                },
+                {
+
+                    field : 'researchArea', 
+                        title : '研究领域',
+                },*/
+                {
+                    field : 'createTime', 
+                    title : '提交时间',
+                    hide : !$("#isCheck").val()
+                },
+                {
+                	
+                	field : 'activityinstIsReturn', 
+                	title : '状态',
+                	templet:function(d){
+                		if(d.activityinstIsReturn=='1' || d.activityinstIsReturn=='2'){
+                			return "退回";
+                		}else if(d.approvalstate=='0'){
+                			return "通过";
+                		}else{
+                			return "";
+                		}
+                	}
+                },
+                {
+
+                    toolbar : '#bar', 
+                    title : '操作',
+                },
+
+        ] ]
+
+        });
+
+            table.on('tool(resultXmShenbaoTable)', function(obj){
+            	var data = obj.data;
+            	 if(obj.event=== 'view'){
+                	var url = "/project/projectApply/edit.do?id="+data.id+"&status=view&approvalstate="+data.approvalstate;
+                    Common.openDlg(url,"项目申报>查看");
+                }
+            })
+        },
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),resultXmShenbaoTable,form);
+        },
+        initToolBar:function(){
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+        }
+    }
+    exports('indexXmShenbao',view);
+
+});
\ No newline at end of file

src/main/resources/static/js/result/resultTongJi/indexYaoZheng.js

+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var resultYaoZhengTable = null;
+    var view ={
+        init:function(){
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),resultYaoZhengTable)
+            }
+        },
+        initTable:function(){
+            resultYaoZhengTable = table.render({
+                elem : '#resultYaoZhengTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/result/resultTongJi/listYaoZheng.json?userId='+$("#userId").val()+'&deptId='+ $("#deptId").val()+'&yeraTimeMin='+ $("#yeraTimeMin").val()+'&yeraTimeMax='+ $("#yeraTimeMax").val()// 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,limit : 10,
+                cols : [ [ // 表头
+                    {
+                        type : 'checkbox',
+                    },
+                {
+
+                    field : 'yaozhengName', 
+                        title : '药证名称',
+                },
+                {
+
+                    field : 'yaozhengCategory', 
+                        title : '药证分类',
+                },
+                {
+
+                    field : 'invent', 
+                        title : '发明人',
+                },
+                {
+
+                    field : 'registerTime', 
+                        title : '批准时间',
+                        templet:function(d){
+                        	if(d.registerTime!=null && d.registerTime!=""){
+                        		return d.registerTime.substring(0,11);
+                        	}
+                        }
+                },
+                {
+
+                    field : 'relyProject', 
+                        title : '依托项目',
+                },
+                {
+                	
+                	field : 'deptname', 
+                	title : '所属科室',
+                },
+                {
+                	
+                	field : 'username', 
+                	title : '提交人',
+                },
+                {
+
+                    field : 'createTime', 
+                    title : '提交时间',
+                    hide : !$("#isCheck").val()
+                },
+                {
+                	toolbar : '#bar', 
+                	title : '操作',
+                }
+
+        ] ]
+
+
+        });
+
+            table.on('tool(resultYaoZhengTable)', function(obj){
+            	var data = obj.data;
+            	if(obj.event=== 'view'){
+                	var url = "/result/resultYaozheng/edit.do?id="+data.id+"&status=view&approvalstate="+data.approvalstate;
+                    Common.openDlg(url,"药证>查看");
+                }
+            })
+        },
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),resultYaoZhengTable,form);
+        },
+        initToolBar:function(){
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+        }
+    }
+    exports('indexYaoZheng',view);
+
+});
\ No newline at end of file

src/main/resources/static/js/result/resultTongJi/resultTongJiApi.js

+/*访问后台的代码*/
+layui.define([], function(exports) {
+    var api={
+            exportExcel:function(form,callback){
+                var formPara = form.serializeJson();
+                Common.post("/result/resultTongJi/export.json?type="+$("#type").val()+'&deptId='+$("#deptId").val(), formPara, function(fileId) {
+                    callback(fileId);
+                })
+            },
+            exportExcelGR:function(form,callback){
+                var formPara = form.serializeJson();
+                Common.post("/result/resultTongJi/exportGR.json?type="+$("#type").val()+'&deptId='+$("#deptId").val(), formPara, function(fileId) {
+                    callback(fileId);
+                })
+            },
+            exportExcelDepartment:function(form,callback){
+                var formPara = form.serializeJson();
+                Common.post("/result/resultTongJi/exportDepartment.json?type="+$("#type").val(), formPara, function(fileId) {
+                    callback(fileId);
+                })
+            },
+            exportExcelKZDepartment:function(form,callback){
+                var formPara = form.serializeJson();
+                Common.post("/result/resultTongJi/exportKZDepartment.json?type="+$("#type").val(), formPara, function(fileId) {
+                    callback(fileId);
+                })
+            }
+		
+    };
+    exports('resultTongJiApi',api);
+});
\ No newline at end of file

src/main/resources/static/js/result/resultWork/index.js

@@ -63,6 +63,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                         	}
                         }
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultWork/kymsIndex.js

@@ -87,6 +87,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     field : 'publishTime', 
                         title : '出版日期',
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/static/js/result/resultWork/synIndex.js

@@ -64,6 +64,11 @@ layui.define([ 'form', 'laydate', 'table','resultWorkApi'  ], function(exports)
                         	}
                         }
                 },
+                 {
+
+                    field : 'specialityCtText', 
+                        title : '专业类别',
+                },
                 {
                 	
                 	field : 'deptname', 

src/main/resources/templates/key/keyDisciplines/add.html

@@ -49,7 +49,7 @@
 	</div>
 		<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 			<legend>
-				上传附件<font color="red">(请上传封面、作者页、版权页)</font>
+				上传附件
 			</legend>
 		</fieldset>
 		<div class="layui-row">

src/main/resources/templates/key/keyDisciplines/edit.html

@@ -47,7 +47,7 @@
         </div>
     </div>
      <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
-			<legend>上传附件<font color="red">(请上传封面、作者页、版权页)</font></legend>
+			<legend>上传附件</legend>
 		</fieldset>	
 		<div class="layui-row">
 			<!--#if(isNotEmpty(status)){  -->

src/main/resources/templates/key/keyDisciplines/passEdit.html

@@ -45,7 +45,7 @@
         </div>
     </div>
      <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
-			<legend>上传附件<font color="red">(请上传封面、作者页、版权页)</font></legend>
+			<legend>上传附件</legend>
 		</fieldset>	
 		<div class="layui-row">
 			<!--#if(isNotEmpty(status)){  -->

src/main/resources/templates/key/keyResearchOffice/add.html

@@ -48,7 +48,7 @@
     </div>
     <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 			<legend>
-				上传附件<font color="red">(请上传封面、作者页、版权页)</font>
+				上传附件
 			</legend>
 		</fieldset>
 		<div class="layui-row">

src/main/resources/templates/key/keyResearchOffice/edit.html

@@ -47,7 +47,7 @@
         </div>
     </div>
     <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
-			<legend>上传附件<font color="red">(请上传封面、作者页、版权页)</font></legend>
+			<legend>上传附件</legend>
 		</fieldset>	
 		<div class="layui-row">
 			<!--#if(isNotEmpty(status)){  -->

src/main/resources/templates/key/keyResearchOffice/passEdit.html

@@ -45,7 +45,7 @@
         </div>
     </div>
      <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
-			<legend>上传附件<font color="red">(请上传封面、作者页、版权页)</font></legend>
+			<legend>上传附件</legend>
 		</fieldset>	
 		<div class="layui-row">
 			<!--#if(isNotEmpty(status)){  -->

src/main/resources/templates/project/projectApply/add.html

@@ -153,6 +153,14 @@
 				</div>
             </div>
          </div>
+         <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect name="specialityCt" lay-verify="required" type="speciality_category" id="specialityCt" layFilter="specialityCt"/>
+				</div>
+            </div>
+         </div>
         <div id="ethic" style="display: none;">
         	<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 	  			<legend>伦理附件</legend>

src/main/resources/templates/project/projectApply/edit.html

@@ -192,6 +192,18 @@
 				</div>
             </div>
         </div>
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${projectApply.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${projectApply.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
+         </div>
         <div id="ethic" style="display: none;">
         	<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 	  			<legend>伦理附件</legend>

src/main/resources/templates/project/projectApply/passEdit.html

@@ -192,6 +192,18 @@
 				</div>
             </div>
         </div>
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${projectApply.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${projectApply.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
+         </div>
         <div id="ethic" style="display: none;">
         	<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 	  			<legend>伦理附件</legend>

src/main/resources/templates/project/projectApproval/add.html

@@ -122,7 +122,14 @@
 				</div>
             </div>
         </div>
-        
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect name="specialityCt" lay-verify="required" type="speciality_category" id="specialityCt" layFilter="specialityCt"/>
+				</div>
+            </div>
+         </div>
     <div class="layui-form-item">    
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
   			<legend>项目组成员</legend>

src/main/resources/templates/project/projectApproval/edit.html

@@ -148,7 +148,18 @@
 				</div>
             </div>
         </div>
-        
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${projectApproval.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${projectApproval.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
+         </div>
         
         <div class="layui-form-item">    
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">

src/main/resources/templates/project/projectApproval/passEdit.html

@@ -148,7 +148,14 @@
 				</div>
             </div>
         </div>
-        
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+				    <layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${projectApproval.specialityCt}"/>
+				 </div>
+            </div>
+         </div>
         
         <div class="layui-form-item">    
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">

src/main/resources/templates/result/patentAuth/add.html

@@ -173,7 +173,15 @@
 				</div>
             </div>
         </div>
-</div>    
+</div>   
+     <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect name="specialityCt" lay-verify="required" type="speciality_category" id="specialityCt" layFilter="specialityCt"/>
+				</div>
+            </div>
+     </div> 
 <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 			<legend>上传专利证书</legend>
 </fieldset>	

src/main/resources/templates/result/patentAuth/edit.html

@@ -215,7 +215,19 @@
 				</div>
             </div>
         </div>
-</div>    
+</div>  
+   <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${patentAuth.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${patentAuth.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
+         </div>  
 <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 			<legend>上传专利证书</legend>
 </fieldset>	

src/main/resources/templates/result/patentAuth/passEdit.html

@@ -216,6 +216,18 @@
             </div>
         </div>
 </div>    
+   <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${patentAuth.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${patentAuth.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
+         </div>
 <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 			<legend>上传专利证书</legend>
 </fieldset>	

src/main/resources/templates/result/resultPaper/add.html

@@ -247,6 +247,12 @@
 				</div>
 		</div>
 		<div class="layui-form-item">
+			<div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect name="specialityCt" lay-verify="required" type="speciality_category" id="specialityCt" layFilter="specialityCt"/>
+				</div>
+            </div>
 		    <div class="layui-inline">
 				<label class="layui-form-label label-size">备注</label>
 				<div class="layui-input-inline">

src/main/resources/templates/result/resultPaper/addEnglish.html

@@ -234,6 +234,12 @@
 			
 		</div>
 		<div class="layui-form-item">
+			 <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect name="specialityCt" lay-verify="required" type="speciality_category" id="specialityCt" layFilter="specialityCt"/>
+				</div>
+            </div>
 		    <div class="layui-inline">
 				<label class="layui-form-label label-size">备注</label>
 				<div class="layui-input-inline">

src/main/resources/templates/result/resultPaper/edit.html

@@ -256,6 +256,16 @@
 			
 		</div>
 		<div class="layui-form-item">
+			<div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${resultPaper.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${resultPaper.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
 		    <div class="layui-inline">
 				<label class="layui-form-label label-size">备注</label>
 				<div class="layui-input-inline">

src/main/resources/templates/result/resultPaper/editEnglish.html

@@ -305,6 +305,16 @@
 			
 		</div>
 		<div class="layui-form-item">
+			<div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${resultPaper.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${resultPaper.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
 		    <div class="layui-inline">
 				<label class="layui-form-label label-size">备注</label>
 				<div class="layui-input-inline">

src/main/resources/templates/result/resultPaper/passEdit.html

@@ -259,6 +259,16 @@
 			
 		</div>
 		<div class="layui-form-item">
+			<div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${resultPaper.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${resultPaper.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
 		    <div class="layui-inline">
 				<label class="layui-form-label label-size">备注</label>
 				<div class="layui-input-inline">

src/main/resources/templates/result/resultPaper/passEditEnglish.html

@@ -297,6 +297,16 @@
 			
 		</div>
 		<div class="layui-form-item">
+			<div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${resultPaper.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${resultPaper.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
 		    <div class="layui-inline">
 				<label class="layui-form-label label-size">备注</label>
 				<div class="layui-input-inline">

src/main/resources/templates/result/resultPatent/add.html

@@ -97,6 +97,14 @@
 				</div>
             </div>
         </div>
+         <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect name="specialityCt" lay-verify="required" type="speciality_category" id="specialityCt" layFilter="specialityCt"/>
+				</div>
+            </div>
+         </div>
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 			<legend>上传附件</legend>
 		</fieldset>	

src/main/resources/templates/result/resultPatent/edit.html

@@ -109,7 +109,18 @@
 				</div>
             </div>
         </div>
-        
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${resultPatent.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${resultPatent.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
+         </div>
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 			<legend>上传附件</legend>
 		</fieldset>	

src/main/resources/templates/result/resultPatent/passEdit.html

@@ -109,7 +109,18 @@
 				</div>
             </div>
         </div>
-        
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${resultPatent.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${resultPatent.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
+         </div>
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 			<legend>上传附件</legend>
 		</fieldset>	

src/main/resources/templates/result/resultPrize/add.html

@@ -145,7 +145,14 @@
 				</div>
             </div>
         </div>
-        
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect name="specialityCt" lay-verify="required" type="speciality_category" id="specialityCt" layFilter="specialityCt"/>
+				</div>
+            </div>
+         </div>
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 			<legend>上传附件</legend>
 		</fieldset>	

src/main/resources/templates/result/resultPrize/edit.html

@@ -164,7 +164,18 @@
 				</div>
             </div>
         </div>
-        
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${resultPrize.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${resultPrize.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
+         </div>
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 			<legend>上传附件</legend>
 		</fieldset>	

src/main/resources/templates/result/resultPrize/passEdit.html

@@ -164,7 +164,18 @@
 				</div>
             </div>
         </div>
-        
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${resultPrize.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${resultPrize.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
+         </div>
 
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 			<legend>上传附件</legend>

src/main/resources/templates/result/resultSoftware/add.html

@@ -82,6 +82,14 @@
 				</div>
             </div>
         </div>
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect name="specialityCt" lay-verify="required" type="speciality_category" id="specialityCt" layFilter="specialityCt"/>
+				</div>
+            </div>
+         </div>
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 			<legend>软件著作登记证</legend>
 	</fieldset>	

src/main/resources/templates/result/resultSoftware/edit.html

@@ -93,7 +93,18 @@
 				</div>
             </div>
         </div>
-        
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${resultSoftware.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${resultSoftware.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
+         </div>
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 			<legend>软件著作登记证</legend>
 	</fieldset>	

src/main/resources/templates/result/resultSoftware/passEdit.html

@@ -93,7 +93,18 @@
 				</div>
             </div>
         </div>
-        
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${resultSoftware.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${resultSoftware.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
+         </div>
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 			<legend>软件著作登记证</legend>
 	</fieldset>	

src/main/resources/templates/result/resultStandard/add.html

@@ -141,6 +141,14 @@
 					</div>
 	            </div>
 	        </div>
+	        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect name="specialityCt" lay-verify="required" type="speciality_category" id="specialityCt" layFilter="specialityCt"/>
+				</div>
+            </div>
+         </div>
 	        <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 				<legend>上传附件</legend>
 			</fieldset>	

src/main/resources/templates/result/resultStandard/edit.html

@@ -158,7 +158,18 @@
 				</div>
             </div> 
         </div>
-        
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${resultStandard.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${resultStandard.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
+         </div>
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 			<legend>上传附件</legend>
 		</fieldset>	

src/main/resources/templates/result/resultStandard/passEdit.html

@@ -159,7 +159,18 @@
 				</div>
             </div>
         </div>
-        
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${resultStandard.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${resultStandard.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
+         </div>
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 			<legend>上传附件</legend>
 		</fieldset>	

src/main/resources/templates/result/resultTongJi/index.html

+<!--#layout("/common/layout.html",{"jsBase":"/js/result/resultTongJi/"}){ -->
+<layui:searchForm formId="searchForm"  condition="${search}">
+</layui:searchForm>
+<div class="layui-btn-group">
+     <layui:accessButton function="resultPaper.exportDocument"  action="exportDocument">导出数据</layui:accessButton>
+</div>
+<input type="hidden" id="type" value="${type}"/>
+<input type="hidden" id="deptId" value="${deptId}"/>
+<table id="resultStandardTable" lay-filter="resultStandardTable"></table>
+<!--#} -->
+<script>
+layui.use(['index'], function(){
+    var index = layui.index
+    index.init();
+});
+</script>

src/main/resources/templates/result/resultTongJi/indexBiaoZhen.html

+<!--#layout("/common/layout.html",{"jsBase":"/js/result/resultTongJi/"}){ -->
+<layui:searchForm formId="searchForm"  condition="${search}">
+</layui:searchForm>
+<input type="hidden" id="userId" value="${userId}"/>
+<input type="hidden" id="type" value="${type}"/>
+<input type="hidden" id="deptId" value="${deptId}"/>
+<input type="hidden" id="yeraTimeMin" value="${yeraTimeMin}"/>
+<input type="hidden" id="yeraTimeMax" value="${yeraTimeMax}"/>
+<table id="resultBiaoZhenTable" lay-filter="resultBiaoZhenTable"></table>
+<!--#} -->
+<script type="text/html" id="bar">
+   	<a class="layui-btn layui-btn-xs" lay-event="view">查看</a>
+</script>
+<script>
+
+layui.use(['indexBiaoZhen'], function(){
+    var indexBiaoZhen = layui.indexBiaoZhen
+    indexBiaoZhen.init();
+});
+
+</script>

src/main/resources/templates/result/resultTongJi/indexDepartment.html

+<!--#layout("/common/layout.html",{"jsBase":"/js/result/resultTongJi/"}){ -->
+<layui:searchForm formId="searchForm"  condition="${search}">
+</layui:searchForm>
+<div class="layui-btn-group">
+     <layui:accessButton function="resultDepartment.exportDocument"  action="exportDocument">导出数据</layui:accessButton>
+</div>
+<input type="hidden" id="type" value="${type}"/>
+<table id="resultDepartmentTable" lay-filter="resultDepartmentTable"></table>
+<!--#} -->
+<script>
+layui.use(['indexDepartment'], function(){
+    var indexDepartment = layui.indexDepartment
+    indexDepartment.init();
+});
+</script>

src/main/resources/templates/result/resultTongJi/indexGR.html

+<!--#layout("/common/layout.html",{"jsBase":"/js/result/resultTongJi/"}){ -->
+<layui:searchForm formId="searchForm"  condition="${search}">
+</layui:searchForm>
+<div class="layui-btn-group">
+     <layui:accessButton function="resultPaper.exportDocument"  action="exportDocument">导出数据</layui:accessButton>
+</div>
+<input type="hidden" id="type" value="${type}"/>
+<input type="hidden" id="deptId" value="${deptId}"/>
+<table id="resultGRTable" lay-filter="resultGRTable"></table>
+<!--#} -->
+<script>
+layui.use(['indexGR'], function(){
+    var indexGR = layui.indexGR
+    indexGR.init();
+});
+</script>

src/main/resources/templates/result/resultTongJi/indexHospital.html

+<!--#layout("/common/layout.html",{"jsBase":"/js/result/resultTongJi/"}){ -->
+<layui:searchForm formId="searchForm"  condition="${search}">
+</layui:searchForm>
+<!--<div class="layui-btn-group">
+     <layui:accessButton function="resultPaper.exportDocument"  action="exportDocument">导出数据</layui:accessButton>
+</div>-->
+<input type="hidden" id="type" value="${type}"/>
+<table id="resultHospitalTable" lay-filter="resultHospitalTable"></table>
+<!--#} -->
+<script>
+layui.use(['indexHospital'], function(){
+    var indexHospital = layui.indexHospital
+    indexHospital.init();
+});
+</script>

src/main/resources/templates/result/resultTongJi/indexHuoJiang.html

+<!--#layout("/common/layout.html",{"jsBase":"/js/result/resultTongJi/"}){ -->
+<layui:searchForm formId="searchForm"  condition="${search}">
+</layui:searchForm>
+<input type="hidden" id="userId" value="${userId}"/>
+<input type="hidden" id="type" value="${type}"/>
+<input type="hidden" id="deptId" value="${deptId}"/>
+<input type="hidden" id="yeraTimeMin" value="${yeraTimeMin}"/>
+<input type="hidden" id="yeraTimeMax" value="${yeraTimeMax}"/>
+<table id="resultHuoJiangTable" lay-filter="resultHuoJiangTable"></table>
+<!--#} -->
+<script type="text/html" id="bar">
+   	<a class="layui-btn layui-btn-xs" lay-event="view">查看</a>
+</script>
+<script>
+
+layui.use(['indexHuoJiang'], function(){
+    var indexHuoJiang = layui.indexHuoJiang
+    indexHuoJiang.init();
+});
+
+</script>

src/main/resources/templates/result/resultTongJi/indexKZDepartment.html

+<!--#layout("/common/layout.html",{"jsBase":"/js/result/resultTongJi/"}){ -->
+<layui:searchForm formId="searchForm"  condition="${search}">
+</layui:searchForm>
+<div class="layui-btn-group">
+     <layui:accessButton function="resultDepartment.exportDocument"  action="exportDocument">导出数据</layui:accessButton>
+</div>
+<input type="hidden" id="type" value="${type}"/>
+<table id="resultKZDepartmentTable" lay-filter="resultKZDepartmentTable"></table>
+<!--#} -->
+<script>
+layui.use(['indexKZDepartment'], function(){
+    var indexKZDepartment = layui.indexKZDepartment
+    indexKZDepartment.init();
+});
+</script>

src/main/resources/templates/result/resultTongJi/indexLunWen.html

+<!--#layout("/common/layout.html",{"jsBase":"/js/result/resultTongJi/"}){ -->
+<layui:searchForm formId="searchForm"  condition="${search}">
+</layui:searchForm>
+<input type="hidden" id="userId" value="${userId}"/>
+<input type="hidden" id="type" value="${type}"/>
+<input type="hidden" id="belongDept" value="${belongDept}"/>
+<input type="hidden" id="yeraTimeMin" value="${yeraTimeMin}"/>
+<input type="hidden" id="yeraTimeMax" value="${yeraTimeMax}"/>
+<table id="resultPaperTable" lay-filter="resultPaperTable"></table>
+<!--#} -->
+<script type="text/html" id="bar">
+   	<a class="layui-btn layui-btn-xs" lay-event="view">查看</a>
+</script>
+<script>
+
+layui.use(['indexLunWen'], function(){
+    var indexLunWen = layui.indexLunWen
+    indexLunWen.init();
+});
+
+</script>

src/main/resources/templates/result/resultTongJi/indexRuanJian.html

+<!--#layout("/common/layout.html",{"jsBase":"/js/result/resultTongJi/"}){ -->
+<layui:searchForm formId="searchForm"  condition="${search}">
+</layui:searchForm>
+<input type="hidden" id="userId" value="${userId}"/>
+<input type="hidden" id="type" value="${type}"/>
+<input type="hidden" id="deptId" value="${deptId}"/>
+<input type="hidden" id="yeraTimeMin" value="${yeraTimeMin}"/>
+<input type="hidden" id="yeraTimeMax" value="${yeraTimeMax}"/>
+<table id="resultRuanJianTable" lay-filter="resultRuanJianTable"></table>
+<!--#} -->
+<script type="text/html" id="bar">
+   	<a class="layui-btn layui-btn-xs" lay-event="view">查看</a>
+</script>
+<script>
+
+layui.use(['indexRuanJian'], function(){
+    var indexRuanJian = layui.indexRuanJian
+    indexRuanJian.init();
+});
+
+</script>

src/main/resources/templates/result/resultTongJi/indexShenQing.html

+<!--#layout("/common/layout.html",{"jsBase":"/js/result/resultTongJi/"}){ -->
+<layui:searchForm formId="searchForm"  condition="${search}">
+</layui:searchForm>
+<input type="hidden" id="userId" value="${userId}"/>
+<input type="hidden" id="type" value="${type}"/>
+<input type="hidden" id="deptId" value="${deptId}"/>
+<input type="hidden" id="yeraTimeMin" value="${yeraTimeMin}"/>
+<input type="hidden" id="yeraTimeMax" value="${yeraTimeMax}"/>
+<table id="resultShenQingTable" lay-filter="resultShenQingTable"></table>
+<!--#} -->
+<script type="text/html" id="bar">
+   	<a class="layui-btn layui-btn-xs" lay-event="view">查看</a>
+</script>
+<script>
+
+layui.use(['indexShenQing'], function(){
+    var indexShenQing = layui.indexShenQing
+    indexShenQing.init();
+});
+
+</script>

src/main/resources/templates/result/resultTongJi/indexShouQuan.html

+<!--#layout("/common/layout.html",{"jsBase":"/js/result/resultTongJi/"}){ -->
+<layui:searchForm formId="searchForm"  condition="${search}">
+</layui:searchForm>
+<input type="hidden" id="userId" value="${userId}"/>
+<input type="hidden" id="type" value="${type}"/>
+<input type="hidden" id="belongDept" value="${belongDept}"/>
+<input type="hidden" id="yeraTimeMin" value="${yeraTimeMin}"/>
+<input type="hidden" id="yeraTimeMax" value="${yeraTimeMax}"/>
+<table id="resultShouQuanTable" lay-filter="resultShouQuanTable"></table>
+<!--#} -->
+<script type="text/html" id="bar">
+   	<a class="layui-btn layui-btn-xs" lay-event="view">查看</a>
+</script>
+<script>
+
+layui.use(['indexShouQuan'], function(){
+    var indexShouQuan = layui.indexShouQuan
+    indexShouQuan.init();
+});
+
+</script>

src/main/resources/templates/result/resultTongJi/indexShuZuo.html

+<!--#layout("/common/layout.html",{"jsBase":"/js/result/resultTongJi/"}){ -->
+<layui:searchForm formId="searchForm"  condition="${search}">
+</layui:searchForm>
+<input type="hidden" id="userId" value="${userId}"/>
+<input type="hidden" id="type" value="${type}"/>
+<input type="hidden" id="deptId" value="${deptId}"/>
+<input type="hidden" id="yeraTimeMin" value="${yeraTimeMin}"/>
+<input type="hidden" id="yeraTimeMax" value="${yeraTimeMax}"/>
+<table id="resultShuZuoTable" lay-filter="resultShuZuoTable"></table>
+<!--#} -->
+<script type="text/html" id="bar">
+   	<a class="layui-btn layui-btn-xs" lay-event="view">查看</a>
+</script>
+<script>
+
+layui.use(['indexShuZuo'], function(){
+    var indexShuZuo = layui.indexShuZuo
+    indexShuZuo.init();
+});
+
+</script>

src/main/resources/templates/result/resultTongJi/indexXmLixiang.html

+<!--#layout("/common/layout.html",{"jsBase":"/js/result/resultTongJi/"}){ -->
+<layui:searchForm formId="searchForm"  condition="${search}">
+</layui:searchForm>
+<input type="hidden" id="userId" value="${userId}"/>
+<input type="hidden" id="type" value="${type}"/>
+<input type="hidden" id="belongDept" value="${belongDept}"/>
+<input type="hidden" id="yeraTimeMin" value="${yeraTimeMin}"/>
+<input type="hidden" id="yeraTimeMax" value="${yeraTimeMax}"/>
+<table id="resultXmLixiangTable" lay-filter="resultXmLixiangTable"></table>
+<!--#} -->
+<script type="text/html" id="bar">
+   	<a class="layui-btn layui-btn-xs" lay-event="view">查看</a>
+</script>
+<script>
+
+layui.use(['indexXmLixiang'], function(){
+    var indexXmLixiang = layui.indexXmLixiang
+    indexXmLixiang.init();
+});
+
+</script>

src/main/resources/templates/result/resultTongJi/indexXmShenbao.html

+<!--#layout("/common/layout.html",{"jsBase":"/js/result/resultTongJi/"}){ -->
+<layui:searchForm formId="searchForm"  condition="${search}">
+</layui:searchForm>
+<input type="hidden" id="userId" value="${userId}"/>
+<input type="hidden" id="type" value="${type}"/>
+<input type="hidden" id="bearDept" value="${bearDept}"/>
+<input type="hidden" id="yeraTimeMin" value="${yeraTimeMin}"/>
+<input type="hidden" id="yeraTimeMax" value="${yeraTimeMax}"/>
+<table id="resultXmShenbaoTable" lay-filter="resultXmShenbaoTable"></table>
+<!--#} -->
+<script type="text/html" id="bar">
+   	<a class="layui-btn layui-btn-xs" lay-event="view">查看</a>
+</script>
+<script>
+
+layui.use(['indexXmShenbao'], function(){
+    var indexXmShenbao = layui.indexXmShenbao
+    indexXmShenbao.init();
+});
+
+</script>

src/main/resources/templates/result/resultTongJi/indexYaoZheng.html

+<!--#layout("/common/layout.html",{"jsBase":"/js/result/resultTongJi/"}){ -->
+<layui:searchForm formId="searchForm"  condition="${search}">
+</layui:searchForm>
+<input type="hidden" id="userId" value="${userId}"/>
+<input type="hidden" id="type" value="${type}"/>
+<input type="hidden" id="deptId" value="${deptId}"/>
+<input type="hidden" id="yeraTimeMin" value="${yeraTimeMin}"/>
+<input type="hidden" id="yeraTimeMax" value="${yeraTimeMax}"/>
+<table id="resultYaoZhengTable" lay-filter="resultYaoZhengTable"></table>
+<!--#} -->
+<script type="text/html" id="bar">
+   	<a class="layui-btn layui-btn-xs" lay-event="view">查看</a>
+</script>
+<script>
+
+layui.use(['indexYaoZheng'], function(){
+    var indexYaoZheng = layui.indexYaoZheng
+    indexYaoZheng.init();
+});
+
+</script>

src/main/resources/templates/result/resultWork/add.html

@@ -166,6 +166,12 @@
 				      </select>
 				</div>
             </div>
+             <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect name="specialityCt" lay-verify="required" type="speciality_category" id="specialityCt" layFilter="specialityCt"/>
+				</div>
+            </div>
         </div>
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 				<legend>上传附件<font color="red">(请上传封面、作者页、版权页)</font></legend>

src/main/resources/templates/result/resultWork/edit.html

@@ -174,6 +174,16 @@
 				      </select>
 				</div>
             </div>
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${resultWork.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${resultWork.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
         </div>
         
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">

src/main/resources/templates/result/resultWork/passEdit.html

@@ -174,6 +174,16 @@
 				      </select>
 				</div>
             </div>
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">专业类别</label>
+				<div class="layui-input-inline">
+			    <!--#if(isNotEmpty(status)){  -->
+					  <input type="text" autocomplete="off" lay-verify="required" class="layui-input" value="${resultWork.specialityCtText}">
+				<!--#}else{  -->
+						<layui:simpleDictSelect layVerify="required" type="speciality_category" layFilter="specialityCt" name="specialityCt" id="specialityCt" value="${resultWork.specialityCt}"/>
+				<!--#}  --> 
+				 </div>
+            </div>
         </div>
         
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">