From cca1a66e13c7317e89370532d98eea9c061abb39 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Tue, 12 Mar 2024 10:29:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=A1=B9=E7=9B=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/出院患者信息导入表.xlsx | Bin 0 -> 11801 bytes .../template/在院患者信息导入表.xlsx | Bin 0 -> 11611 bytes .../template/门诊患者信息导入表.xlsx | Bin 0 -> 11682 bytes .../template/预住院患者信息导入表.xlsx | Bin 0 -> 11740 bytes .../com/xinelu/common/constant/Constants.java | 20 + .../common/constant/NodeTypeConstants.java | 46 ++ .../common/constant/PatientTypeConstants.java | 29 ++ .../common/constant/VisitTypeConstants.java | 19 + .../ImportDownloadController.java | 26 +- .../PatientPreHospitalizationController.java | 120 ++++++ .../PatientVisitRecordController.java | 30 ++ .../controller/project/ProjectController.java | 105 +++++ .../ProjectDeviceController.java | 97 +++++ .../projectgroup/ProjectGroupController.java | 130 ++++++ .../ProjectRecordController.java | 19 - .../ProjectResultController.java | 111 +++++ .../PatientPreHospitalization.java | 148 +++++++ .../PatientVisitRecord.java | 157 +++++-- .../xinelu/manage/domain/project/Project.java | 126 +++--- .../domain/projectbatch/ProjectBatch.java | 83 ++++ .../domain/projectdevice/ProjectDevice.java | 89 ++-- .../domain/projectgroup/ProjectGroup.java | 59 +-- .../projectlastrecord/ProjectLastRecord.java | 122 ------ .../projectlastresult/ProjectLastResult.java | 143 +++++++ .../domain/projectrecord/ProjectRecord.java | 122 ------ .../projectrecordfile/ProjectRecordFile.java | 111 ----- .../domain/projectresult/ProjectResult.java | 153 +++++++ .../signpatientrecord/SignPatientRecord.java | 14 +- .../PatientVisitRecordDto.java | 9 + .../PatientVisitRecordImportDto.java | 120 ++++++ .../projectgroup/ProjectGroupSaveListDto.java | 16 + .../ProjectResultStatisticDto.java | 58 +++ .../PatientPreHospitalizationMapper.java | 42 ++ .../PatientVisitRecordMapper.java | 8 +- .../manage/mapper/project/ProjectMapper.java | 62 ++- .../projectbatch/ProjectBatchMapper.java | 25 ++ .../projectdevice/ProjectDeviceMapper.java | 62 ++- .../projectgroup/ProjectGroupMapper.java | 64 ++- .../ProjectLastRecordMapper.java | 25 -- .../ProjectLastResultMapper.java | 25 ++ .../projectrecord/ProjectRecordMapper.java | 25 -- .../ProjectRecordFileMapper.java | 25 -- .../projectresult/ProjectResultMapper.java | 66 +++ .../IPatientPreHospitalizationService.java | 38 ++ .../PatientPreHospitalizationServiceImpl.java | 220 ++++++++++ .../IPatientVisitRecordService.java | 15 +- .../impl/PatientVisitRecordServiceImpl.java | 183 +++++++- .../service/project/IProjectService.java | 63 ++- .../project/impl/ProjectServiceImpl.java | 83 +++- .../projectdevice/IProjectDeviceService.java | 63 ++- .../impl/ProjectDeviceServiceImpl.java | 83 +++- .../projectgroup/IProjectGroupService.java | 66 ++- .../impl/ProjectGroupServiceImpl.java | 109 ++++- .../IProjectLastRecordService.java | 10 - .../impl/ProjectLastRecordServiceImpl.java | 14 - .../IProjectLastResultService.java | 10 + .../impl/ProjectLastResultServiceImpl.java | 18 + .../projectrecord/IProjectRecordService.java | 10 - .../impl/ProjectRecordServiceImpl.java | 14 - .../IProjectRecordFileService.java | 10 - .../impl/ProjectRecordFileServiceImpl.java | 14 - .../projectresult/IProjectResultService.java | 64 +++ .../impl/ProjectResultServiceImpl.java | 148 +++++++ .../vo/projectgroup/ProjectGroupTreeVo.java | 42 ++ .../ProjectResultStatisticVo.java | 29 ++ .../vo/projectresult/ProjectResultVo.java | 30 ++ .../PatientPreHospitalizationMapper.xml | 377 ++++++++++++++++ .../PatientVisitRecordMapper.xml | 113 +++-- .../mapper/manage/project/ProjectMapper.xml | 404 ++++++++++-------- .../projectbatch/ProjectBatchMapper.xml | 178 ++++++++ .../projectdevice/ProjectDeviceMapper.xml | 357 +++++++++------- .../projectgroup/ProjectGroupMapper.xml | 268 ++++++------ .../ProjectLastResultMapper.xml} | 153 ++++--- .../projectrecord/ProjectRecordMapper.xml | 243 ----------- .../ProjectRecordFileMapper.xml | 219 ---------- .../projectresult/ProjectResultMapper.xml | 371 ++++++++++++++++ .../SignPatientRecordMapper.xml | 53 +-- 77 files changed, 4972 insertions(+), 1811 deletions(-) create mode 100644 postdischarge-admin/src/main/resources/template/出院患者信息导入表.xlsx create mode 100644 postdischarge-admin/src/main/resources/template/在院患者信息导入表.xlsx create mode 100644 postdischarge-admin/src/main/resources/template/门诊患者信息导入表.xlsx create mode 100644 postdischarge-admin/src/main/resources/template/预住院患者信息导入表.xlsx create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/constant/NodeTypeConstants.java create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/constant/PatientTypeConstants.java create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/constant/VisitTypeConstants.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientprehospitalization/PatientPreHospitalizationController.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/controller/project/ProjectController.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectdevice/ProjectDeviceController.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectgroup/ProjectGroupController.java delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectrecord/ProjectRecordController.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectresult/ProjectResultController.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectbatch/ProjectBatch.java delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastrecord/ProjectLastRecord.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastresult/ProjectLastResult.java delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectrecord/ProjectRecord.java delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectrecordfile/ProjectRecordFile.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectresult/ProjectResult.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectgroup/ProjectGroupSaveListDto.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectresult/ProjectResultStatisticDto.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientprehospitalization/PatientPreHospitalizationMapper.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectbatch/ProjectBatchMapper.java delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectlastrecord/ProjectLastRecordMapper.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectlastresult/ProjectLastResultMapper.java delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectrecord/ProjectRecordMapper.java delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectrecordfile/ProjectRecordFileMapper.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectresult/ProjectResultMapper.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/IPatientPreHospitalizationService.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastrecord/IProjectLastRecordService.java delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastrecord/impl/ProjectLastRecordServiceImpl.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastresult/IProjectLastResultService.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastresult/impl/ProjectLastResultServiceImpl.java delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecord/IProjectRecordService.java delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecord/impl/ProjectRecordServiceImpl.java delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecordfile/IProjectRecordFileService.java delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecordfile/impl/ProjectRecordFileServiceImpl.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/projectresult/IProjectResultService.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/projectresult/impl/ProjectResultServiceImpl.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/projectgroup/ProjectGroupTreeVo.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/projectresult/ProjectResultStatisticVo.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/projectresult/ProjectResultVo.java create mode 100644 postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml create mode 100644 postdischarge-manage/src/main/resources/mapper/manage/projectbatch/ProjectBatchMapper.xml rename postdischarge-manage/src/main/resources/mapper/manage/{projectlastrecord/ProjectLastRecordMapper.xml => projectlastresult/ProjectLastResultMapper.xml} (63%) delete mode 100644 postdischarge-manage/src/main/resources/mapper/manage/projectrecord/ProjectRecordMapper.xml delete mode 100644 postdischarge-manage/src/main/resources/mapper/manage/projectrecordfile/ProjectRecordFileMapper.xml create mode 100644 postdischarge-manage/src/main/resources/mapper/manage/projectresult/ProjectResultMapper.xml diff --git a/postdischarge-admin/src/main/resources/template/出院患者信息导入表.xlsx b/postdischarge-admin/src/main/resources/template/出院患者信息导入表.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..e914f2353ef0954c97f60856fefbbe4b4f3701c8 GIT binary patch literal 11801 zcmaJ{bzD_j)26#UgoLEDv~+iOcXxM6hcrlcgS2!bpmeu%H_|Qe9rS&#SKj;G^~XNv zxA(+a&+M65d(Fs7fJ4B6JdI%KHQuM+{|;E-A43}hS$i8>2U=Mm831?#<|o-Oza}U> zC@}U-DrM^xf9}M8F4iaAHi`9~+#K(~`i=bL9>BnZh z*lGh6(Pw{!4?By}fYvW}jkLjLH$CnxAYsGK-J)eJ0H%CO5-^7?^)bJxhSdEW{Zn;> zuX<=UIW4ctCgz;5VpYBxe2}N1DZczYg^3GxcGw%&lH93Cc~6r837#2HisGo5?W_8p zkwQ$0*o@^{J5#*jOIay*0c__8E#58BPMXzmc|=#GH;#EcK4bzb8HDS`Y5Q+MHd6)K z+U%OnsWg84XuJjc6J8E0k4_;VynH}-QU4CFfsMV<6TV(CeBxi|umZ3AT*$xGixse& znsHC{Mao@38}`4({XKzrmZMrNS~g{*5S z_Yq+%Bnt#kA()-;vMEKTix{BV6Q^sGPauF(X&QTUl&?wF!eFaMiP(*<3oawiyvi;> zwe9HlX_G2?P{$YeB1SMZ?av!ipYizbSIBA!7AR!IP1r-BJY+ ze#-GH=%y6U>uT$*5={VsH1o~&`q|z5K+nEHsCU@M6|0s299<;A6@1CM6ZcJaZmv`r zxg|%8*!Aeh?EsR)Mk%|ay{$7)@@9xfG!baR_X6zZA;EV1yGWm)H>|#AW@dPU{)ssh z+z)w5Am*q*%wPP0xs!vVjnxzC`7u%wUAzFHE5Ap=LGEN)GBfemaZld{*-B?BJq9!I zKFOqH#jxw;bor77+uVVkX53*fTD8_le;1UwbMXQYXc$+1`>9L&M886*Ls}mbOX7KB zS^2ybas*YQ8I?YN8#l8_OS4FDuZmRQSS=T>duy^+XN==d|AH*ZT`tABGI$)_4=Bn)WaNc1}#6&qEu3iIA7pY_(; zyI^l1XElRa^;*6=UAkIf+cd`Yh5A4Vz!hjV<@?+~Yuampm4T}Qmx@9z#risC1)&Q= zq4I!+hP5rkpt}~V07L}~N_|EGhJr_zUQS5PWWlhQzgrN8+(LBfHL)UO_%17dNkXl! zKAQaw`-UVme=(=+2f6M0oWrbem$T0>##+b%`P(3(%3p1Jf(Rz?Wf9&eC{-7riaA6L zI)rM9r29j?r(5uY>J43C@7i5=VrWW_eaD-p&p4;8k!ink*6!T1Skkw`;Py^xdCu%e zZ`{K!+RR7NF7AS#(L<;7@SVY7V%_)K_2K&l4#{Aa-5~{r9h|WI&DZmD*2(K`al?Ea zXK-=lK4xHUuNY2{O=j<)84n(ZUY?fqCvc1O-~WrL5Pn(0&|c5Q%-ZC63b0rrP9y}{ zD+v(<1m_v0vz4XbFD`l-;Qzx!iKsa`6rUr}d*m1o#Ff03>1ahI{Q5e1{5?A(G=T*t z202c{u7}%51Jmq1Wz#8bWgJ*rV@_lb?x?{%BbAgarHCon*VNc{7)6x+nkw@FUiYWg z4Z6NUYMbM{`Dk@239XWuh|0r}-0|oHFX}8P^{V;f$B`t`-|Fi5cOi&_rbZ0MMZerr zCKA$vuD%5;!M0XX@Gn0$ozl|HZ<0*T1=ZADao|+1@vb(N=o&|d(dbow*%*umRVIr^ zD!Ga6kv=S;mMP}1NpvXxrF+-h(>SeM{RsZ57S1uFazApyA%Z?iEgF=mamuCU%#LZD z^PpXgm)jif+sMb)7_d}sy+eFQCh1;h(w`hrAZT!zZFBvOYRWLKf;1Dcl>{2yTF)>o zagr^R^xCBx#ITe=1fi7j85|o)OS5Ab)gxpQqLH9_(9_Gig*h`a3J=pcc{IKgW@48* z7r`{v={grB2wTY>V<*BmJ!SmVp|IX7ai&D)$+~M~CEe6(q#F>HUz@VO z)+#B}w#c=kg-hQqRUi2#P_tAW^Q>;Y`CiQi~It4cKLS+dr9%&{u8kG0=uSFG@Ht7qeZesW9ZXv zpn3$&Y&~*wDWNkBXGxV2QGpOA*zD>iBZB2xURtOK%n~xUwgxN8fYBX}BH0upGrd_5 zaYaAc_xGChA|Bh;<%#jr=G|N%@M}U0^nJH*qqWJTpY^7x; zjEZ>rgi?-^(oaxbg1bSf%&{?tmhxRAS&j^~XqNT9T4DdRVeDoJNvJjDm5hEQQ#t=^o zv{d7tH_@Yd4>fQ9`gPF5t+rUgdc`HI0z;B8{PgZEr zU1roOpl#*r1eWh2!GmEi*+ z!gI-P0?h=U^hM0aED-oVc;i&KBXj%DnK>MRHPExWqiFNjZ$uYUWjuUEtBo4PWt%6a zZI`c`rwXxNlZoy@rZi$}Efh)V?1BlLlN(gf4P4gluGxx7j8UmhNI>-$E3OA@AT`g% zmD>kVf!&#_w!)QoygjEatcE`*XMEp{j#`S2YN!;rqF+ZtNcG}P>F{Q6rev3!6KI!O zwvHlaC40s<5!V8AZlm-IKdZP^cjPD`-9h&FCvy$i*FYrH45PuP`aTP*;iMDd+fsC zUn!2ewRg^5XxeB(z0-njWlQa^#bddBg|vU{?Pu@RQ`o)k#!>8WRuTxB%HEFrmIJ~} zZBeqPdLr{cET&-DH(k{DVHdSk9ZuW*_y+7#vYzv*K)w;*xd{fX51>2o-2)_uuAg~V z?+0D3a^Zm$m@~$5l=gGfhKPnL7+YC~0IPtE13cPw=Cv7a{c+)i^H$9o)OIz9ovcWM zIbqL3Vw(97jW7_%N!)7YH4S`v8{+S`FbfoW_aJ!+Qy0L?^bvTpw3c^$w6T~Z?-f|@@U zJyx$5X4QATwkv96u7RkG%}*xZ&Z%Xl^}(z+p}UHQk%L^~hs&7jPxrCEmu4sHU{+c4 zmnwKTR^{dra5RzX_t@{|+p_yBBq4*LU1}O$+FCOzC*h1}b~KJI9LPWLzgX+&Olmr`Cw>nA2P&=#e5xCrLFeFJqSChg_B$!&wwXiTrfEs99_W;N!)a zDbaVk=n^p9`1O-;98mQjD~O81A-Ex$P)kY`ODy7HCT0cbBYh5rPLggRxE@am6Lq*w znHl%Aps4jP(Ohqxs`WnPU^0RCPhHe=gkw%|+$GjrQmlK#+iZ@utH3owm`L zJ)})uSdw~GU1hn+yWJ+o4$~@q*HGOg#Hp--kWF!6E17Mbm;R)f^~8{C)WAi#>HOi?1Cx(O+3G zjxR2i3#+$Q5PR2VFpgU#hH9I_ShAwWT&sMhkq$59_t*>vze!Vg;;rmY0k}o@m^Q}p z)xzCM6TYek9NCY7`#>?2nubqO6B--{V7b^b0RR?IuKp{X;drN;ozYu?d9PvU9 zL2*eF9`^_HGb0&UGb69?7rosbAA@tDkt4r*+nBMzyV&9aFxzf#KPcu&Z|wbPfJ3=f0#i%ns-E%Y`( zT-Z#kXv7h1rOqf-UFjnH?YH#RzZ@EP%62#V8}!sJnt>@X!i)D@rbn~tf2YT#!i`QM z&)dEZh(4Y+a5;r~ucO?WJ@f}`CrDX4efmTYVJDOA>8hLVdid;852W>&?GcmF+a`Hik6Rgzw%O76A$c0}vQ2HO)vk07X zT!Z#VEPAD)^(>NM`e`uP3Z_7ZWF&{8>1e-Rc)$D*9zjp91SQ_2@R1n%QSF;CV6SfT zxX!Y^<<0Du{#cW3)lb?%cbEw~R-6%6Fos{(FfQu&+sj6myxaI`2R6?t2F~OWl+;;B z>SmbJU21AhUMY0nns@g)nYr7*;*1tS`@5&JImP}UNC-GCVtk3k+Q6$@4Fy}yoke*N z%<9|Lx@AV>D=7wz_FA*kZ44oCeA;#AKAy{p`JC;GGSd4g8vJjoN?d7pEcOh-#h=s6 z7==qxKAR<%X^X%2v$p9hEeK?PTc3hD1P}_=D6eAv#Fpsa=P;#9S5NB540B6Zd5WEO z_tt{-NLN^R?)$VzvPL-O@PrV<7vk7k(f!t)+!Q-`3@Z3gQ!Y!oo$7U1Whz?>^D1xO zd9yS{LlvD)nzJRH6M2jd2U^hD_1)ezefugbyt)=+gZx!Oe6lw-2qH$V;b_NAlS3rN zpqi{V;Le)gQ-+?s5-4+`dqr5 z&nxzpJsnW8kAm=+1ke?ksWs#zZKGswrpvK1(V39%FANQN$I31!z>I!}wNN2|e*RJp zmgQ9e(GF%q#>6zUg0-FWhjLd6V_Rq3YLYKzjZ+jUMpc2SesKf3OK@wx*7;R9o5SUy zVmA)*`B>eLj7sP4z*JC5hz~*W%Yz|>*%j1ZVN!0$2F6C;a)Czpf5bz1WBV0;0!7hQ z%<2K&KI?Hlt(r+vy-Q5~Z~_Dt?k)xnlF&moLGnDEw>06qRsx9xY;p)?2-OR!%V=B_ z=FzvdQb⁣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 GeE$bV>jZoN literal 0 HcmV?d00001 diff --git a/postdischarge-admin/src/main/resources/template/在院患者信息导入表.xlsx b/postdischarge-admin/src/main/resources/template/在院患者信息导入表.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..1f2ede012e756bd9194cdba87ae082a217c4bd67 GIT binary patch literal 11611 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 XMjY~|1AGbc5=0faR(GGA3&{Tg9YEwB literal 0 HcmV?d00001 diff --git a/postdischarge-admin/src/main/resources/template/门诊患者信息导入表.xlsx b/postdischarge-admin/src/main/resources/template/门诊患者信息导入表.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..199e617641d7554180ca899609a843b76378ddcf GIT binary patch literal 11682 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 literal 0 HcmV?d00001 diff --git a/postdischarge-admin/src/main/resources/template/预住院患者信息导入表.xlsx b/postdischarge-admin/src/main/resources/template/预住院患者信息导入表.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..fe410cea2d6a2fb195d7d93c0f5134f2ccae968b GIT binary patch literal 11740 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 list = preHospitalizationService.selectList(patientInfo); + return getDataTable(list); + } + + /** + * 获取住院患者信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('manage:patientInfo:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(preHospitalizationService.getById(id)); + } + + /** + * 修改预住院患者信息 + */ + @PreAuthorize("@ss.hasPermi('manage:patientInfo:edit')") + @Log(title = "预住院患者", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@RequestBody PatientPreHospitalization preHospitalization) { + int flag = preHospitalizationService.update(preHospitalization); + return flag < 0 ? R.fail() : R.ok(); + } + + /** + * 删除预住院患者信息 + */ + @PreAuthorize("@ss.hasPermi('manage:patientInfo:remove')") + @Log(title = "患者信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(preHospitalizationService.deleteByIds(ids)); + } + + /** + * 导入预住院患者信息 + * + * @param file 模板文件 + * @return 导入结果 + * @throws Exception 异常信息 + */ + @Log(title = "导入患者就诊信息", businessType = BusinessType.IMPORT) + @PostMapping("/importInfo") + public AjaxResult importPatientList(MultipartFile file) throws Exception { + // 判断excel里面是否有数据/文件格式 + if (Objects.isNull(file) || StringUtils.isBlank(file.getOriginalFilename())) { + return AjaxResult.error("请选择需要导入的文件！"); + } + // 获取文件名 + String orgName = file.getOriginalFilename(); + if (!orgName.endsWith(Constants.XLSX) && !orgName.endsWith(Constants.XLS)) { + return AjaxResult.error("导入文件格式不正确，请导入xlsx或xls格式的文件！"); + } + ExcelUtil util = new ExcelUtil<>(PatientPreHospitalization.class); + List list = util.importExcel(file.getInputStream()); + return preHospitalizationService.importList(list); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java index 4cc69d59..0221df0c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java @@ -1,6 +1,7 @@ package com.xinelu.manage.controller.patientvisitrecord; import com.xinelu.common.annotation.Log; +import com.xinelu.common.constant.Constants; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.page.TableDataInfo; @@ -8,12 +9,15 @@ import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; +import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordImportDto; import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.util.List; +import java.util.Objects; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -22,7 +26,9 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; /** * 患者就诊记录基本信息Controller @@ -110,4 +116,28 @@ public class PatientVisitRecordController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(patientVisitRecordService.deletePatientVisitRecordByIds(ids)); } + + /** + * 导入患者信息 + * + * @param file 模板文件 + * @return 导入结果 + * @throws Exception 异常信息 + */ + @Log(title = "导入患者就诊信息", businessType = BusinessType.IMPORT) + @PostMapping("/importPatientInfo") + public AjaxResult importPatientList(MultipartFile file, @RequestParam(value = "patientType") String patientType) throws Exception { + // 判断excel里面是否有数据/文件格式 + if (Objects.isNull(file) || StringUtils.isBlank(file.getOriginalFilename())) { + return AjaxResult.error("请选择需要导入的文件！"); + } + // 获取文件名 + String orgName = file.getOriginalFilename(); + if (!orgName.endsWith(Constants.XLSX) && !orgName.endsWith(Constants.XLS)) { + return AjaxResult.error("导入文件格式不正确，请导入xlsx或xls格式的文件！"); + } + ExcelUtil util = new ExcelUtil<>(PatientVisitRecordImportDto.class); + List list = util.importExcel(file.getInputStream()); + return patientVisitRecordService.importPatientList(list, patientType); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/project/ProjectController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/project/ProjectController.java new file mode 100644 index 00000000..a52e1265 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/project/ProjectController.java @@ -0,0 +1,105 @@ +package com.xinelu.manage.controller.project; + +import com.xinelu.common.annotation.Log; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.BusinessType; +import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.manage.domain.project.Project; +import com.xinelu.manage.service.project.IProjectService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import java.util.List; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 检测项目Controller + * + * @author haown + * @date 2024-03-11 + */ +@Api(tags = "检测项目控制器") +@RestController +@RequestMapping("/manage/project") +public class ProjectController extends BaseController { + @Resource + private IProjectService projectService; + + /** + * 查询检测项目列表 + */ + @ApiOperation("分页查询检测项目列表") + @PreAuthorize("@ss.hasPermi('manage:project:list')") + @GetMapping("/list") + public TableDataInfo list(Project project) { + startPage(); + List list = projectService.selectProjectList(project); + return getDataTable(list); + } + + /** + * 导出检测项目列表 + */ + @PreAuthorize("@ss.hasPermi('manage:project:export')") + @Log(title = "检测项目", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, Project project) { + List list = projectService.selectProjectList(project); + ExcelUtil util = new ExcelUtil(Project. class); + util.exportExcel(response, list, "检测项目数据"); + } + + /** + * 获取检测项目详细信息 + */ + @ApiOperation("根据id获取检测项目详细信息") + @PreAuthorize("@ss.hasPermi('manage:project:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(projectService.selectProjectById(id)); + } + + /** + * 新增检测项目 + */ + @ApiOperation("新增检测项目") + @PreAuthorize("@ss.hasPermi('manage:project:add')") + @Log(title = "检测项目", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody Project project) { + return toAjax(projectService.insertProject(project)); + } + + /** + * 修改检测项目 + */ + @ApiOperation("修改检测项目") + @PreAuthorize("@ss.hasPermi('manage:project:edit')") + @Log(title = "检测项目", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody Project project) { + return toAjax(projectService.updateProject(project)); + } + + /** + * 删除检测项目 + */ + @ApiOperation("批量删除检测项目") + @PreAuthorize("@ss.hasPermi('manage:project:remove')") + @Log(title = "检测项目", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(projectService.deleteProjectByIds(ids)); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectdevice/ProjectDeviceController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectdevice/ProjectDeviceController.java new file mode 100644 index 00000000..80366369 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectdevice/ProjectDeviceController.java @@ -0,0 +1,97 @@ +package com.xinelu.manage.controller.projectdevice; + +import com.xinelu.common.annotation.Log; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.BusinessType; +import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.manage.domain.projectdevice.ProjectDevice; +import com.xinelu.manage.service.projectdevice.IProjectDeviceService; +import java.util.List; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 检测项目设备Controller + * + * @author haown + * @date 2024-03-11 + */ +@RestController +@RequestMapping("/manage/projectdevice") +public class ProjectDeviceController extends BaseController { + @Resource + private IProjectDeviceService projectDeviceService; + +/** + * 查询检测项目设备列表 + */ +@PreAuthorize("@ss.hasPermi('manage:projectdevice:list')") +@GetMapping("/list") + public TableDataInfo list(ProjectDevice projectDevice) { + startPage(); + List list = projectDeviceService.selectProjectDeviceList(projectDevice); + return getDataTable(list); + } + + /** + * 导出检测项目设备列表 + */ + @PreAuthorize("@ss.hasPermi('manage:projectdevice:export')") + @Log(title = "检测项目设备", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ProjectDevice projectDevice) { + List list = projectDeviceService.selectProjectDeviceList(projectDevice); + ExcelUtil util = new ExcelUtil(ProjectDevice. class); + util.exportExcel(response, list, "检测项目设备数据"); + } + + /** + * 获取检测项目设备详细信息 + */ + @PreAuthorize("@ss.hasPermi('manage:projectdevice:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(projectDeviceService.selectProjectDeviceById(id)); + } + + /** + * 新增检测项目设备 + */ + @PreAuthorize("@ss.hasPermi('manage:projectdevice:add')") + @Log(title = "检测项目设备", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ProjectDevice projectDevice) { + return toAjax(projectDeviceService.insertProjectDevice(projectDevice)); + } + + /** + * 修改检测项目设备 + */ + @PreAuthorize("@ss.hasPermi('manage:projectdevice:edit')") + @Log(title = "检测项目设备", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ProjectDevice projectDevice) { + return toAjax(projectDeviceService.updateProjectDevice(projectDevice)); + } + + /** + * 删除检测项目设备 + */ + @PreAuthorize("@ss.hasPermi('manage:projectdevice:remove')") + @Log(title = "检测项目设备", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(projectDeviceService.deleteProjectDeviceByIds(ids)); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectgroup/ProjectGroupController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectgroup/ProjectGroupController.java new file mode 100644 index 00000000..7b79f5fb --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectgroup/ProjectGroupController.java @@ -0,0 +1,130 @@ +package com.xinelu.manage.controller.projectgroup; + +import com.xinelu.common.annotation.Log; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.domain.R; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.BusinessType; +import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.manage.domain.projectgroup.ProjectGroup; +import com.xinelu.manage.dto.projectgroup.ProjectGroupSaveListDto; +import com.xinelu.manage.service.projectgroup.IProjectGroupService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import java.util.List; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 检测项目分组Controller + * + * @author haown + * @date 2024-03-11 + */ +@Api(tags = "检测项目分组控制器") +@RestController +@RequestMapping("/manage/projectgroup") +public class ProjectGroupController extends BaseController { + @Resource + private IProjectGroupService projectGroupService; + + /** + * 查询检测项目分组列表 + */ + @ApiOperation("分页查询检测项目分组列表") + @PreAuthorize("@ss.hasPermi('manage:projectgroup:list')") + @GetMapping("/list") + public TableDataInfo list(ProjectGroup projectGroup) { + startPage(); + List list = projectGroupService.selectProjectGroupList(projectGroup); + return getDataTable(list); + } + + /** + * 查询检测项目分组列表 + */ + @ApiOperation("查询检测项目分组列表") + @PreAuthorize("@ss.hasPermi('manage:projectgroup:list')") + @GetMapping("/getList") + public R> getList(ProjectGroup projectGroup) { + List list = projectGroupService.selectProjectGroupList(projectGroup); + return R.ok(list); + } + + /** + * 导出检测项目分组列表 + */ + @PreAuthorize("@ss.hasPermi('manage:projectgroup:export')") + @Log(title = "检测项目分组", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ProjectGroup projectGroup) { + List list = projectGroupService.selectProjectGroupList(projectGroup); + ExcelUtil util = new ExcelUtil(ProjectGroup. class); + util.exportExcel(response, list, "检测项目分组数据"); + } + + /** + * 获取检测项目分组详细信息 + */ + @ApiOperation("根据id获取检测项目分组详细信息") + @PreAuthorize("@ss.hasPermi('manage:projectgroup:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(projectGroupService.selectProjectGroupById(id)); + } + + /** + * 新增检测项目分组 + */ + @ApiOperation("新增检测项目分组") + @PreAuthorize("@ss.hasPermi('manage:projectgroup:add')") + @Log(title = "检测项目分组", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ProjectGroup projectGroup) { + return toAjax(projectGroupService.insertProjectGroup(projectGroup)); + } + + /** + * 新增检测项目分组 + */ + @ApiOperation("批量新增检测项目分组") + @PreAuthorize("@ss.hasPermi('manage:projectgroup:add')") + @Log(title = "检测项目分组", businessType = BusinessType.INSERT) + @PostMapping("addList") + public R addList(@RequestBody ProjectGroupSaveListDto saveDto) { + int flag = projectGroupService.insertList(saveDto); + return flag > 0 ? R.ok() : R.fail(); + } + + /** + * 修改检测项目分组 + */ + @ApiOperation("修改检测项目分组") + @PreAuthorize("@ss.hasPermi('manage:projectgroup:edit')") + @Log(title = "检测项目分组", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ProjectGroup projectGroup) { + return toAjax(projectGroupService.updateProjectGroup(projectGroup)); + } + + /** + * 删除检测项目分组 + */ + @ApiOperation("删除检测项目分组") + @PreAuthorize("@ss.hasPermi('manage:projectgroup:remove')") + @Log(title = "检测项目分组", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(projectGroupService.deleteProjectGroupByIds(ids)); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectrecord/ProjectRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectrecord/ProjectRecordController.java deleted file mode 100644 index 378cc845..00000000 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectrecord/ProjectRecordController.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.xinelu.manage.controller.projectrecord; - -import com.xinelu.common.core.controller.BaseController; -import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @description: 检测项目数据记录控制器 - * @author: haown - * @create: 2024-02-29 15:45 - **/ -@Api(tags = "检测项目数据记录控制器") -@RestController -@RequestMapping("/manage/projectRecord") -public class ProjectRecordController extends BaseController { - - -} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectresult/ProjectResultController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectresult/ProjectResultController.java new file mode 100644 index 00000000..d9907636 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectresult/ProjectResultController.java @@ -0,0 +1,111 @@ +package com.xinelu.manage.controller.projectresult; + +import com.xinelu.common.annotation.Log; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.domain.R; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.BusinessType; +import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.manage.domain.projectresult.ProjectResult; +import com.xinelu.manage.dto.projectresult.ProjectResultStatisticDto; +import com.xinelu.manage.service.projectresult.IProjectResultService; +import com.xinelu.manage.vo.projectresult.ProjectResultStatisticVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import java.util.List; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description: 检测项目结果控制器 + * @author: haown + * @create: 2024-03-06 11:20 + **/ +@Api(tags = "检测项目结果控制器") +@RestController +@RequestMapping("/manage/projectResult") +public class ProjectResultController extends BaseController { + + @Resource + private IProjectResultService projectResultService; + /** + * 查询检测项目结果列表 + */ + @PreAuthorize("@ss.hasPermi('manage:projectresult:list')") + @GetMapping("/list") + public TableDataInfo list(ProjectResult projectResult) { + startPage(); + List list = projectResultService.selectProjectResultList(projectResult); + return getDataTable(list); + } + + /** + * 导出检测项目结果列表 + */ + @PreAuthorize("@ss.hasPermi('manage:projectresult:export')") + @Log(title = "检测项目结果", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ProjectResult projectResult) { + List list = projectResultService.selectProjectResultList(projectResult); + ExcelUtil util = new ExcelUtil(ProjectResult. class); + util.exportExcel(response, list, "检测项目结果数据"); + } + + /** + * 获取检测项目结果详细信息 + */ + @PreAuthorize("@ss.hasPermi('manage:projectresult:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(projectResultService.selectProjectResultById(id)); + } + + /** + * 新增检测项目结果 + */ + @PreAuthorize("@ss.hasPermi('manage:projectresult:add')") + @Log(title = "检测项目结果", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ProjectResult projectResult) { + return toAjax(projectResultService.insertProjectResult(projectResult)); + } + + /** + * 修改检测项目结果 + */ + @PreAuthorize("@ss.hasPermi('manage:projectresult:edit')") + @Log(title = "检测项目结果", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ProjectResult projectResult) { + return toAjax(projectResultService.updateProjectResult(projectResult)); + } + + /** + * 删除检测项目结果 + */ + @PreAuthorize("@ss.hasPermi('manage:projectresult:remove')") + @Log(title = "检测项目结果", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(projectResultService.deleteProjectResultByIds(ids)); + } + /** + * 查询检测检测项目结果曲线统计 + */ + @ApiOperation("查询检测项目结果曲线统计") + @GetMapping("/curveStatistics") + public R curveStatistics(ProjectResultStatisticDto projectResultStatisticDto) { + return R.ok(projectResultService.curveStatistics(projectResultStatisticDto)); + } + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java new file mode 100644 index 00000000..8315c9d5 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java @@ -0,0 +1,148 @@ +package com.xinelu.manage.domain.patientprehospitalization; + +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** +* 预住院患者表 +* @TableName patient_pre_hospitalization +*/ +@ApiModel("预住院患者表") +@Data +public class PatientPreHospitalization extends BaseEntity { + + /** + * 主键Id + */ + @ApiModelProperty("主键Id") + private Long id; + /** + * 患者表id + */ + @ApiModelProperty("患者表id") + private Long patientId; + /** + * 姓名 + */ + @ApiModelProperty("姓名") + private String patientName; + /** + * 患者电话 + */ + @ApiModelProperty("患者电话") + private String patientPhone; + /** + * 身份证号 + */ + @ApiModelProperty("身份证号") + private String cardNo; + /** + * 性别，男：MALE，女：FEMALE + */ + @ApiModelProperty("性别，男：MALE，女：FEMALE") + private String sex; + /** + * 出生日期，格式：yyyy-MM-dd + */ + @ApiModelProperty("出生日期，格式：yyyy-MM-dd") + private Date birthDate; + /** + * 家属电话 + */ + @ApiModelProperty("家属电话") + private String familyMemberPhone; + /** + * 住址 + */ + @ApiModelProperty("住址") + private String address; + /** + * 主要诊断 + */ + @ApiModelProperty("主要诊断") + private String mainDiagnosis; + /** + * 所属医院id + */ + @ApiModelProperty("所属医院id") + private Long hospitalAgencyId; + /** + * 所属医院名称 + */ + @ApiModelProperty("所属医院名称") + private String hospitalAgencyName; + /** + * 所属院区id + */ + @ApiModelProperty("所属院区id") + private Long campusAgencyId; + /** + * 所属院区名称 + */ + @ApiModelProperty("所属院区名称") + private String campusAgencyName; + /** + * 所属科室id + */ + @ApiModelProperty("所属科室id") + private Long departmentId; + /** + * 所属科室名称 + */ + @ApiModelProperty("所属科室名称") + private String departmentName; + /** + * 所属病区id + */ + @ApiModelProperty("所属病区id") + private Long wardId; + /** + * 所属病区名称 + */ + @ApiModelProperty("所属病区名称") + private String wardName; + /** + * 预约治疗组（取值以及枚举未知？） + */ + @ApiModelProperty("预约治疗组（取值以及枚举未知？）") + private String appointmentTreatmentGroup; + /** + * 登记号（预住院患者） + */ + @ApiModelProperty("登记号（预住院患者）") + private String registrationNo; + /** + * 登记日期（预住院患者），时间格式：yyyy-MM-dd + */ + @ApiModelProperty("登记日期（预住院患者），时间格式：yyyy-MM-dd") + private Date registrationDate; + /** + * 预约时间（预住院患者），时间格式：yyyy-MM-dd + */ + @ApiModelProperty("预约时间（预住院患者），时间格式：yyyy-MM-dd") + private Date appointmentDate; + /** + * 开证医生id + */ + @ApiModelProperty("开证医生id") + private Long certificateIssuingDoctorId; + /** + * 开证医生姓名 + */ + @ApiModelProperty("开证医生姓名") + private String certificateIssuingDoctorName; + /** + * 责任护士 + */ + @ApiModelProperty("责任护士") + private String responsibleNurse; + /** + * 删除标识，0：未删除，1：已删除 + */ + @ApiModelProperty("删除标识，0：未删除，1：已删除") + private Integer delFlag; + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java index 9ca5d642..a7d2ee8f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java @@ -15,7 +15,7 @@ import lombok.NoArgsConstructor; * 患者就诊记录基本信息对象 patient_visit_record * * @author haown - * @date 2024-02-26 + * @date 2024-03-11 */ @Data @AllArgsConstructor @@ -23,7 +23,6 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @ApiModel(value = "患者就诊记录基本信息对象", description = "patient_visit_record") public class PatientVisitRecord extends BaseEntity { - private static final long serialVersionUID=1L; /** 主键Id */ @@ -34,42 +33,42 @@ public class PatientVisitRecord extends BaseEntity { @Excel(name = "患者表id") private Long patientId; - /** 就诊科室 */ - @ApiModelProperty(value = "就诊科室") - @Excel(name = "就诊科室") - private String visitDept; - - /** 就诊名称 */ - @ApiModelProperty(value = "就诊名称") - @Excel(name = "就诊名称") - private String visitName; - - /** 就诊时间，格式：yyyy-MM-dd HH:mm:ss */ - @ApiModelProperty(value = "就诊时间，格式：yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "就诊时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd") - private Date visitDate; - - /** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED */ - @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") - @Excel(name = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") - private String visitType; + /** 身份证号 */ + @ApiModelProperty(value = "身份证号") + @Excel(name = "身份证号") + private String cardNo; /** 姓名 */ @ApiModelProperty(value = "姓名") @Excel(name = "姓名") private String patientName; - /** 出生地 */ - @ApiModelProperty(value = "出生地") - @Excel(name = "出生地") - private String birthplace; + /** 患者电话 */ + @ApiModelProperty(value = "患者电话") + @Excel(name = "患者电话") + private String patientPhone; + + /** 家属电话 */ + @ApiModelProperty(value = "家属电话") + @Excel(name = "家属电话") + private String familyMemberPhone; + + /** 地址 */ + @ApiModelProperty(value = "地址") + @Excel(name = "地址") + private String address; /** 性别，男：MALE，女：FEMALE */ @ApiModelProperty(value = "性别，男：MALE，女：FEMALE") @Excel(name = "性别，男：MALE，女：FEMALE") private String sex; + /** 出生日期，格式：yyyy-MM-dd */ + @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "出生日期，格式：yyyy-MM-dd", width = 30, dateFormat = "yyyy-MM-dd") + private Date birthDate; + /** 年龄 */ @ApiModelProperty(value = "年龄") @Excel(name = "年龄") @@ -80,6 +79,77 @@ public class PatientVisitRecord extends BaseEntity { @Excel(name = "民族") private String nation; + /** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED */ + @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") + @Excel(name = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") + private String visitType; + + /** 就诊时间，格式：yyyy-MM-dd HH:mm:ss */ + @ApiModelProperty(value = "就诊时间，格式：yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "就诊时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd") + private Date visitDate; + + /** 就诊名称 */ + @ApiModelProperty(value = "就诊名称") + @Excel(name = "就诊名称") + private String visitName; + + /** 所属医院id */ + @ApiModelProperty(value = "所属医院id") + @Excel(name = "所属医院id") + private Long hospitalAgencyId; + + /** 所属医院名称 */ + @ApiModelProperty(value = "所属医院名称") + @Excel(name = "所属医院名称") + private String hospitalAgencyName; + + /** 所属院区id */ + @ApiModelProperty(value = "所属院区id") + @Excel(name = "所属院区id") + private Long campusAgencyId; + + /** 所属院区名称 */ + @ApiModelProperty(value = "所属院区名称") + @Excel(name = "所属院区名称") + private String campusAgencyName; + + /** 所属科室id */ + @ApiModelProperty(value = "所属科室id") + @Excel(name = "所属科室id") + private Long departmentId; + + /** 所属科室名称 */ + @ApiModelProperty(value = "所属科室名称") + @Excel(name = "所属科室名称") + private String departmentName; + + /** 所属病区id */ + @ApiModelProperty(value = "所属病区id") + @Excel(name = "所属病区id") + private Long wardId; + + /** 所属病区名称 */ + @ApiModelProperty(value = "所属病区名称") + @Excel(name = "所属病区名称") + private String wardName; + + /** 主治医生id */ + @ApiModelProperty(value = "主治医生id") + @Excel(name = "主治医生id") + private Long attendingPhysicianId; + + /** 主治医生姓名 */ + @ApiModelProperty(value = "主治医生姓名") + @Excel(name = "主治医生姓名") + private String attendingPhysicianName; + + /** 主要诊断 */ + @ApiModelProperty(value = "主要诊断") + @Excel(name = "主要诊断") + private String mainDiagnosis; + /** 婚姻，已婚：MARRIED，未婚：UNMARRIED，丧偶：BEREAVE */ @ApiModelProperty(value = "婚姻，已婚：MARRIED，未婚：UNMARRIED，丧偶：BEREAVE") @Excel(name = "婚姻，已婚：MARRIED，未婚：UNMARRIED，丧偶：BEREAVE") @@ -107,9 +177,9 @@ public class PatientVisitRecord extends BaseEntity { @Excel(name = "_记录时间", readConverterExp = "入=院记录") private Date recordTime; - /** 门诊就诊信息（就诊类型） */ - @ApiModelProperty(value = "门诊就诊信息") - @Excel(name = "门诊就诊信息", readConverterExp = "就=诊类型") + /** 门诊记录信息（就诊记录-门诊记录） */ + @ApiModelProperty(value = "门诊记录信息") + @Excel(name = "门诊记录信息", readConverterExp = "就=诊记录-门诊记录") private String outpatientVisitInfo; /** 住院天数（出院记录），单位为：天 */ @@ -117,5 +187,34 @@ public class PatientVisitRecord extends BaseEntity { @Excel(name = "住院天数", readConverterExp = "出=院记录") private Integer hospitalizationDays; + /** 入院病历信息，存储患者入院的整个病历信息 */ + @ApiModelProperty(value = "入院病历信息，存储患者入院的整个病历信息") + @Excel(name = "入院病历信息，存储患者入院的整个病历信息") + private String inHospitalInfo; + + /** 出院病历信息，存储患者出院的整个病历信息 */ + @ApiModelProperty(value = "出院病历信息，存储患者出院的整个病历信息") + @Excel(name = "出院病历信息，存储患者出院的整个病历信息") + private String outHospitalInfo; + + /** 就诊流水号 */ + @ApiModelProperty(value = "就诊流水号") + @Excel(name = "就诊流水号") + private String visitSerialNumber; + + /** 门诊/住院号 */ + @ApiModelProperty(value = "门诊/住院号") + @Excel(name = "门诊/住院号") + private String inHospitalNumber; + + /** 责任护士 */ + @ApiModelProperty(value = "责任护士") + @Excel(name = "责任护士") + private String responsibleNurse; + + /** 手术名称 */ + @ApiModelProperty(value = "手术名称") + @Excel(name = "手术名称") + private String surgicalName; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/project/Project.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/project/Project.java index 67050ea9..f6ce23ae 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/project/Project.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/project/Project.java @@ -1,107 +1,103 @@ package com.xinelu.manage.domain.project; +import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; /** - * 检测项目表 - * @TableName project + * 检测项目对象 project + * + * @author haown + * @date 2024-03-11 */ -@ApiModel("检测项目表") @Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "检测项目对象", description = "project") public class Project extends BaseEntity { - /** - * 主键id - */ - @ApiModelProperty("主键id") + private static final long serialVersionUID=1L; + + /** 主键id */ private Long id; - /** - * 所属分组id - */ - @ApiModelProperty("所属分组id") + /** 所属分组id */ + @ApiModelProperty(value = "所属分组id") + @Excel(name = "所属分组id") private Long groupId; - /** - * 分组名称 - */ - @ApiModelProperty("分组名称") + /** 分组名称 */ + @ApiModelProperty(value = "分组名称") + @Excel(name = "分组名称") private String groupName; - /** - * 项目名称 - */ - @ApiModelProperty("项目名称") + /** 项目名称 */ + @ApiModelProperty(value = "项目名称") + @Excel(name = "项目名称") private String projectName; - /** - * 项目编码 - */ - @ApiModelProperty("项目编码") + /** 项目编码 */ + @ApiModelProperty(value = "项目编码") + @Excel(name = "项目编码") private String projectCode; - /** - * 项目别名 - */ - @ApiModelProperty("项目别名") + /** 项目别名 */ + @ApiModelProperty(value = "项目别名") + @Excel(name = "项目别名") private String projectAlias; - /** - * 是否启用，0：是，1：否 - */ - @ApiModelProperty("是否启用，0：是，1：否") + /** 是否启用，0：是，1：否 */ + @ApiModelProperty(value = "是否启用，0：是，1：否") + @Excel(name = "是否启用，0：是，1：否") private Integer enableStatus; - /** - * 判断模式，定量：QUANTIFY，定性：QUALITATIVE - */ - @ApiModelProperty("判断模式，定量：QUANTIFY，定性：QUALITATIVE") + /** 判断模式，定量：QUANTIFY，定性：QUALITATIVE */ + @ApiModelProperty(value = "判断模式，定量：QUANTIFY，定性：QUALITATIVE") + @Excel(name = "判断模式，定量：QUANTIFY，定性：QUALITATIVE") private String judgeMode; - /** - * 项目指标最大值 - */ - @ApiModelProperty("项目指标最大值") + /** 项目指标最大值 */ + @ApiModelProperty(value = "项目指标最大值") + @Excel(name = "项目指标最大值") private Integer maxValue; - /** - * 项目指标最小值 - */ - @ApiModelProperty("项目指标最小值") + /** 项目指标最小值 */ + @ApiModelProperty(value = "项目指标最小值") + @Excel(name = "项目指标最小值") private Integer minValue; - /** - * 项目指标默认值 - */ - @ApiModelProperty("项目指标默认值") + /** 项目指标默认值 */ + @ApiModelProperty(value = "项目指标默认值") + @Excel(name = "项目指标默认值") private String defaultValue; - /** - * LIS对照 - */ - @ApiModelProperty("LIS对照") + /** LIS对照 */ + @ApiModelProperty(value = "LIS对照") + @Excel(name = "LIS对照") private String lisCompare; - /** - * 排序 - */ - @ApiModelProperty("排序") + /** 计量单位 */ + @ApiModelProperty(value = "计量单位") + @Excel(name = "计量单位") + private String projectUnit; + + /** 排序 */ + @ApiModelProperty(value = "排序") + @Excel(name = "排序") private Integer projectSort; - /** - * 备注信息 - */ - @ApiModelProperty("备注信息") + /** 备注信息 */ + @ApiModelProperty(value = "备注信息") + @Excel(name = "备注信息") private String projectRemark; - /** - * 删除标识，0：未删除，1：已删除 - */ - @ApiModelProperty("删除标识，0：未删除，1：已删除") + /** 删除标识，0：未删除，1：已删除 */ private Integer delFlag; - private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectbatch/ProjectBatch.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectbatch/ProjectBatch.java new file mode 100644 index 00000000..6ecf5942 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectbatch/ProjectBatch.java @@ -0,0 +1,83 @@ +package com.xinelu.manage.domain.projectbatch; + +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** +* 指标检测批次信息表 +* @TableName project_batch +*/ +@ApiModel("指标检测批次信息表") +@Data +public class ProjectBatch extends BaseEntity { + + /** + * 主键id + */ + @ApiModelProperty("主键id") + private Long id; + /** + * 患者id + */ + @ApiModelProperty("患者id") + private Long patientId; + /** + * 患者姓名 + */ + @ApiModelProperty("患者姓名") + private String patientName; + /** + * 患者电话 + */ + @ApiModelProperty("患者电话") + private String patientPhone; + /** + * 出生日期，格式：yyyy-MM-dd + */ + @ApiModelProperty("出生日期，格式：yyyy-MM-dd") + private Date birthDate; + /** + * 身份证号 + */ + @ApiModelProperty("身份证号") + private String cardNo; + /** + * 性别，男：MALE，女：FEMALE + */ + @ApiModelProperty("性别，男：MALE，女：FEMALE") + private String sex; + /** + * 批次名称 + */ + @ApiModelProperty("批次名称") + private String batchName; + /** + * 批次编号 + */ + @ApiModelProperty("批次编号") + private String batchCode; + /** + * 排序 + */ + @ApiModelProperty("排序") + private Integer batchSort; + /** + * 备注信息 + */ + @ApiModelProperty("备注信息") + private String batchRemark; + /** + * 批次创建时间，格式：yyyy-MM-dd HH:mm:ss + */ + @ApiModelProperty("批次创建时间，格式：yyyy-MM-dd HH:mm:ss") + private Date batchDate; + /** + * 删除标识，0：否，1：是 + */ + @ApiModelProperty("删除标识，0：否，1：是") + private Integer delFlag; + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectdevice/ProjectDevice.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectdevice/ProjectDevice.java index 9ed1bb3d..84c1c6b9 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectdevice/ProjectDevice.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectdevice/ProjectDevice.java @@ -2,81 +2,82 @@ package com.xinelu.manage.domain.projectdevice; import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import lombok.Data; /** - * 检测项目设备表 - * @TableName project_device - */ +* 检测项目设备表 +* @TableName project_device +*/ @ApiModel("检测项目设备表") @Data public class ProjectDevice extends BaseEntity { + /** - * 主键id - */ + * 主键id + */ + @ApiModelProperty("主键id") private Long id; - /** - * 患者id - */ + * 患者id + */ + @ApiModelProperty("患者id") private Long patientId; - /** - * 患者姓名 - */ + * 患者姓名 + */ + @ApiModelProperty("患者姓名") private String patientName; - /** - * 身份证号 - */ + * 身份证号 + */ + @ApiModelProperty("身份证号") private String cardNo; - /** - * 设备类型，血糖仪：GLUCOSE_METER，血压计：BLOOD_PRESSURE_DEVICE - */ + * 设备类型，血糖仪：GLUCOSE_METER，血压计：BLOOD_PRESSURE_DEVICE + */ + @ApiModelProperty("设备类型，血糖仪：GLUCOSE_METER，血压计：BLOOD_PRESSURE_DEVICE") private String deviceType; - /** - * 设备名称 - */ + * 设备名称 + */ + @ApiModelProperty("设备名称") private String deviceName; - /** - * 设备编码 - */ + * 设备编码 + */ + @ApiModelProperty("设备编码") private String deviceCode; - /** - * 设备状态 - */ + * 设备状态 + */ + @ApiModelProperty("设备状态") private String deviceStatus; - /** - * 备注信息 - */ + * 备注信息 + */ + @ApiModelProperty("备注信息") private String deviceRemark; - /** - * 设备绑定时间 - */ + * 设备绑定时间 + */ + @ApiModelProperty("设备绑定时间") private Date deviceBindTime; - /** - * 设备解绑时间 - */ + * 设备解绑时间 + */ + @ApiModelProperty("设备解绑时间") private Date deviceUnbindTime; - /** - * 设备IP地址 - */ + * 设备IP地址 + */ + @ApiModelProperty("设备IP地址") private String deviceIp; - /** - * 设备端口 - */ + * 设备端口 + */ + @ApiModelProperty("设备端口") private Integer devicePort; - private static final long serialVersionUID = 1L; - -} \ No newline at end of file +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectgroup/ProjectGroup.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectgroup/ProjectGroup.java index 61fb6477..15889922 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectgroup/ProjectGroup.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectgroup/ProjectGroup.java @@ -2,55 +2,56 @@ package com.xinelu.manage.domain.projectgroup; import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 检测项目分组表 - * @TableName project_group - */ +* 检测项目分组表 +* @TableName project_group +*/ @ApiModel("检测项目分组表") @Data public class ProjectGroup extends BaseEntity { + /** - * 主键id - */ + * 主键id + */ + @ApiModelProperty("主键id") private Long id; - /** - * 上级分组id - */ + * 上级分组id + */ + @ApiModelProperty("上级分组id") private Long parentId; - /** - * 分组名称 - */ + * 分组名称 + */ + @ApiModelProperty("分组名称") private String groupName; - /** - * 分组编码 - */ + * 分组编码 + */ + @ApiModelProperty("分组编码") private String groupCode; - /** - * 是否启用，0：是，1：否 - */ + * 是否启用，0：是，1：否 + */ + @ApiModelProperty("是否启用，0：否，1：是") private Integer enableStatus; - /** - * 排序 - */ + * 排序 + */ + @ApiModelProperty("排序") private Integer groupSort; - /** - * 备注信息 - */ + * 备注信息 + */ + @ApiModelProperty("备注信息") private String groupRemark; - /** - * 删除标识，0：未删除，1：已删除 - */ + * 删除标识，0：未删除，1：已删除 + */ + @ApiModelProperty("删除标识，0：未删除，1：已删除") private Integer delFlag; - private static final long serialVersionUID = 1L; - -} \ No newline at end of file +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastrecord/ProjectLastRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastrecord/ProjectLastRecord.java deleted file mode 100644 index 1b31ec66..00000000 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastrecord/ProjectLastRecord.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.xinelu.manage.domain.projectlastrecord; - -import com.xinelu.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import java.util.Date; -import lombok.Data; - -/** - * 最近一次检测项目数据记录表 - * @TableName project_last_record - */ -@ApiModel("最近一次检测项目数据记录表") -@Data -public class ProjectLastRecord extends BaseEntity { - /** - * 主键id - */ - private Long id; - - /** - * 患者id - */ - private Long patientId; - - /** - * 患者姓名 - */ - private String patientName; - - /** - * 患者身份证号 - */ - private String cardNo; - - /** - * 分组id - */ - private Long groupId; - - /** - * 分组名称 - */ - private String groupName; - - /** - * 项目id - */ - private Long projectId; - - /** - * 项目名称 - */ - private String projectName; - - /** - * 检测设备id - */ - private Long deviceId; - - /** - * 检测设备名称 - */ - private String deviceName; - - /** - * 项目别名 - */ - private String projectAlias; - - /** - * 判断模式，定量：QUANTIFY，定性：QUALITATIVE - */ - private String judgeMode; - - /** - * 检测结果，数字或文字描述 - */ - private String measureResult; - - /** - * 项目指标最大值 - */ - private Integer maxValue; - - /** - * 项目指标最小值 - */ - private Integer minValue; - - /** - * 项目指标默认值 - */ - private String defaultValue; - - /** - * LIS对照 - */ - private String lisCompare; - - /** - * 检测时间 - */ - private Date measureTime; - - /** - * 检测人姓名，自动上传时为空，手动上传为上传人姓名 - */ - private String measureName; - - /** - * 备注信息 - */ - private String recordRemark; - - /** - * 合格标识，合格：QUALIFIED，不合格：NOT_QUALIFIED - */ - private String qualifiedSign; - - private static final long serialVersionUID = 1L; - -} \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastresult/ProjectLastResult.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastresult/ProjectLastResult.java new file mode 100644 index 00000000..9ac32e86 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastresult/ProjectLastResult.java @@ -0,0 +1,143 @@ +package com.xinelu.manage.domain.projectlastresult; + +import com.xinelu.common.annotation.Excel; +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** +* 最近一次检测项目结果表 +* @TableName project_last_result +*/ +@ApiModel("最近一次检测项目结果表") +@Data +public class ProjectLastResult extends BaseEntity { + + /** + * 主键id + */ + @ApiModelProperty("主键id") + private Long id; + /** + * 患者id + */ + @ApiModelProperty("患者id") + private Long patientId; + /** + * 患者姓名 + */ + @ApiModelProperty("患者姓名") + private String patientName; + /** + * 患者身份证号 + */ + @ApiModelProperty("患者身份证号") + private String cardNo; + /** + * 批次表id + */ + @ApiModelProperty("批次表id") + private Long batchId; + /** + * 批次名称 + */ + @ApiModelProperty("批次名称") + private String batchName; + /** + * 分组id + */ + @ApiModelProperty("分组id") + private Long groupId; + /** + * 分组名称 + */ + @ApiModelProperty("分组名称") + private String groupName; + /** + * 项目id + */ + @ApiModelProperty("项目id") + private Long projectId; + /** + * 项目名称 + */ + @ApiModelProperty("项目名称") + private String projectName; + /** + * 检测设备id + */ + @ApiModelProperty("检测设备id") + private Long deviceId; + /** + * 检测设备名称 + */ + @ApiModelProperty("检测设备名称") + private String deviceName; + /** + * 项目别名 + */ + @ApiModelProperty("项目别名") + private String projectAlias; + /** + * 判断模式，定量：QUANTIFY，定性：QUALITATIVE + */ + @ApiModelProperty("判断模式，定量：QUANTIFY，定性：QUALITATIVE") + private String judgeMode; + /** + * 检测结果，数字或文字描述 + */ + @ApiModelProperty("检测结果，数字或文字描述") + private String measureResult; + /** + * 项目指标最大值 + */ + @ApiModelProperty("项目指标最大值") + private Integer maxValue; + /** + * 项目指标最小值 + */ + @ApiModelProperty("项目指标最小值") + private Integer minValue; + /** + * 项目指标默认值 + */ + @ApiModelProperty("项目指标默认值") + private String defaultValue; + /** + * LIS对照 + */ + @ApiModelProperty("LIS对照") + private String lisCompare; + /** + * 检测时间 + */ + @ApiModelProperty("检测时间") + private Date measureTime; + /** + * 检测人姓名，自动上传时为空，手动上传为上传人姓名 + */ + @ApiModelProperty("检测人姓名，自动上传时为空，手动上传为上传人姓名") + private String measureName; + /** + * 备注信息 + */ + @ApiModelProperty("备注信息") + private String recordRemark; + /** + * 合格标识，合格：QUALIFIED，不合格：NOT_QUALIFIED + */ + @ApiModelProperty("合格标识，合格：QUALIFIED，不合格：NOT_QUALIFIED") + private String qualifiedSign; + + /** 检测结果附件路径 */ + @ApiModelProperty(value = "检测结果附件路径") + @Excel(name = "检测结果附件路径") + private String measureResultPath; + + /** 计量单位 */ + @ApiModelProperty(value = "计量单位") + @Excel(name = "计量单位") + private String projectUnit; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectrecord/ProjectRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectrecord/ProjectRecord.java deleted file mode 100644 index 3f1f4591..00000000 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectrecord/ProjectRecord.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.xinelu.manage.domain.projectrecord; - -import com.xinelu.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import java.util.Date; -import lombok.Data; - -/** - * 检测项目数据记录表 - * @TableName project_record - */ -@ApiModel("检测项目数据记录表") -@Data -public class ProjectRecord extends BaseEntity { - /** - * 主键id - */ - private Long id; - - /** - * 患者id - */ - private Long patientId; - - /** - * 患者姓名 - */ - private String patientName; - - /** - * 患者身份证号 - */ - private String cardNo; - - /** - * 分组id - */ - private Long groupId; - - /** - * 分组名称 - */ - private String groupName; - - /** - * 项目id - */ - private Long projectId; - - /** - * 项目名称 - */ - private String projectName; - - /** - * 检测设备id - */ - private Long deviceId; - - /** - * 检测设备名称 - */ - private String deviceName; - - /** - * 项目别名 - */ - private String projectAlias; - - /** - * 判断模式，定量：QUANTIFY，定性：QUALITATIVE - */ - private String judgeMode; - - /** - * 检测结果，数字或文字描述 - */ - private String measureResult; - - /** - * 项目指标最大值 - */ - private Integer maxValue; - - /** - * 项目指标最小值 - */ - private Integer minValue; - - /** - * 项目指标默认值 - */ - private String defaultValue; - - /** - * LIS对照 - */ - private String lisCompare; - - /** - * 检测时间 - */ - private Date measureTime; - - /** - * 检测人姓名，自动上传时为空，手动上传为上传人姓名 - */ - private String measureName; - - /** - * 备注信息 - */ - private String recordRemark; - - /** - * 合格标识，合格：QUALIFIED，不合格：NOT_QUALIFIED - */ - private String qualifiedSign; - - private static final long serialVersionUID = 1L; - -} \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectrecordfile/ProjectRecordFile.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectrecordfile/ProjectRecordFile.java deleted file mode 100644 index 5e52355d..00000000 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectrecordfile/ProjectRecordFile.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.xinelu.manage.domain.projectrecordfile; - -import com.xinelu.common.core.domain.BaseEntity; -import java.util.Date; -import lombok.Data; - -/** - * 检测项目数据记录附件表（存储检测结果既含有报告又含有指标数据的检测项） - * @TableName project_record_file - */ -@Data -public class ProjectRecordFile extends BaseEntity { - /** - * 主键id - */ - private Long id; - - /** - * 患者id - */ - private Long patientId; - - /** - * 患者姓名 - */ - private String patientName; - - /** - * 患者身份证号 - */ - private String cardNo; - - /** - * 分组id - */ - private Long groupId; - - /** - * 分组名称 - */ - private String groupName; - - /** - * 项目id - */ - private Long projectId; - - /** - * 项目名称 - */ - private String projectName; - - /** - * 检测设备id - */ - private Long deviceId; - - /** - * 检测设备名称 - */ - private String deviceName; - - /** - * 项目别名 - */ - private String projectAlias; - - /** - * 检测结果附件路径 - */ - private String filePath; - - /** - * 检测时间 - */ - private Date measureTime; - - /** - * 检测人姓名，自动上传时为空，手动上传为上传人姓名 - */ - private String measureName; - - /** - * 项目指标最大值 - */ - private Integer maxValue; - - /** - * 项目指标最小值 - */ - private Integer minValue; - - /** - * 项目指标默认值 - */ - private String defaultValue; - - /** - * 合格标识，合格：QUALIFIED，不合格：NOT_QUALIFIED - */ - private String qualifiedSign; - - - /** - * 修改时间 - */ - private Date updateTime; - - private static final long serialVersionUID = 1L; - -} \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectresult/ProjectResult.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectresult/ProjectResult.java new file mode 100644 index 00000000..340357ef --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectresult/ProjectResult.java @@ -0,0 +1,153 @@ +package com.xinelu.manage.domain.projectresult; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xinelu.common.annotation.Excel; +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * 检测项目结果对象 project_result + * + * @author haown + * @date 2024-03-11 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "检测项目结果对象", description = "project_result") +public class ProjectResult extends BaseEntity + { +private static final long serialVersionUID=1L; + + /** 主键id */ + private Long id; + + /** 患者id */ + @ApiModelProperty(value = "患者id") + @Excel(name = "患者id") + private Long patientId; + + /** 患者姓名 */ + @ApiModelProperty(value = "患者姓名") + @Excel(name = "患者姓名") + private String patientName; + + /** 患者身份证号 */ + @ApiModelProperty(value = "患者身份证号") + @Excel(name = "患者身份证号") + private String cardNo; + + /** 批次表id */ + @ApiModelProperty(value = "批次表id") + @Excel(name = "批次表id") + private Long batchId; + + /** 批次名称 */ + @ApiModelProperty(value = "批次名称") + @Excel(name = "批次名称") + private String batchName; + + /** 分组id */ + @ApiModelProperty(value = "分组id") + @Excel(name = "分组id") + private Long groupId; + + /** 分组名称 */ + @ApiModelProperty(value = "分组名称") + @Excel(name = "分组名称") + private String groupName; + + /** 项目id */ + @ApiModelProperty(value = "项目id") + @Excel(name = "项目id") + private Long projectId; + + /** 项目名称 */ + @ApiModelProperty(value = "项目名称") + @Excel(name = "项目名称") + private String projectName; + + /** 检测设备id */ + @ApiModelProperty(value = "检测设备id") + @Excel(name = "检测设备id") + private Long deviceId; + + /** 检测设备名称 */ + @ApiModelProperty(value = "检测设备名称") + @Excel(name = "检测设备名称") + private String deviceName; + + /** 项目别名 */ + @ApiModelProperty(value = "项目别名") + @Excel(name = "项目别名") + private String projectAlias; + + /** 判断模式，定量：QUANTIFY，定性：QUALITATIVE */ + @ApiModelProperty(value = "判断模式，定量：QUANTIFY，定性：QUALITATIVE") + @Excel(name = "判断模式，定量：QUANTIFY，定性：QUALITATIVE") + private String judgeMode; + + /** 检测结果，数字或文字描述 */ + @ApiModelProperty(value = "检测结果，数字或文字描述") + @Excel(name = "检测结果，数字或文字描述") + private String measureResult; + + /** 项目指标最大值 */ + @ApiModelProperty(value = "项目指标最大值") + @Excel(name = "项目指标最大值") + private Integer maxValue; + + /** 项目指标最小值 */ + @ApiModelProperty(value = "项目指标最小值") + @Excel(name = "项目指标最小值") + private Integer minValue; + + /** 项目指标默认值 */ + @ApiModelProperty(value = "项目指标默认值") + @Excel(name = "项目指标默认值") + private String defaultValue; + + /** LIS对照 */ + @ApiModelProperty(value = "LIS对照") + @Excel(name = "LIS对照") + private String lisCompare; + + /** 检测时间 */ + @ApiModelProperty(value = "检测时间") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "检测时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date measureTime; + + /** 检测人姓名，自动上传时为空，手动上传为上传人姓名 */ + @ApiModelProperty(value = "检测人姓名，自动上传时为空，手动上传为上传人姓名") + @Excel(name = "检测人姓名，自动上传时为空，手动上传为上传人姓名") + private String measureName; + + /** 备注信息 */ + @ApiModelProperty(value = "备注信息") + @Excel(name = "备注信息") + private String recordRemark; + + /** 合格标识，合格：QUALIFIED，不合格：NOT_QUALIFIED */ + @ApiModelProperty(value = "合格标识，合格：QUALIFIED，不合格：NOT_QUALIFIED") + @Excel(name = "合格标识，合格：QUALIFIED，不合格：NOT_QUALIFIED") + private String qualifiedSign; + + /** 检测结果附件路径 */ + @ApiModelProperty(value = "检测结果附件路径") + @Excel(name = "检测结果附件路径") + private String measureResultPath; + + /** 计量单位 */ + @ApiModelProperty(value = "计量单位") + @Excel(name = "计量单位") + private String projectUnit; + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java index 3bb7a867..ade18bd6 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java @@ -201,7 +201,19 @@ public class SignPatientRecord extends BaseEntity { @ApiModelProperty(value = "解约原因") private String separateReason; - /** + /** + * 健康管理师id + */ + @ApiModelProperty(value = "健康管理师id") + private Long healthManageId; + + /** + * 健康管理师姓名 + */ + @ApiModelProperty(value = "健康管理师姓名") + private String healthManageName; + + /** * 删除标识，0：未删除，1：已删除 */ @ApiModelProperty(value = "删除标识，0：未删除，1：已删除") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java index b7e39149..94761bff 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java @@ -17,6 +17,15 @@ public class PatientVisitRecordDto { @ApiModelProperty(value = "患者表id") private Long patientId; + /** + * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED + */ + @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") + private String visitType; + + @ApiModelProperty(value = "住院/门诊号") + private String inHospitalNumber; + @ApiModelProperty(value = "就诊时间开始") @JsonFormat(pattern = "yyyy-MM-dd") private Date visitDateStart; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java new file mode 100644 index 00000000..64f759dd --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java @@ -0,0 +1,120 @@ +package com.xinelu.manage.dto.patientvisitrecord; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xinelu.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** + * @description: 患者导入传输对象 + * @author: haown + * @create: 2024-03-07 11:24 + **/ +@ApiModel("患者导入传输对象") +@Data +public class PatientVisitRecordImportDto { + + /** 患者姓名 */ + @ApiModelProperty(value = "患者姓名") + @Excel(name = "姓名") + private String patientName; + + /** 患者电话 */ + @ApiModelProperty(value = "患者电话") + @Excel(name = "电话") + private String patientPhone; + + /** 主要诊断 */ + @ApiModelProperty(value = "主要诊断") + @Excel(name = "诊断") + private String mainDiagnosis; + + + /** 入院时间，时间格式：yyyy-MM-dd */ + @ApiModelProperty(value = "入院时间") + @Excel(name = "入院时间") + private Date admissionDate; + + /** 身份证号 */ + @ApiModelProperty(value = "身份证号") + @Excel(name = "身份证号") + private String cardNo; + + /** 出生日期，格式：yyyy-MM-dd */ + @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "出生日期") + private Date birthDate; + + /** 性别，男：MALE，女：FEMALE */ + + @ApiModelProperty(value = "性别，男：MALE，女：FEMALE") + @Excel(name = "性别",readConverterExp = "男=MALE,女=FEMALE") + private String sex; + + /** 所属医院名称 */ + @ApiModelProperty(value = "所属医院名称") + @Excel(name = "医院") + private String hospitalAgencyName; + + /** 所属院区名称 */ + @ApiModelProperty(value = "所属院区名称") + @Excel(name = "院区") + private String campusAgencyName; + + /** 所属科室名称 */ + @ApiModelProperty(value = "所属科室名称") + @Excel(name = "科室名称") + private String departmentName; + + /** 所属病区名称 */ + @ApiModelProperty(value = "所属病区名称") + @Excel(name = "病区名称") + private String wardName; + + /** 主治医生 */ + @ApiModelProperty(value = "主治医生") + @Excel(name = "主治医生") + private String attendingPhysician; + + @ApiModelProperty(value = "住院/门诊号") + @Excel(name = "住院号") + private String inHospitalNumber; + + /** 责任护士 */ + @ApiModelProperty(value = "责任护士") + @Excel(name = "责任护士") + private String responsibleNurse; + + /** 家属电话 */ + @ApiModelProperty(value = "家属电话") + @Excel(name = "家属电话") + private String familyMemberPhone; + + /** 就诊流水号 */ + @ApiModelProperty(value = "就诊流水号") + @Excel(name = "就诊流水号") + private String visitSerialNumber; + + /** 入院病历 */ + @ApiModelProperty(value = "入院病历") + @Excel(name = "入院病历信息") + private String inHospitalInfo; + + /** 门诊记录信息（就诊记录-门诊记录） */ + @ApiModelProperty(value = "门诊记录信息") + @Excel(name = "门诊病历信息") + private String outpatientVisitInfo; + + /** 出院病历信息，存储患者出院的整个病历信息 */ + @ApiModelProperty(value = "出院病历信息，存储患者出院的整个病历信息") + @Excel(name = "出院病历信息") + private String outHospitalInfo; + + /** 手术名称 */ + @ApiModelProperty(value = "手术名称") + @Excel(name = "手术名称") + private String surgicalName; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectgroup/ProjectGroupSaveListDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectgroup/ProjectGroupSaveListDto.java new file mode 100644 index 00000000..b858c8eb --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectgroup/ProjectGroupSaveListDto.java @@ -0,0 +1,16 @@ +package com.xinelu.manage.dto.projectgroup; + +import com.xinelu.manage.domain.projectgroup.ProjectGroup; +import java.util.List; +import lombok.Data; + +/** + * @description: 检测项目组批量保存传输对象 + * @author: haown + * @create: 2024-03-12 09:27 + **/ +@Data +public class ProjectGroupSaveListDto { + + private List list; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectresult/ProjectResultStatisticDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectresult/ProjectResultStatisticDto.java new file mode 100644 index 00000000..46d22553 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectresult/ProjectResultStatisticDto.java @@ -0,0 +1,58 @@ +package com.xinelu.manage.dto.projectresult; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** + * @description: 项目检测统计查询传输对象 + * @author: haown + * @create: 2024-03-06 13:09 + **/ +@ApiModel("项目检测统计查询传输对象") +@Data +public class ProjectResultStatisticDto { + + @ApiModelProperty("患者id") + private Long patientId; + + /** + * 分组编码 + */ + @ApiModelProperty("分组编码，血压：bp,血糖:bg,运动：sport") + private String groupCode; + + /** + * 分组id + */ + @ApiModelProperty("分组id") + private Long groupId; + /** + * 项目编码 + */ + @ApiModelProperty("项目编码") + private String projectCode; + + /** + * 项目id + */ + @ApiModelProperty("项目id") + private Long projectId; + + /** + * 检测时间开始 + */ + @ApiModelProperty("检测时间开始") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date measureTimeStart; + + /** + * 检测时间结束 + */ + @ApiModelProperty("检测时间结束") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date measureTimeEnd; + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientprehospitalization/PatientPreHospitalizationMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientprehospitalization/PatientPreHospitalizationMapper.java new file mode 100644 index 00000000..49df6d7a --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientprehospitalization/PatientPreHospitalizationMapper.java @@ -0,0 +1,42 @@ +package com.xinelu.manage.mapper.patientprehospitalization; + +import com.xinelu.manage.domain.patientprehospitalization.PatientPreHospitalization; +import com.xinelu.manage.dto.patientinfo.PatientInfoDto; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +/** +* @author Administrator +* @description 针对表【patient_pre_hospitalization(预住院患者表)】的数据库操作Mapper +* @createDate 2024-03-08 10:26:02 +* @Entity com.xinelu.manage.domain.patientprehospitalization.PatientPreHospitalization +*/ +public interface PatientPreHospitalizationMapper { + + int deleteByPrimaryKey(Long id); + + int insert(PatientPreHospitalization record); + + int insertBatch(@Param("recordList") List recordList); + + int insertSelective(PatientPreHospitalization record); + + PatientPreHospitalization selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(PatientPreHospitalization record); + + int updateByPrimaryKey(PatientPreHospitalization record); + + List selectList(PatientInfoDto patientInfo); + + List selectApplyList(PatientPreHospitalization preHospitalizationQuery); + + /** + * 批量删除患者信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteByIds(Long[] ids); + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitrecord/PatientVisitRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitrecord/PatientVisitRecordMapper.java index 8d866ee5..3a1ffea2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitrecord/PatientVisitRecordMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitrecord/PatientVisitRecordMapper.java @@ -1,9 +1,10 @@ package com.xinelu.manage.mapper.patientvisitrecord; - -import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; -import java.util.List; +import org.apache.ibatis.annotations.Param; +import java.util.Collection; import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; +import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; +import java.util.List; /** * 患者就诊记录基本信息Mapper接口 @@ -36,6 +37,7 @@ public interface PatientVisitRecordMapper { */ public int insertPatientVisitRecord(PatientVisitRecord patientVisitRecord); + int insertBatch(@Param("patientVisitRecordList") Collection patientVisitRecordList); /** * 修改患者就诊记录基本信息 * diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/project/ProjectMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/project/ProjectMapper.java index 76e3d275..a42e0f4a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/project/ProjectMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/project/ProjectMapper.java @@ -1,25 +1,61 @@ package com.xinelu.manage.mapper.project; import com.xinelu.manage.domain.project.Project; +import java.util.List; + /** -* @author haown -* @description 针对表【project(检测项目表)】的数据库操作Mapper -* @createDate 2024-03-05 16:33:33 -* @Entity com.xinelu.manage.domain.project.Project -*/ + * 检测项目Mapper接口 + * + * @author haown + * @date 2024-03-11 + */ public interface ProjectMapper { + /** + * 查询检测项目 + * + * @param id 检测项目主键 + * @return 检测项目 + */ + public Project selectProjectById(Long id); - int deleteByPrimaryKey(Long id); + /** + * 查询检测项目列表 + * + * @param project 检测项目 + * @return 检测项目集合 + */ + public List selectProjectList(Project project); - int insert(Project record); + /** + * 新增检测项目 + * + * @param project 检测项目 + * @return 结果 + */ + public int insertProject(Project project); - int insertSelective(Project record); + /** + * 修改检测项目 + * + * @param project 检测项目 + * @return 结果 + */ + public int updateProject(Project project); - Project selectByPrimaryKey(Long id); - - int updateByPrimaryKeySelective(Project record); - - int updateByPrimaryKey(Project record); + /** + * 删除检测项目 + * + * @param id 检测项目主键 + * @return 结果 + */ + public int deleteProjectById(Long id); + /** + * 批量删除检测项目 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteProjectByIds(Long[] ids); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectbatch/ProjectBatchMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectbatch/ProjectBatchMapper.java new file mode 100644 index 00000000..55498038 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectbatch/ProjectBatchMapper.java @@ -0,0 +1,25 @@ +package com.xinelu.manage.mapper.projectbatch; + +import com.xinelu.manage.domain.projectbatch.ProjectBatch; + +/** +* @author Administrator +* @description 针对表【project_batch(指标检测批次信息表)】的数据库操作Mapper +* @createDate 2024-03-06 10:12:52 +* @Entity com.xinelu.manage.domain.projectbatch.ProjectBatch +*/ +public interface ProjectBatchMapper { + + int deleteByPrimaryKey(Long id); + + int insert(ProjectBatch record); + + int insertSelective(ProjectBatch record); + + ProjectBatch selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(ProjectBatch record); + + int updateByPrimaryKey(ProjectBatch record); + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectdevice/ProjectDeviceMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectdevice/ProjectDeviceMapper.java index 226ab16a..80809dae 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectdevice/ProjectDeviceMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectdevice/ProjectDeviceMapper.java @@ -1,25 +1,61 @@ package com.xinelu.manage.mapper.projectdevice; import com.xinelu.manage.domain.projectdevice.ProjectDevice; +import java.util.List; + /** -* @author haown -* @description 针对表【project_device(检测项目设备表)】的数据库操作Mapper -* @createDate 2024-03-05 17:14:06 -* @Entity com.xinelu.manage.domain.projectdevice.ProjectDevice -*/ + * 检测项目设备Mapper接口 + * + * @author haown + * @date 2024-03-11 + */ public interface ProjectDeviceMapper { + /** + * 查询检测项目设备 + * + * @param id 检测项目设备主键 + * @return 检测项目设备 + */ + public ProjectDevice selectProjectDeviceById(Long id); - int deleteByPrimaryKey(Long id); + /** + * 查询检测项目设备列表 + * + * @param projectDevice 检测项目设备 + * @return 检测项目设备集合 + */ + public List selectProjectDeviceList(ProjectDevice projectDevice); - int insert(ProjectDevice record); + /** + * 新增检测项目设备 + * + * @param projectDevice 检测项目设备 + * @return 结果 + */ + public int insertProjectDevice(ProjectDevice projectDevice); - int insertSelective(ProjectDevice record); + /** + * 修改检测项目设备 + * + * @param projectDevice 检测项目设备 + * @return 结果 + */ + public int updateProjectDevice(ProjectDevice projectDevice); - ProjectDevice selectByPrimaryKey(Long id); - - int updateByPrimaryKeySelective(ProjectDevice record); - - int updateByPrimaryKey(ProjectDevice record); + /** + * 删除检测项目设备 + * + * @param id 检测项目设备主键 + * @return 结果 + */ + public int deleteProjectDeviceById(Long id); + /** + * 批量删除检测项目设备 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteProjectDeviceByIds(Long[] ids); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectgroup/ProjectGroupMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectgroup/ProjectGroupMapper.java index 3b2cd63a..1e15d504 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectgroup/ProjectGroupMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectgroup/ProjectGroupMapper.java @@ -1,25 +1,65 @@ package com.xinelu.manage.mapper.projectgroup; +import org.apache.ibatis.annotations.Param; +import java.util.Collection; import com.xinelu.manage.domain.projectgroup.ProjectGroup; +import java.util.List; + /** -* @author haown -* @description 针对表【project_group(检测项目分组表)】的数据库操作Mapper -* @createDate 2024-03-05 16:34:58 -* @Entity com.xinelu.manage.domain.projectgroup.ProjectGroup -*/ + * 检测项目分组Mapper接口 + * + * @author haown + * @date 2024-03-11 + */ public interface ProjectGroupMapper { + /** + * 查询检测项目分组 + * + * @param id 检测项目分组主键 + * @return 检测项目分组 + */ + public ProjectGroup selectProjectGroupById(Long id); - int deleteByPrimaryKey(Long id); + /** + * 查询检测项目分组列表 + * + * @param projectGroup 检测项目分组 + * @return 检测项目分组集合 + */ + public List selectProjectGroupList(ProjectGroup projectGroup); - int insert(ProjectGroup record); + /** + * 新增检测项目分组 + * + * @param projectGroup 检测项目分组 + * @return 结果 + */ + public int insertProjectGroup(ProjectGroup projectGroup); - int insertSelective(ProjectGroup record); + int insertBatch(@Param("projectGroupList") Collection projectGroupList); - ProjectGroup selectByPrimaryKey(Long id); + /** + * 修改检测项目分组 + * + * @param projectGroup 检测项目分组 + * @return 结果 + */ + public int updateProjectGroup(ProjectGroup projectGroup); - int updateByPrimaryKeySelective(ProjectGroup record); - - int updateByPrimaryKey(ProjectGroup record); + /** + * 删除检测项目分组 + * + * @param id 检测项目分组主键 + * @return 结果 + */ + public int deleteProjectGroupById(Long id); + /** + * 批量删除检测项目分组 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteProjectGroupByIds(Long[] ids); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectlastrecord/ProjectLastRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectlastrecord/ProjectLastRecordMapper.java deleted file mode 100644 index 757d6a91..00000000 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectlastrecord/ProjectLastRecordMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.xinelu.manage.mapper.projectlastrecord; - -import com.xinelu.manage.domain.projectlastrecord.ProjectLastRecord; - -/** -* @author haown -* @description 针对表【project_last_record(最近一次检测项目数据记录表)】的数据库操作Mapper -* @createDate 2024-03-05 17:09:28 -* @Entity com.xinelu.manage.domain.projectlastrecord.ProjectLastRecord -*/ -public interface ProjectLastRecordMapper { - - int deleteByPrimaryKey(Long id); - - int insert(ProjectLastRecord record); - - int insertSelective(ProjectLastRecord record); - - ProjectLastRecord selectByPrimaryKey(Long id); - - int updateByPrimaryKeySelective(ProjectLastRecord record); - - int updateByPrimaryKey(ProjectLastRecord record); - -} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectlastresult/ProjectLastResultMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectlastresult/ProjectLastResultMapper.java new file mode 100644 index 00000000..5766e1c1 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectlastresult/ProjectLastResultMapper.java @@ -0,0 +1,25 @@ +package com.xinelu.manage.mapper.projectlastresult; + +import com.xinelu.manage.domain.projectlastresult.ProjectLastResult; + +/** +* @author haown +* @description 针对表【project_last_result(最近一次检测项目结果表)】的数据库操作Mapper +* @createDate 2024-03-06 10:49:43 +* @Entity com.xinelu.manage.domain.projectlastresult.ProjectLastResult +*/ +public interface ProjectLastResultMapper { + + int deleteByPrimaryKey(Long id); + + int insert(ProjectLastResult record); + + int insertSelective(ProjectLastResult record); + + ProjectLastResult selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(ProjectLastResult record); + + int updateByPrimaryKey(ProjectLastResult record); + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectrecord/ProjectRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectrecord/ProjectRecordMapper.java deleted file mode 100644 index 987b9252..00000000 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectrecord/ProjectRecordMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.xinelu.manage.mapper.projectrecord; - -import com.xinelu.manage.domain.projectrecord.ProjectRecord; - -/** -* @author haown -* @description 针对表【project_record(检测项目数据记录表)】的数据库操作Mapper -* @createDate 2024-03-05 17:09:04 -* @Entity com.xinelu.manage.domain.projectrecord.ProjectRecord -*/ -public interface ProjectRecordMapper { - - int deleteByPrimaryKey(Long id); - - int insert(ProjectRecord record); - - int insertSelective(ProjectRecord record); - - ProjectRecord selectByPrimaryKey(Long id); - - int updateByPrimaryKeySelective(ProjectRecord record); - - int updateByPrimaryKey(ProjectRecord record); - -} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectrecordfile/ProjectRecordFileMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectrecordfile/ProjectRecordFileMapper.java deleted file mode 100644 index b3831d6c..00000000 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectrecordfile/ProjectRecordFileMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.xinelu.manage.mapper.projectrecordfile; - -import com.xinelu.manage.domain.projectrecordfile.ProjectRecordFile; - -/** -* @author haown -* @description 针对表【project_record_file(检测项目数据记录附件表（存储检测结果既含有报告又含有指标数据的检测项）)】的数据库操作Mapper -* @createDate 2024-03-05 16:36:32 -* @Entity com.xinelu.manage.domain.projectrecordfile.ProjectRecordFile -*/ -public interface ProjectRecordFileMapper { - - int deleteByPrimaryKey(Long id); - - int insert(ProjectRecordFile record); - - int insertSelective(ProjectRecordFile record); - - ProjectRecordFile selectByPrimaryKey(Long id); - - int updateByPrimaryKeySelective(ProjectRecordFile record); - - int updateByPrimaryKey(ProjectRecordFile record); - -} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectresult/ProjectResultMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectresult/ProjectResultMapper.java new file mode 100644 index 00000000..1764786e --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectresult/ProjectResultMapper.java @@ -0,0 +1,66 @@ +package com.xinelu.manage.mapper.projectresult; + +import com.xinelu.manage.domain.projectresult.ProjectResult; +import com.xinelu.manage.dto.projectresult.ProjectResultStatisticDto; +import com.xinelu.manage.vo.projectresult.ProjectResultVo; +import java.util.List; + +/** +* @author haown +* @description 针对表【project_result(检测项目结果表)】的数据库操作Mapper +* @createDate 2024-03-06 10:41:36 +* @Entity com.xinelu.manage.domain.projectresult.ProjectResult +*/ +public interface ProjectResultMapper { + + /** + * 查询检测项目结果 + * + * @param id 检测项目结果主键 + * @return 检测项目结果 + */ + public ProjectResult selectProjectResultById(Long id); + + /** + * 查询检测项目结果列表 + * + * @param projectResult 检测项目结果 + * @return 检测项目结果集合 + */ + public List selectProjectResultList(ProjectResult projectResult); + + /** + * 新增检测项目结果 + * + * @param projectResult 检测项目结果 + * @return 结果 + */ + public int insertProjectResult(ProjectResult projectResult); + + /** + * 修改检测项目结果 + * + * @param projectResult 检测项目结果 + * @return 结果 + */ + public int updateProjectResult(ProjectResult projectResult); + + /** + * 删除检测项目结果 + * + * @param id 检测项目结果主键 + * @return 结果 + */ + public int deleteProjectResultById(Long id); + + /** + * 批量删除检测项目结果 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteProjectResultByIds(Long[] ids); + + List selectList(ProjectResultStatisticDto projectResultStatisticDto); + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/IPatientPreHospitalizationService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/IPatientPreHospitalizationService.java new file mode 100644 index 00000000..f036587a --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/IPatientPreHospitalizationService.java @@ -0,0 +1,38 @@ +package com.xinelu.manage.service.patientprehospitalization; + +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.manage.domain.patientprehospitalization.PatientPreHospitalization; +import com.xinelu.manage.dto.patientinfo.PatientInfoDto; +import java.util.List; + +/** +* @author haown +* @description 针对表【patient_pre_hospitalization(预住院患者表)】的数据库操作Service +* @createDate 2024-03-08 10:25:39 +*/ +public interface IPatientPreHospitalizationService { + + int insert(PatientPreHospitalization preHospitalization); + + List selectList(PatientInfoDto patientInfo); + + int update(PatientPreHospitalization preHospitalization); + + /** + * 批量删除 + * + * @param ids 需要删除的预住院患者信息主键集合 + * @return 结果 + */ + int deleteByIds(Long[] ids); + + PatientPreHospitalization getById(Long id); + + /** + * 预住院患者导入 + * + * @param patientList 患者就诊信息 + * @return int + **/ + AjaxResult importList(List patientList); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java new file mode 100644 index 00000000..903b3762 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java @@ -0,0 +1,220 @@ +package com.xinelu.manage.service.patientprehospitalization.impl; + +import com.xinelu.common.constant.NodeTypeConstants; +import com.xinelu.common.constant.PatientTypeConstants; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.exception.ServiceException; +import com.xinelu.common.utils.DateUtils; +import com.xinelu.common.utils.SecurityUtils; +import com.xinelu.common.utils.StringUtils; +import com.xinelu.common.utils.bean.BeanUtils; +import com.xinelu.common.utils.regex.RegexUtil; +import com.xinelu.manage.domain.agency.Agency; +import com.xinelu.manage.domain.department.Department; +import com.xinelu.manage.domain.patientinfo.PatientInfo; +import com.xinelu.manage.domain.patientprehospitalization.PatientPreHospitalization; +import com.xinelu.manage.dto.patientinfo.PatientInfoDto; +import com.xinelu.manage.mapper.agency.AgencyMapper; +import com.xinelu.manage.mapper.department.DepartmentMapper; +import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; +import com.xinelu.manage.mapper.patientprehospitalization.PatientPreHospitalizationMapper; +import com.xinelu.manage.service.patientprehospitalization.IPatientPreHospitalizationService; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; +import javax.annotation.Resource; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.stereotype.Service; + +/** +* @author haown +* @description 针对表【patient_pre_hospitalization(预住院患者表)】的数据库操作Service实现 +* @createDate 2024-03-08 10:25:39 +*/ +@Service +public class PatientPreHospitalizationServiceImpl implements IPatientPreHospitalizationService { + + @Resource + private PatientPreHospitalizationMapper preHospitalizationMapper; + + @Resource + private PatientInfoMapper patientInfoMapper; + + @Resource + private AgencyMapper agencyMapper; + + @Resource + private DepartmentMapper departmentMapper; + + @Resource + private RegexUtil regexUtil; + + @Override public int insert(PatientPreHospitalization preHospitalization) { + // 根据身份证号查询是否有患者信息 + PatientInfoDto patientInfoDto = new PatientInfoDto(); + patientInfoDto.setCardNo(preHospitalization.getCardNo()); + List patientList = patientInfoMapper.selectPatientInfoList(patientInfoDto); + if (CollectionUtils.isEmpty(patientList)) { + // 保存患者信息 + PatientInfo patientInfo = new PatientInfo(); + BeanUtils.copyBeanProp(patientInfo, preHospitalization); + patientInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + patientInfo.setCreateTime(DateUtils.getNowDate()); + patientInfo.setDelFlag(0); + patientInfo.setPatientType(PatientTypeConstants.PRE_HOSPITALIZED_PATIENT); + patientInfoMapper.insertPatientInfo(patientInfo); + preHospitalization.setPatientId(patientInfo.getId()); + } else { + // 修改患者信息 + PatientInfo patientInfo = patientList.get(0); + BeanUtils.copyBeanProp(patientInfo, preHospitalization); + patientInfo.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + patientInfo.setUpdateTime(DateUtils.getNowDate()); + patientInfo.setDelFlag(0); + patientInfo.setPatientType(PatientTypeConstants.PRE_HOSPITALIZED_PATIENT); + patientInfoMapper.updatePatientInfo(patientInfo); + preHospitalization.setPatientId(patientList.get(0).getId()); + } + // 保存预住院信息 + preHospitalization.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + preHospitalization.setCreateTime(DateUtils.getNowDate()); + return preHospitalizationMapper.insertSelective(preHospitalization); + } + + @Override public List selectList(PatientInfoDto patientInfo) { + return preHospitalizationMapper.selectList(patientInfo); + } + + @Override public int update(PatientPreHospitalization preHospitalization) { + // 修改患者信息 + PatientInfo patientInfo = patientInfoMapper.selectPatientInfoById(preHospitalization.getPatientId()); + Long patientId = patientInfo.getId(); + BeanUtils.copyBeanProp(patientInfo, preHospitalization); + patientInfo.setId(patientId); + int flag = patientInfoMapper.updatePatientInfo(patientInfo); + if (flag >= 0) { + return preHospitalizationMapper.updateByPrimaryKeySelective(preHospitalization); + } + return -1; + } + + + @Override public int deleteByIds(Long[] ids) { + return preHospitalizationMapper.deleteByIds(ids); + } + + @Override public PatientPreHospitalization getById(Long id) { + return preHospitalizationMapper.selectByPrimaryKey(id); + } + + @Override public AjaxResult importList(List patientList) { + //判断添加的数据是否为空 + if (CollectionUtils.isEmpty(patientList)) { + return AjaxResult.error("请添加预住院患者导入信息！"); + } + // 根据患者身份证号做去重处理 + List importDataList = patientList.stream().filter(item -> StringUtils.isNotBlank(item.getCardNo())).distinct().collect(Collectors.toList()); + // 校验联系电话格式是否正确 + PatientPreHospitalization patient = importDataList.stream().filter(item -> StringUtils.isNotBlank(item.getPatientPhone())).filter(item -> BooleanUtils.isFalse(regexUtil.regexPhone(item.getPatientPhone()))).findFirst().orElse(new PatientPreHospitalization()); + if (StringUtils.isNotBlank(patient.getPatientPhone())) { + return AjaxResult.error("当前患者联系电话：" + patient.getPatientPhone() + " 格式不正确，请重新录入！"); + } + List saveList = new ArrayList<>(); + for (PatientPreHospitalization item : importDataList) { + PatientPreHospitalization preHospitalization = new PatientPreHospitalization(); + BeanUtils.copyProperties(item, preHospitalization); + // 根据医院名称查询医院id + Agency agency = new Agency(); + if (StringUtils.isNotBlank(item.getHospitalAgencyName())) { + agency.setAgencyName(item.getHospitalAgencyName()); + agency.setNodeType(NodeTypeConstants.HOSPITAL); + List agencyList = agencyMapper.selectAgencyList(agency); + if (CollectionUtils.isNotEmpty(agencyList)) { + preHospitalization.setHospitalAgencyId(agencyList.get(0).getId()); + } + } else { + preHospitalization.setHospitalAgencyId(SecurityUtils.getLoginUser().getUser().getAgencyId()); + Agency agencyData = agencyMapper.selectAgencyById(SecurityUtils.getLoginUser().getUser().getAgencyId()); + if (ObjectUtils.isNotEmpty(agencyData)) { + preHospitalization.setHospitalAgencyName(agencyData.getAgencyName()); + } + } + // 查询院区id + if (StringUtils.isNotBlank(item.getCampusAgencyName())) { + agency.setAgencyName(item.getWardName()); + agency.setNodeType(NodeTypeConstants.CAMPUS); + List campusList = agencyMapper.selectAgencyList(agency); + if (CollectionUtils.isNotEmpty(campusList)) { + preHospitalization.setCampusAgencyId(campusList.get(0).getId()); + } + } + + // 查询科室id + Department department = new Department(); + if (StringUtils.isNotBlank(item.getDepartmentName())) { + department.setAgencyName(item.getHospitalAgencyName()); + department.setDepartmentName(item.getDepartmentName()); + department.setNodeType(NodeTypeConstants.DEPARTMENT); + List deptList = departmentMapper.selectDepartmentList(department); + if (CollectionUtils.isNotEmpty(deptList)) { + preHospitalization.setDepartmentId(deptList.get(0).getId()); + } + } else { + preHospitalization.setDepartmentId(SecurityUtils.getLoginUser().getUser().getDepartmentId()); + Department department1 = departmentMapper.selectDepartmentById(SecurityUtils.getLoginUser().getUser().getDepartmentId()); + if (ObjectUtils.isNotEmpty(department1)) { + preHospitalization.setDepartmentName(department1.getDepartmentName()); + } + } + // 查询病区 + if (StringUtils.isNotBlank(item.getWardName())) { + department.setAgencyName(item.getHospitalAgencyName()); + department.setDepartmentName(item.getWardName()); + department.setNodeType(NodeTypeConstants.WARD); + List deptList = departmentMapper.selectDepartmentList(department); + if (CollectionUtils.isNotEmpty(deptList)) { + preHospitalization.setWardId(deptList.get(0).getId()); + } + } + + preHospitalization.setCreateTime(DateUtils.getNowDate()); + preHospitalization.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + + // 根据身份证号查询患者信息 + PatientInfoDto patientQuery = new PatientInfoDto(); + patientQuery.setCardNo(item.getCardNo()); + List patientInfoList = patientInfoMapper.selectPatientInfoList(patientQuery); + if (CollectionUtils.isNotEmpty(patientInfoList)) { + // 修改居民信息 + PatientInfo updInfo = patientInfoList.get(0); + BeanUtils.copyBeanProp(updInfo, item); + patientInfoMapper.updatePatientInfo(updInfo); + preHospitalization.setPatientId(patientInfoList.get(0).getId()); + } else { + PatientInfo saveInfo = new PatientInfo(); + // 添加居民 + BeanUtils.copyBeanProp(saveInfo, item); + patientInfoMapper.insertPatientInfo(saveInfo); + preHospitalization.setPatientId(saveInfo.getId()); + } + // 根据患者身份证号和预约时间查询是否有记录 + PatientPreHospitalization preHospitalizationQuery = new PatientPreHospitalization(); + preHospitalizationQuery.setCardNo(item.getCardNo()); + preHospitalizationQuery.setAppointmentDate(item.getAppointmentDate()); + List list = preHospitalizationMapper.selectApplyList(preHospitalizationQuery); + if (CollectionUtils.isEmpty(list)) { + // 新增 + saveList.add(preHospitalization); + } else { + // 有预约信息暂时不导入 + } + } + int insertCount = preHospitalizationMapper.insertBatch(saveList); + if (insertCount <= 0) { + throw new ServiceException("导入预住院信息失败，请联系管理员！"); + } + return AjaxResult.success(); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java index afab462d..79be4e0e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java @@ -1,9 +1,10 @@ package com.xinelu.manage.service.patientvisitrecord; -import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; -import java.util.List; - +import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; +import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; +import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordImportDto; +import java.util.List; /** * 患者就诊记录基本信息Service接口 @@ -59,4 +60,12 @@ public interface IPatientVisitRecordService { * @return 结果 */ public int deletePatientVisitRecordById(Long id); + + /** + * 患者就诊信息导入 + * + * @param patientList 患者就诊信息 + * @return int + **/ + AjaxResult importPatientList(List patientList, String patientType); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java index d5a59f8e..c2aa39d1 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java @@ -1,13 +1,38 @@ package com.xinelu.manage.service.patientvisitrecord.impl; -import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; -import java.util.List; +import com.xinelu.common.constant.NodeTypeConstants; +import com.xinelu.common.constant.PatientTypeConstants; +import com.xinelu.common.constant.VisitTypeConstants; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.DateUtils; -import javax.annotation.Resource; -import org.springframework.stereotype.Service; -import com.xinelu.manage.mapper.patientvisitrecord.PatientVisitRecordMapper; +import com.xinelu.common.utils.SecurityUtils; +import com.xinelu.common.utils.StringUtils; +import com.xinelu.common.utils.bean.BeanUtils; +import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.common.utils.regex.RegexUtil; +import com.xinelu.manage.domain.agency.Agency; +import com.xinelu.manage.domain.department.Department; +import com.xinelu.manage.domain.patientinfo.PatientInfo; import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; +import com.xinelu.manage.dto.patientinfo.PatientInfoDto; +import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; +import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordImportDto; +import com.xinelu.manage.mapper.agency.AgencyMapper; +import com.xinelu.manage.mapper.department.DepartmentMapper; +import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; +import com.xinelu.manage.mapper.patientvisitrecord.PatientVisitRecordMapper; import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService; +import java.io.File; +import java.io.FileInputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; +import javax.annotation.Resource; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.stereotype.Service; /** * 患者就诊记录基本信息Service业务层处理 @@ -19,6 +44,14 @@ import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService; public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService { @Resource private PatientVisitRecordMapper patientVisitRecordMapper; + @Resource + private RegexUtil regexUtil; + @Resource + private PatientInfoMapper patientMapper; + @Resource + private AgencyMapper agencyMapper; + @Resource + private DepartmentMapper departmentMapper; /** * 查询患者就诊记录基本信息 @@ -87,4 +120,144 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService public int deletePatientVisitRecordById(Long id) { return patientVisitRecordMapper.deletePatientVisitRecordById(id); } + + @Override + public AjaxResult importPatientList(List patientList, String patientType) { + //判断添加的数据是否为空 + if (CollectionUtils.isEmpty(patientList)) { + return AjaxResult.error("请添加就诊信息导入信息！"); + } + // 根据患者身份证号做去除处理 + List importDataList = patientList.stream().filter(item -> StringUtils.isNotBlank(item.getCardNo())).distinct().collect(Collectors.toList()); + // 校验联系电话格式是否正确 + PatientVisitRecordImportDto patient = importDataList.stream().filter(item -> StringUtils.isNotBlank(item.getPatientPhone())).filter(item -> BooleanUtils.isFalse(regexUtil.regexPhone(item.getPatientPhone()))).findFirst().orElse(new PatientVisitRecordImportDto()); + if (StringUtils.isNotBlank(patient.getPatientPhone())) { + return AjaxResult.error("当前患者联系电话：" + patient.getPatientPhone() + " 格式不正确，请重新录入！"); + } + + List saveList = new ArrayList<>(); + for (PatientVisitRecordImportDto item : importDataList) { + PatientVisitRecord patientVisitRecord = new PatientVisitRecord(); + BeanUtils.copyProperties(item, patientVisitRecord); + patientVisitRecord.setCreateTime(DateUtils.getNowDate()); + patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + switch (patientType) { + // 预住院患者 + case PatientTypeConstants.PRE_HOSPITALIZED_PATIENT: + break; + // 在院患者 + case PatientTypeConstants.IN_HOSPITAL_PATIENT: + case PatientTypeConstants.DISCHARGED_PATIENT: + patientVisitRecord.setVisitType(VisitTypeConstants.BE_HOSPITALIZED); + break; + // 门诊患者 + case PatientTypeConstants.OUTPATIENT: + patientVisitRecord.setVisitType(VisitTypeConstants.OUTPATIENT_SERVICE); + break; + } + // 根据身份证号查询患者信息 + PatientInfoDto patientQuery = new PatientInfoDto(); + patientQuery.setCardNo(item.getCardNo()); + List patientInfoList = patientMapper.selectPatientInfoList(patientQuery); + if (CollectionUtils.isNotEmpty(patientInfoList)) { + // 修改居民信息 + PatientInfo updInfo = patientInfoList.get(0); + BeanUtils.copyBeanProp(updInfo, item); + patientMapper.updatePatientInfo(updInfo); + patientVisitRecord.setPatientId(patientInfoList.get(0).getId()); + } else { + PatientInfo saveInfo = new PatientInfo(); + // 添加居民 + BeanUtils.copyBeanProp(saveInfo, item); + patientMapper.insertPatientInfo(saveInfo); + patientVisitRecord.setPatientId(saveInfo.getId()); + } + // 根据医院名称查询医院id + Agency agency = new Agency(); + if (StringUtils.isNotBlank(item.getHospitalAgencyName())) { + agency.setAgencyName(item.getHospitalAgencyName()); + agency.setNodeType(NodeTypeConstants.HOSPITAL); + List agencyList = agencyMapper.selectAgencyList(agency); + if (CollectionUtils.isNotEmpty(agencyList)) { + patientVisitRecord.setHospitalAgencyId(agencyList.get(0).getId()); + } + } else { + patientVisitRecord.setHospitalAgencyId(SecurityUtils.getLoginUser().getUser().getAgencyId()); + Agency agencyData = agencyMapper.selectAgencyById(SecurityUtils.getLoginUser().getUser().getAgencyId()); + if (ObjectUtils.isNotEmpty(agencyData)) { + patientVisitRecord.setHospitalAgencyName(agencyData.getAgencyName()); + } + } + // 查询院区id + if (StringUtils.isNotBlank(item.getCampusAgencyName())) { + agency.setAgencyName(item.getWardName()); + agency.setNodeType(NodeTypeConstants.CAMPUS); + List campusList = agencyMapper.selectAgencyList(agency); + if (CollectionUtils.isNotEmpty(campusList)) { + patientVisitRecord.setCampusAgencyId(campusList.get(0).getId()); + } + } + + // 查询科室id + Department department = new Department(); + if (StringUtils.isNotBlank(item.getDepartmentName())) { + department.setAgencyName(item.getHospitalAgencyName()); + department.setDepartmentName(item.getDepartmentName()); + department.setNodeType(NodeTypeConstants.DEPARTMENT); + List deptList = departmentMapper.selectDepartmentList(department); + if (CollectionUtils.isNotEmpty(deptList)) { + patientVisitRecord.setDepartmentId(deptList.get(0).getId()); + } + } else { + patientVisitRecord.setDepartmentId(SecurityUtils.getLoginUser().getUser().getDepartmentId()); + Department department1 = departmentMapper.selectDepartmentById(SecurityUtils.getLoginUser().getUser().getDepartmentId()); + if (ObjectUtils.isNotEmpty(department1)) { + patientVisitRecord.setDepartmentName(department1.getDepartmentName()); + } + } + // 查询病区 + if (StringUtils.isNotBlank(item.getWardName())) { + department.setAgencyName(item.getHospitalAgencyName()); + department.setDepartmentName(item.getWardName()); + department.setNodeType(NodeTypeConstants.WARD); + List deptList = departmentMapper.selectDepartmentList(department); + if (CollectionUtils.isNotEmpty(deptList)) { + patientVisitRecord.setWardId(deptList.get(0).getId()); + } + } + // 根据门诊/住院编号查询是否有记录 + PatientVisitRecordDto recordQuery = new PatientVisitRecordDto(); + recordQuery.setVisitType(patientType); + recordQuery.setInHospitalNumber(patientVisitRecord.getInHospitalInfo()); + List patientVisitRecordList = patientVisitRecordMapper.selectPatientVisitRecordList(recordQuery); + if (CollectionUtils.isEmpty(patientVisitRecordList)) { + // 新增 + saveList.add(patientVisitRecord); + } else { + // 修改 + patientVisitRecord.setId(patientVisitRecordList.get(0).getId()); + int flag = patientVisitRecordMapper.updatePatientVisitRecord(patientVisitRecord); + if (flag < 0) { + throw new ServiceException("导入患者就诊信息失败，请联系管理员！"); + } + } + } + int insertCount = patientVisitRecordMapper.insertBatch(saveList); + if (insertCount <= 0) { + throw new ServiceException("导入患者就诊信息失败，请联系管理员！"); + } + return AjaxResult.success(); + } + + public static void main(String[] args) { + String filePath = "E:\\在院患者导入.xlsx"; + ExcelUtil util = new ExcelUtil<>(PatientVisitRecordImportDto.class); + File file = new File(filePath); + try { + List list = util.importExcel(new FileInputStream(file)); + //importPatientList(list); + } catch (Exception e) { + throw new RuntimeException(e); + } + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/project/IProjectService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/project/IProjectService.java index fb47bbb7..ec9eb361 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/project/IProjectService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/project/IProjectService.java @@ -1,10 +1,61 @@ package com.xinelu.manage.service.project; -/** -* @author haown -* @description 针对表【project(检测项目表)】的数据库操作Service -* @createDate 2024-02-29 15:10:38 -*/ -public interface IProjectService { +import com.xinelu.manage.domain.project.Project; +import java.util.List; + +/** + * 检测项目Service接口 + * + * @author haown + * @date 2024-03-11 + */ +public interface IProjectService { + /** + * 查询检测项目 + * + * @param id 检测项目主键 + * @return 检测项目 + */ + public Project selectProjectById(Long id); + + /** + * 查询检测项目列表 + * + * @param project 检测项目 + * @return 检测项目集合 + */ + public List selectProjectList(Project project); + + /** + * 新增检测项目 + * + * @param project 检测项目 + * @return 结果 + */ + public int insertProject(Project project); + + /** + * 修改检测项目 + * + * @param project 检测项目 + * @return 结果 + */ + public int updateProject(Project project); + + /** + * 批量删除检测项目 + * + * @param ids 需要删除的检测项目主键集合 + * @return 结果 + */ + public int deleteProjectByIds(Long[] ids); + + /** + * 删除检测项目信息 + * + * @param id 检测项目主键 + * @return 结果 + */ + public int deleteProjectById(Long id); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/project/impl/ProjectServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/project/impl/ProjectServiceImpl.java index 1fd2f0f8..31eda437 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/project/impl/ProjectServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/project/impl/ProjectServiceImpl.java @@ -1,14 +1,89 @@ package com.xinelu.manage.service.project.impl; +import com.xinelu.common.utils.DateUtils; +import com.xinelu.manage.domain.project.Project; +import com.xinelu.manage.mapper.project.ProjectMapper; import com.xinelu.manage.service.project.IProjectService; +import java.util.List; +import javax.annotation.Resource; import org.springframework.stereotype.Service; /** -* @author haown -* @description 针对表【project(检测项目表)】的数据库操作Service实现 -* @createDate 2024-02-29 15:10:38 -*/ + * 检测项目Service业务层处理 + * + * @author haown + * @date 2024-03-11 + */ @Service public class ProjectServiceImpl implements IProjectService { + @Resource + private ProjectMapper projectMapper; + /** + * 查询检测项目 + * + * @param id 检测项目主键 + * @return 检测项目 + */ + @Override + public Project selectProjectById(Long id) { + return projectMapper.selectProjectById(id); + } + + /** + * 查询检测项目列表 + * + * @param project 检测项目 + * @return 检测项目 + */ + @Override + public List selectProjectList(Project project) { + return projectMapper.selectProjectList(project); + } + + /** + * 新增检测项目 + * + * @param project 检测项目 + * @return 结果 + */ + @Override + public int insertProject(Project project) { + project.setCreateTime(DateUtils.getNowDate()); + return projectMapper.insertProject(project); + } + + /** + * 修改检测项目 + * + * @param project 检测项目 + * @return 结果 + */ + @Override + public int updateProject(Project project) { + project.setUpdateTime(DateUtils.getNowDate()); + return projectMapper.updateProject(project); + } + + /** + * 批量删除检测项目 + * + * @param ids 需要删除的检测项目主键 + * @return 结果 + */ + @Override + public int deleteProjectByIds(Long[] ids) { + return projectMapper.deleteProjectByIds(ids); + } + + /** + * 删除检测项目信息 + * + * @param id 检测项目主键 + * @return 结果 + */ + @Override + public int deleteProjectById(Long id) { + return projectMapper.deleteProjectById(id); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectdevice/IProjectDeviceService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectdevice/IProjectDeviceService.java index 7a5aa2c7..48f224f2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectdevice/IProjectDeviceService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectdevice/IProjectDeviceService.java @@ -1,10 +1,61 @@ package com.xinelu.manage.service.projectdevice; -/** -* @author haown -* @description 针对表【project_device(检测项目设备表)】的数据库操作Service -* @createDate 2024-02-29 15:15:14 -*/ -public interface IProjectDeviceService { +import com.xinelu.manage.domain.projectdevice.ProjectDevice; +import java.util.List; + +/** + * 检测项目设备Service接口 + * + * @author haown + * @date 2024-03-11 + */ +public interface IProjectDeviceService { + /** + * 查询检测项目设备 + * + * @param id 检测项目设备主键 + * @return 检测项目设备 + */ + public ProjectDevice selectProjectDeviceById(Long id); + + /** + * 查询检测项目设备列表 + * + * @param projectDevice 检测项目设备 + * @return 检测项目设备集合 + */ + public List selectProjectDeviceList(ProjectDevice projectDevice); + + /** + * 新增检测项目设备 + * + * @param projectDevice 检测项目设备 + * @return 结果 + */ + public int insertProjectDevice(ProjectDevice projectDevice); + + /** + * 修改检测项目设备 + * + * @param projectDevice 检测项目设备 + * @return 结果 + */ + public int updateProjectDevice(ProjectDevice projectDevice); + + /** + * 批量删除检测项目设备 + * + * @param ids 需要删除的检测项目设备主键集合 + * @return 结果 + */ + public int deleteProjectDeviceByIds(Long[] ids); + + /** + * 删除检测项目设备信息 + * + * @param id 检测项目设备主键 + * @return 结果 + */ + public int deleteProjectDeviceById(Long id); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectdevice/impl/ProjectDeviceServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectdevice/impl/ProjectDeviceServiceImpl.java index 7d752099..3e5c2c03 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectdevice/impl/ProjectDeviceServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectdevice/impl/ProjectDeviceServiceImpl.java @@ -1,14 +1,89 @@ package com.xinelu.manage.service.projectdevice.impl; +import com.xinelu.common.utils.DateUtils; +import com.xinelu.manage.domain.projectdevice.ProjectDevice; +import com.xinelu.manage.mapper.projectdevice.ProjectDeviceMapper; import com.xinelu.manage.service.projectdevice.IProjectDeviceService; +import java.util.List; +import javax.annotation.Resource; import org.springframework.stereotype.Service; /** -* @author Administrator -* @description 针对表【project_device(检测项目设备表)】的数据库操作Service实现 -* @createDate 2024-02-29 15:15:14 -*/ + * 检测项目设备Service业务层处理 + * + * @author haown + * @date 2024-03-11 + */ @Service public class ProjectDeviceServiceImpl implements IProjectDeviceService { + @Resource + private ProjectDeviceMapper projectDeviceMapper; + /** + * 查询检测项目设备 + * + * @param id 检测项目设备主键 + * @return 检测项目设备 + */ + @Override + public ProjectDevice selectProjectDeviceById(Long id) { + return projectDeviceMapper.selectProjectDeviceById(id); + } + + /** + * 查询检测项目设备列表 + * + * @param projectDevice 检测项目设备 + * @return 检测项目设备 + */ + @Override + public List selectProjectDeviceList(ProjectDevice projectDevice) { + return projectDeviceMapper.selectProjectDeviceList(projectDevice); + } + + /** + * 新增检测项目设备 + * + * @param projectDevice 检测项目设备 + * @return 结果 + */ + @Override + public int insertProjectDevice(ProjectDevice projectDevice) { + projectDevice.setCreateTime(DateUtils.getNowDate()); + return projectDeviceMapper.insertProjectDevice(projectDevice); + } + + /** + * 修改检测项目设备 + * + * @param projectDevice 检测项目设备 + * @return 结果 + */ + @Override + public int updateProjectDevice(ProjectDevice projectDevice) { + projectDevice.setUpdateTime(DateUtils.getNowDate()); + return projectDeviceMapper.updateProjectDevice(projectDevice); + } + + /** + * 批量删除检测项目设备 + * + * @param ids 需要删除的检测项目设备主键 + * @return 结果 + */ + @Override + public int deleteProjectDeviceByIds(Long[] ids) { + return projectDeviceMapper.deleteProjectDeviceByIds(ids); + } + + /** + * 删除检测项目设备信息 + * + * @param id 检测项目设备主键 + * @return 结果 + */ + @Override + public int deleteProjectDeviceById(Long id) { + return projectDeviceMapper.deleteProjectDeviceById(id); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectgroup/IProjectGroupService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectgroup/IProjectGroupService.java index da067932..c6e1c993 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectgroup/IProjectGroupService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectgroup/IProjectGroupService.java @@ -1,10 +1,64 @@ package com.xinelu.manage.service.projectgroup; -/** -* @author haown -* @description 针对表【project_group(检测项目分组表)】的数据库操作Service -* @createDate 2024-02-29 15:19:16 -*/ -public interface IProjectGroupService { +import com.xinelu.manage.domain.projectgroup.ProjectGroup; +import com.xinelu.manage.dto.projectgroup.ProjectGroupSaveListDto; +import java.util.List; + +/** + * 检测项目分组Service接口 + * + * @author haown + * @date 2024-03-11 + */ +public interface IProjectGroupService { + /** + * 查询检测项目分组 + * + * @param id 检测项目分组主键 + * @return 检测项目分组 + */ + public ProjectGroup selectProjectGroupById(Long id); + + /** + * 查询检测项目分组列表 + * + * @param projectGroup 检测项目分组 + * @return 检测项目分组集合 + */ + public List selectProjectGroupList(ProjectGroup projectGroup); + + /** + * 新增检测项目分组 + * + * @param projectGroup 检测项目分组 + * @return 结果 + */ + public int insertProjectGroup(ProjectGroup projectGroup); + + int insertList(ProjectGroupSaveListDto saveDto); + + /** + * 修改检测项目分组 + * + * @param projectGroup 检测项目分组 + * @return 结果 + */ + public int updateProjectGroup(ProjectGroup projectGroup); + + /** + * 批量删除检测项目分组 + * + * @param ids 需要删除的检测项目分组主键集合 + * @return 结果 + */ + public int deleteProjectGroupByIds(Long[] ids); + + /** + * 删除检测项目分组信息 + * + * @param id 检测项目分组主键 + * @return 结果 + */ + public int deleteProjectGroupById(Long id); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectgroup/impl/ProjectGroupServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectgroup/impl/ProjectGroupServiceImpl.java index 07f790ba..80db55fc 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectgroup/impl/ProjectGroupServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectgroup/impl/ProjectGroupServiceImpl.java @@ -1,14 +1,115 @@ package com.xinelu.manage.service.projectgroup.impl; +import com.xinelu.common.exception.ServiceException; +import com.xinelu.common.utils.DateUtils; +import com.xinelu.common.utils.SecurityUtils; +import com.xinelu.manage.domain.projectgroup.ProjectGroup; +import com.xinelu.manage.dto.projectgroup.ProjectGroupSaveListDto; +import com.xinelu.manage.mapper.projectgroup.ProjectGroupMapper; import com.xinelu.manage.service.projectgroup.IProjectGroupService; +import java.util.List; +import javax.annotation.Resource; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; /** -* @author haown -* @description 针对表【project_group(检测项目分组表)】的数据库操作Service实现 -* @createDate 2024-02-29 15:19:16 -*/ + * 检测项目分组Service业务层处理 + * + * @author haown + * @date 2024-03-11 + */ @Service public class ProjectGroupServiceImpl implements IProjectGroupService { + @Resource + private ProjectGroupMapper projectGroupMapper; + /** + * 查询检测项目分组 + * + * @param id 检测项目分组主键 + * @return 检测项目分组 + */ + @Override + public ProjectGroup selectProjectGroupById(Long id) { + return projectGroupMapper.selectProjectGroupById(id); + } + + /** + * 查询检测项目分组列表 + * + * @param projectGroup 检测项目分组 + * @return 检测项目分组 + */ + @Override + public List selectProjectGroupList(ProjectGroup projectGroup) { + return projectGroupMapper.selectProjectGroupList(projectGroup); + } + + /** + * 新增检测项目分组 + * + * @param projectGroup 检测项目分组 + * @return 结果 + */ + @Override + public int insertProjectGroup(ProjectGroup projectGroup) { + projectGroup.setCreateTime(DateUtils.getNowDate()); + projectGroup.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + projectGroup.setDelFlag(0); + return projectGroupMapper.insertProjectGroup(projectGroup); + } + + @Override public int insertList(ProjectGroupSaveListDto saveDto) { + if (ObjectUtils.isNotEmpty(saveDto)) { + List list = saveDto.getList(); + if (CollectionUtils.isNotEmpty(list)) { + for (ProjectGroup projectGroup : list) { + projectGroup.setCreateTime(DateUtils.getNowDate()); + projectGroup.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + projectGroup.setDelFlag(0); + } + return projectGroupMapper.insertBatch(list); + } else { + throw new ServiceException("传输数据错误"); + } + } else { + throw new ServiceException("传输数据错误"); + } + } + + /** + * 修改检测项目分组 + * + * @param projectGroup 检测项目分组 + * @return 结果 + */ + @Override + public int updateProjectGroup(ProjectGroup projectGroup) { + projectGroup.setUpdateTime(DateUtils.getNowDate()); + projectGroup.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + return projectGroupMapper.updateProjectGroup(projectGroup); + } + + /** + * 批量删除检测项目分组 + * + * @param ids 需要删除的检测项目分组主键 + * @return 结果 + */ + @Override + public int deleteProjectGroupByIds(Long[] ids) { + return projectGroupMapper.deleteProjectGroupByIds(ids); + } + + /** + * 删除检测项目分组信息 + * + * @param id 检测项目分组主键 + * @return 结果 + */ + @Override + public int deleteProjectGroupById(Long id) { + return projectGroupMapper.deleteProjectGroupById(id); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastrecord/IProjectLastRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastrecord/IProjectLastRecordService.java deleted file mode 100644 index d87f2d1d..00000000 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastrecord/IProjectLastRecordService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.xinelu.manage.service.projectlastrecord; - -/** -* @author haown -* @description 针对表【project_last_record(最近一次检测项目数据记录表)】的数据库操作Service -* @createDate 2024-02-29 15:20:41 -*/ -public interface IProjectLastRecordService { - -} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastrecord/impl/ProjectLastRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastrecord/impl/ProjectLastRecordServiceImpl.java deleted file mode 100644 index bb9f777e..00000000 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastrecord/impl/ProjectLastRecordServiceImpl.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.xinelu.manage.service.projectlastrecord.impl; - -import com.xinelu.manage.service.projectlastrecord.IProjectLastRecordService; -import org.springframework.stereotype.Service; - -/** -* @author haown -* @description 针对表【project_last_record(最近一次检测项目数据记录表)】的数据库操作Service实现 -* @createDate 2024-02-29 15:20:41 -*/ -@Service -public class ProjectLastRecordServiceImpl implements IProjectLastRecordService { - -} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastresult/IProjectLastResultService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastresult/IProjectLastResultService.java new file mode 100644 index 00000000..887e6ad3 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastresult/IProjectLastResultService.java @@ -0,0 +1,10 @@ +package com.xinelu.manage.service.projectlastresult; + +/** +* @author haown +* @description 针对表【project_last_result(最近一次检测项目结果表)】的数据库操作Service +* @createDate 2024-03-06 10:48:45 +*/ +public interface IProjectLastResultService { + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastresult/impl/ProjectLastResultServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastresult/impl/ProjectLastResultServiceImpl.java new file mode 100644 index 00000000..ac6e4fbf --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastresult/impl/ProjectLastResultServiceImpl.java @@ -0,0 +1,18 @@ +package com.xinelu.manage.service.projectlastresult.impl; + +import com.xinelu.manage.service.projectlastresult.IProjectLastResultService; +import org.springframework.stereotype.Service; + +/** +* @author haown +* @description 针对表【project_last_result(最近一次检测项目结果表)】的数据库操作Service实现 +* @createDate 2024-03-06 10:48:45 +*/ +@Service +public class ProjectLastResultServiceImpl implements IProjectLastResultService { + +} + + + + diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecord/IProjectRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecord/IProjectRecordService.java deleted file mode 100644 index 85cb8919..00000000 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecord/IProjectRecordService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.xinelu.manage.service.projectrecord; - -/** -* @author haown -* @description 针对表【project_record(检测项目数据记录表)】的数据库操作Service -* @createDate 2024-02-29 15:22:15 -*/ -public interface IProjectRecordService { - -} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecord/impl/ProjectRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecord/impl/ProjectRecordServiceImpl.java deleted file mode 100644 index 0bfa281b..00000000 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecord/impl/ProjectRecordServiceImpl.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.xinelu.manage.service.projectrecord.impl; - -import com.xinelu.manage.service.projectrecord.IProjectRecordService; -import org.springframework.stereotype.Service; - -/** -* @author haown -* @description 针对表【project_record(检测项目数据记录表)】的数据库操作Service实现 -* @createDate 2024-02-29 15:22:15 -*/ -@Service -public class ProjectRecordServiceImpl implements IProjectRecordService { - -} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecordfile/IProjectRecordFileService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecordfile/IProjectRecordFileService.java deleted file mode 100644 index cd42f07c..00000000 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecordfile/IProjectRecordFileService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.xinelu.manage.service.projectrecordfile; - -/** -* @author haown -* @description 针对表【project_record_file(检测项目数据记录附件表（扩展）)】的数据库操作Service -* @createDate 2024-02-29 15:23:25 -*/ -public interface IProjectRecordFileService { - -} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecordfile/impl/ProjectRecordFileServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecordfile/impl/ProjectRecordFileServiceImpl.java deleted file mode 100644 index c071974f..00000000 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecordfile/impl/ProjectRecordFileServiceImpl.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.xinelu.manage.service.projectrecordfile.impl; - -import com.xinelu.manage.service.projectrecordfile.IProjectRecordFileService; -import org.springframework.stereotype.Service; - -/** -* @author haown -* @description 针对表【project_record_file(检测项目数据记录附件表（扩展）)】的数据库操作Service实现 -* @createDate 2024-02-29 15:23:25 -*/ -@Service -public class ProjectRecordFileServiceImpl implements IProjectRecordFileService { - -} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectresult/IProjectResultService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectresult/IProjectResultService.java new file mode 100644 index 00000000..1ca41b78 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectresult/IProjectResultService.java @@ -0,0 +1,64 @@ +package com.xinelu.manage.service.projectresult; + +import com.xinelu.manage.domain.projectresult.ProjectResult; +import com.xinelu.manage.dto.projectresult.ProjectResultStatisticDto; +import com.xinelu.manage.vo.projectresult.ProjectResultStatisticVo; +import java.util.List; + +/** +* @author haown +* @description 针对表【project_result(检测项目结果表)】的数据库操作Service +* @createDate 2024-03-06 10:40:56 +*/ +public interface IProjectResultService { + + ProjectResultStatisticVo curveStatistics(ProjectResultStatisticDto projectResultStatisticDto); + + /** + * 查询检测项目结果 + * + * @param id 检测项目结果主键 + * @return 检测项目结果 + */ + public ProjectResult selectProjectResultById(Long id); + + /** + * 查询检测项目结果列表 + * + * @param projectResult 检测项目结果 + * @return 检测项目结果集合 + */ + public List selectProjectResultList(ProjectResult projectResult); + + /** + * 新增检测项目结果 + * + * @param projectResult 检测项目结果 + * @return 结果 + */ + public int insertProjectResult(ProjectResult projectResult); + + /** + * 修改检测项目结果 + * + * @param projectResult 检测项目结果 + * @return 结果 + */ + public int updateProjectResult(ProjectResult projectResult); + + /** + * 批量删除检测项目结果 + * + * @param ids 需要删除的检测项目结果主键集合 + * @return 结果 + */ + public int deleteProjectResultByIds(Long[] ids); + + /** + * 删除检测项目结果信息 + * + * @param id 检测项目结果主键 + * @return 结果 + */ + public int deleteProjectResultById(Long id); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectresult/impl/ProjectResultServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectresult/impl/ProjectResultServiceImpl.java new file mode 100644 index 00000000..7cb99d0e --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectresult/impl/ProjectResultServiceImpl.java @@ -0,0 +1,148 @@ +package com.xinelu.manage.service.projectresult.impl; + +import com.xinelu.common.exception.ServiceException; +import com.xinelu.common.utils.DateUtils; +import com.xinelu.common.utils.StringUtils; +import com.xinelu.manage.domain.project.Project; +import com.xinelu.manage.domain.projectgroup.ProjectGroup; +import com.xinelu.manage.domain.projectresult.ProjectResult; +import com.xinelu.manage.dto.projectresult.ProjectResultStatisticDto; +import com.xinelu.manage.mapper.project.ProjectMapper; +import com.xinelu.manage.mapper.projectgroup.ProjectGroupMapper; +import com.xinelu.manage.mapper.projectresult.ProjectResultMapper; +import com.xinelu.manage.service.projectresult.IProjectResultService; +import com.xinelu.manage.vo.projectresult.ProjectResultStatisticVo; +import com.xinelu.manage.vo.projectresult.ProjectResultVo; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import javax.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +/** +* @author haown +* @description 针对表【project_result(检测项目结果表)】的数据库操作Service实现 +* @createDate 2024-03-06 10:40:56 +*/ +@Service +public class ProjectResultServiceImpl implements IProjectResultService { + + @Resource + private ProjectGroupMapper projectGroupMapper; + @Resource + private ProjectMapper projectMapper; + @Resource + private ProjectResultMapper projectResultMapper; + + /** + * 查询检测项目结果 + * + * @param id 检测项目结果主键 + * @return 检测项目结果 + */ + @Override + public ProjectResult selectProjectResultById(Long id) { + return projectResultMapper.selectProjectResultById(id); + } + + /** + * 查询检测项目结果列表 + * + * @param projectResult 检测项目结果 + * @return 检测项目结果 + */ + @Override + public List selectProjectResultList(ProjectResult projectResult) { + return projectResultMapper.selectProjectResultList(projectResult); + } + + /** + * 新增检测项目结果 + * + * @param projectResult 检测项目结果 + * @return 结果 + */ + @Override + public int insertProjectResult(ProjectResult projectResult) { + projectResult.setCreateTime(DateUtils.getNowDate()); + return projectResultMapper.insertProjectResult(projectResult); + } + + /** + * 修改检测项目结果 + * + * @param projectResult 检测项目结果 + * @return 结果 + */ + @Override + public int updateProjectResult(ProjectResult projectResult) { + projectResult.setUpdateTime(DateUtils.getNowDate()); + return projectResultMapper.updateProjectResult(projectResult); + } + + /** + * 批量删除检测项目结果 + * + * @param ids 需要删除的检测项目结果主键 + * @return 结果 + */ + @Override + public int deleteProjectResultByIds(Long[] ids) { + return projectResultMapper.deleteProjectResultByIds(ids); + } + + /** + * 删除检测项目结果信息 + * + * @param id 检测项目结果主键 + * @return 结果 + */ + @Override + public int deleteProjectResultById(Long id) { + return projectResultMapper.deleteProjectResultById(id); + } + + @Override + public ProjectResultStatisticVo curveStatistics(ProjectResultStatisticDto projectResultStatisticDto) { + // 根据groupCode查询groupId + if (StringUtils.isNotBlank(projectResultStatisticDto.getGroupCode())) { + ProjectGroup projectGroup = new ProjectGroup(); + projectGroup.setGroupCode(projectResultStatisticDto.getGroupCode()); + List groupList = projectGroupMapper.selectProjectGroupList(projectGroup); + if (CollectionUtils.isEmpty(groupList)) { + throw new ServiceException("未找到该检测项目"); + } + projectResultStatisticDto.setGroupId(groupList.get(0).getId()); + } + // 根据projectCode查询projectId + if (StringUtils.isNotBlank(projectResultStatisticDto.getProjectCode())) { + Project projectQuery = new Project(); + projectQuery.setProjectCode(projectResultStatisticDto.getProjectCode()); + List projectList = projectMapper.selectProjectList(projectQuery); + if (CollectionUtils.isEmpty(projectList)) { + throw new ServiceException("未找到该检测项目"); + } + projectResultStatisticDto.setProjectId(projectList.get(0).getId()); + } + if (projectResultStatisticDto.getPatientId() == null) { + throw new ServiceException("数据格式错误"); + } + List measureTimeList = new ArrayList<>(); + Map> valueMap = new HashMap<>(); + List resultList = projectResultMapper.selectList(projectResultStatisticDto); + if (!CollectionUtils.isEmpty(resultList)) { + // 根据projectId进行分组 + Map> groupByProject = resultList.stream().collect(Collectors.groupingBy(ProjectResultVo::getProjectName)); + for (String projectName : groupByProject.keySet()) { + List projectResultList = groupByProject.get(projectName); + List valueList = projectResultList.stream().map(ProjectResultVo::getMeasureResult).collect(Collectors.toList()); + measureTimeList = projectResultList.stream().map(ProjectResultVo::getMeasureTimeStr).collect(Collectors.toList()); + valueMap.put(projectName, valueList); + } + } + return ProjectResultStatisticVo.builder().xList(measureTimeList).yList(valueMap).build(); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/projectgroup/ProjectGroupTreeVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/projectgroup/ProjectGroupTreeVo.java new file mode 100644 index 00000000..aea487b9 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/projectgroup/ProjectGroupTreeVo.java @@ -0,0 +1,42 @@ +package com.xinelu.manage.vo.projectgroup; + +import com.fasterxml.jackson.annotation.JsonInclude; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: 检测项目分组树形结构查询返回视图类 + * @author: haown + * @create: 2024-03-11 15:30 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ProjectGroupTreeVo { + + /** + * 节点ID + */ + private Long id; + + /** + * 节点名称 + */ + private String label; + + /** + * 节点名称 + */ + private String value; + + /** + * 子节点 + */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List children; + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/projectresult/ProjectResultStatisticVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/projectresult/ProjectResultStatisticVo.java new file mode 100644 index 00000000..a91aae87 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/projectresult/ProjectResultStatisticVo.java @@ -0,0 +1,29 @@ +package com.xinelu.manage.vo.projectresult; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import java.util.Map; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: 项目检测统计返回视图类 + * @author: haown + * @create: 2024-03-06 11:40 + **/ +@ApiModel("项目检测统计返回视图类") +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ProjectResultStatisticVo { + + @ApiModelProperty("横坐标轴列表") + private List xList; + + @ApiModelProperty("纵坐标轴列表") + private Map> yList; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/projectresult/ProjectResultVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/projectresult/ProjectResultVo.java new file mode 100644 index 00000000..199ffc75 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/projectresult/ProjectResultVo.java @@ -0,0 +1,30 @@ +package com.xinelu.manage.vo.projectresult; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 项目检测结果查询返回视图类 + * @author: haown + * @create: 2024-03-06 15:33 + **/ +@ApiModel("项目检测结果查询返回视图类") +@Data +public class ProjectResultVo { + + @ApiModelProperty("分组id") + private Long groupId; + + @ApiModelProperty("分组名称") + private String groupName; + + @ApiModelProperty("分组id") + private Long projectId; + + private String projectName; + + private String measureResult; + + private String measureTimeStr; +} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml new file mode 100644 index 00000000..3ed61a32 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml @@ -0,0 +1,377 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,patient_id,patient_name, + patient_phone,card_no,sex, + birth_date,family_member_phone,address, + main_diagnosis,hospital_agency_id,hospital_agency_name, + campus_agency_id,campus_agency_name,department_id, + department_name,ward_id,ward_name, + appointment_treatment_group,registration_no,registration_date, + appointment_date,certificate_issuing_doctor_id,certificate_issuing_doctor_name, + responsible_nurse,del_flag,create_by, + create_time,update_by,update_time + + + + + + delete from patient_pre_hospitalization + where id = #{id,jdbcType=BIGINT} + + + insert into patient_pre_hospitalization + ( id,patient_id,patient_name + ,patient_phone,card_no,sex + ,birth_date,family_member_phone,address + ,main_diagnosis,hospital_agency_id,hospital_agency_name + ,campus_agency_id,campus_agency_name,department_id + ,department_name,ward_id,ward_name + ,appointment_treatment_group,registration_no,registration_date + ,appointment_date,certificate_issuing_doctor_id,certificate_issuing_doctor_name + ,responsible_nurse,del_flag,create_by + ,create_time,update_by,update_time + ) + values (#{id,jdbcType=BIGINT},#{patientId,jdbcType=BIGINT},#{patientName,jdbcType=VARCHAR} + ,#{patientPhone,jdbcType=VARCHAR},#{cardNo,jdbcType=VARCHAR},#{sex,jdbcType=VARCHAR} + ,#{birthDate,jdbcType=DATE},#{familyMemberPhone,jdbcType=VARCHAR},#{address,jdbcType=VARCHAR} + ,#{mainDiagnosis,jdbcType=VARCHAR},#{hospitalAgencyId,jdbcType=BIGINT},#{hospitalAgencyName,jdbcType=VARCHAR} + ,#{campusAgencyId,jdbcType=BIGINT},#{campusAgencyName,jdbcType=VARCHAR},#{departmentId,jdbcType=BIGINT} + ,#{departmentName,jdbcType=VARCHAR},#{wardId,jdbcType=BIGINT},#{wardName,jdbcType=VARCHAR} + ,#{appointmentTreatmentGroup,jdbcType=VARCHAR},#{registrationNo,jdbcType=VARCHAR},#{registrationDate,jdbcType=DATE} + ,#{appointmentDate,jdbcType=DATE},#{certificateIssuingDoctorId,jdbcType=BIGINT},#{certificateIssuingDoctorName,jdbcType=VARCHAR} + ,#{responsibleNurse,jdbcType=VARCHAR},#{delFlag,jdbcType=TINYINT},#{createBy,jdbcType=VARCHAR} + ,#{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR},#{updateTime,jdbcType=TIMESTAMP} + ) + + + insert into patient_pre_hospitalization + + id, + patient_id, + patient_name, + patient_phone, + card_no, + sex, + birth_date, + family_member_phone, + address, + main_diagnosis, + hospital_agency_id, + hospital_agency_name, + campus_agency_id, + campus_agency_name, + department_id, + department_name, + ward_id, + ward_name, + appointment_treatment_group, + registration_no, + registration_date, + appointment_date, + certificate_issuing_doctor_id, + certificate_issuing_doctor_name, + responsible_nurse, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id,jdbcType=BIGINT}, + #{patientId,jdbcType=BIGINT}, + #{patientName,jdbcType=VARCHAR}, + #{patientPhone,jdbcType=VARCHAR}, + #{cardNo,jdbcType=VARCHAR}, + #{sex,jdbcType=VARCHAR}, + #{birthDate,jdbcType=DATE}, + #{familyMemberPhone,jdbcType=VARCHAR}, + #{address,jdbcType=VARCHAR}, + #{mainDiagnosis,jdbcType=VARCHAR}, + #{hospitalAgencyId,jdbcType=BIGINT}, + #{hospitalAgencyName,jdbcType=VARCHAR}, + #{campusAgencyId,jdbcType=BIGINT}, + #{campusAgencyName,jdbcType=VARCHAR}, + #{departmentId,jdbcType=BIGINT}, + #{departmentName,jdbcType=VARCHAR}, + #{wardId,jdbcType=BIGINT}, + #{wardName,jdbcType=VARCHAR}, + #{appointmentTreatmentGroup,jdbcType=VARCHAR}, + #{registrationNo,jdbcType=VARCHAR}, + #{registrationDate,jdbcType=DATE}, + #{appointmentDate,jdbcType=DATE}, + #{certificateIssuingDoctorId,jdbcType=BIGINT}, + #{certificateIssuingDoctorName,jdbcType=VARCHAR}, + #{responsibleNurse,jdbcType=VARCHAR}, + #{delFlag,jdbcType=TINYINT}, + #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, + + + + update patient_pre_hospitalization + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + patient_name = #{patientName,jdbcType=VARCHAR}, + + + patient_phone = #{patientPhone,jdbcType=VARCHAR}, + + + card_no = #{cardNo,jdbcType=VARCHAR}, + + + sex = #{sex,jdbcType=VARCHAR}, + + + birth_date = #{birthDate,jdbcType=DATE}, + + + family_member_phone = #{familyMemberPhone,jdbcType=VARCHAR}, + + + address = #{address,jdbcType=VARCHAR}, + + + main_diagnosis = #{mainDiagnosis,jdbcType=VARCHAR}, + + + hospital_agency_id = #{hospitalAgencyId,jdbcType=BIGINT}, + + + hospital_agency_name = #{hospitalAgencyName,jdbcType=VARCHAR}, + + + campus_agency_id = #{campusAgencyId,jdbcType=BIGINT}, + + + campus_agency_name = #{campusAgencyName,jdbcType=VARCHAR}, + + + department_id = #{departmentId,jdbcType=BIGINT}, + + + department_name = #{departmentName,jdbcType=VARCHAR}, + + + ward_id = #{wardId,jdbcType=BIGINT}, + + + ward_name = #{wardName,jdbcType=VARCHAR}, + + + appointment_treatment_group = #{appointmentTreatmentGroup,jdbcType=VARCHAR}, + + + registration_no = #{registrationNo,jdbcType=VARCHAR}, + + + registration_date = #{registrationDate,jdbcType=DATE}, + + + appointment_date = #{appointmentDate,jdbcType=DATE}, + + + certificate_issuing_doctor_id = #{certificateIssuingDoctorId,jdbcType=BIGINT}, + + + certificate_issuing_doctor_name = #{certificateIssuingDoctorName,jdbcType=VARCHAR}, + + + responsible_nurse = #{responsibleNurse,jdbcType=VARCHAR}, + + + del_flag = #{delFlag,jdbcType=TINYINT}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=BIGINT} + + + update patient_pre_hospitalization + set + patient_id = #{patientId,jdbcType=BIGINT}, + patient_name = #{patientName,jdbcType=VARCHAR}, + patient_phone = #{patientPhone,jdbcType=VARCHAR}, + card_no = #{cardNo,jdbcType=VARCHAR}, + sex = #{sex,jdbcType=VARCHAR}, + birth_date = #{birthDate,jdbcType=DATE}, + family_member_phone = #{familyMemberPhone,jdbcType=VARCHAR}, + address = #{address,jdbcType=VARCHAR}, + main_diagnosis = #{mainDiagnosis,jdbcType=VARCHAR}, + hospital_agency_id = #{hospitalAgencyId,jdbcType=BIGINT}, + hospital_agency_name = #{hospitalAgencyName,jdbcType=VARCHAR}, + campus_agency_id = #{campusAgencyId,jdbcType=BIGINT}, + campus_agency_name = #{campusAgencyName,jdbcType=VARCHAR}, + department_id = #{departmentId,jdbcType=BIGINT}, + department_name = #{departmentName,jdbcType=VARCHAR}, + ward_id = #{wardId,jdbcType=BIGINT}, + ward_name = #{wardName,jdbcType=VARCHAR}, + appointment_treatment_group = #{appointmentTreatmentGroup,jdbcType=VARCHAR}, + registration_no = #{registrationNo,jdbcType=VARCHAR}, + registration_date = #{registrationDate,jdbcType=DATE}, + appointment_date = #{appointmentDate,jdbcType=DATE}, + certificate_issuing_doctor_id = #{certificateIssuingDoctorId,jdbcType=BIGINT}, + certificate_issuing_doctor_name = #{certificateIssuingDoctorName,jdbcType=VARCHAR}, + responsible_nurse = #{responsibleNurse,jdbcType=VARCHAR}, + del_flag = #{delFlag,jdbcType=TINYINT}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=BIGINT} + + + + + + + update patient_pre_hospitalization set del_flag = 1 where id in + + #{id} + + + + insert into patient_pre_hospitalization(id,patient_id,patient_name, + patient_phone,card_no,sex, + birth_date,family_member_phone,address, + main_diagnosis,hospital_agency_id,hospital_agency_name, + campus_agency_id,campus_agency_name,department_id, + department_name,ward_id,ward_name, + appointment_treatment_group,registration_no,registration_date, + appointment_date,certificate_issuing_doctor_id,certificate_issuing_doctor_name, + responsible_nurse,del_flag,search_value, + create_by,create_time,update_by, + update_time,remark,params) + values + + (#{item.id,jdbcType=NUMERIC},#{item.patientId,jdbcType=NUMERIC},#{item.patientName,jdbcType=VARCHAR}, + #{item.patientPhone,jdbcType=VARCHAR},#{item.cardNo,jdbcType=VARCHAR},#{item.sex,jdbcType=VARCHAR}, + #{item.birthDate,jdbcType=TIMESTAMP},#{item.familyMemberPhone,jdbcType=VARCHAR},#{item.address,jdbcType=VARCHAR}, + #{item.mainDiagnosis,jdbcType=VARCHAR},#{item.hospitalAgencyId,jdbcType=NUMERIC},#{item.hospitalAgencyName,jdbcType=VARCHAR}, + #{item.campusAgencyId,jdbcType=NUMERIC},#{item.campusAgencyName,jdbcType=VARCHAR},#{item.departmentId,jdbcType=NUMERIC}, + #{item.departmentName,jdbcType=VARCHAR},#{item.wardId,jdbcType=NUMERIC},#{item.wardName,jdbcType=VARCHAR}, + #{item.appointmentTreatmentGroup,jdbcType=VARCHAR},#{item.registrationNo,jdbcType=VARCHAR},#{item.registrationDate,jdbcType=TIMESTAMP}, + #{item.appointmentDate,jdbcType=TIMESTAMP},#{item.certificateIssuingDoctorId,jdbcType=NUMERIC},#{item.certificateIssuingDoctorName,jdbcType=VARCHAR}, + #{item.responsibleNurse,jdbcType=VARCHAR},#{item.delFlag,jdbcType=NUMERIC},#{item.searchValue,jdbcType=VARCHAR}, + #{item.createBy,jdbcType=VARCHAR},#{item.createTime,jdbcType=TIMESTAMP},#{item.updateBy,jdbcType=VARCHAR}, + #{item.updateTime,jdbcType=TIMESTAMP},#{item.remark,jdbcType=VARCHAR},#{item.params}) + + + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml index 4961417a..5bfedaf6 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml @@ -5,40 +5,66 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - select id, patient_id, visit_dept, visit_name, visit_date, visit_type, patient_name, birthplace, sex, age, nation, marriage, medical_history_narrator, admission_time, discharge_time, record_time, outpatient_visit_info, hospitalization_days, create_by, create_time, update_by, update_time from patient_visit_record + select id, patient_id, card_no, patient_name, patient_phone, family_member_phone, address, sex, birth_date, age, nation, visit_type, visit_date, visit_name, hospital_agency_id, hospital_agency_name, campus_agency_id, campus_agency_name, department_id, department_name, ward_id, ward_name, attending_physician_id, attending_physician_name, main_diagnosis, marriage, medical_history_narrator, admission_time, discharge_time, record_time, outpatient_visit_info, hospitalization_days, in_hospital_info, out_hospital_info, visit_serial_number, in_hospital_number, responsible_nurse, surgical_name, create_by, create_time, update_by, update_time from patient_visit_record - select - - from project - where id = #{id,jdbcType=BIGINT} + - - delete from project - where id = #{id,jdbcType=BIGINT} - - - insert into project - ( id,group_id,group_name - ,project_name,project_code,project_alias - ,enable_status,judge_mode,max_value - ,min_value,default_value,lis_compare - ,project_sort,project_remark,del_flag - ,create_by,create_time,update_by - ,update_time) - values (#{id,jdbcType=BIGINT},#{groupId,jdbcType=BIGINT},#{groupName,jdbcType=VARCHAR} - ,#{projectName,jdbcType=VARCHAR},#{projectCode,jdbcType=VARCHAR},#{projectAlias,jdbcType=VARCHAR} - ,#{enableStatus,jdbcType=TINYINT},#{judgeMode,jdbcType=VARCHAR},#{maxValue,jdbcType=INTEGER} - ,#{minValue,jdbcType=INTEGER},#{defaultValue,jdbcType=VARCHAR},#{lisCompare,jdbcType=VARCHAR} - ,#{projectSort,jdbcType=INTEGER},#{projectRemark,jdbcType=VARCHAR},#{delFlag,jdbcType=TINYINT} - ,#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR} - ,#{updateTime,jdbcType=TIMESTAMP}) - - + + + insert into project - id, - group_id, - group_name, - project_name, - project_code, - project_alias, - enable_status, - judge_mode, - max_value, - min_value, - default_value, - lis_compare, - project_sort, - project_remark, - del_flag, - create_by, - create_time, - update_by, - update_time, + group_id, + + group_name, + + project_name, + + project_code, + + project_alias, + + enable_status, + + judge_mode, + + max_value, + + min_value, + + default_value, + + lis_compare, + + project_unit, + + project_sort, + + project_remark, + + del_flag, + + create_by, + + create_time, + + update_by, + + update_time, + - #{id,jdbcType=BIGINT}, - #{groupId,jdbcType=BIGINT}, - #{groupName,jdbcType=VARCHAR}, - #{projectName,jdbcType=VARCHAR}, - #{projectCode,jdbcType=VARCHAR}, - #{projectAlias,jdbcType=VARCHAR}, - #{enableStatus,jdbcType=TINYINT}, - #{judgeMode,jdbcType=VARCHAR}, - #{maxValue,jdbcType=INTEGER}, - #{minValue,jdbcType=INTEGER}, - #{defaultValue,jdbcType=VARCHAR}, - #{lisCompare,jdbcType=VARCHAR}, - #{projectSort,jdbcType=INTEGER}, - #{projectRemark,jdbcType=VARCHAR}, - #{delFlag,jdbcType=TINYINT}, - #{createBy,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, - #{updateBy,jdbcType=VARCHAR}, - #{updateTime,jdbcType=TIMESTAMP}, + #{groupId}, + + #{groupName}, + + #{projectName}, + + #{projectCode}, + + #{projectAlias}, + + #{enableStatus}, + + #{judgeMode}, + + #{maxValue}, + + #{minValue}, + + #{defaultValue}, + + #{lisCompare}, + + #{projectUnit}, + + #{projectSort}, + + #{projectRemark}, + + #{delFlag}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + - + + update project - - - group_id = #{groupId,jdbcType=BIGINT}, - - - group_name = #{groupName,jdbcType=VARCHAR}, - - - project_name = #{projectName,jdbcType=VARCHAR}, - - - project_code = #{projectCode,jdbcType=VARCHAR}, - - - project_alias = #{projectAlias,jdbcType=VARCHAR}, - - - enable_status = #{enableStatus,jdbcType=TINYINT}, - - - judge_mode = #{judgeMode,jdbcType=VARCHAR}, - - - max_value = #{maxValue,jdbcType=INTEGER}, - - - min_value = #{minValue,jdbcType=INTEGER}, - - - default_value = #{defaultValue,jdbcType=VARCHAR}, - - - lis_compare = #{lisCompare,jdbcType=VARCHAR}, - - - project_sort = #{projectSort,jdbcType=INTEGER}, - - - project_remark = #{projectRemark,jdbcType=VARCHAR}, - - - del_flag = #{delFlag,jdbcType=TINYINT}, - - - create_by = #{createBy,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_by = #{updateBy,jdbcType=VARCHAR}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=BIGINT} + + group_id = + #{groupId}, + + group_name = + #{groupName}, + + project_name = + #{projectName}, + + project_code = + #{projectCode}, + + project_alias = + #{projectAlias}, + + enable_status = + #{enableStatus}, + + judge_mode = + #{judgeMode}, + + max_value = + #{maxValue}, + + min_value = + #{minValue}, + + default_value = + #{defaultValue}, + + lis_compare = + #{lisCompare}, + + project_unit = + #{projectUnit}, + + project_sort = + #{projectSort}, + + project_remark = + #{projectRemark}, + + del_flag = + #{delFlag}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} - - update project - set - group_id = #{groupId,jdbcType=BIGINT}, - group_name = #{groupName,jdbcType=VARCHAR}, - project_name = #{projectName,jdbcType=VARCHAR}, - project_code = #{projectCode,jdbcType=VARCHAR}, - project_alias = #{projectAlias,jdbcType=VARCHAR}, - enable_status = #{enableStatus,jdbcType=TINYINT}, - judge_mode = #{judgeMode,jdbcType=VARCHAR}, - max_value = #{maxValue,jdbcType=INTEGER}, - min_value = #{minValue,jdbcType=INTEGER}, - default_value = #{defaultValue,jdbcType=VARCHAR}, - lis_compare = #{lisCompare,jdbcType=VARCHAR}, - project_sort = #{projectSort,jdbcType=INTEGER}, - project_remark = #{projectRemark,jdbcType=VARCHAR}, - del_flag = #{delFlag,jdbcType=TINYINT}, - create_by = #{createBy,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_by = #{updateBy,jdbcType=VARCHAR}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=BIGINT} - - + + + delete from project where id = #{id} + + + + delete from project where id in + + #{id} + + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/projectbatch/ProjectBatchMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/projectbatch/ProjectBatchMapper.xml new file mode 100644 index 00000000..5250ef96 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/projectbatch/ProjectBatchMapper.xml @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id,patient_id,patient_name, + patient_phone,birth_date,card_no, + sex,batch_name,batch_code, + batch_sort,batch_remark,batch_date, + del_flag,create_by,create_time, + update_by,update_time + + + + + + delete from project_batch + where id = #{id,jdbcType=BIGINT} + + + insert into project_batch + ( id,patient_id,patient_name + ,patient_phone,birth_date,card_no + ,sex,batch_name,batch_code + ,batch_sort,batch_remark,batch_date + ,del_flag,create_by,create_time + ,update_by,update_time) + values (#{id,jdbcType=BIGINT},#{patientId,jdbcType=BIGINT},#{patientName,jdbcType=VARCHAR} + ,#{patientPhone,jdbcType=VARCHAR},#{birthDate,jdbcType=DATE},#{cardNo,jdbcType=VARCHAR} + ,#{sex,jdbcType=VARCHAR},#{batchName,jdbcType=VARCHAR},#{batchCode,jdbcType=VARCHAR} + ,#{batchSort,jdbcType=INTEGER},#{batchRemark,jdbcType=VARCHAR},#{batchDate,jdbcType=TIMESTAMP} + ,#{delFlag,jdbcType=TINYINT},#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP} + ,#{updateBy,jdbcType=VARCHAR},#{updateTime,jdbcType=TIMESTAMP}) + + + insert into project_batch + + id, + patient_id, + patient_name, + patient_phone, + birth_date, + card_no, + sex, + batch_name, + batch_code, + batch_sort, + batch_remark, + batch_date, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id,jdbcType=BIGINT}, + #{patientId,jdbcType=BIGINT}, + #{patientName,jdbcType=VARCHAR}, + #{patientPhone,jdbcType=VARCHAR}, + #{birthDate,jdbcType=DATE}, + #{cardNo,jdbcType=VARCHAR}, + #{sex,jdbcType=VARCHAR}, + #{batchName,jdbcType=VARCHAR}, + #{batchCode,jdbcType=VARCHAR}, + #{batchSort,jdbcType=INTEGER}, + #{batchRemark,jdbcType=VARCHAR}, + #{batchDate,jdbcType=TIMESTAMP}, + #{delFlag,jdbcType=TINYINT}, + #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, + + + + update project_batch + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + patient_name = #{patientName,jdbcType=VARCHAR}, + + + patient_phone = #{patientPhone,jdbcType=VARCHAR}, + + + birth_date = #{birthDate,jdbcType=DATE}, + + + card_no = #{cardNo,jdbcType=VARCHAR}, + + + sex = #{sex,jdbcType=VARCHAR}, + + + batch_name = #{batchName,jdbcType=VARCHAR}, + + + batch_code = #{batchCode,jdbcType=VARCHAR}, + + + batch_sort = #{batchSort,jdbcType=INTEGER}, + + + batch_remark = #{batchRemark,jdbcType=VARCHAR}, + + + batch_date = #{batchDate,jdbcType=TIMESTAMP}, + + + del_flag = #{delFlag,jdbcType=TINYINT}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=BIGINT} + + + update project_batch + set + patient_id = #{patientId,jdbcType=BIGINT}, + patient_name = #{patientName,jdbcType=VARCHAR}, + patient_phone = #{patientPhone,jdbcType=VARCHAR}, + birth_date = #{birthDate,jdbcType=DATE}, + card_no = #{cardNo,jdbcType=VARCHAR}, + sex = #{sex,jdbcType=VARCHAR}, + batch_name = #{batchName,jdbcType=VARCHAR}, + batch_code = #{batchCode,jdbcType=VARCHAR}, + batch_sort = #{batchSort,jdbcType=INTEGER}, + batch_remark = #{batchRemark,jdbcType=VARCHAR}, + batch_date = #{batchDate,jdbcType=TIMESTAMP}, + del_flag = #{delFlag,jdbcType=TINYINT}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=BIGINT} + + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/projectdevice/ProjectDeviceMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/projectdevice/ProjectDeviceMapper.xml index b1b1fef2..42b822db 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/projectdevice/ProjectDeviceMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/projectdevice/ProjectDeviceMapper.xml @@ -1,178 +1,217 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - id,patient_id,patient_name, - card_no,device_type,device_name, - device_code,device_status,device_remark, - device_bind_time,device_unbind_time,device_ip, - device_port,create_by,create_time, - update_by,update_time + + select id, patient_id, patient_name, card_no, device_type, device_name, device_code, device_status, device_remark, device_bind_time, device_unbind_time, device_ip, device_port, create_by, create_time, update_by, update_time from project_device - + + + + and patient_id = #{patientId} + + + and patient_name like concat('%', #{patientName}, '%') + + + and card_no = #{cardNo} + + + and device_type = #{deviceType} + + + and device_name like concat('%', #{deviceName}, '%') + + + and device_code = #{deviceCode} + + + and device_status = #{deviceStatus} + + + and device_remark = #{deviceRemark} + + + and device_bind_time = #{deviceBindTime} + + + and device_unbind_time = #{deviceUnbindTime} + + + and device_ip = #{deviceIp} + + + and device_port = #{devicePort} + + - - delete from project_device - where id = #{id,jdbcType=BIGINT} - - - insert into project_device - ( id,patient_id,patient_name - ,card_no,device_type,device_name - ,device_code,device_status,device_remark - ,device_bind_time,device_unbind_time,device_ip - ,device_port,create_by,create_time - ,update_by,update_time) - values (#{id,jdbcType=BIGINT},#{patientId,jdbcType=BIGINT},#{patientName,jdbcType=VARCHAR} - ,#{cardNo,jdbcType=VARCHAR},#{deviceType,jdbcType=VARCHAR},#{deviceName,jdbcType=VARCHAR} - ,#{deviceCode,jdbcType=VARCHAR},#{deviceStatus,jdbcType=VARCHAR},#{deviceRemark,jdbcType=VARCHAR} - ,#{deviceBindTime,jdbcType=TIMESTAMP},#{deviceUnbindTime,jdbcType=TIMESTAMP},#{deviceIp,jdbcType=VARCHAR} - ,#{devicePort,jdbcType=INTEGER},#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP} - ,#{updateBy,jdbcType=VARCHAR},#{updateTime,jdbcType=TIMESTAMP}) - - + + + insert into project_device - id, - patient_id, - patient_name, - card_no, - device_type, - device_name, - device_code, - device_status, - device_remark, - device_bind_time, - device_unbind_time, - device_ip, - device_port, - create_by, - create_time, - update_by, - update_time, + patient_id, + + patient_name, + + card_no, + + device_type, + + device_name, + + device_code, + + device_status, + + device_remark, + + device_bind_time, + + device_unbind_time, + + device_ip, + + device_port, + + create_by, + + create_time, + + update_by, + + update_time, + - #{id,jdbcType=BIGINT}, - #{patientId,jdbcType=BIGINT}, - #{patientName,jdbcType=VARCHAR}, - #{cardNo,jdbcType=VARCHAR}, - #{deviceType,jdbcType=VARCHAR}, - #{deviceName,jdbcType=VARCHAR}, - #{deviceCode,jdbcType=VARCHAR}, - #{deviceStatus,jdbcType=VARCHAR}, - #{deviceRemark,jdbcType=VARCHAR}, - #{deviceBindTime,jdbcType=TIMESTAMP}, - #{deviceUnbindTime,jdbcType=TIMESTAMP}, - #{deviceIp,jdbcType=VARCHAR}, - #{devicePort,jdbcType=INTEGER}, - #{createBy,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, - #{updateBy,jdbcType=VARCHAR}, - #{updateTime,jdbcType=TIMESTAMP}, + #{patientId}, + + #{patientName}, + + #{cardNo}, + + #{deviceType}, + + #{deviceName}, + + #{deviceCode}, + + #{deviceStatus}, + + #{deviceRemark}, + + #{deviceBindTime}, + + #{deviceUnbindTime}, + + #{deviceIp}, + + #{devicePort}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + - + + update project_device - - - patient_id = #{patientId,jdbcType=BIGINT}, - - - patient_name = #{patientName,jdbcType=VARCHAR}, - - - card_no = #{cardNo,jdbcType=VARCHAR}, - - - device_type = #{deviceType,jdbcType=VARCHAR}, - - - device_name = #{deviceName,jdbcType=VARCHAR}, - - - device_code = #{deviceCode,jdbcType=VARCHAR}, - - - device_status = #{deviceStatus,jdbcType=VARCHAR}, - - - device_remark = #{deviceRemark,jdbcType=VARCHAR}, - - - device_bind_time = #{deviceBindTime,jdbcType=TIMESTAMP}, - - - device_unbind_time = #{deviceUnbindTime,jdbcType=TIMESTAMP}, - - - device_ip = #{deviceIp,jdbcType=VARCHAR}, - - - device_port = #{devicePort,jdbcType=INTEGER}, - - - create_by = #{createBy,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_by = #{updateBy,jdbcType=VARCHAR}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=BIGINT} + + patient_id = + #{patientId}, + + patient_name = + #{patientName}, + + card_no = + #{cardNo}, + + device_type = + #{deviceType}, + + device_name = + #{deviceName}, + + device_code = + #{deviceCode}, + + device_status = + #{deviceStatus}, + + device_remark = + #{deviceRemark}, + + device_bind_time = + #{deviceBindTime}, + + device_unbind_time = + #{deviceUnbindTime}, + + device_ip = + #{deviceIp}, + + device_port = + #{devicePort}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} - - update project_device - set - patient_id = #{patientId,jdbcType=BIGINT}, - patient_name = #{patientName,jdbcType=VARCHAR}, - card_no = #{cardNo,jdbcType=VARCHAR}, - device_type = #{deviceType,jdbcType=VARCHAR}, - device_name = #{deviceName,jdbcType=VARCHAR}, - device_code = #{deviceCode,jdbcType=VARCHAR}, - device_status = #{deviceStatus,jdbcType=VARCHAR}, - device_remark = #{deviceRemark,jdbcType=VARCHAR}, - device_bind_time = #{deviceBindTime,jdbcType=TIMESTAMP}, - device_unbind_time = #{deviceUnbindTime,jdbcType=TIMESTAMP}, - device_ip = #{deviceIp,jdbcType=VARCHAR}, - device_port = #{devicePort,jdbcType=INTEGER}, - create_by = #{createBy,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_by = #{updateBy,jdbcType=VARCHAR}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=BIGINT} - - + + + delete from project_device where id = #{id} + + + + delete from project_device where id in + + #{id} + + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/projectgroup/ProjectGroupMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/projectgroup/ProjectGroupMapper.xml index fcd52673..0d42822d 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/projectgroup/ProjectGroupMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/projectgroup/ProjectGroupMapper.xml @@ -1,139 +1,169 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - id,parent_id,group_name, - group_code,enable_status,group_sort, - group_remark,del_flag,create_by, - create_time,update_by,update_time + + select id, parent_id, group_name, group_code, enable_status, group_sort, group_remark, del_flag, create_by, create_time, update_by, update_time from project_group - + + + del_flag = 0 + + and parent_id = #{parentId} + + + and group_name like concat('%', #{groupName}, '%') + + + and group_code = #{groupCode} + + + and enable_status = #{enableStatus} + + - - delete from project_group - where id = #{id,jdbcType=BIGINT} - - - insert into project_group - ( id,parent_id,group_name - ,group_code,enable_status,group_sort - ,group_remark,del_flag,create_by - ,create_time,update_by,update_time - ) - values (#{id,jdbcType=BIGINT},#{parentId,jdbcType=BIGINT},#{groupName,jdbcType=VARCHAR} - ,#{groupCode,jdbcType=VARCHAR},#{enableStatus,jdbcType=TINYINT},#{groupSort,jdbcType=INTEGER} - ,#{groupRemark,jdbcType=VARCHAR},#{delFlag,jdbcType=TINYINT},#{createBy,jdbcType=VARCHAR} - ,#{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR},#{updateTime,jdbcType=TIMESTAMP} - ) - - + + + insert into project_group - id, - parent_id, - group_name, - group_code, - enable_status, - group_sort, - group_remark, - del_flag, - create_by, - create_time, - update_by, - update_time, + parent_id, + + group_name, + + group_code, + + enable_status, + + group_sort, + + group_remark, + + del_flag, + + create_by, + + create_time, + + update_by, + + update_time, + - #{id,jdbcType=BIGINT}, - #{parentId,jdbcType=BIGINT}, - #{groupName,jdbcType=VARCHAR}, - #{groupCode,jdbcType=VARCHAR}, - #{enableStatus,jdbcType=TINYINT}, - #{groupSort,jdbcType=INTEGER}, - #{groupRemark,jdbcType=VARCHAR}, - #{delFlag,jdbcType=TINYINT}, - #{createBy,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, - #{updateBy,jdbcType=VARCHAR}, - #{updateTime,jdbcType=TIMESTAMP}, + #{parentId}, + + #{groupName}, + + #{groupCode}, + + #{enableStatus}, + + #{groupSort}, + + #{groupRemark}, + + #{delFlag}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + - + + update project_group - - - parent_id = #{parentId,jdbcType=BIGINT}, - - - group_name = #{groupName,jdbcType=VARCHAR}, - - - group_code = #{groupCode,jdbcType=VARCHAR}, - - - enable_status = #{enableStatus,jdbcType=TINYINT}, - - - group_sort = #{groupSort,jdbcType=INTEGER}, - - - group_remark = #{groupRemark,jdbcType=VARCHAR}, - - - del_flag = #{delFlag,jdbcType=TINYINT}, - - - create_by = #{createBy,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_by = #{updateBy,jdbcType=VARCHAR}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=BIGINT} + + parent_id = + #{parentId}, + + group_name = + #{groupName}, + + group_code = + #{groupCode}, + + enable_status = + #{enableStatus}, + + group_sort = + #{groupSort}, + + group_remark = + #{groupRemark}, + + del_flag = + #{delFlag}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} - - update project_group - set - parent_id = #{parentId,jdbcType=BIGINT}, - group_name = #{groupName,jdbcType=VARCHAR}, - group_code = #{groupCode,jdbcType=VARCHAR}, - enable_status = #{enableStatus,jdbcType=TINYINT}, - group_sort = #{groupSort,jdbcType=INTEGER}, - group_remark = #{groupRemark,jdbcType=VARCHAR}, - del_flag = #{delFlag,jdbcType=TINYINT}, - create_by = #{createBy,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_by = #{updateBy,jdbcType=VARCHAR}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=BIGINT} + + + update project_group set del_flag = 1 where id = #{id} - + + + update project_group set del_flag = 1 where id in + + #{id} + + + + insert into project_group(parent_id,group_name, + group_code,enable_status,group_sort, + group_remark,del_flag, + create_by,create_time,update_by, + update_time) + values + + (#{item.parentId,jdbcType=NUMERIC},#{item.groupName,jdbcType=VARCHAR}, + #{item.groupCode,jdbcType=VARCHAR},#{item.enableStatus,jdbcType=NUMERIC},#{item.groupSort,jdbcType=NUMERIC}, + #{item.groupRemark,jdbcType=VARCHAR},#{item.delFlag,jdbcType=NUMERIC}, + #{item.createBy,jdbcType=VARCHAR},#{item.createTime,jdbcType=TIMESTAMP},#{item.updateBy,jdbcType=VARCHAR}, + #{item.updateTime,jdbcType=TIMESTAMP}) + + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/projectlastrecord/ProjectLastRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/projectlastresult/ProjectLastResultMapper.xml similarity index 63% rename from postdischarge-manage/src/main/resources/mapper/manage/projectlastrecord/ProjectLastRecordMapper.xml rename to postdischarge-manage/src/main/resources/mapper/manage/projectlastresult/ProjectLastResultMapper.xml index 1dc6dfc7..7ec2f0c1 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/projectlastrecord/ProjectLastRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/projectlastresult/ProjectLastResultMapper.xml @@ -2,87 +2,96 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,patient_id,patient_name, - card_no,group_id,group_name, - project_id,project_name,device_id, - device_name,project_alias,judge_mode, - measure_result,max_value,min_value, - default_value,lis_compare,measure_time, - measure_name,record_remark,qualified_sign, - create_by,create_time,update_by, - update_time + card_no,batch_id,batch_name, + group_id,group_name,project_id, + project_name,device_id,device_name, + project_alias,judge_mode,measure_result, + max_value,min_value,default_value, + lis_compare,measure_time,measure_name, + record_remark,qualified_sign,measure_result_path,project_unit,create_by, + create_time,update_by,update_time - delete from project_last_record + delete from project_last_result where id = #{id,jdbcType=BIGINT} - - insert into project_last_record + + insert into project_last_result ( id,patient_id,patient_name - ,card_no,group_id,group_name - ,project_id,project_name,device_id - ,device_name,project_alias,judge_mode - ,measure_result,max_value,min_value - ,default_value,lis_compare,measure_time - ,measure_name,record_remark,qualified_sign - ,create_by,create_time,update_by - ,update_time) + ,card_no,batch_id,batch_name + ,group_id,group_name,project_id + ,project_name,device_id,device_name + ,project_alias,judge_mode,measure_result + ,max_value,min_value,default_value + ,lis_compare,measure_time,measure_name + ,record_remark,qualified_sign,measure_result_path,project_unit + ,create_by,create_time,update_by,update_time + ) values (#{id,jdbcType=BIGINT},#{patientId,jdbcType=BIGINT},#{patientName,jdbcType=VARCHAR} - ,#{cardNo,jdbcType=VARCHAR},#{groupId,jdbcType=BIGINT},#{groupName,jdbcType=VARCHAR} - ,#{projectId,jdbcType=BIGINT},#{projectName,jdbcType=VARCHAR},#{deviceId,jdbcType=BIGINT} - ,#{deviceName,jdbcType=VARCHAR},#{projectAlias,jdbcType=VARCHAR},#{judgeMode,jdbcType=VARCHAR} - ,#{measureResult,jdbcType=VARCHAR},#{maxValue,jdbcType=INTEGER},#{minValue,jdbcType=INTEGER} - ,#{defaultValue,jdbcType=VARCHAR},#{lisCompare,jdbcType=VARCHAR},#{measureTime,jdbcType=TIMESTAMP} - ,#{measureName,jdbcType=VARCHAR},#{recordRemark,jdbcType=VARCHAR},#{qualifiedSign,jdbcType=VARCHAR} - ,#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR} - ,#{updateTime,jdbcType=TIMESTAMP}) + ,#{cardNo,jdbcType=VARCHAR},#{batchId,jdbcType=BIGINT},#{batchName,jdbcType=VARCHAR} + ,#{groupId,jdbcType=BIGINT},#{groupName,jdbcType=VARCHAR},#{projectId,jdbcType=BIGINT} + ,#{projectName,jdbcType=VARCHAR},#{deviceId,jdbcType=BIGINT},#{deviceName,jdbcType=VARCHAR} + ,#{projectAlias,jdbcType=VARCHAR},#{judgeMode,jdbcType=VARCHAR},#{measureResult,jdbcType=VARCHAR} + ,#{maxValue,jdbcType=INTEGER},#{minValue,jdbcType=INTEGER},#{defaultValue,jdbcType=VARCHAR} + ,#{lisCompare,jdbcType=VARCHAR},#{measureTime,jdbcType=TIMESTAMP},#{measureName,jdbcType=VARCHAR} + ,#{recordRemark,jdbcType=VARCHAR},#{qualifiedSign,jdbcType=VARCHAR} + ,#{measureResultPath,jdbcType=VARCHAR},#{projectUnit,jdbcType=VARCHAR} + ,#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR},#{updateTime,jdbcType=TIMESTAMP} + ) - - insert into project_last_record + + insert into project_last_result id, patient_id, patient_name, card_no, + batch_id, + batch_name, group_id, group_name, project_id, @@ -100,6 +109,8 @@ measure_name, record_remark, qualified_sign, + measure_result_path, + project_unit, create_by, create_time, update_by, @@ -110,6 +121,8 @@ #{patientId,jdbcType=BIGINT}, #{patientName,jdbcType=VARCHAR}, #{cardNo,jdbcType=VARCHAR}, + #{batchId,jdbcType=BIGINT}, + #{batchName,jdbcType=VARCHAR}, #{groupId,jdbcType=BIGINT}, #{groupName,jdbcType=VARCHAR}, #{projectId,jdbcType=BIGINT}, @@ -127,14 +140,16 @@ #{measureName,jdbcType=VARCHAR}, #{recordRemark,jdbcType=VARCHAR}, #{qualifiedSign,jdbcType=VARCHAR}, + #{measureResultPath,jdbcType=VARCHAR}, + #{projectUnit,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, - - update project_last_record + + update project_last_result patient_id = #{patientId,jdbcType=BIGINT}, @@ -145,6 +160,12 @@ card_no = #{cardNo,jdbcType=VARCHAR}, + + batch_id = #{batchId,jdbcType=BIGINT}, + + + batch_name = #{batchName,jdbcType=VARCHAR}, + group_id = #{groupId,jdbcType=BIGINT}, @@ -196,6 +217,12 @@ qualified_sign = #{qualifiedSign,jdbcType=VARCHAR}, + + measure_result_path = #{measureResultPath,jdbcType=VARCHAR}, + + + project_unit = #{projectUnit,jdbcType=VARCHAR}, + create_by = #{createBy,jdbcType=VARCHAR}, @@ -211,12 +238,14 @@ where id = #{id,jdbcType=BIGINT} - - update project_last_record + + update project_last_result set patient_id = #{patientId,jdbcType=BIGINT}, patient_name = #{patientName,jdbcType=VARCHAR}, card_no = #{cardNo,jdbcType=VARCHAR}, + batch_id = #{batchId,jdbcType=BIGINT}, + batch_name = #{batchName,jdbcType=VARCHAR}, group_id = #{groupId,jdbcType=BIGINT}, group_name = #{groupName,jdbcType=VARCHAR}, project_id = #{projectId,jdbcType=BIGINT}, @@ -234,6 +263,8 @@ measure_name = #{measureName,jdbcType=VARCHAR}, record_remark = #{recordRemark,jdbcType=VARCHAR}, qualified_sign = #{qualifiedSign,jdbcType=VARCHAR}, + measure_result_path = #{measureResultPath,jdbcType=VARCHAR}, + project_unit = #{projectUnit,jdbcType=VARCHAR}, create_by = #{createBy,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, update_by = #{updateBy,jdbcType=VARCHAR}, diff --git a/postdischarge-manage/src/main/resources/mapper/manage/projectrecord/ProjectRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/projectrecord/ProjectRecordMapper.xml deleted file mode 100644 index 746e88ae..00000000 --- a/postdischarge-manage/src/main/resources/mapper/manage/projectrecord/ProjectRecordMapper.xml +++ /dev/null @@ -1,243 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id,patient_id,patient_name, - card_no,group_id,group_name, - project_id,project_name,device_id, - device_name,project_alias,judge_mode, - measure_result,max_value,min_value, - default_value,lis_compare,measure_time, - measure_name,record_remark,qualified_sign, - create_by,create_time,update_by, - update_time - - - - - - delete from project_record - where id = #{id,jdbcType=BIGINT} - - - insert into project_record - ( id,patient_id,patient_name - ,card_no,group_id,group_name - ,project_id,project_name,device_id - ,device_name,project_alias,judge_mode - ,measure_result,max_value,min_value - ,default_value,lis_compare,measure_time - ,measure_name,record_remark,qualified_sign - ,create_by,create_time,update_by - ,update_time) - values (#{id,jdbcType=BIGINT},#{patientId,jdbcType=BIGINT},#{patientName,jdbcType=VARCHAR} - ,#{cardNo,jdbcType=VARCHAR},#{groupId,jdbcType=BIGINT},#{groupName,jdbcType=VARCHAR} - ,#{projectId,jdbcType=BIGINT},#{projectName,jdbcType=VARCHAR},#{deviceId,jdbcType=BIGINT} - ,#{deviceName,jdbcType=VARCHAR},#{projectAlias,jdbcType=VARCHAR},#{judgeMode,jdbcType=VARCHAR} - ,#{measureResult,jdbcType=VARCHAR},#{maxValue,jdbcType=INTEGER},#{minValue,jdbcType=INTEGER} - ,#{defaultValue,jdbcType=VARCHAR},#{lisCompare,jdbcType=VARCHAR},#{measureTime,jdbcType=TIMESTAMP} - ,#{measureName,jdbcType=VARCHAR},#{recordRemark,jdbcType=VARCHAR},#{qualifiedSign,jdbcType=VARCHAR} - ,#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR} - ,#{updateTime,jdbcType=TIMESTAMP}) - - - insert into project_record - - id, - patient_id, - patient_name, - card_no, - group_id, - group_name, - project_id, - project_name, - device_id, - device_name, - project_alias, - judge_mode, - measure_result, - max_value, - min_value, - default_value, - lis_compare, - measure_time, - measure_name, - record_remark, - qualified_sign, - create_by, - create_time, - update_by, - update_time, - - - #{id,jdbcType=BIGINT}, - #{patientId,jdbcType=BIGINT}, - #{patientName,jdbcType=VARCHAR}, - #{cardNo,jdbcType=VARCHAR}, - #{groupId,jdbcType=BIGINT}, - #{groupName,jdbcType=VARCHAR}, - #{projectId,jdbcType=BIGINT}, - #{projectName,jdbcType=VARCHAR}, - #{deviceId,jdbcType=BIGINT}, - #{deviceName,jdbcType=VARCHAR}, - #{projectAlias,jdbcType=VARCHAR}, - #{judgeMode,jdbcType=VARCHAR}, - #{measureResult,jdbcType=VARCHAR}, - #{maxValue,jdbcType=INTEGER}, - #{minValue,jdbcType=INTEGER}, - #{defaultValue,jdbcType=VARCHAR}, - #{lisCompare,jdbcType=VARCHAR}, - #{measureTime,jdbcType=TIMESTAMP}, - #{measureName,jdbcType=VARCHAR}, - #{recordRemark,jdbcType=VARCHAR}, - #{qualifiedSign,jdbcType=VARCHAR}, - #{createBy,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, - #{updateBy,jdbcType=VARCHAR}, - #{updateTime,jdbcType=TIMESTAMP}, - - - - update project_record - - - patient_id = #{patientId,jdbcType=BIGINT}, - - - patient_name = #{patientName,jdbcType=VARCHAR}, - - - card_no = #{cardNo,jdbcType=VARCHAR}, - - - group_id = #{groupId,jdbcType=BIGINT}, - - - group_name = #{groupName,jdbcType=VARCHAR}, - - - project_id = #{projectId,jdbcType=BIGINT}, - - - project_name = #{projectName,jdbcType=VARCHAR}, - - - device_id = #{deviceId,jdbcType=BIGINT}, - - - device_name = #{deviceName,jdbcType=VARCHAR}, - - - project_alias = #{projectAlias,jdbcType=VARCHAR}, - - - judge_mode = #{judgeMode,jdbcType=VARCHAR}, - - - measure_result = #{measureResult,jdbcType=VARCHAR}, - - - max_value = #{maxValue,jdbcType=INTEGER}, - - - min_value = #{minValue,jdbcType=INTEGER}, - - - default_value = #{defaultValue,jdbcType=VARCHAR}, - - - lis_compare = #{lisCompare,jdbcType=VARCHAR}, - - - measure_time = #{measureTime,jdbcType=TIMESTAMP}, - - - measure_name = #{measureName,jdbcType=VARCHAR}, - - - record_remark = #{recordRemark,jdbcType=VARCHAR}, - - - qualified_sign = #{qualifiedSign,jdbcType=VARCHAR}, - - - create_by = #{createBy,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_by = #{updateBy,jdbcType=VARCHAR}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=BIGINT} - - - update project_record - set - patient_id = #{patientId,jdbcType=BIGINT}, - patient_name = #{patientName,jdbcType=VARCHAR}, - card_no = #{cardNo,jdbcType=VARCHAR}, - group_id = #{groupId,jdbcType=BIGINT}, - group_name = #{groupName,jdbcType=VARCHAR}, - project_id = #{projectId,jdbcType=BIGINT}, - project_name = #{projectName,jdbcType=VARCHAR}, - device_id = #{deviceId,jdbcType=BIGINT}, - device_name = #{deviceName,jdbcType=VARCHAR}, - project_alias = #{projectAlias,jdbcType=VARCHAR}, - judge_mode = #{judgeMode,jdbcType=VARCHAR}, - measure_result = #{measureResult,jdbcType=VARCHAR}, - max_value = #{maxValue,jdbcType=INTEGER}, - min_value = #{minValue,jdbcType=INTEGER}, - default_value = #{defaultValue,jdbcType=VARCHAR}, - lis_compare = #{lisCompare,jdbcType=VARCHAR}, - measure_time = #{measureTime,jdbcType=TIMESTAMP}, - measure_name = #{measureName,jdbcType=VARCHAR}, - record_remark = #{recordRemark,jdbcType=VARCHAR}, - qualified_sign = #{qualifiedSign,jdbcType=VARCHAR}, - create_by = #{createBy,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_by = #{updateBy,jdbcType=VARCHAR}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=BIGINT} - - diff --git a/postdischarge-manage/src/main/resources/mapper/manage/projectrecordfile/ProjectRecordFileMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/projectrecordfile/ProjectRecordFileMapper.xml deleted file mode 100644 index b65108d5..00000000 --- a/postdischarge-manage/src/main/resources/mapper/manage/projectrecordfile/ProjectRecordFileMapper.xml +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id,patient_id,patient_name, - card_no,group_id,group_name, - project_id,project_name,device_id, - device_name,project_alias,file_path, - measure_time,measure_name,max_value, - min_value,default_value,qualified_sign, - create_by,create_time,update_by, - update_time - - - - - - delete from project_record_file - where id = #{id,jdbcType=BIGINT} - - - insert into project_record_file - ( id,patient_id,patient_name - ,card_no,group_id,group_name - ,project_id,project_name,device_id - ,device_name,project_alias,file_path - ,measure_time,measure_name,max_value - ,min_value,default_value,qualified_sign - ,create_by,create_time,update_by - ,update_time) - values (#{id,jdbcType=BIGINT},#{patientId,jdbcType=BIGINT},#{patientName,jdbcType=VARCHAR} - ,#{cardNo,jdbcType=VARCHAR},#{groupId,jdbcType=BIGINT},#{groupName,jdbcType=VARCHAR} - ,#{projectId,jdbcType=BIGINT},#{projectName,jdbcType=VARCHAR},#{deviceId,jdbcType=BIGINT} - ,#{deviceName,jdbcType=VARCHAR},#{projectAlias,jdbcType=VARCHAR},#{filePath,jdbcType=VARCHAR} - ,#{measureTime,jdbcType=TIMESTAMP},#{measureName,jdbcType=VARCHAR},#{maxValue,jdbcType=INTEGER} - ,#{minValue,jdbcType=INTEGER},#{defaultValue,jdbcType=VARCHAR},#{qualifiedSign,jdbcType=VARCHAR} - ,#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR} - ,#{updateTime,jdbcType=TIMESTAMP}) - - - insert into project_record_file - - id, - patient_id, - patient_name, - card_no, - group_id, - group_name, - project_id, - project_name, - device_id, - device_name, - project_alias, - file_path, - measure_time, - measure_name, - max_value, - min_value, - default_value, - qualified_sign, - create_by, - create_time, - update_by, - update_time, - - - #{id,jdbcType=BIGINT}, - #{patientId,jdbcType=BIGINT}, - #{patientName,jdbcType=VARCHAR}, - #{cardNo,jdbcType=VARCHAR}, - #{groupId,jdbcType=BIGINT}, - #{groupName,jdbcType=VARCHAR}, - #{projectId,jdbcType=BIGINT}, - #{projectName,jdbcType=VARCHAR}, - #{deviceId,jdbcType=BIGINT}, - #{deviceName,jdbcType=VARCHAR}, - #{projectAlias,jdbcType=VARCHAR}, - #{filePath,jdbcType=VARCHAR}, - #{measureTime,jdbcType=TIMESTAMP}, - #{measureName,jdbcType=VARCHAR}, - #{maxValue,jdbcType=INTEGER}, - #{minValue,jdbcType=INTEGER}, - #{defaultValue,jdbcType=VARCHAR}, - #{qualifiedSign,jdbcType=VARCHAR}, - #{createBy,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, - #{updateBy,jdbcType=VARCHAR}, - #{updateTime,jdbcType=TIMESTAMP}, - - - - update project_record_file - - - patient_id = #{patientId,jdbcType=BIGINT}, - - - patient_name = #{patientName,jdbcType=VARCHAR}, - - - card_no = #{cardNo,jdbcType=VARCHAR}, - - - group_id = #{groupId,jdbcType=BIGINT}, - - - group_name = #{groupName,jdbcType=VARCHAR}, - - - project_id = #{projectId,jdbcType=BIGINT}, - - - project_name = #{projectName,jdbcType=VARCHAR}, - - - device_id = #{deviceId,jdbcType=BIGINT}, - - - device_name = #{deviceName,jdbcType=VARCHAR}, - - - project_alias = #{projectAlias,jdbcType=VARCHAR}, - - - file_path = #{filePath,jdbcType=VARCHAR}, - - - measure_time = #{measureTime,jdbcType=TIMESTAMP}, - - - measure_name = #{measureName,jdbcType=VARCHAR}, - - - max_value = #{maxValue,jdbcType=INTEGER}, - - - min_value = #{minValue,jdbcType=INTEGER}, - - - default_value = #{defaultValue,jdbcType=VARCHAR}, - - - qualified_sign = #{qualifiedSign,jdbcType=VARCHAR}, - - - create_by = #{createBy,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_by = #{updateBy,jdbcType=VARCHAR}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=BIGINT} - - - update project_record_file - set - patient_id = #{patientId,jdbcType=BIGINT}, - patient_name = #{patientName,jdbcType=VARCHAR}, - card_no = #{cardNo,jdbcType=VARCHAR}, - group_id = #{groupId,jdbcType=BIGINT}, - group_name = #{groupName,jdbcType=VARCHAR}, - project_id = #{projectId,jdbcType=BIGINT}, - project_name = #{projectName,jdbcType=VARCHAR}, - device_id = #{deviceId,jdbcType=BIGINT}, - device_name = #{deviceName,jdbcType=VARCHAR}, - project_alias = #{projectAlias,jdbcType=VARCHAR}, - file_path = #{filePath,jdbcType=VARCHAR}, - measure_time = #{measureTime,jdbcType=TIMESTAMP}, - measure_name = #{measureName,jdbcType=VARCHAR}, - max_value = #{maxValue,jdbcType=INTEGER}, - min_value = #{minValue,jdbcType=INTEGER}, - default_value = #{defaultValue,jdbcType=VARCHAR}, - qualified_sign = #{qualifiedSign,jdbcType=VARCHAR}, - create_by = #{createBy,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_by = #{updateBy,jdbcType=VARCHAR}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=BIGINT} - - diff --git a/postdischarge-manage/src/main/resources/mapper/manage/projectresult/ProjectResultMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/projectresult/ProjectResultMapper.xml new file mode 100644 index 00000000..f8b85862 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/projectresult/ProjectResultMapper.xml @@ -0,0 +1,371 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, patient_id, patient_name, card_no, batch_id, batch_name, group_id, group_name, project_id, project_name, device_id, device_name, project_alias, judge_mode, measure_result, max_value, min_value, default_value, lis_compare, measure_time, measure_name, record_remark, qualified_sign, measure_result_path, project_unit, create_by, create_time, update_by, update_time from project_result + + + + + + + + insert into project_result + + patient_id, + + patient_name, + + card_no, + + batch_id, + + batch_name, + + group_id, + + group_name, + + project_id, + + project_name, + + device_id, + + device_name, + + project_alias, + + judge_mode, + + measure_result, + + max_value, + + min_value, + + default_value, + + lis_compare, + + measure_time, + + measure_name, + + record_remark, + + qualified_sign, + + measure_result_path, + + project_unit, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{patientId}, + + #{patientName}, + + #{cardNo}, + + #{batchId}, + + #{batchName}, + + #{groupId}, + + #{groupName}, + + #{projectId}, + + #{projectName}, + + #{deviceId}, + + #{deviceName}, + + #{projectAlias}, + + #{judgeMode}, + + #{measureResult}, + + #{maxValue}, + + #{minValue}, + + #{defaultValue}, + + #{lisCompare}, + + #{measureTime}, + + #{measureName}, + + #{recordRemark}, + + #{qualifiedSign}, + + #{measureResultPath}, + + #{projectUnit}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + + update project_result + + patient_id = + #{patientId}, + + patient_name = + #{patientName}, + + card_no = + #{cardNo}, + + batch_id = + #{batchId}, + + batch_name = + #{batchName}, + + group_id = + #{groupId}, + + group_name = + #{groupName}, + + project_id = + #{projectId}, + + project_name = + #{projectName}, + + device_id = + #{deviceId}, + + device_name = + #{deviceName}, + + project_alias = + #{projectAlias}, + + judge_mode = + #{judgeMode}, + + measure_result = + #{measureResult}, + + max_value = + #{maxValue}, + + min_value = + #{minValue}, + + default_value = + #{defaultValue}, + + lis_compare = + #{lisCompare}, + + measure_time = + #{measureTime}, + + measure_name = + #{measureName}, + + record_remark = + #{recordRemark}, + + qualified_sign = + #{qualifiedSign}, + + measure_result_path = + #{measureResultPath}, + + project_unit = + #{projectUnit}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete from project_result where id = #{id} + + + + delete from project_result where id in + + #{id} + + + + + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml index ee08244a..12760267 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml @@ -34,6 +34,8 @@ + + @@ -41,35 +43,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id,patient_id,patient_name, patient_phone,card_no,sex,birth_date,sign_time, @@ -79,7 +52,7 @@ visit_method,in_hospital_number,sign_diagnosis,review_diagnosis, service_status,sign_status,intentional_source, intentional_time,billing_doctor_id,billing_doctor_name, - price,payment_status,del_flag, + price,payment_status,health_manage_id,health_manage_name,del_flag, create_by,create_time,update_by, update_time @@ -105,7 +78,7 @@ ,visit_method,in_hospital_number,sign_diagnosis,review_diagnosis ,service_status,sign_status,intentional_source ,intentional_time,billing_doctor_id,billing_doctor_name - ,price,payment_status,del_flag + ,price,payment_status,health_manage_id,health_manage_name,del_flag ,create_by,create_time,update_by ,update_time) values (#{id,jdbcType=BIGINT},#{patientId,jdbcType=BIGINT},#{patientName,jdbcType=VARCHAR} @@ -116,8 +89,8 @@ ,#{visitMethod,jdbcType=VARCHAR},#{inHospitalNumber,jdbcType=VARCHAR},#{signDiagnosis,jdbcType=VARCHAR},#{reviewDiagnosis,jdbcType=VARCHAR} ,#{serviceStatus,jdbcType=VARCHAR},#{signStatus,jdbcType=VARCHAR},#{intentionalSource,jdbcType=VARCHAR} ,#{intentionalTime,jdbcType=TIMESTAMP},#{billingDoctorId,jdbcType=BIGINT},#{billingDoctorName,jdbcType=VARCHAR} - ,#{price,jdbcType=DECIMAL},#{paymentStatus,jdbcType=VARCHAR},#{delFlag,jdbcType=TINYINT} - ,#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR} + ,#{price,jdbcType=DECIMAL},#{paymentStatus,jdbcType=VARCHAR},#{healthManageId,jdbcType=BIGINT},#{healthManageName,jdbcType=VARCHAR} + ,#{delFlag,jdbcType=TINYINT},#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR} ,#{updateTime,jdbcType=TIMESTAMP}) @@ -152,6 +125,8 @@ billing_doctor_name, price, payment_status, + health_manage_id, + health_manage_name, del_flag, create_by, create_time, @@ -188,6 +163,8 @@ #{billingDoctorName,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{paymentStatus,jdbcType=VARCHAR}, + #{healthManageId,jdbcType=BIGINT}, + #{healthManageName,jdbcType=VARCHAR}, #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, @@ -282,6 +259,12 @@ payment_status = #{paymentStatus,jdbcType=VARCHAR}, + + health_manage_id = #{healthManageId,jdbcType=BIGINT}, + + + health_manage_name = #{healthManageName,jdbcType=VARCHAR}, + del_flag = #{delFlag,jdbcType=TINYINT}, @@ -331,6 +314,8 @@ billing_doctor_name = #{billingDoctorName,jdbcType=VARCHAR}, price = #{price,jdbcType=DECIMAL}, payment_status = #{paymentStatus,jdbcType=VARCHAR}, + health_manage_id = #{healthManageId,jdbcType=BIGINT}, + health_manage_name = #{healthManageName,jdbcType=VARCHAR}, del_flag = #{delFlag,jdbcType=TINYINT}, create_by = #{createBy,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, @@ -408,7 +393,7 @@ - select sign.id,sign.patient_id,sign.patient_name, sign.patient_phone,sign.card_no,sign.sex, sign.birth_date,sign.sign_time,