diff --git a/src/main/java/com/emr/controller/CommomSetController.java b/src/main/java/com/emr/controller/CommomSetController.java new file mode 100644 index 0000000..37f462b --- /dev/null +++ b/src/main/java/com/emr/controller/CommomSetController.java @@ -0,0 +1,24 @@ +package com.emr.controller; + +import com.emr.entity.Emr_Commom_Set; +import com.emr.service.ipml.EmrCommomSetService; +import com.emr.util.Msg; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +@Controller +@RequestMapping("commom/") +public class CommomSetController { + @Autowired + private EmrCommomSetService commomSetService; + + @RequestMapping(value="update",method = {RequestMethod.POST}) + @ResponseBody + public Msg update(Emr_Commom_Set commomSet) throws Exception{ + commomSetService.update(commomSet); + return Msg.success(); + } +} diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java index 457a0dd..3501f4d 100644 --- a/src/main/java/com/emr/controller/FontController.java +++ b/src/main/java/com/emr/controller/FontController.java @@ -5,11 +5,13 @@ import com.emr.dao.Emr_DictionaryMapper; import com.emr.entity.*; import com.emr.service.Archive_DetailService; import com.emr.service.Archive_MasterService; +import com.emr.service.ipml.ArchiveFlowInfoService; import com.emr.service.ipml.ArchiveOtherService; import com.emr.service.ipml.TPrintinfoService; import com.emr.service.ipml.ZdAssortService; import com.emr.util.ExceptionPrintUtil; import com.emr.util.Msg; +import com.emr.vo.ArchiveFlowInfoVo; import net.sf.json.JSONObject; import org.apache.commons.lang3.StringUtils; import org.apache.http.client.methods.CloseableHttpResponse; @@ -56,6 +58,9 @@ public class FontController { private ZdAssortService assortService; @Autowired private ArchiveOtherService archiveOtherService; + @Autowired + private ArchiveFlowInfoService archiveFlowInfoService; + @RequestMapping("selectIsPrintByPatienId") @ResponseBody public Msg selectIsPrintByPatienId(String patientId) throws Exception{ @@ -421,4 +426,17 @@ public class FontController { return null; } } + + /** + * 根据masterId查询流程明细 + * @param masterId + * @return + * @throws Exception + */ + @RequestMapping("toShowFlowInfo") + @ResponseBody + public Msg toShowFlowInfo(String masterId) throws Exception{ + List list = archiveFlowInfoService.selectFlowInfoByMasterId(masterId); + return Msg.success().add("list",list); + } } diff --git a/src/main/java/com/emr/controller/HolidaySetController.java b/src/main/java/com/emr/controller/HolidaySetController.java index 805f288..24035c3 100644 --- a/src/main/java/com/emr/controller/HolidaySetController.java +++ b/src/main/java/com/emr/controller/HolidaySetController.java @@ -1,12 +1,15 @@ package com.emr.controller; +import com.emr.dao.Emr_Commom_SetMapper; import com.emr.entity.EmrHolidaySetVo; +import com.emr.entity.Emr_Commom_Set; import com.emr.entity.OffsetLimitPage; import com.emr.service.ipml.HolidaySetService; import com.emr.util.ExceptionPrintUtil; import com.emr.util.Msg; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -15,8 +18,12 @@ import org.springframework.web.bind.annotation.ResponseBody; public class HolidaySetController { @Autowired private HolidaySetService holidaySetService; + @Autowired + private Emr_Commom_SetMapper commomSetMapper; @RequestMapping("holidaySetList") - public String holidaySetList(){ + public String holidaySetList(Model model){ + Emr_Commom_Set obj = commomSetMapper.selectByPrimaryKey(1); + model.addAttribute("commomSet",obj); return "holidaySetDir/holidaySetList"; } diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index 10cbb63..1c16e3e 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -10,6 +10,7 @@ import com.emr.entity.*; import com.emr.service.Archive_MasterService; import com.emr.service.Emr_Fault_DetailService; import com.emr.service.Emr_Fault_TypeService; +import com.emr.service.ipml.Archive_DetailServiceImpl; import com.emr.util.ExceptionPrintUtil; import com.emr.util.ExportExcelUtil; import com.emr.util.Msg; @@ -35,6 +36,9 @@ public class lastVerifyController { @Autowired private Emr_Fault_DetailService emrFaultDetailService; + @Autowired + private Archive_DetailServiceImpl archiveDetailService; + @RequestMapping(value = "/lastVerifys") public String faults(){ return "lastVerifyDir/lastVerifyList"; @@ -145,6 +149,15 @@ public class lastVerifyController { archiveMasterService.updateFiled(master); return Msg.success(); } + + + @ResponseBody + @RequestMapping(value = "/selectIsScan") + public Msg selectIsScan(String ids) throws Exception{ + ids = archiveDetailService.selectIsScan(ids); + return Msg.success().add("ids",ids); + } + } diff --git a/src/main/java/com/emr/dao/Archive_DetailMapper.java b/src/main/java/com/emr/dao/Archive_DetailMapper.java index fd08fd1..7d5007d 100644 --- a/src/main/java/com/emr/dao/Archive_DetailMapper.java +++ b/src/main/java/com/emr/dao/Archive_DetailMapper.java @@ -2,6 +2,7 @@ package com.emr.dao; import com.emr.entity.Archive_Detail; import com.emr.entity.Archive_Detail_Vo; +import com.emr.entity.Archive_Master_Vo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -49,4 +50,6 @@ public interface Archive_DetailMapper { List selectNotInspectionList(@Param("masterIds") String masterIds); List getSourceByMasterId(@Param("masterid") String masterid); + + List selectIsScan(@Param("ids") String ids); } \ No newline at end of file diff --git a/src/main/java/com/emr/dao/Emr_Commom_SetMapper.java b/src/main/java/com/emr/dao/Emr_Commom_SetMapper.java new file mode 100644 index 0000000..392bf9d --- /dev/null +++ b/src/main/java/com/emr/dao/Emr_Commom_SetMapper.java @@ -0,0 +1,9 @@ +package com.emr.dao; + +import com.emr.entity.Emr_Commom_Set; + +public interface Emr_Commom_SetMapper { + Emr_Commom_Set selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(Emr_Commom_Set record); +} diff --git a/src/main/java/com/emr/entity/Emr_Commom_Set.java b/src/main/java/com/emr/entity/Emr_Commom_Set.java new file mode 100644 index 0000000..7ac2572 --- /dev/null +++ b/src/main/java/com/emr/entity/Emr_Commom_Set.java @@ -0,0 +1,19 @@ +package com.emr.entity; + +import lombok.Data; + +import java.util.Date; + +@Data +public class Emr_Commom_Set { + private Integer id; + private Integer int1; + private Integer int2; + private Integer int3; + private String str1; + private String str2; + private String str3; + private Date date1; + private Date date2; + private Date date3; +} diff --git a/src/main/java/com/emr/service/Archive_DetailService.java b/src/main/java/com/emr/service/Archive_DetailService.java index 81dd377..8d3a0ee 100644 --- a/src/main/java/com/emr/service/Archive_DetailService.java +++ b/src/main/java/com/emr/service/Archive_DetailService.java @@ -9,10 +9,7 @@ package com.emr.service; import com.emr.entity.Archive_Detail; import com.emr.entity.Archive_Detail_Vo; import com.emr.entity.OffsetLimitPage; -import org.apache.ibatis.annotations.Param; -import org.springframework.web.bind.annotation.PathVariable; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.util.List; @@ -85,6 +82,8 @@ public interface Archive_DetailService { void showPdf(HttpServletResponse response, HttpSession session, String pdfWater); List getSourceByMasterId(String masterid); + + String selectIsScan(String ids); } diff --git a/src/main/java/com/emr/service/ipml/ArchiveFlowInfoService.java b/src/main/java/com/emr/service/ipml/ArchiveFlowInfoService.java index 7843fb9..0d3cb11 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveFlowInfoService.java +++ b/src/main/java/com/emr/service/ipml/ArchiveFlowInfoService.java @@ -40,8 +40,6 @@ public class ArchiveFlowInfoService { @Autowired private ArchiveFlowInfoMapper flowInfoMapper; @Autowired - private ArchiveFlowRoleMapper flowRoleMapper; - @Autowired private Archive_MasterMapper archiveMasterMapper; @Autowired private StatisticsService statisticsService; 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 30a4fd5..5f6e793 100644 --- a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java @@ -7,9 +7,8 @@ package com.emr.service.ipml; import com.emr.dao.Archive_DetailMapper; -import com.emr.entity.Archive_Detail; -import com.emr.entity.Archive_Detail_Vo; -import com.emr.entity.OffsetLimitPage; +import com.emr.dao.Emr_Commom_SetMapper; +import com.emr.entity.*; import com.emr.service.Archive_DetailService; import com.emr.util.Jpg2PdfUtil; import com.github.pagehelper.Page; @@ -19,7 +18,6 @@ import org.apache.shiro.util.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.util.ArrayList; @@ -29,7 +27,8 @@ import java.util.List; public class Archive_DetailServiceImpl implements Archive_DetailService { @Autowired private Archive_DetailMapper archiveDetailMapper; - + @Autowired + private Emr_Commom_SetMapper commomSetMapper; @Override public List selectByClo(Archive_Detail_Vo record) { @@ -203,6 +202,30 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { public List selectTypeTreeByPatientIdAndAssortIds(String patientId, String assortIds) { return archiveDetailMapper.selectTypeTreeByPatientIdAndAssortIds(patientId, assortIds); } + + @Override + public String selectIsScan(String ids) { + //判断是否需要判断纸质病历已扫描 + Emr_Commom_Set commomSet = commomSetMapper.selectByPrimaryKey(1); + if(commomSet.getInt1() == 1){ + StringBuilder idsStr = new StringBuilder(); + //组织已经扫描上传的MasterId + List list = archiveDetailMapper.selectIsScan(ids); + if(!CollectionUtils.isEmpty(list)){ + ids = ""; + for (Archive_Detail obj: list ) { + String masterid = obj.getMasterid(); + if(StringUtils.isBlank(idsStr)){ + idsStr.append(masterid); + }else{ + idsStr.append(",").append(masterid); + } + } + ids = idsStr.toString(); + } + } + return ids; + } } 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 a6e98fa..f541780 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -10,7 +10,9 @@ import com.emr.dao.*; import com.emr.entity.*; import com.emr.service.Archive_MasterService; import com.emr.service.Emr_Fault_DetailService; +import com.emr.util.ExceptionPrintUtil; import com.emr.util.Msg; +import com.emr.util.OracleConnect; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; @@ -198,14 +200,50 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { public List selectLastVerifyList(Archive_Master_Vo archiveMasterVo){ List list = archiveMasterMapper.selectByLast(archiveMasterVo); if(null != list && !list.isEmpty()){ + //记帐号集合 + StringBuilder patientIdStr = new StringBuilder(); for (Archive_Master_Vo masterVo : list) { //状态均为护士长已质控，取出一个对象，转换中文状态 - Integer status = Integer.valueOf(masterVo.getArchivestate()); + /*Integer status = Integer.valueOf(masterVo.getArchivestate()); if(status.equals(EnumVerify.DocState.HeadNurseCheck.getCode())){ masterVo.setStatus(EnumVerify.DocState.HeadNurseCheck.getName()); }else if(status.equals(EnumVerify.DocState.CallBacked.getCode())){ masterVo.setStatus(EnumVerify.DocState.CallBacked.getName()); + }*/ + //组织记帐号集合 + if(StringUtils.isNotBlank(masterVo.getPatientId())) { + if (StringUtils.isNotBlank(patientIdStr)) { + patientIdStr.append(",'").append(masterVo.getPatientId()).append("'"); + } else { + patientIdStr.append("'").append(masterVo.getPatientId()).append("'"); + } + } + } + //赋值签收情况 + //查询签收情况 + String sql = "select fpat_no from v_jswzh_archive_bqreg where fpat_no in ("+patientIdStr.toString()+")" + + "and freg_date is not null"; + try{ + //执行查询 + List selectList = OracleConnect.selectList(sql); + for (Archive_Master_Vo masterVo : list) { + masterVo.setStatus("未签收"); + //赋值 + if(!CollectionUtils.isEmpty(selectList)){ + String patientId = masterVo.getPatientId(); + if(StringUtils.isNotBlank(patientId)) { + for (String str : selectList) { + if(str.equals(patientId)){ + masterVo.setStatus("已签收"); + break; + } + } + } + } } + }catch (Exception e){ + e.printStackTrace(); + ExceptionPrintUtil.printException(e); } } return list; @@ -273,29 +311,29 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { List dictionaries = dictionaryMapper.dicByTypeCode(dictionary); //查询出院天数 List selectDays = archiveMasterMapper.selectDaysByMasterIds(list); - if(!CollectionUtils.isEmpty(dictionaries)){ - for (Archive_Master_Vo vo:list) { + for (Archive_Master_Vo vo:list) { + if(!CollectionUtils.isEmpty(dictionaries)) { //在院科室 String deptAdmissionTo = vo.getDeptAdmissionTo(); //出院科室 String deptName = vo.getDeptName(); //住院科室 - for (Emr_Dictionary dictionaryTemp:dictionaries) { + for (Emr_Dictionary dictionaryTemp : dictionaries) { String name = dictionaryTemp.getName(); - if(StringUtils.isNotBlank(deptAdmissionTo) && deptAdmissionTo.equals(dictionaryTemp.getCode())){ + if (StringUtils.isNotBlank(deptAdmissionTo) && deptAdmissionTo.equals(dictionaryTemp.getCode())) { vo.setDeptAdmissionTo(name); } - if(StringUtils.isNotBlank(deptName) && deptName.equals(dictionaryTemp.getCode())){ + if (StringUtils.isNotBlank(deptName) && deptName.equals(dictionaryTemp.getCode())) { vo.setDeptName(name); } } - //赋值出院天数 - if(!CollectionUtils.isEmpty(selectDays)){ - for(Archive_Master_Vo days : selectDays){ - if(days.getId().equals(vo.getId())){ - vo.setDays(days.getDays()); - break; - } + } + //赋值出院天数 + if(!CollectionUtils.isEmpty(selectDays)){ + for(Archive_Master_Vo days : selectDays){ + if(days.getId().equals(vo.getId())){ + vo.setDays(days.getDays()); + break; } } } diff --git a/src/main/java/com/emr/service/ipml/EmrCommomSetService.java b/src/main/java/com/emr/service/ipml/EmrCommomSetService.java new file mode 100644 index 0000000..5058ae2 --- /dev/null +++ b/src/main/java/com/emr/service/ipml/EmrCommomSetService.java @@ -0,0 +1,17 @@ +package com.emr.service.ipml; + +import com.emr.dao.Emr_Commom_SetMapper; +import com.emr.entity.Emr_Commom_Set; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Transactional +public class EmrCommomSetService { + @Autowired + private Emr_Commom_SetMapper commomSetMapper; + public void update(Emr_Commom_Set commomSet) { + commomSetMapper.updateByPrimaryKeySelective(commomSet); + } +} diff --git a/src/main/java/com/emr/util/OracleConnect.java b/src/main/java/com/emr/util/OracleConnect.java index 082fa63..50739c3 100644 --- a/src/main/java/com/emr/util/OracleConnect.java +++ b/src/main/java/com/emr/util/OracleConnect.java @@ -5,6 +5,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.util.ArrayList; +import java.util.List; import com.alibaba.druid.pool.DruidDataSource; @@ -28,10 +30,10 @@ public class OracleConnect { if (dataSourceTest == null) { dataSourceTest = new DruidDataSource(); // 设置连接参数 - dataSourceTest.setUrl("jdbc:oracle:thin:@192.168.10.6:1521/orc1"); + dataSourceTest.setUrl("jdbc:oracle:thin:@200.100.100.1:1521/orc1"); dataSourceTest.setDriverClassName("oracle.jdbc.driver.OracleDriver"); - dataSourceTest.setUsername("pacs"); - dataSourceTest.setPassword("pacs"); + dataSourceTest.setUsername("Jswzh"); + dataSourceTest.setPassword("Jswzh"); dataSourceTest.setInitialSize(3); dataSourceTest.setMaxActive(10); } @@ -95,4 +97,17 @@ public class OracleConnect { OracleConnect.CloseConn(rs, pst, conn); return str; } + public static List selectList(String arg0) throws Exception { + List str = new ArrayList<>(); + Connection conn = new OracleConnect().getConnect(); + pst = conn.prepareStatement(arg0); + rs = pst.executeQuery(); + if (rs != null) { + while (rs.next()) { + str.add(rs.getString(1)); + } + } + OracleConnect.CloseConn(rs, pst, conn); + return str; + } } diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index cddbbb4..2d08151 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -363,4 +363,20 @@ + + \ No newline at end of file diff --git a/src/main/resources/mapper/EmrCommomSetMapper.xml b/src/main/resources/mapper/EmrCommomSetMapper.xml new file mode 100644 index 0000000..3ec8b2d --- /dev/null +++ b/src/main/resources/mapper/EmrCommomSetMapper.xml @@ -0,0 +1,49 @@ + + + + + + + + id, int1,int2,int3,str1,str2,str3,date1,date2,date3 + + + + update emr_commom_set + + + int1 = #{int1,jdbcType=INTEGER}, + + + int2 = #{int2,jdbcType=INTEGER}, + + + int3 = #{int3,jdbcType=INTEGER}, + + + str1 = #{str1,jdbcType=NVARCHAR}, + + + str2 = #{str2,jdbcType=NVARCHAR}, + + + str1 = #{str3,jdbcType=NVARCHAR}, + + + date1 = #{date1,jdbcType=TIMESTAMP}, + + + date2 = #{date2,jdbcType=TIMESTAMP}, + + + date3 = #{date3,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index b1cfb21..94345c6 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -680,7 +680,7 @@ - - + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp b/src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp index 98a650e..8073b0e 100644 --- a/src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp +++ b/src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp @@ -90,6 +90,16 @@
+
+
+ +
+ checked/> +
+ +
+
+
@@ -138,5 +148,5 @@
- + \ 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 63621d3..647b384 100644 --- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp +++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp @@ -446,7 +446,7 @@ - + - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index d3844e1..9318584 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -350,7 +350,7 @@