diff --git a/123.txt b/123.txt deleted file mode 100644 index cecf3c1..0000000 --- a/123.txt +++ /dev/null @@ -1,271 +0,0 @@ - - 000596678700 - 2 - 47岁 - 陈家权 - - 男 - 1973/6/5 0:00:00 - 广东省湛江市雷州市 - 440824197306052312 - - 中国 - - 汉族 - 农民 - - 已婚 - - 无 - - - - 524200 - - - - - 2020/5/7 8:51:24 - 1350200 - 059 - 2020/5/18 11:12:00 - 1350200 - 028 - 11 - - 0 - 0 - 02236 - 余忠华 - 02236 - 余忠华 - 09226 - 周和超 - 06484 - 林炯 - - - - - - - - 甲 - 02236 - 余忠华 - 02398 - 杨晓旭 - 2020/5/20 11:39:00 - 医嘱离院 - 13428144478 - - - 城镇居民基本医疗保险 - 广东省湛江市雷州市 - 广东省湛江市雷州市 - 12440000455858169P - 广东医科大学附属医院 - 13428144478 - 524200 - - - 0 - - 2020/5/8 9:00:00 - Z51.103 - 鼻咽未分化型非角化性癌(T4N1M1(肺)，IVb期，AJCC8th) - - B - - 二级 - - - 阳 - 周和超 - 有 - 化疗 - 门诊 - - 059 - 胡碧云 - 028 - - - - - - 注射或输注抗肿瘤药物 - 有 - - - 6 - 出院诊断 - 3 - 化疗后骨髓抑制 - D61.101 - - - 5 - 出院诊断 - 3 - 慢性鼻窦炎 - J32.900 - - - 4 - 出院诊断 - 3 - 频发房性早博 - I49.101 - - - 3 - 出院诊断 - 3 - 慢性乙型病毒性肝炎 - B18.107 - - - 2 - 出院诊断 - 3 - 肺部继发性恶性肿瘤 - C78.000 - - - 1 - 出院诊断 - 3 - 鼻咽癌化疗 - Z51.103 - - - 5 - 入院诊断 - 2 - 慢性鼻窦炎 - J32.900 - - - 4 - 入院诊断 - 2 - 频发房性早博 - I49.101 - - - 3 - 入院诊断 - 2 - 慢性乙型病毒性肝炎 - B18.107 - - - 2 - 入院诊断 - 2 - 肺部继发性恶性肿瘤 - C78.000 - - - 1 - 入院诊断 - 2 - 鼻咽癌 - C11.900 - - - 5 - 门诊诊断 - 1 - 慢性鼻窦炎 - J32.900 - - - 4 - 门诊诊断 - 1 - 频发房性早博 - I49.101 - - - 3 - 门诊诊断 - 1 - 慢性乙型病毒性肝炎 - B18.107 - - - 2 - 门诊诊断 - 1 - 肺部继发性恶性肿瘤 - C78.000 - - - 1 - 门诊诊断 - 1 - 鼻咽癌 - C11.900 - - - - - 1 - 99.2501 - 注射或输注抗肿瘤药物 - 2020/5/8 9:00:00 - 0 - 0 - 1 - 甲 - 09226 - 周和超 - - - - - - - - - - 二级 - - - 25727.06 - 1663.08 - 596.20 - 735.90 - 552.20 - 0.00 - 645.70 - 911.40 - 363.00 - 401.30 - 2529.20 - 0.00 - 660.00 - 0.00 - 660.00 - 55.00 - 0.00 - 16629.78 - 0.00 - 0.00 - 0.00 - 0.00 - 0.00 - 0.00 - 491.16 - 0.00 - 0.00 - 0.00 - 0.00 - 491.16 - 0.00 - 0.00 - 1816.22 - 0.00 - 0 - \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 45eb1ba..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -## ZhanjiangAffiliatedHospital - - - diff --git a/WholeCheckInterface.iml b/WholeCheckInterface.iml index 57aae52..ea627ba 100644 --- a/WholeCheckInterface.iml +++ b/WholeCheckInterface.iml @@ -110,6 +110,7 @@ + diff --git a/pom.xml b/pom.xml index e40ae76..5c83fc2 100644 --- a/pom.xml +++ b/pom.xml @@ -42,17 +42,18 @@ lombok - org.apache.cxf cxf-spring-boot-starter-jaxws 3.2.5 - - - - - + + + com.alibaba + fastjson + 1.2.4 + + org.springframework.boot spring-boot-starter-test diff --git a/src/main/java/com/ann/demo/entity/filing/CommonTable.java b/src/main/java/com/ann/demo/entity/filing/CommonTable.java new file mode 100644 index 0000000..9161ac0 --- /dev/null +++ b/src/main/java/com/ann/demo/entity/filing/CommonTable.java @@ -0,0 +1,149 @@ +package com.ann.demo.entity.filing; + +import com.ann.demo.entity.filing.ids.CommonTableIds; +import lombok.Data; + +import javax.persistence.*; +import java.util.Date; + +/** + * @Author: LeiJiaXin + * @Date: 2019/8/6 9:44 + */ +@Data +@Entity +@Table(name = "commomtable") +@IdClass(CommonTableIds.class) +public class CommonTable { + + /** + * masterId + */ + @Id + @Column(name = "patient_id") + private String masterId; + + /** + * 3 鎮ｈ匢D 鐥呮鍙 + */ + @Column(name = "admiss_id", length = 30) + private String YZY001; + + /** + * 骞撮緞 (宀) + */ + @Column(name = "age") + private Integer age; + + /** + * 骞撮緞(鏈) + */ + @Column(name = "age_month") + private Integer age_month; + + /** + * 骞撮緞(澶) + */ + @Column(name = "age_day") + private Integer age_day; + + /** + * 4 骞撮緞 + */ + @Column(name = "bothDate") + private String AKC023; + + /** + * 6 鎬у埆 + */ + @Column(name = "sex") + private String YZY008; + + /** + * 8 鐜颁綇鍧锛堢渷銆佸競銆佸幙銆佽閬擄級 + */ + @Column(name = "home_addr") + private String YZY075; + + /** + * 14 浣忛櫌娆℃暟 + */ + @Id + @Column(name = "admiss_times", length = 10) + private String YZY002; + + /** + * 16 濮撳悕 + */ + @Id + @Column(name = "name", length = 20) + private String AAC003; + + + /** + * 60 锛堜富瑕佸嚭闄㈣瘖鏂級鍚嶇О + */ + @Column(name = "main_diag_name") + private String mainDiagName; + + /** + * 88 鍏ラ櫌鏃堕棿 + */ + @Column(name = "admiss_date") + private Date YKC701; + + /** + * 89 鍑洪櫌鏃堕棿 + */ + @Column(name = "dis_date") + private Date YKC702; + + + /** + * 90 鍑洪櫌绉戝埆 + */ + @Column(name = "dis_dept") + private String YZY038; + + /** + * 93 瀹為檯浣忛櫌澶╂暟 + */ + @Column(name = "admiss_days") + private String AKB063; + + /** + * 103 涓绘不鍖诲笀 + */ + @Column(name = "attending") + private String YZY055; + + + /** + * 鏄惁鎵嬫湳澶勭悊 + */ + @Column(name = "is_oper") + private String isOper; + + + ///////////////////////////////// + + /** + * 浣忛櫌鍙 + */ + @Id + @Column(name = "inpatient_no", length = 30) + private String inpatient_no; + + /** + * 濮撳悕绠鍐 + */ + @Column(name = "name_cym") + private String nameCym; + + /** + * 涓昏璇婃柇杞綊鎯呭喌 + */ + @Column(name = "main_dis_thing") + private String main_dis_thing; + +} diff --git a/src/main/java/com/ann/demo/entity/filing/CommonTable1.java b/src/main/java/com/ann/demo/entity/filing/CommonTable1.java new file mode 100644 index 0000000..268a392 --- /dev/null +++ b/src/main/java/com/ann/demo/entity/filing/CommonTable1.java @@ -0,0 +1,298 @@ +package com.ann.demo.entity.filing; + +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import java.util.Date; + +/** + * @Author: LeiJiaXin + * @Date: 2019/8/6 9:53 + */ +@Data +@Entity +@Table(name = "commomtable1") +public class CommonTable1 { + + @Id + @Column(name = "patient_id") + private String masterId; + + + /** + * 1 鏂扮敓鍎垮嚭鐢熶綋閲 + */ + @Column(name = "avoirdupois") + private float YZY072; + + /** + * 2 鏂扮敓鍎垮叆闄綋閲 + */ + @Column(name = "avoirdupois_admiss") + private float YZY073; + + /** + * 5 鍑虹敓鏃ユ湡 + */ + @Column(name = "birthday") + private Date AAC006; + + + /** + * 7 鍖荤枟浠樿垂鏂瑰紡 + */ + @Column(name = "pay_type") + private String YZY074; + + + /** + * 9 鍑虹敓鍦 + */ + @Column(name = "birth_addr") + private String YZY010; + + + /** + * 10 鑱屼笟 + */ + @Column(name = "job") + private String YZY016; + + /** + * 11 鑱旂郴浜哄湴鍧 + */ + @Column(name = "rel_addr") + private String YZY027; + + /** + * 12 鑱旂郴浜虹數璇 + */ + @Column(name = "rel_tel") + private String YZY028; + + /** + * 13 韬唤璇佸彿 + */ + @Column(name = "id_card") + private String YZY011; + + /** + * 15 濠氬喌 1.鏈锛2.宸插锛3.绂诲锛4.涓у伓锛5.鍏朵粬 + */ + @Column(name = "marriage") + private String YZY018; + + /** + * 16 姘戞棌 + */ + @Column(name = "nation") + private String YZY015; + + + /** + * 17 鍥界睄 + */ + @Column(name = "country") + private String AAC161; + + /** + * 18 绫嶈疮 + */ + @Column(name = "native_place") + private String YZY076; + + /** + * 23 鑱旂郴浜哄叧绯 + */ + @Column(name = "relation") + private String YZY026; + + + /** + * 24 鐜颁綇鍧鐢佃瘽 + */ + @Column(name = "home_tel") + private String YZY079; + + /** + * 25 宸ヤ綔鍗曚綅鐢佃瘽 + */ + @Column(name = "work_tel") + private String YZY021; + + /** + * 26 宸ヤ綔鍗曚綅浣忓潃閭紪 + */ + @Column(name = "work_zip") + private String YZY022; + + /** + * 27 鐜颁綇鍧閭紪 + */ + @Column(name = "home_zip") + private String YZY080; + + /** + * 64 锛堜富瑕佸嚭闄㈣瘖鏂級鍏ラ櫌鐥呮儏 -------------鍏ラ櫌鐥呮儏 1.鍗憋紝2.鎬ワ紝3.涓鑸 + */ + @Column(name = "admiss_thing") + private String YZY111; + + /** + * 72 闂((鎬)璇婅瘖鏂紪鐮 + */ + @Column(name = "clinic_diag") + private String YZY113; + + /** + * 73闂((鎬)璇婅瘖鏂 + */ + @Column(name = "clinic_name") + private String YZY114; + + + /** + * 74 杩囨晱鑽墿 + */ + @Column(name = "medicine") + private String YZY046; + + /** + * 75 鏄惁姝讳骸鎮ｈ呭案妫 0.鏈仛锛1.绗﹀悎锛2.涓嶇鍚堬紝3.涓嶈偗瀹氾紝4.涓嶄綔缁熻 + */ + @Column(name = "emit_pathology") + private String YZY089; + + + /** + * 76 琛鍨 + */ + @Column(name = "blood_type") + private String YZY090; + + /** + * 77 鏄惁鑽墿杩囨晱 + */ + @Column(name = "is_medicine") + private String is_medicine; + + + /** + * 84 Rh 1.闃达紝2.闃筹紝3鏈煡 + */ + @Column(name = "RH") + private String YZY096; + + /** + * 94 鍏ラ櫌绉戝埆 + */ + @Column(name = "admiss_dept") + private String YZY033; + + /** + * 95 鍏ラ櫌閫斿緞 1.闂ㄨ瘖锛2.鎬ヨ瘖锛3.杞櫌 + */ + @Column(name = "admiss_type") + private String YZY100; + + /** + * 96 杞绉戝埆 + */ + @Column(name = "change_dept") + private String YZY101; + + /** + * 97 鍏ラ櫌鐥呮埧 + */ + @Column(name = "admiss_ward") + private String YZY102; + + + /** + * 99 涓讳换锛堝壇涓讳换锛夊尰甯 + */ + @Column(name = "director") + private String YZY052; + + /** + * 101 缂栫爜鍛 + */ + @Column(name = "coding") + private String YZY061; + + + /** + * 102 锛堝嚭闄級鐥呮埧 + */ + @Column(name = "dis_ward") + private String YZY039; + + /** + * 104 浣忛櫌鍖诲笀 + */ + @Column(name = "admiss_doctor") + private String YZY056; + + /** + * 105 绉戜富浠 + */ + @Column(name = "dept_director") + private String YZY050; + + + + /** + * 宸ヤ綔鍗曚綅鍦板潃 + */ + @Column(name = "work_addr") + private String YZY020; + + /** + * 鑱旂郴浜哄鍚 + */ + @Column(name = "linkman") + private String AAE004; + + ///////////////////////////////// + + + /** + * 璐ㄦ鏃ユ湡 + */ + @Column(name = "quality_date") + private Date YZY069; + + /** + * 璐ㄦ帶鍖诲笀 + */ + @Column(name = "control") + private String YZY066; + /** + * 璐ㄦ帶鎶ゅ＋ + */ + @Column(name = "nurses") + private String YZY068; + + /** + * 鐥呮璐ㄩ噺 1.鐢诧紝2.涔欙紝3.涓 + */ + @Column(name = "quality") + private String YZY064; + + + /** + * 杩涗慨鍖诲笀 + */ + @Column(name = "refresher") + private String YZY058; + /** + * 瀹炰範鍖诲笀 + */ + @Column(name = "praxis") + private String YZY060; + + +} diff --git a/src/main/java/com/ann/demo/entity/filing/DiagDetail.java b/src/main/java/com/ann/demo/entity/filing/DiagDetail.java new file mode 100644 index 0000000..a54631d --- /dev/null +++ b/src/main/java/com/ann/demo/entity/filing/DiagDetail.java @@ -0,0 +1,120 @@ +package com.ann.demo.entity.filing; + +import com.ann.demo.entity.filing.ids.DiagDetailIds; +import lombok.Data; + +import javax.persistence.*; +import java.util.Date; + +/** + * @Author: LeiJiaXin + * @Date: 2019/8/6 10:04 + */ +@Data +@Entity +@Table(name = "t_diag") +@IdClass(DiagDetailIds.class) +public class DiagDetail { + + /** + * 鐥呮鍙 + * */ + @Id + @Column(name = "patient_id", length = 50) + private String masterId; + + /** + * 璇婃柇ID + * */ + @Id + @Column(name = "diag_code", length = 50) + private String AKC196; + + /** + * 璇婃柇绫诲瀷 1闂ㄨ瘖璇婃柇 2鍏ラ櫌璇婃柇 3鍑洪櫌璇婃柇 4鎵嬫湳骞跺彂鐥 + * 5骞跺彂鐥 6闄㈠唴鎰熸煋 7鎹熶激鍜屼腑姣掔殑澶栭儴鍘熷洜 8鐥呯悊璇婃柇 + * 9鏂扮敓鍎跨柧鐥呰瘖鏂 + * */ + @Id + @Column(name = "diag_type", length = 50) + private String YZY203; + + /** + * 璇婃柇搴忓彿 + * */ + @Column(name = "diag_no") + private Integer YZY201; + + /** + * 璇婃柇鐥呭悕 + * */ + @Column(name = "diag_name") + private String AKC185; + + /** + * 杞綊鎯呭喌 + * */ + @Column(name = "dis_thing") + private String dis_thing; + + /** + * 鐥呯悊鍒囩墖鍙 + * */ + @Column(name = "pathology_cut") + private String pathology_cut; + + /** + * X鍏夌墖鍙 + * */ + @Column(name = "X_ray") + private String X_ray; + + /** + * 褰曞叆鍛樺鍚 + * */ + @Column(name = "oper_name") + private String oper_name; + + /** + * 褰曞叆鏃ユ湡 + * */ + @Column(name = "oper_date") + private Date oper_date; + + /** + * + * */ + @Column(name = "create_date") + private Date create_date; + + /** + * + * */ + @Column(name = "singl") + private String singl; + + /** + * + * */ + @Column(name = "pat_adm_condition") + private String pat_adm_condition; + + /** + * + * */ + @Column(name = "pid") + private String pid; + + /** + * + * */ + @Column(name = "vid") + private String vid; + + /** + * + * */ + @Column(name = "inhospstat") + private String INHospStat; + +} diff --git a/src/main/java/com/ann/demo/entity/filing/MedicalRecordHomepage.java b/src/main/java/com/ann/demo/entity/filing/MedicalRecordHomepage.java new file mode 100644 index 0000000..58cccdd --- /dev/null +++ b/src/main/java/com/ann/demo/entity/filing/MedicalRecordHomepage.java @@ -0,0 +1,33 @@ +package com.ann.demo.entity.filing; + +import lombok.Data; + +import java.util.List; + +/** + * 鐥呮棣栭〉 + * + * @Author: LeiJiaXin + * @Date: 2019/8/6 9:06 + */ +@Data +public class MedicalRecordHomepage { + + private CommonTable commonTable; + + private CommonTable1 commonTable1; + + /** + * 鎵嬫湳鑺傜偣 + */ + private List OperDetails; + + /** + * 璇婃柇鑺傜偣 + */ + private List DiagDetails; + + // 20200525 鏂板鍏朵粬鑺傜偣 鐢ㄤ簬鏍￠獙鏁版嵁 + private OtherData otherData; + +} diff --git a/src/main/java/com/ann/demo/entity/filing/MedicalRecordHomepageCache.java b/src/main/java/com/ann/demo/entity/filing/MedicalRecordHomepageCache.java new file mode 100644 index 0000000..c5231f0 --- /dev/null +++ b/src/main/java/com/ann/demo/entity/filing/MedicalRecordHomepageCache.java @@ -0,0 +1,41 @@ +package com.ann.demo.entity.filing; + +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import java.util.Date; + +/** + * 鐥呮棣栭〉缂撳瓨 + * + * @Author: LeiJiaXin + * @Date: 2019/8/6 9:06 + */ +@Data +@Table +@Entity +public class MedicalRecordHomepageCache { + + @Id + private String masterId; + + private String content; + + private Date createTime = new Date(); + + private String remark; + + // 鏄惁鏂板 榛樿娌℃湁鏂板 + private Integer isAdd = 0; + + + public MedicalRecordHomepageCache(String masterId, String content) { + this.masterId = masterId; + this.content = content; + } + + public MedicalRecordHomepageCache() { + } +} diff --git a/src/main/java/com/ann/demo/entity/filing/OperDetail.java b/src/main/java/com/ann/demo/entity/filing/OperDetail.java new file mode 100644 index 0000000..8424423 --- /dev/null +++ b/src/main/java/com/ann/demo/entity/filing/OperDetail.java @@ -0,0 +1,137 @@ +package com.ann.demo.entity.filing; + +import com.ann.demo.entity.filing.ids.OperDetailIds; +import lombok.Data; + +import javax.persistence.*; +import java.util.Date; + +/** + * 鎵嬫湳 + * + * @Author: LeiJiaXin + * @Date: 2019/8/6 9:08 + */ + +@Table(name = "t_operate") +@Entity +@IdClass(OperDetailIds.class) +@Data +public class OperDetail { + + @Id + @Column(name = "patient_id", length = 50) + private String masterId; + + /** + * + */ + @Column(name = "operate_no") + private Integer YZY201; + + /** + * 鎵嬫湳鎿嶄綔缂栫爜 + */ + @Id + @Column(name = "operateCode") + private String YZY207; + + /** + * 鎵嬫湳鎿嶄綔鍚嶇О + */ + @Column(name = "operateName") + private String YZY208; + + /** + * 鎵嬫湳鎿嶄綔鏃ユ湡 + */ + @Column(name = "operateDate") + private Date YZY209; + + /** + * 鎵嬫湳绾у埆 + */ + @Column(name = "operateClass") + private String YZY227; + + /** + * 鎵嬫湳鎿嶄綔鏈 + */ + @Column(name = "operator") + private String YZY215; + + /** + * 鎵嬫湳I鍔 + */ + @Column(name = "assistant_1") + private String YZY220; + + /** + * 鎵嬫湳II鍔 + */ + @Column(name = "assistant_2") + private String YZY222; + + /** + * 鎵嬫湳III鍔 + */ + @Column(name = "assistant_3") + private String assistant_3; + + /** + * 鍒囧彛鎰堝悎绛夌骇 + */ + @Column(name = "cut") + private String YZY210; + + /** + * 楹婚唹鏂瑰紡 + */ + @Column(name = "anaesthesia_type") + private String YZY216; + + /** + * 楹婚唹鍖诲笀 + */ + @Column(name = "anaesthesia_name") + private String YZY223; + + /** + * 褰曞叆鍛樼紪鍙 + */ + @Column(name = "oper_code") + private String oper_code; + + /** + * 褰曞叆鍛樺鍚 + */ + @Column(name = "oper_name") + private String oper_name; + + /** + * 褰曞叆鏃ユ湡 + */ + @Column(name = "oper_date") + private String oper_date; + + + /** + * + */ + @Column(name = "OPERATION_SCALE") + private String OPERATION_SCALE; + + /** + * + */ + @Column(name = "chossurg") + private String ChosSurg; + + /** + * + */ + @Column(name = "operdegr") + private String OperDegr; + + +} diff --git a/src/main/java/com/ann/demo/entity/filing/OtherData.java b/src/main/java/com/ann/demo/entity/filing/OtherData.java new file mode 100644 index 0000000..4a376ee --- /dev/null +++ b/src/main/java/com/ann/demo/entity/filing/OtherData.java @@ -0,0 +1,367 @@ +package com.ann.demo.entity.filing; + +import lombok.Data; + +import javax.persistence.Column; + +/** + * 鏍￠獙璐ㄦ帶瑙勫垯鎵鏈変俊鎭 + * @Author: LeiJiaXin + * @Date: 2020/5/22 10:27 + */ +@Data +public class OtherData { + + + /** + * 19 缁勭粐鏈烘瀯浠ｇ爜 Organization code + */ + private String YZY077; + + /** + * 20 鍖荤枟鏈烘瀯 + */ + private String YZY078; + + + /** + * 21 鎴峰彛鍦板潃 + */ + private String AAC010; + + /** + * 22 鎴峰彛鍦板潃閭紪 + */ + private String YZY024; + + /** + * 28 浣忛櫌鎬昏垂鐢 + */ + private String AKC264; + + /** + * 29 娌荤枟绫-9-涓村簥鐗╃悊娌荤枟璐 + */ + @Column(name = "lcwlzlf") + private String YZY132; + + /** + * 30 娌荤枟绫-10-楹婚唹璐 + */ + @Column(name = "mzf") + private String YZY134; + + + /** + * 31 娌荤枟绫-10-鎵嬫湳璐 + */ + @Column(name = "ssf") + private String YZY135; + + /** + * 32 瑗胯嵂绫-13-鎶楄弻鑽墿璐圭敤 + */ + @Column(name = "kjywfy") + private String YZY152; + + /** + * 33 缁煎悎鍖荤枟鏈嶅姟绫-涓鑸尰鐤楁湇鍔¤垂(1) + */ + @Column(name = "ybylfwf1") + private String YZY123; + + /** + * 34 缁煎悎鍖荤枟鏈嶅姟绫-涓鑸不鐤楁搷浣滆垂(2) + */ + @Column(name = "ybylfwf2") + private String YZY124; + + /** + * 35 缁煎悎鍖荤枟鏈嶅姟绫-鎶ょ悊璐(3) + */ + @Column(name = "hlf") + private String YZY125; + + /** + * 36 缁煎悎鍖荤枟鏈嶅姟绫-鍏朵粬璐圭敤(4) + */ + @Column(name = "qtfy") + private String YZY126; + + /** + * 37 璇婃柇绫-鐥呯悊璇婃柇璐(5) + */ + @Column(name = "blzdf") + private String YZY127; + + /** + * 38 璇婃柇绫-瀹為獙瀹よ瘖鏂垂(6) + */ + @Column(name = "syszdf") + private String YZY128; + + /** + * 39 璇婃柇绫-褰卞儚瀛﹁瘖鏂垂(7) + */ + @Column(name = "yxxzdf") + private String YZY129; + + /** + * 40 璇婃柇绫-涓村簥璇婃柇椤圭洰璐(8) + */ + @Column(name = "lczdxmf") + private String YZY130; + +// /** +// * 41 娌荤枟绫-闈炴墜鏈不鐤楅」鐩垂(9)-2 +// */ +// @Column(name = "fsszlxmf2") +// private String YZY132; + + + /** + * 42 娌荤枟绫-闈炴墜鏈不鐤楅」鐩垂(9) + */ + @Column(name = "fsszlxmf") + private String YZY131; + + /** + * 43 娌荤枟绫-鎵嬫湳娌荤枟璐(10) + */ + @Column(name = "sszlf") + private String YZY133; + + /** + * 44 搴峰绫-搴峰璐(11) + */ + @Column(name = "kff") + private String YZY136; + + /** + * 45 涓尰绫-涓尰娌荤枟璐(12) + */ + @Column(name = "zyzlf") + private String YZY137; + + + /** + * 46 瑗胯嵂绫-瑗胯嵂璐(13) + */ + @Column(name = "xyf") + private String YZY138; + + /** + * 47 涓嵂绫-涓垚鑽垂(14) + */ + @Column(name = "zcyf") + private String YZY153; + + /** + * 48 涓嵂绫-涓崏鑽垂(15) + */ + @Column(name = "zcyf") + private String YZY154; + + /** + * 49 琛娑插拰琛娑插埗鍝佺被-琛璐(16) + */ + @Column(name = "xf") + private String YZY139; + + /** + * 50 琛娑插拰琛娑插埗鍝佺被-鐧借泲鐧界被鍒跺搧璐(17) + */ + @Column(name = "bdblzpf") + private String YZY140; + + /** + * 51 琛娑插拰琛娑插埗鍝佺被-鐞冭泲鐧界被鍒跺搧璐(18) + */ + @Column(name = "qdblzpf") + private String YZY141; + + /** + * 52 琛娑插拰琛娑插埗鍝佺被-鍑濊鍥犲瓙绫诲埗鍝佽垂(19) + */ + @Column(name = "nxyzlzpf") + private String YZY142; + + /** + * 53 琛娑插拰琛娑插埗鍝佺被-缁嗚優鍥犲瓙绫诲埗鍝佽垂(20) + */ + @Column(name = "xbyzlzpf") + private String YZY143; + + /** + * 54 鑰楁潗绫-妫鏌ョ敤涓娆℃у尰鐢ㄦ潗鏂欒垂(21) + */ + @Column(name = "jcyycxyyclf") + private String YZY144; + + /** + * 55 鑰楁潗绫-娌荤枟鐢ㄤ竴娆℃у尰鐢ㄦ潗鏂欒垂(22) + */ + @Column(name = "zlyycxyyclf") + private String YZY145; + + /** + * 56 鑰楁潗绫-鎵嬫湳鐢ㄤ竴娆℃у尰鐢ㄦ潗鏂欒垂(23) + */ + @Column(name = "ssyycxyyclf") + private String YZY146; + + /** + * 57 鍏朵粬绫-鍏朵粬璐(24) + */ + @Column(name = "qtf") + private String YZY155; + + /** + * 58 鑷粯璐圭敤 + */ + @Column(name = "zffy") + private String YZY122; + + /** + * 59 锛堜富瑕佸嚭闄㈣瘖鏂級缂栫爜 + */ + private String mainDiagCode; + + + + /** + * 61 锛堜富瑕佹墜鏈級鍚嶇О + */ + private String YZY105; + + + /** + * 62 锛堜富瑕佹搷浣滐級鍚嶇О + */ + private String YZY110; + + + /** + * 63 锛堝叾浠栧嚭闄㈣瘖鏂級缂栫爜-1-2 + * 绛夊緟纭 + */ + + + /** + * 65 锛堝叆闄㈠墠锛夐鑴戞崯浼ゆ椂闂 + */ + private String YZY081; + + /** + * 66 锛堝叆闄㈠悗锛夐鑴戞崯浼ゆ椂闂 + */ + private String YZY082; + + /** + * 67 锛堜富瑕佹搷浣滐級鍒囧彛鎰堝悎绛夌骇 + */ + private String YZY083; + + /** + * 68 锛堜富瑕佹墜鏈級鍒囧彛鎰堝悎绛夌骇 + */ + private String YZY084; + + /** + * 69 锛堜富瑕佹墜鏈級鏃ユ湡 + */ + private String YZY106; + + /** + * 70 锛堜富瑕佹搷浣滐級鏃ユ湡 + */ + private String YZY085; + + /** + * 70-1 鐥呯悊璇婃柇缂栫爜 + */ + private String pathologyDingCode; + + /** + * 70-2 鐥呯悊璇婃柇 + */ + private String pathologyDingName; + + /** + * 71 锛堜富瑕佹墜鏈級楹婚唹鏂瑰紡 + */ + private String YZY107; + + /** + * 78 鎹熶激銆佷腑姣掔殑澶栭儴鍘熷洜鐤剧梾缂栫爜蹇呭～ + */ + private String mainDiagCodeOutSideReason; + + /** + * 79 鎹熶激涓瘨鐨勫閮ㄥ師鍥犵紪鐮 + */ + private String YZY092; + + /** + * 80 鎹熶激銆佷腑姣掔殑澶栭儴鍘熷洜蹇呭～ + */ + private String YZY093; + + /** + * 81 锛堜富瑕佹搷浣滐級绾у埆 + */ + private String YZY094; + + /** + * 82 锛堜富瑕佹墜鏈級绾у埆 + */ + private String YZY108; + + /** + * 83 鐥呯悊鍙 (鍩轰簬鍏朵粬鐥呯悊璇婃柇鍐呭鍒ゆ柇鐥呯悊鍙蜂笉涓虹┖ ) + */ + private String YZY095; + + /** + * 85 锛堜富瑕佹墜鏈級鏈 + */ + private String YZY109; + + + /** + * 86 锛堜富瑕佹搷浣滐級鏈 + */ + private String YZY097; + + + /** + * 87 绂婚櫌鏂瑰紡 + */ + private String YZY070; + + + /** + * 91 鏄惁鏈31澶╁唴鍐嶆鍏ラ櫌璁″垝 + */ + private String YZY098; + + + /** + * 92 31澶╁唴鍐嶆鍏ラ櫌鐩殑 + */ + private String YZY099; + + /** + * 98 锛堜富瑕佹墜鏈級楹婚唹鍖诲笀 + */ + private String YZY112; + + + /** + * 100 璐ｄ换鎶ゅ＋ + */ + private String YZY103; + + + +} diff --git a/src/main/java/com/ann/demo/entity/filing/ids/CommonTableIds.java b/src/main/java/com/ann/demo/entity/filing/ids/CommonTableIds.java new file mode 100644 index 0000000..ea1a912 --- /dev/null +++ b/src/main/java/com/ann/demo/entity/filing/ids/CommonTableIds.java @@ -0,0 +1,30 @@ +package com.ann.demo.entity.filing.ids; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author: LeiJiaXin + * @Date: 2019/8/6 16:16 + */ +@Data +public class CommonTableIds implements Serializable { + + private String masterId; + + /** + * 浣忛櫌娆℃暟 + */ + private String YZY002; + + /** + * 鐥呮鍙 + */ + private String YZY001; + + /** + * 濮撳悕 + */ + private String AAC003; +} diff --git a/src/main/java/com/ann/demo/entity/filing/ids/DiagDetailIds.java b/src/main/java/com/ann/demo/entity/filing/ids/DiagDetailIds.java new file mode 100644 index 0000000..909a941 --- /dev/null +++ b/src/main/java/com/ann/demo/entity/filing/ids/DiagDetailIds.java @@ -0,0 +1,19 @@ +package com.ann.demo.entity.filing.ids; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author: LeiJiaXin + * @Date: 2019/8/7 10:03 + */ +@Data +public class DiagDetailIds implements Serializable { + + private String masterId; + + private String YZY203; + + private String AKC196; +} diff --git a/src/main/java/com/ann/demo/entity/filing/ids/MedicalRecordHomepageCacheIds.java b/src/main/java/com/ann/demo/entity/filing/ids/MedicalRecordHomepageCacheIds.java new file mode 100644 index 0000000..a14d738 --- /dev/null +++ b/src/main/java/com/ann/demo/entity/filing/ids/MedicalRecordHomepageCacheIds.java @@ -0,0 +1,17 @@ +package com.ann.demo.entity.filing.ids; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author: LeiJiaXin + * @Date: 2019/9/26 9:22 + */ +@Data +public class MedicalRecordHomepageCacheIds implements Serializable { + + private String patientId; + + private String visitId; +} diff --git a/src/main/java/com/ann/demo/entity/filing/ids/OperDetailIds.java b/src/main/java/com/ann/demo/entity/filing/ids/OperDetailIds.java new file mode 100644 index 0000000..8c563cc --- /dev/null +++ b/src/main/java/com/ann/demo/entity/filing/ids/OperDetailIds.java @@ -0,0 +1,17 @@ +package com.ann.demo.entity.filing.ids; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author: LeiJiaXin + * @Date: 2019/8/7 10:04 + */ +@Data +public class OperDetailIds implements Serializable { + + private String masterId; + + private String YZY207; +} 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 e687955..a091e22 100644 --- a/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java +++ b/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java @@ -126,17 +126,3 @@ public class HomepageDictionaryImpl implements HomepageDictionary { return sb + ""; } } - - - - - - -// String checkLisNotExits1 = archiveDetailService.getInspectionReportNotExits(types, masterId); -// if (checkLisNotExits1 != null) { -// if (sb.length() != 0) { -// sb.append(","); -// } -// sb.append(checkLisNotExits1); -// } -// diff --git a/src/main/java/com/ann/demo/repository/MedicalRecordHomepageCacheRepository.java b/src/main/java/com/ann/demo/repository/MedicalRecordHomepageCacheRepository.java new file mode 100644 index 0000000..74bf93e --- /dev/null +++ b/src/main/java/com/ann/demo/repository/MedicalRecordHomepageCacheRepository.java @@ -0,0 +1,18 @@ +package com.ann.demo.repository; + +import com.ann.demo.entity.filing.MedicalRecordHomepageCache; +import com.ann.demo.entity.filing.ids.MedicalRecordHomepageCacheIds; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +/** + * @Author: LeiJiaXin + * @Date: 2019/9/26 9:31 + */ +@Repository +public interface MedicalRecordHomepageCacheRepository extends JpaRepository { + + +} diff --git a/src/main/java/com/ann/demo/service/MedicalRecordHomepageCacheService.java b/src/main/java/com/ann/demo/service/MedicalRecordHomepageCacheService.java new file mode 100644 index 0000000..babcc29 --- /dev/null +++ b/src/main/java/com/ann/demo/service/MedicalRecordHomepageCacheService.java @@ -0,0 +1,12 @@ +package com.ann.demo.service; + + +/** + * @Author: LeiJiaXin + * @Date: 2019/9/26 9:26 + */ +public interface MedicalRecordHomepageCacheService { + + + +} diff --git a/src/main/java/com/ann/demo/service/impl/MedicalRecordHomepageCacheServiceImpl.java b/src/main/java/com/ann/demo/service/impl/MedicalRecordHomepageCacheServiceImpl.java new file mode 100644 index 0000000..a55b004 --- /dev/null +++ b/src/main/java/com/ann/demo/service/impl/MedicalRecordHomepageCacheServiceImpl.java @@ -0,0 +1,28 @@ +package com.ann.demo.service.impl; + +import com.alibaba.fastjson.JSON; +import com.ann.demo.repository.MedicalRecordHomepageCacheRepository; +import com.ann.demo.service.ArchiveMasterService; +import com.ann.demo.service.MedicalRecordHomepageCacheService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * @Author: LeiJiaXin + * @Date: 2019/9/26 9:27 + */ +@Service +public class MedicalRecordHomepageCacheServiceImpl implements MedicalRecordHomepageCacheService { + + static final Logger logger = LoggerFactory.getLogger(MedicalRecordHomepageCacheServiceImpl.class); + + @Autowired + MedicalRecordHomepageCacheRepository medicalRecordHomepageCacheRepository; + + +}