diff --git a/pom.xml b/pom.xml index c158558..3f8e780 100644 --- a/pom.xml +++ b/pom.xml @@ -207,11 +207,6 @@ cxf-rt-frontend-jaxws ${cxf.version} - - org.apache.pdfbox - pdfbox - 2.0.12 - @@ -236,12 +231,6 @@ ${lombok.version} provided - diff --git a/src/main/java/com/emr/controller/ArchiveOtherExtController.java b/src/main/java/com/emr/controller/ArchiveOtherExtController.java index 242bba6..e313f07 100644 --- a/src/main/java/com/emr/controller/ArchiveOtherExtController.java +++ b/src/main/java/com/emr/controller/ArchiveOtherExtController.java @@ -1,8 +1,10 @@ package com.emr.controller; +import com.emr.entity.ArchiveOther; import com.emr.entity.ArchiveOtherExtSubmittime; import com.emr.entity.OffsetLimitPage; import com.emr.service.ipml.ArchiveOtherExtService; +import com.emr.service.ipml.ArchiveOtherService; import com.emr.util.ExceptionPrintUtil; import com.emr.util.Msg; import com.emr.vo.ArchiveOtherExtVo; @@ -22,7 +24,8 @@ import java.util.List; public class ArchiveOtherExtController { @Autowired private ArchiveOtherExtService archiveOtherExtService; - + @Autowired + private ArchiveOtherService archiveOtherService; /** * 任务详情列表 * @param offset @@ -91,8 +94,22 @@ public class ArchiveOtherExtController { */ @RequestMapping("selectSuccessByExtIds") @ResponseBody - public Msg selectSuccessByExtIds(String ids) throws Exception{ - List list = archiveOtherExtService.selectSuccessByExtIds(ids); - return Msg.success().add("list",list); + public Msg selectSuccessByExtIds(String ids,String c1) throws Exception{ + if(StringUtils.isNotBlank(ids)){ + String[] split = ids.split(","); + StringBuilder temp = new StringBuilder(); + for(String str : split){ + if(StringUtils.isNotBlank(str)){ + if(StringUtils.isNotBlank(temp)){ + temp.append(","); + } + temp.append("'").append(str).append("'"); + } + } + List list = archiveOtherService.selectAllByC2(temp.toString(),c1); + return Msg.success().add("list",list); + }else{ + return Msg.fail("参数ids不能为空"); + } } } diff --git a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java index 2b557ae..9efe31f 100644 --- a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java +++ b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java @@ -21,5 +21,7 @@ public interface ArchiveOtherExtMapper { List getArchiveExtInfo(ArchiveOtherExtVo record); - int updateSubmit(@Param("ids")String ids); + List selectAllByIds(@Param("ids") String ids); + + //int updateSubmit(@Param("ids")String ids); } \ No newline at end of file diff --git a/src/main/java/com/emr/dao/ArchiveOtherExtSubmittimeMapper.java b/src/main/java/com/emr/dao/ArchiveOtherExtSubmittimeMapper.java index 9df0522..1692bae 100644 --- a/src/main/java/com/emr/dao/ArchiveOtherExtSubmittimeMapper.java +++ b/src/main/java/com/emr/dao/ArchiveOtherExtSubmittimeMapper.java @@ -23,6 +23,4 @@ public interface ArchiveOtherExtSubmittimeMapper { int createInfo(@Param("ids") String ids); int updateInfo(@Param("ids") String ids); - - List selectSuccessByExtIds(@Param("ids")String ids); } \ No newline at end of file diff --git a/src/main/java/com/emr/dao/ArchiveOtherMapper.java b/src/main/java/com/emr/dao/ArchiveOtherMapper.java index ddb3c15..5cb534c 100644 --- a/src/main/java/com/emr/dao/ArchiveOtherMapper.java +++ b/src/main/java/com/emr/dao/ArchiveOtherMapper.java @@ -1,10 +1,11 @@ package com.emr.dao; import com.emr.entity.ArchiveOther; +import org.apache.ibatis.annotations.Param; import java.util.List; -public interface ArchiveOtherMapper { +public interface ArchiveOtherMapper extends CommomMapper{ int deleteByPrimaryKey(Long id); int insert(ArchiveOther record); @@ -23,4 +24,16 @@ public interface ArchiveOtherMapper { * @return */ List selectExistByPatientId(String patientId); + /** + * 根据c2查询是否存在 + * @param c2s + * @return + */ + List selectAllByC2(@Param("c2s")String c2s,@Param("c1")String c1); + /** + * 根据c2集合置空c1 + * @param c2s + * @return + */ + void updateBatchC1ByC2s(@Param("c2s")String c2s); } \ No newline at end of file diff --git a/src/main/java/com/emr/entity/Archive_Detail_Vo.java b/src/main/java/com/emr/entity/Archive_Detail_Vo.java index 5e4badc..bb56936 100644 --- a/src/main/java/com/emr/entity/Archive_Detail_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Detail_Vo.java @@ -35,6 +35,10 @@ public class Archive_Detail_Vo extends Archive_Detail{ private String pageCounts; private String pdfPaths; + + private String eTimeStr; + + private String createTime; } diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java index 5308d41..2bc1bbd 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java +++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java @@ -2,19 +2,23 @@ package com.emr.service.ipml; import com.emr.dao.ArchiveOtherExtMapper; import com.emr.dao.ArchiveOtherExtSubmittimeMapper; -import com.emr.entity.ArchiveOtherExt; +import com.emr.dao.ArchiveOtherMapper; +import com.emr.entity.ArchiveOther; import com.emr.entity.ArchiveOtherExtSubmittime; import com.emr.vo.ArchiveOtherExtVo; import com.emr.vo.KeyValue; import net.sf.json.JSONArray; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.util.CollectionUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import java.io.*; +import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; @Service @@ -26,6 +30,10 @@ public class ArchiveOtherExtService { private ArchiveOtherExtSubmittimeMapper archiveOtherExtSubmittimeMapper; @Autowired private ArchiveOtherService archiveOtherService; + @Autowired + private ArchiveOtherMapper archiveOtherMapper; + @Autowired + private CommomService commomService; /**查询任务详情列表 * @param request * @param archiveOtherExtVo @@ -111,26 +119,106 @@ public class ArchiveOtherExtService { * @param sysFlag */ public void updateSubmit(String ids,String notNursingIds, String jzh, String masterId, Integer sysFlag) throws Exception{ - String idsStr = SplitString2String(ids); + String idsStr = splitString2String(ids); + String idsTemp = idsStr; //存在护理记录则调用护理按需采集功能 if(null != sysFlag && sysFlag == 1) { //调用护理按需采集功能 archiveOtherService.updateArchiveOther(jzh, masterId); //ext表更新非护理记录 if(StringUtils.isNotBlank(notNursingIds)){ - String tempIds = SplitString2String(notNursingIds); - archiveOtherExtMapper.updateSubmit(tempIds); + idsTemp = splitString2String(notNursingIds); } - }else{ - //全部更新ext表 - archiveOtherExtMapper.updateSubmit(idsStr); + } + //ext表更新非护理记录 + if(StringUtils.isNotBlank(notNursingIds)){ + updateCommomSubmit(idsTemp); + //archiveOtherExtMapper.updateSubmit(idsTemp); } //操作提交信息表 - OperOtherExtSubmitInfo(ids, idsStr); + operOtherExtSubmitInfo(ids, idsStr); + } + + /** + * 处理护理，其余同步更新操作 + * 1.按idsTemp记录查询archive_other表是否存在 + * 2.存在将C1置为空串，批量更新 + * 3.不存在按各自系统的标识插入数据 + * @param idsTemp + */ + private void updateCommomSubmit(String idsTemp) throws Exception { + //根据other_ext的id查询存在c2字段值的集合 + List archiveOthers = archiveOtherService.selectAllByC2(idsTemp,null); + //定义需要新增的id集合 + String notExistTemp = ""; + if(!CollectionUtils.isEmpty(archiveOthers)){ + String existTemp = ""; + List existOtherData = getExistOtherData(idsTemp, archiveOthers); + existTemp = existOtherData.get(0); + //批量更新 + archiveOtherService.updateBatchC1ByC2s(existTemp); + notExistTemp = existOtherData.get(1); + }else{ + notExistTemp = idsTemp; + } + //不存在的部门批量添加 + //查询other_ext记录 + if(StringUtils.isNotBlank(notExistTemp)) { + //定义批量新增的集合 + List batchInsertList = new ArrayList<>(); + List archiveOtherExtVos = archiveOtherExtMapper.selectAllByIds(notExistTemp); + for (ArchiveOtherExtVo vo : archiveOtherExtVos){ + batchInsertList.add(archiveOtherService.getArchiveOther(vo)); + } + //批量新增 + commomService.insertBatch("archive_other",batchInsertList,archiveOtherMapper); + } + } + + /** + * list.get(0)存在，list.get(1)不存在 + * 组织是否存在other_ext表里记录的集合 + * @param idsTemp + * @param archiveOthers + * @return + */ + private List getExistOtherData(String idsTemp, List archiveOthers) { + String[] idList = idsTemp.split(","); + //定义存在的id集合 + StringBuilder existTemp = new StringBuilder(); + //定义不存在的id集合 + StringBuilder notExistTemp = new StringBuilder(); + //重新组织需要增加的id + for(String str : idList){ //定义是否存在 + boolean existFlag = false; + for(ArchiveOther other : archiveOthers) { + String id = "'" + other.getC2() + "'"; + if (StringUtils.isNotBlank(str) && str.equals(id)) { + existFlag = true; + break; + } + } + if(existFlag){ + if(StringUtils.isNotBlank(existTemp)){ + existTemp.append(","); + } + existTemp.append(str); + }else{ + if(StringUtils.isNotBlank(notExistTemp)){ + notExistTemp.append(","); + } + notExistTemp.append(str); + } + } + //定义返回集合 + List list = new LinkedList<>(); + list.add(existTemp.toString()); + list.add(notExistTemp.toString()); + return list; } //带逗号的字符串加单引号 - private String SplitString2String(String notNursingIds) { + private String splitString2String(String notNursingIds) { String[] notNursingIdsArr = notNursingIds.split(","); //批量更新ext表的statusFlag字段值为0 StringBuilder notNursingIdsBuilder = new StringBuilder(); @@ -150,7 +238,7 @@ public class ArchiveOtherExtService { * @param ids * @param idsStr */ - private void OperOtherExtSubmitInfo(String ids, String idsStr) { + private void operOtherExtSubmitInfo(String ids, String idsStr) { //查询ext_id在ext_info表中是否存在 List infoList = archiveOtherExtSubmittimeMapper.selectAllByExtId(idsStr); //定义需要新增的id集合 @@ -195,8 +283,4 @@ public class ArchiveOtherExtService { archiveOtherExtSubmittimeMapper.createInfo(createStr.toString()); } } - - public List selectSuccessByExtIds(String ids) { - return archiveOtherExtSubmittimeMapper.selectSuccessByExtIds(ids); - } } diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherService.java index 13ce78c..d063cdc 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveOtherService.java +++ b/src/main/java/com/emr/service/ipml/ArchiveOtherService.java @@ -2,7 +2,9 @@ package com.emr.service.ipml; import com.emr.dao.ArchiveOtherMapper; import com.emr.entity.ArchiveOther; +import com.emr.entity.ArchiveOtherExt; import com.emr.util.IDHelper; +import com.emr.vo.ArchiveOtherExtVo; import org.apache.commons.lang.StringUtils; import org.apache.shiro.util.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -46,34 +48,96 @@ public class ArchiveOtherService { archiveOtherMapper.updateByPrimaryKeySelective(archiveOther); }else{ //不存在则新增 - ArchiveOther archiveOther = new ArchiveOther(); - long id = IDHelper.NewID(); - archiveOther.setId(id); - archiveOther.setPid(patientId); - archiveOther.setCreatedtime(new Date()); - archiveOther.setOtherinfo("护理系统按需采集"); - archiveOther.setMasterid(masterId); - archiveOther.setDetailid("0"); - archiveOther.setDtime(new Date()); - archiveOther.setSysflag(-2); - archiveOther.setC1(""); - archiveOther.setC2(""); - archiveOther.setC3(""); - archiveOther.setC4(""); - archiveOther.setC5(""); - archiveOther.setN1(BigDecimal.valueOf(0)); - archiveOther.setN2(BigDecimal.valueOf(0)); - archiveOther.setN3(BigDecimal.valueOf(0)); - String date = "1801-02-03 00:00:00"; - SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - archiveOther.setT1(fmt.parse(date)); - archiveOther.setT2(fmt.parse(date)); - archiveOther.setT3(fmt.parse(date)); - archiveOther.setIsfulltext(false); + ArchiveOtherExtVo extObj = new ArchiveOtherExtVo(); + extObj.setJzh(patientId); + extObj.setMid(masterId); + //填充数据 + ArchiveOther archiveOther = getArchiveOther(extObj); archiveOtherMapper.insert(archiveOther); } } + /** + * 填充ArchiveOtherExt对象数据 + * @param extObj + * @return + * @throws Exception + */ + public ArchiveOther getArchiveOther(ArchiveOtherExtVo extObj) throws Exception { + ArchiveOther archiveOther = new ArchiveOther(); + long id = IDHelper.NewID(); + archiveOther.setId(id); + archiveOther.setCreatedtime(new Date()); + archiveOther.setDetailid("0"); + archiveOther.setDtime(new Date()); + archiveOther.setC1(""); + archiveOther.setC2(""); + archiveOther.setC3(""); + archiveOther.setC4(""); + archiveOther.setC5(""); + archiveOther.setN1(BigDecimal.valueOf(0)); + archiveOther.setN2(BigDecimal.valueOf(0)); + archiveOther.setN3(BigDecimal.valueOf(0)); + String date = "1801-02-03 00:00:00"; + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + archiveOther.setT1(fmt.parse(date)); + archiveOther.setT2(fmt.parse(date)); + archiveOther.setT3(fmt.parse(date)); + archiveOther.setIsfulltext(false); + //不同部分 + archiveOther.setPid(extObj.getJzh()); + archiveOther.setMasterid(extObj.getMid()); + Integer sysflag = extObj.getSysflag(); + //定义不同的sysFlag + Integer sysFlagTemp = null; + String otherInfo = ""; + if(sysflag == null){ + //护理系统 + sysFlagTemp = -2; + otherInfo = "护理"; + }else{ + //设置C2的值为other_ext表的id + archiveOther.setC2(extObj.getId().toString()); + //2 His，3 Pasc，4 心电，5 手麻，6 Lis，7 首页，8 医嘱 + //-2 护理，-3 Pasc，-4 心电，-5 手麻，-6 Lis，-7 首页，-8 医嘱，-9 His + switch (sysflag){ + case 2: + sysFlagTemp = -9; + otherInfo = "His"; + break; + case 3: + sysFlagTemp = -3; + otherInfo = "Pasc"; + break; + case 4: + sysFlagTemp = -4; + otherInfo = "心电"; + break; + case 5: + sysFlagTemp = -5; + otherInfo = "手麻"; + break; + case 6: + sysFlagTemp = -6; + otherInfo = "Lis"; + break; + case 7: + sysFlagTemp = -7; + otherInfo = "首页"; + break; + case 8: + sysFlagTemp = -8; + otherInfo = "医嘱"; + break; + default: + break; + } + } + archiveOther.setOtherinfo(otherInfo+"系统按需采集"); + archiveOther.setSysflag(sysFlagTemp); + return archiveOther; + } + /** * @param patientId 记账号 * @return @@ -93,4 +157,22 @@ public class ArchiveOtherService { } return 0; } + + /** + * 根据c2字段的查询集合 + * @param c2s + * @param c1 + * @return + */ + public List selectAllByC2(String c2s,String c1){ + return archiveOtherMapper.selectAllByC2(c2s,c1); + } + + /** + * 根据护理记录 + * @param c2s + */ + public void updateBatchC1ByC2s(String c2s){ + archiveOtherMapper.updateBatchC1ByC2s(c2s); + } } diff --git a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java index a1d0421..d57acb0 100644 --- a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java @@ -62,7 +62,7 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { StringBuilder newPageCount = new StringBuilder(); for (int i = 0; i < pageCountArr.length; i++) { String pageCountStr = pageCountArr[i]; - if("0".equals(pageCountStr)){ + /*if("0".equals(pageCountStr)){ String pathPath = pdfPathArr[i]; File file = new File(pathPath); try{ @@ -71,7 +71,7 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { }catch (Exception e){ e.printStackTrace(); } - } + }*/ if(StringUtils.isNotBlank(newPageCount)){ newPageCount.append(","); } @@ -124,6 +124,10 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { if(StringUtils.isNotBlank(detailVo.getTitle()) && !detailVo.getTitle().contains(strTemp) && !detailVo.getTitle().contains(nurseTemp)) { returnList.add(detailVo); + }else{ + if(StringUtils.isBlank(detailVo.getTitle())){ + returnList.add(detailVo); + } } } } diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index c86d1a4..b335862 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -122,23 +122,28 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { //定义匹配分类成功次数 int successCount = 0; for (Zd_Assort assortFor : assortList) { - //定义无匹配的分类 - boolean flag = false; for (Archive_Detail detail : details) { //判断主键相同且分类id相同 if (master.getId().equals(detail.getMasterid()) && assortFor.getAssortId().equals(detail.getAssortid())) { successCount++; - flag = true; break; } } - //该分类无匹配直接跳出循环，改主键不完整 - if (!flag) { - break; - } } //如果成功匹配个数和需校验分类个数相等，全部匹配 - if (successCount == assortList.size()) { + //特殊情况验证完整性，婴儿带B的住院号少验证三类：病案首页、入(出、死亡)院记录 + int verificationCount = 0; + String inpNo = master.getInpNo(); + if(StringUtils.isNotBlank(inpNo)){ + //最后一个字符带B的是婴儿 + String lastChar = inpNo.substring(inpNo.length() - 1, inpNo.length()); + if("B".equals(lastChar)){ + verificationCount = assortList.size() - 2; + }else{ + verificationCount = assortList.size(); + } + } + if (verificationCount > 0 && successCount == verificationCount) { //list的isSuccess字段值赋值1 master.setIsSuccess("1"); //不完整的批量更新为完整 diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml index c559cb3..e689c1c 100644 --- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml @@ -511,7 +511,10 @@ order by sysupdatetimeStr - + + \ No newline at end of file diff --git a/src/main/resources/mapper/ArchiveOtherExtSubmittimeMapper.xml b/src/main/resources/mapper/ArchiveOtherExtSubmittimeMapper.xml index efa0ee8..391ef94 100644 --- a/src/main/resources/mapper/ArchiveOtherExtSubmittimeMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherExtSubmittimeMapper.xml @@ -161,19 +161,4 @@ update archive_other_ext_submitTime set create_time = CONVERT(varchar(19),GETDATE(),120) where other_ext_id in (${ids}) - - \ No newline at end of file diff --git a/src/main/resources/mapper/ArchiveOtherMapper.xml b/src/main/resources/mapper/ArchiveOtherMapper.xml index 6c73bb6..837f222 100644 --- a/src/main/resources/mapper/ArchiveOtherMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherMapper.xml @@ -268,4 +268,31 @@ + + + update archive_other set C1 = '' where C2 in (${c2s}) + + + + insert into archive_other(ID, pid, createdtime, + otherInfo, masterID, detailID, + dTime, sysFlag, C1, + C2, C3, C4, C5, + N1, N2, N3, T1, + T2, T3, IsFullText) + values + + (#{item.id,jdbcType=BIGINT}, #{item.pid,jdbcType=NVARCHAR}, #{item.createdtime,jdbcType=TIMESTAMP}, + #{item.otherinfo,jdbcType=VARCHAR}, #{item.masterid,jdbcType=NVARCHAR}, #{item.detailid,jdbcType=NVARCHAR}, + #{item.dtime,jdbcType=TIMESTAMP}, #{item.sysflag,jdbcType=INTEGER}, #{item.c1,jdbcType=NVARCHAR}, + #{item.c2,jdbcType=NVARCHAR}, #{item.c3,jdbcType=NVARCHAR}, #{item.c4,jdbcType=NVARCHAR}, #{item.c5,jdbcType=NVARCHAR}, + #{item.n1,jdbcType=DECIMAL}, #{item.n2,jdbcType=DECIMAL}, #{item.n3,jdbcType=DECIMAL}, #{item.t1,jdbcType=TIMESTAMP}, + #{item.t2,jdbcType=TIMESTAMP}, #{item.t3,jdbcType=TIMESTAMP}, #{item.isfulltext,jdbcType=BIT}) + + \ No newline at end of file diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index be6798e..c7b1fdc 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -19,6 +19,7 @@ + @@ -36,6 +37,7 @@ Sys + and flag = 0 and MasterID=#{patientId,jdbcType=VARCHAR} @@ -70,8 +72,7 @@ ',' + CONVERT ( VARCHAR ( 255 ), isnull(PageCount,0) ) FROM archive_detail - where - AssortID = z.assort_id + where AssortID = z.assort_id FOR XML path ( '' ) ), @@ -111,10 +112,16 @@ @@ -357,28 +320,49 @@ disDate FROM archive_master - LEFT JOIN ( + + + + GROUP BY + + ) t4 ON t1.disDate = t4.disDate + order by t1.disDate desc + + + + LEFT JOIN ( SELECT MasterID, - COUNT( AssortID ) count + case + when + substring(inp_no,len(inp_no),len(inp_no)+1) = 'B' + then + COUNT( AssortID ) + 2 + else + COUNT( AssortID ) + end count FROM ( SELECT archive_detail.MasterID, + archive_master.inp_no, dbo.archive_detail.AssortID FROM dbo.archive_detail INNER JOIN dbo.zd_assort ON dbo.archive_detail.AssortID = dbo.zd_assort.assort_id AND dbo.zd_assort.print_flag = 0 AND dbo.zd_assort.is_check = 1 + inner join archive_master + on archive_detail.MasterID = archive_master.id WHERE ( dbo.archive_detail.flag = 0 ) GROUP BY archive_detail.MasterID, + archive_master.inp_no, dbo.archive_detail.AssortID ) temp GROUP BY - MasterID + MasterID,inp_no ) temp ON archive_master.id = temp.MasterID LEFT JOIN ( SELECT @@ -396,12 +380,7 @@ WHERE ISNULL( count, 0 ) = ( SELECT COUNT( assort_id ) FROM zd_assort WHERE print_flag = 0 AND is_check = 1 ) AND inspectionCount IS NULL - - GROUP BY - - ) t4 ON t1.disDate = t4.disDate - order by t1.disDate desc - + diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index e578f71..0c1e282 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -772,7 +772,7 @@ - - + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp index 08dd4a8..98b5c07 100644 --- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp +++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp @@ -448,5 +448,5 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index fc0128f..6aa9cc0 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -644,7 +644,7 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index a814efe..7ba922f 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -588,6 +588,6 @@ var path = "${path}"; - + \ No newline at end of file diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js index 79f0468..3a8c3c8 100644 --- a/src/main/webapp/static/js/beHospList/beHospList.js +++ b/src/main/webapp/static/js/beHospList/beHospList.js @@ -801,7 +801,7 @@ $("#checkSuccessBtn").click(function(){ var result = checkSuccessMethod(masterId); if(result != ''){ //刷新表格 - $('#table').bootstrapTable('refresh'); + //$('#table').bootstrapTable('refresh'); $("#wzContent").text(result); //增加完整性刷新后高亮状态 $("#wzContent").addClass("wzContent"); diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js index 6182eb7..eb7c226 100644 --- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js +++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js @@ -630,12 +630,21 @@ function initTable2() { valign: 'middle' }, { - title: '上传时间', + title: '最近更新', field: 'uploaddatetime', align: 'left', valign: 'middle', sortable: true, width: 150, // 定义列的宽度，单位为像素px + formatter: function (value, row, index) { + //是否同步过 + var createTime = row.createTime; + if(createTime != null){ + return selectTimeColor(createTime,row.etimeStr); + }else{ + return value; + } + } }, { title: '来源', @@ -923,6 +932,8 @@ $("#updateStateBtn").click(function () { //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("批量作废成功！"); + //获取选中节点 + initTree($("#idLab").html(),$("#checker").val()); } else { toastr.error("批量作废失败，无记录！"); } @@ -970,6 +981,8 @@ $("#stateBtn").click(function () { //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("作废成功！"); + //获取选中节点 + initTree($("#idLab").html(),$("#checker").val()); } else { toastr.error("作废失败，无该条记录！"); } @@ -1184,21 +1197,13 @@ function initTable5(data,sidePagination) { valign: 'middle' }, { - title: '最近提交', + title: '最近更新', field: 'createTime', align: 'center', valign: 'middle', sortable: true, formatter: function (value, row, index) { - if(value != null){ - var color = 'red'; - if(row.etimeStr != null && row.etimeStr > value){ - color = 'green'; - } - return ''+value+''; - }else{ - return value; - } + return selectTimeColor(value,row.etimeStr); } }, { @@ -1278,6 +1283,18 @@ function initTable5(data,sidePagination) { } $("#table5").bootstrapTable(option); } +//对比结束时间方法 +function selectTimeColor(time,etimeStr){ + if(time != null){ + var color = 'red'; + if(etimeStr != null && etimeStr > time){ + color = 'green'; + } + return ''+time+''; + }else{ + return time; + } +} //定义刷新开始计时到超时时间为10分钟 var timeOut = 10 * 60 * 1000; //定义查询间隔时间默认10秒 @@ -1302,6 +1319,8 @@ function submitUpdate(ids,notNursingIds,sysFlag) { initTable5('','server'); $("#loading").show(); var timeInterval = setInterval(function () { + //定义成功个数 + var successCount = 0; //10秒查询一次 if(sysFlag == 1){ //护理记录 @@ -1313,25 +1332,39 @@ function submitUpdate(ids,notNursingIds,sysFlag) { async:false, success:function(result){ if(result.code == 100){ - sysFlag = ''; - ids = successMethod(idsArr,'',notNursingIds,sysFlag); + successCount = 1; } } }) } - if(ids != '') { + //定义需要查询的other_ext_id集合 + var idsTemp = ''; + if(sysFlag == 1){ + //存在护理 + idsTemp = notNursingIds; + }else{ + //不存在护理 + idsTemp = ids; + } + if(idsTemp != '') { //其他 $.ajax({ type: 'get', url: path + '/archiveExt/selectSuccessByExtIds', - data: {ids: ids}, + data: {ids: idsTemp,c1:'done'}, dataType: 'json', success: function (result) { if (result.code == 100) { - var successIds = result.extend.list; - if (successIds.length > 0) { - //返回成功id集合 - ids = successMethod(ids.split(","), successIds, notNursingIds, sysFlag); + var data = result.extend.list.length; + if(successCount == 1 && idsTemp.split(",").length == data){ + toastr.success("按需采集全部完成,页面将在" + times + "秒后自动刷新"); + setTimeout(function(){ + //刷新列表 + initTable5('','server'); + },times*1000); + //隐藏加载控件 + $("#loading").hide(); + clearInterval(timeInterval); } } } @@ -1349,56 +1382,6 @@ function submitUpdate(ids,notNursingIds,sysFlag) { } }) } -//采集完成执行代码 -function successMethod(idsArr,successIds,notNursingIds,sysFlag){ - setTimeout(function(){ - //刷新列表 - initTable5('','server'); - },times*1000); - var idsList = []; - //原来的个数 - var idsArrLen = idsArr.length; - if(successIds != ''){ - //不存在护理，idsList = idsArr-successIds - idsList = getIdArr(idsArr,successIds); - }else{ - //存在护理，idsList = idsArr∩notNursingIds - var list2 = notNursingIds.split(","); - for (var i = 0; i < idsArr.length; i++) { - //定义是否包含关系 - var idFlag = false; - for (var j = 0; j < list2.length; j++) { - if(idsArr[i] == list2[j]){ - idsList.push(idsArr[i]); - idFlag = true; - } - } - //成功 - if(!idFlag) { - toastr.warning("按需采集完成1个,剩余" + (idsArr.length - 1) + "个,页面将在" + times + "秒后自动刷新"); - } - } - } - idsArr = idsList; - if(idsArr.length == 0){ - //隐藏加载控件 - $("#loading").hide(); - clearInterval(timeInterval); - } - return idsArr.toString(); -} -function getIdArr(idsArr,successIds){ - for (var i = 0; i < idsArr.length; i++) { - for (var j = 0; j < successIds.length; j++) { - if(idsArr[i] == successIds[j].otherExtId){ - //成功 - toastr.warning("按需采集完成1个,剩余"+(idsArr.length-1)+"个,页面将在"+times+"秒后自动刷新"); - idsArr.splice(i,1); - } - } - } - return idsArr; -} //批量更新 $("#searchBtn6").click(function(){ var data =$("#table5").bootstrapTable('getSelections'); @@ -1410,7 +1393,7 @@ $("#searchBtn6").click(function(){ var notNursingIds = ''; for (var i = 0; i < data.length; i++) { var id = data[i].idTemp; - if(i != 0){ + if(ids != ''){ ids += ','; } ids += id;