diff --git a/src/main/java/com/ann/demo/dao/OracleDzblMapper.java b/src/main/java/com/ann/demo/dao/OracleDzblMapper.java new file mode 100644 index 0000000..3b84db8 --- /dev/null +++ b/src/main/java/com/ann/demo/dao/OracleDzblMapper.java @@ -0,0 +1,20 @@ +package com.ann.demo.dao; + +import com.ann.demo.entity.filing.OracleDzbl; +import com.ann.demo.entity.filing.OracleHL; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +@Mapper +public interface OracleDzblMapper { + + List getOracleDzblByJzh(String jzh, String zyh); + + Integer del(String jzh, String zyh); + + Integer save(OracleDzbl oracleDzbl); + + +} diff --git a/src/main/java/com/ann/demo/dao/OracleHLMapper.java b/src/main/java/com/ann/demo/dao/OracleHLMapper.java index b8f27af..047ba24 100644 --- a/src/main/java/com/ann/demo/dao/OracleHLMapper.java +++ b/src/main/java/com/ann/demo/dao/OracleHLMapper.java @@ -14,14 +14,11 @@ public interface OracleHLMapper { String getConfigureTime(); - - Integer save(OracleHL oracleHL); - Integer setConfigureTime(String afterDate); - List getOracleHByJzh(String jzh,String zyh,String zycs); + List getOracleHByJzh(String jzh,String zyh); - Integer del(String jzh,String zyh,String zycs); + Integer del(String jzh,String zyh,String typeCode); } diff --git a/src/main/java/com/ann/demo/dao/OraclePacsMappper.java b/src/main/java/com/ann/demo/dao/OraclePacsMappper.java index 1eb530e..6b4bfc4 100644 --- a/src/main/java/com/ann/demo/dao/OraclePacsMappper.java +++ b/src/main/java/com/ann/demo/dao/OraclePacsMappper.java @@ -1,5 +1,6 @@ package com.ann.demo.dao; +import com.ann.demo.entity.filing.OracleHL; import com.ann.demo.entity.filing.OraclePACS; import org.apache.ibatis.annotations.Mapper; @@ -10,7 +11,7 @@ public interface OraclePacsMappper { Integer save(OraclePACS oraclePACS); - List getOracleHByFrecId(String pdfFileNo); + List getOraclePacsByJzh(String jzh, String zyh); - Integer del(String pdfFileNo); + Integer del(String jzh, String zyh,String typeCode); } diff --git a/src/main/java/com/ann/demo/entity/filing/OracleDzbl.java b/src/main/java/com/ann/demo/entity/filing/OracleDzbl.java new file mode 100644 index 0000000..637d978 --- /dev/null +++ b/src/main/java/com/ann/demo/entity/filing/OracleDzbl.java @@ -0,0 +1,22 @@ +package com.ann.demo.entity.filing; + +import lombok.Data; + +import javax.persistence.Id; +import java.util.Date; + +@Data +public class OracleDzbl { + @Id + private Long id; + //记帐号 + private String jzh; + //住院号 + private String zyh; + //文件id + private String frecId; + //文件名称 + private String frecName; + //最后更新时间 + private Date flogluDate; +} diff --git a/src/main/java/com/ann/demo/entity/filing/OracleHL.java b/src/main/java/com/ann/demo/entity/filing/OracleHL.java index 86a2e17..7ce6286 100644 --- a/src/main/java/com/ann/demo/entity/filing/OracleHL.java +++ b/src/main/java/com/ann/demo/entity/filing/OracleHL.java @@ -3,20 +3,21 @@ package com.ann.demo.entity.filing; import lombok.Data; import javax.persistence.Id; +import java.math.BigDecimal; import java.util.Date; @Data public class OracleHL { @Id private Long id; - //文件名称 - private String showName; - //最后更新时间 - private Date kdsj; //记帐号 private String jzh; //住院号 private String zyh; - //住院次数 - private String zycs; + //类型 + private String typeCode; + //文件数量 + private BigDecimal otherNum; + //最后更新时间 + private String updateTime; } diff --git a/src/main/java/com/ann/demo/entity/filing/OraclePACS.java b/src/main/java/com/ann/demo/entity/filing/OraclePACS.java index 86f2d14..6c54ef3 100644 --- a/src/main/java/com/ann/demo/entity/filing/OraclePACS.java +++ b/src/main/java/com/ann/demo/entity/filing/OraclePACS.java @@ -3,21 +3,22 @@ package com.ann.demo.entity.filing; import lombok.Data; import javax.persistence.Id; +import java.math.BigDecimal; import java.util.Date; @Data public class OraclePACS { @Id private Long id; - //文件名称 - private String fentryName; - //文件id - private String pdfFileNo; - //最后更新时间 - private Date affirmTime; //记帐号 private String jzh; - //记帐号 + //住院号 private String zyh; + //类型 + private String typeCode; + //文件数量 + private BigDecimal otherNum; + //最后更新时间 + private String updateTime; } diff --git a/src/main/java/com/ann/demo/integrityTimeCon.java b/src/main/java/com/ann/demo/integrityTimeCon.java index f57194f..20cea50 100644 --- a/src/main/java/com/ann/demo/integrityTimeCon.java +++ b/src/main/java/com/ann/demo/integrityTimeCon.java @@ -39,8 +39,7 @@ public class integrityTimeCon { String afterDate = simpleDateFormat.format(format); homepageDictionary.Synchronizationhuli(configureTime); homepageDictionary.SynchronizationPacs(configureTime); +// homepageDictionary.SynchronizationDzbl(configureTime); oracleHLService.setConfigureTime(afterDate); - - } } diff --git a/src/main/java/com/ann/demo/interfaces/HomepageDictionary.java b/src/main/java/com/ann/demo/interfaces/HomepageDictionary.java index eee3db5..b7140cd 100644 --- a/src/main/java/com/ann/demo/interfaces/HomepageDictionary.java +++ b/src/main/java/com/ann/demo/interfaces/HomepageDictionary.java @@ -16,5 +16,8 @@ public interface HomepageDictionary { String SynchronizationPacs(@WebParam(name = "configureTime") String configureTime); + @WebMethod + String SynchronizationDzbl(@WebParam(name = "configureTime") String configureTime); + } diff --git a/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java b/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java index dcb785a..1436fc9 100644 --- a/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java +++ b/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java @@ -5,13 +5,16 @@ package com.ann.demo.interfaces.impl; +import com.ann.demo.entity.filing.OracleDzbl; import com.ann.demo.entity.filing.OraclePACS; import com.ann.demo.entity.filing.OracleHL; import com.ann.demo.interfaces.HomepageDictionary; +import java.math.BigDecimal; import java.util.*; import javax.jws.WebService; +import com.ann.demo.service.OracleDzblService; import com.ann.demo.service.OraclePacsService; import com.ann.demo.service.OracleHLService; import com.ann.demo.util.OracleConnect; @@ -30,72 +33,44 @@ public class HomepageDictionaryImpl implements HomepageDictionary { OracleHLService oracleHLService; @Autowired OraclePacsService oraclePacsService; + @Autowired + OracleDzblService oracleDzblService; //同步护理记录 @Override public String Synchronizationhuli(String configureTime) { - String sql1 = "SELECT DISTINCT JZH,ZYH,ZYCS FROM V_JSWZH_HL_DATA WHERE (ENABLED_VALUE = 'Y' OR ENABLED_VALUE IS NULL) AND SHOW_NAME != '护嘱单' AND SHOW_NAME != '术前准备与手术交接记录单' AND SHOW_NAME != '新生儿转NICU交接记录单' AND SHOW_NAME != '护理计划' AND SHOW_NAME != '首次护理记录单(二)' AND SHOW_NAME != '健康教育' AND SHOW_NAME != '产程图' AND SHOW_NAME != '普外科术后疼痛护理单' and KDSJ > to_date('" + configureTime + "', 'YYYY/MM/DD HH24:MI:SS')"; + String sql1 = "SELECT * FROM V_JSWZH_FILE_SL WHERE UPDATE_TIME >'" + configureTime + "' AND THEME_CODE='移动护理文书'"; try { List selectList1 = OracleConnect.selectListConvertMap(sql1); if (!CollectionUtils.isEmpty(selectList1)) { for (Map map1 : selectList1) { String jzh = (String) map1.get("JZH"); String zyh = (String) map1.get("ZYH"); - String zycs = map1.get("ZYCS").toString(); + String typeCode = (String) map1.get("THEME_CODE"); + BigDecimal otherNum = (BigDecimal) map1.get("SL"); + String updateTime = (String) map1.get("UPDATE_TIME"); //查询是否有记录 - List oracleHByJzh = oracleHLService.getOracleHByJzh(jzh,zyh,zycs); + List oracleHByJzh = oracleHLService.getOracleHByJzh(jzh, zyh); + //存在则更新 if (oracleHByJzh.size() > 0) { - oracleHLService.del(jzh,zyh,zycs); - String sqlHl = "SELECT SHOW_NAME,KDSJ,JZH,ZYH,ZYCS FROM V_JSWZH_HL_DATA WHERE (ENABLED_VALUE = 'Y' OR ENABLED_VALUE IS NULL) AND SHOW_NAME != '护嘱单' AND SHOW_NAME != '术前准备与手术交接记录单' AND SHOW_NAME != '新生儿转NICU交接记录单' AND SHOW_NAME != '护理计划' AND SHOW_NAME != '首次护理记录单(二)' AND SHOW_NAME != '健康教育' AND SHOW_NAME != '产程图' AND SHOW_NAME != '普外科术后疼痛护理单' and JZH = '" + jzh + "' and ZYH = '" + zyh + "' and ZYCS = '" + zycs + "'"; - List mapHl = OracleConnect.selectListConvertMap(sqlHl); - for (Map oracleHl : mapHl) { - String jzhHl = (String) oracleHl.get("JZH"); - //获取文件名 - String showName = (String) oracleHl.get("SHOW_NAME"); - Date kdsjDate = null; - if (null != oracleHl.get("KDSJ")) { - try { - kdsjDate = (Date) oracleHl.get("KDSJ"); - } catch (Exception e) { - e.printStackTrace(); - } - } - String zyhhl = (String) map1.get("ZYH"); - String zycshl = (String) map1.get("ZYCS").toString(); - OracleHL oracleHL = new OracleHL(); - oracleHL.setShowName(showName); - oracleHL.setKdsj(kdsjDate); - oracleHL.setJzh(jzhHl); - oracleHL.setZyh(zyhhl); - oracleHL.setZycs(zycshl); - oracleHLService.save(oracleHL); - } - }else { + oracleHLService.del(jzh, zyh, "移动护理文书"); + OracleHL oracleHL = new OracleHL(); + oracleHL.setZyh(zyh); + oracleHL.setJzh(jzh); + oracleHL.setTypeCode(typeCode); + oracleHL.setOtherNum(otherNum); + oracleHL.setUpdateTime(updateTime); + oracleHLService.save(oracleHL); + } else { //不存在则新增 - String sqlHl = "SELECT SHOW_NAME,KDSJ,JZH,ZYH,ZYCS FROM V_JSWZH_HL_DATA WHERE (ENABLED_VALUE = 'Y' OR ENABLED_VALUE IS NULL) AND SHOW_NAME != '护嘱单' AND SHOW_NAME != '术前准备与手术交接记录单' AND SHOW_NAME != '新生儿转NICU交接记录单' AND SHOW_NAME != '护理计划' AND SHOW_NAME != '首次护理记录单(二)' AND SHOW_NAME != '健康教育' AND SHOW_NAME != '产程图' AND SHOW_NAME != '普外科术后疼痛护理单' and JZH = '" + jzh + "' and ZYH = '" + zyh + "' and ZYCS = '" + zycs + "'"; - List mapHl = OracleConnect.selectListConvertMap(sqlHl); - for (Map oracleHl : mapHl) { - String jzhHl = (String) oracleHl.get("JZH"); - //获取文件名 - String showName = (String) oracleHl.get("SHOW_NAME"); - Date kdsjDate = null; - if (null != oracleHl.get("KDSJ")) { - try { - kdsjDate = (Date) oracleHl.get("KDSJ"); - } catch (Exception e) { - e.printStackTrace(); - } - } - String zyhhl = (String) map1.get("ZYH"); - String zycshl = (String) map1.get("ZYCS").toString(); - OracleHL oracleHL = new OracleHL(); - oracleHL.setShowName(showName); - oracleHL.setKdsj(kdsjDate); - oracleHL.setJzh(jzhHl); - oracleHL.setZyh(zyhhl); - oracleHL.setZycs(zycshl); - oracleHLService.save(oracleHL); - } + OracleHL oracleHL = new OracleHL(); + oracleHL.setZyh(zyh); + oracleHL.setJzh(jzh); + oracleHL.setTypeCode(typeCode); + oracleHL.setOtherNum(otherNum); + oracleHL.setUpdateTime(updateTime); + oracleHLService.save(oracleHL); + } } } @@ -105,40 +80,117 @@ public class HomepageDictionaryImpl implements HomepageDictionary { return null; } + //同步Pacs @Override public String SynchronizationPacs(String configureTime) { - String sql1 = "SELECT VISIT_ID,ZYH,REPORT_NAME,PDF_FILE_NO,REGISTER_TIME FROM V_JSWZH_PACS_DATA_NEW WHERE REGISTER_TIME > to_date('" + configureTime + "', 'YYYY/MM/DD HH24:MI:SS') "; + String sql1 = "SELECT * FROM V_JSWZH_FILE_SL WHERE UPDATE_TIME >'" + configureTime + "' AND THEME_CODE='PACS文档'"; try { List selectList1 = OracleConnect.selectListConvertMap(sql1); if (!CollectionUtils.isEmpty(selectList1)) { for (Map map1 : selectList1) { - String pdfFileNo = (String) map1.get("PDF_FILE_NO"); + String jzh = (String) map1.get("JZH"); + String zyh = (String) map1.get("ZYH"); + String typeCode = (String) map1.get("THEME_CODE"); + BigDecimal otherNum = (BigDecimal) map1.get("SL"); + String updateTime = (String) map1.get("UPDATE_TIME"); //查询是否有记录 - List oracleHByFrecId = oraclePacsService.getOracleHByFrecId(pdfFileNo); - //有记录更新 - if (oracleHByFrecId.size()>0){ - oraclePacsService.del(pdfFileNo); + List oraclePacsByJzh = oraclePacsService.getOraclePacsByJzh(jzh, zyh); + //存在则更新 + if (oraclePacsByJzh.size() > 0) { + oraclePacsService.del(jzh, zyh, "PACS文档"); + OraclePACS oraclePACS = new OraclePACS(); + oraclePACS.setZyh(zyh); + oraclePACS.setJzh(jzh); + oraclePACS.setTypeCode(typeCode); + oraclePACS.setOtherNum(otherNum); + oraclePACS.setUpdateTime(updateTime); + oraclePacsService.save(oraclePACS); + //不存在则新增 + } else { + OraclePACS oraclePACS = new OraclePACS(); + oraclePACS.setZyh(zyh); + oraclePACS.setJzh(jzh); + oraclePACS.setTypeCode(typeCode); + oraclePACS.setOtherNum(otherNum); + oraclePACS.setUpdateTime(updateTime); + oraclePacsService.save(oraclePACS); } - String jzh = (String) map1.get("VISIT_ID"); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + + //同步Pacs + @Override + public String SynchronizationDzbl(String configureTime) { + String sql1 = "SELECT ZYH,FPAT_NO FROM VIEW_DOCTOR_DATA_2 WHERE FISAVAILABLE = 'Y' AND FENTRY_NAME NOT IN ('手术同意书','手术安全审核单','手术风险评估单','彩超检查申请单','X线检查申请单','B超检查申请单','电子支气管镜检查申请单','CT检查申请单','MRI检查申请单','组织病理学送检单','细胞病理学送检单','知情沟通记录') AND FLOGLUDATE > to_date('" + configureTime + "', 'YYYY/MM/DD HH24:MI:SS')"; + try { + List selectList1 = OracleConnect.selectListConvertMap(sql1); + if (!CollectionUtils.isEmpty(selectList1)) { + for (Map map1 : selectList1) { String zyh = (String) map1.get("ZYH"); - //获取文件名 - String fentryName = (String) map1.get("REPORT_NAME"); - Date affirmTime = null; - if (null != map1.get("REGISTER_TIME")) { - try { - affirmTime = (Date) map1.get("REGISTER_TIME"); - } catch (Exception e) { - e.printStackTrace(); + String jzh = (String) map1.get("FPAT_NO"); + List oracleDzblByJzh = oracleDzblService.getOracleDzblByJzh(jzh, zyh); + //存在则更新 + if (oracleDzblByJzh.size()>0){ + oracleDzblService.del(jzh,zyh); + String sql2 = "SELECT ZYH,FREC_ID,FREC_NAME,FPAT_NO,FLOGLUDATE FROM VIEW_DOCTOR_DATA_2 WHERE FISAVAILABLE = 'Y' AND FENTRY_NAME NOT IN ('手术同意书','手术安全审核单','手术风险评估单','彩超检查申请单','X线检查申请单','B超检查申请单','电子支气管镜检查申请单','CT检查申请单','MRI检查申请单','组织病理学送检单','细胞病理学送检单','知情沟通记录') AND ZYH='"+zyh+"' AND FPAT_NO='"+jzh+"'"; + List selectList2 = OracleConnect.selectListConvertMap(sql2); + if (!CollectionUtils.isEmpty(selectList2)) { + for (Map map2 : selectList2) { + String zyh1 = (String) map2.get("ZYH"); + String jzh1 = (String) map2.get("FPAT_NO"); + String frecId = (String) map2.get("FREC_ID"); + String frecName = (String) map2.get("FREC_NAME"); + Date updateTime = null; + if (null != map2.get("FLOGLUDATE")) { + try { + updateTime = (Date) map2.get("FLOGLUDATE"); + } catch (Exception e) { + e.printStackTrace(); + } + } + OracleDzbl oracleDzbl=new OracleDzbl(); + oracleDzbl.setJzh(jzh1); + oracleDzbl.setZyh(zyh1); + oracleDzbl.setFrecId(frecId); + oracleDzbl.setFrecName(frecName); + oracleDzbl.setFlogluDate(updateTime); + oracleDzblService.save(oracleDzbl); + } + } + }else { + String sql2 = "SELECT ZYH,FREC_ID,FREC_NAME,FPAT_NO,FLOGLUDATE FROM VIEW_DOCTOR_DATA_2 WHERE FISAVAILABLE = 'Y' AND FENTRY_NAME NOT IN ('手术同意书','手术安全审核单','手术风险评估单','彩超检查申请单','X线检查申请单','B超检查申请单','电子支气管镜检查申请单','CT检查申请单','MRI检查申请单','组织病理学送检单','细胞病理学送检单','知情沟通记录') AND ZYH='"+zyh+"' AND FPAT_NO='"+jzh+"'"; + List selectList2 = OracleConnect.selectListConvertMap(sql2); + if (!CollectionUtils.isEmpty(selectList2)) { + for (Map map2 : selectList2) { + String zyh1 = (String) map2.get("ZYH"); + String jzh1 = (String) map2.get("FPAT_NO"); + String frecId = (String) map2.get("FREC_ID"); + String frecName = (String) map2.get("FREC_NAME"); + Date updateTime = null; + if (null != map2.get("FLOGLUDATE")) { + try { + updateTime = (Date) map2.get("FLOGLUDATE"); + } catch (Exception e) { + e.printStackTrace(); + } + } + OracleDzbl oracleDzbl=new OracleDzbl(); + oracleDzbl.setJzh(jzh1); + oracleDzbl.setZyh(zyh1); + oracleDzbl.setFrecId(frecId); + oracleDzbl.setFrecName(frecName); + oracleDzbl.setFlogluDate(updateTime); + oracleDzblService.save(oracleDzbl); + } } } - OraclePACS oraclePACS = new OraclePACS(); - oraclePACS.setJzh(jzh); - oraclePACS.setZyh(zyh); - oraclePACS.setAffirmTime(affirmTime); - oraclePACS.setFentryName(fentryName); - oraclePACS.setPdfFileNo(pdfFileNo); - oraclePacsService.save(oraclePACS); } } } catch (Exception e) { @@ -146,4 +198,5 @@ public class HomepageDictionaryImpl implements HomepageDictionary { } return null; } + } diff --git a/src/main/java/com/ann/demo/service/OracleDzblService.java b/src/main/java/com/ann/demo/service/OracleDzblService.java new file mode 100644 index 0000000..d860a56 --- /dev/null +++ b/src/main/java/com/ann/demo/service/OracleDzblService.java @@ -0,0 +1,17 @@ +package com.ann.demo.service; + +import com.ann.demo.entity.filing.OracleDzbl; +import com.ann.demo.entity.filing.OracleHL; +import com.ann.demo.entity.filing.OraclePACS; + +import java.util.List; + +public interface OracleDzblService { + + List getOracleDzblByJzh(String jzh, String zyh); + + Integer del(String jzh, String zyh); + + + Integer save(OracleDzbl oracleDzbl); +} diff --git a/src/main/java/com/ann/demo/service/OracleHLService.java b/src/main/java/com/ann/demo/service/OracleHLService.java index 7b29018..b01656f 100644 --- a/src/main/java/com/ann/demo/service/OracleHLService.java +++ b/src/main/java/com/ann/demo/service/OracleHLService.java @@ -12,7 +12,7 @@ public interface OracleHLService { Integer save(OracleHL oracleHL); - List getOracleHByJzh(String jzh,String zyh,String zycs); + List getOracleHByJzh(String jzh,String zyh); - Integer del(String jzh,String zyh,String zycs); + Integer del(String jzh,String zyh,String typeCode); } diff --git a/src/main/java/com/ann/demo/service/OraclePacsService.java b/src/main/java/com/ann/demo/service/OraclePacsService.java index 31eb908..4d17275 100644 --- a/src/main/java/com/ann/demo/service/OraclePacsService.java +++ b/src/main/java/com/ann/demo/service/OraclePacsService.java @@ -1,5 +1,6 @@ package com.ann.demo.service; +import com.ann.demo.entity.filing.OracleHL; import com.ann.demo.entity.filing.OraclePACS; import java.util.List; @@ -8,7 +9,7 @@ public interface OraclePacsService { Integer save(OraclePACS oraclePACS); - List getOracleHByFrecId(String pdfFileNo); + List getOraclePacsByJzh(String jzh, String zyh); - Integer del(String pdfFileNo); + Integer del(String jzh, String zyh,String typeCode); } diff --git a/src/main/java/com/ann/demo/service/impl/OracleDzblServiceImpl.java b/src/main/java/com/ann/demo/service/impl/OracleDzblServiceImpl.java new file mode 100644 index 0000000..ec84520 --- /dev/null +++ b/src/main/java/com/ann/demo/service/impl/OracleDzblServiceImpl.java @@ -0,0 +1,35 @@ +package com.ann.demo.service.impl; + + +import com.ann.demo.dao.OracleDzblMapper; +import com.ann.demo.dao.OracleHLMapper; +import com.ann.demo.entity.filing.OracleDzbl; +import com.ann.demo.entity.filing.OracleHL; +import com.ann.demo.service.OracleDzblService; +import com.ann.demo.service.OracleHLService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class OracleDzblServiceImpl implements OracleDzblService { + @Autowired + OracleDzblMapper oracleDzblMapper; + + @Override + public List getOracleDzblByJzh(String jzh, String zyh) { + return oracleDzblMapper.getOracleDzblByJzh(jzh,zyh); + } + + @Override + public Integer del(String jzh, String zyh) { + return oracleDzblMapper.del(jzh,zyh); + } + + @Override + public Integer save(OracleDzbl oracleDzbl) { + return oracleDzblMapper.save(oracleDzbl); + } + +} diff --git a/src/main/java/com/ann/demo/service/impl/OracleHLServiceImpl.java b/src/main/java/com/ann/demo/service/impl/OracleHLServiceImpl.java index e78a0a7..e646d71 100644 --- a/src/main/java/com/ann/demo/service/impl/OracleHLServiceImpl.java +++ b/src/main/java/com/ann/demo/service/impl/OracleHLServiceImpl.java @@ -31,12 +31,12 @@ public class OracleHLServiceImpl implements OracleHLService { } @Override - public List getOracleHByJzh(String jzh,String zyh,String zycs) { - return oracleHLMapper.getOracleHByJzh(jzh,zyh,zycs); + public List getOracleHByJzh(String jzh,String zyh) { + return oracleHLMapper.getOracleHByJzh(jzh,zyh); } @Override - public Integer del(String jzh,String zyh,String zycs) { - return oracleHLMapper.del(jzh,zyh,zycs); + public Integer del(String jzh,String zyh,String typeCode) { + return oracleHLMapper.del(jzh,zyh,typeCode); } } diff --git a/src/main/java/com/ann/demo/service/impl/OraclePacsServiceImpl.java b/src/main/java/com/ann/demo/service/impl/OraclePacsServiceImpl.java index 5d6b218..441d290 100644 --- a/src/main/java/com/ann/demo/service/impl/OraclePacsServiceImpl.java +++ b/src/main/java/com/ann/demo/service/impl/OraclePacsServiceImpl.java @@ -1,6 +1,7 @@ package com.ann.demo.service.impl; import com.ann.demo.dao.OraclePacsMappper; +import com.ann.demo.entity.filing.OracleHL; import com.ann.demo.entity.filing.OraclePACS; import com.ann.demo.service.OraclePacsService; import org.springframework.beans.factory.annotation.Autowired; @@ -18,12 +19,12 @@ public class OraclePacsServiceImpl implements OraclePacsService { } @Override - public List getOracleHByFrecId(String pdfFileNo) { - return oraclePacsMappper.getOracleHByFrecId(pdfFileNo); + public List getOraclePacsByJzh(String jzh, String zyh) { + return oraclePacsMappper.getOraclePacsByJzh(jzh,zyh); } @Override - public Integer del(String pdfFileNo) { - return oraclePacsMappper.del(pdfFileNo); + public Integer del(String jzh, String zyh,String typeCode) { + return oraclePacsMappper.del(jzh,zyh,typeCode); } } diff --git a/src/main/resources/mapper/OracleDzblMapper.xml b/src/main/resources/mapper/OracleDzblMapper.xml new file mode 100644 index 0000000..08504f0 --- /dev/null +++ b/src/main/resources/mapper/OracleDzblMapper.xml @@ -0,0 +1,50 @@ + + + + + insert into oracleDzbl + + + zyh, + + + jzh , + + + frecId, + + + frecName, + + + flogluDate, + + + + + #{zyh}, + + + #{jzh}, + + + #{frecId}, + + + #{frecName}, + + + #{flogluDate}, + + + + + delete from oracleDzbl + where jzh=#{jzh} and zyh=#{zyh} + + + + + diff --git a/src/main/resources/mapper/OracleHLMapper.xml b/src/main/resources/mapper/OracleHLMapper.xml index 51a3803..c5803fc 100644 --- a/src/main/resources/mapper/OracleHLMapper.xml +++ b/src/main/resources/mapper/OracleHLMapper.xml @@ -2,39 +2,39 @@ - insert into oracleHL + insert into sycView - - showName, - - - kdsj , + + zyh, - jzh, + jzh , - - zyh, + + typeCode, + + + otherNum, - - zycs, + + updateTime, - - #{showName}, - - - #{kdsj}, + + #{zyh}, #{jzh}, - - #{zyh}, + + #{typeCode}, + + + #{otherNum}, - - #{zycs}, + + #{updateTime}, @@ -42,14 +42,14 @@ update oracleTime set integrityTime=#{afterDate} - delete from oracleHL - where jzh=#{jzh} and zyh=#{zyh} and zycs=#{zycs} + delete from sycView + where jzh=#{jzh} and zyh=#{zyh} and typeCode=#{typeCode} diff --git a/src/main/resources/mapper/OraclePacsMapper.xml b/src/main/resources/mapper/OraclePacsMapper.xml index 04ab670..8a91d1f 100644 --- a/src/main/resources/mapper/OraclePacsMapper.xml +++ b/src/main/resources/mapper/OraclePacsMapper.xml @@ -4,48 +4,47 @@ - insert into oraclePACS + insert into sycView - - jzh, - - zyh , + zyh, - - fentryName, + + jzh , - - pdfFileNo, + + typeCode, - - affirmTime, + + otherNum, + + + updateTime, - - #{jzh}, - #{zyh}, - - #{fentryName}, + + #{jzh}, + + + #{typeCode}, - - #{pdfFileNo}, + + #{otherNum}, - - #{affirmTime}, + + #{updateTime}, - delete from oraclePACS - where pdfFileNo=#{pdfFileNo} + delete from sycView + where jzh=#{jzh} and zyh=#{zyh} and typeCode=#{typeCode} - + SELECT * FROM sycView where jzh=#{jzh} and zyh=#{zyh} and typeCode='PACS文档'