From 002f2555a20c4ac9f81cf1d5621c413d38ba9a4a Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Mon, 23 Mar 2026 17:59:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/RegInterfaceImpl.java | 19 +- .../impl/RegTransitSampleServiceImpl.java | 4 +- .../service/util/RequestInfoUtil.java | 8 +- .../main/resources/mapper/RegResultMapper.xml | 298 +++++++++--------- 4 files changed, 173 insertions(+), 156 deletions(-) diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java index b63d2bd..b989a54 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java @@ -27,8 +27,6 @@ public class RegInterfaceImpl { @Autowired RegTransitSampleMapper regTransitSampleMapper; @Autowired - private CommonUtil commonUtil; - @Autowired RequestInfoUtil requestInfoUtil; /** @@ -126,6 +124,7 @@ public class RegInterfaceImpl { } /** + * 查询条码信息 * { * "method":"queryTransitSample", * "req":{ @@ -134,7 +133,7 @@ public class RegInterfaceImpl { * } * * } * } - * 查询条码信息 + * * @param jsonStr * @return */ @@ -311,6 +310,7 @@ public class RegInterfaceImpl { /** + * 添加报告 *{ * "method":"addReport", * "req":{ @@ -321,7 +321,7 @@ public class RegInterfaceImpl { * "regReportFile":{} * } * } - * 添加报告 + * * @param jsonStr * @return */ @@ -333,6 +333,17 @@ public class RegInterfaceImpl { } + /** + * 删除报告 + * { + * "method":"delLisReport", + * "req":{ + * "reportNo":"" + * } + * } + * @param jsonStr + * @return + */ public Result delReport(String jsonStr){ JSONObject jsonObject = JSONUtil.parseObj(jsonStr).getJSONObject("req"); String reportNo = jsonObject.getStr("reportNo"); diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java index dc975e7..0c31181 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java @@ -63,9 +63,9 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService { return regInterfaceImpl.queryTransitSample(jsonStr); case "update": //修改状态 return regInterfaceImpl.updateStatus(jsonStr); - case "addReport": + case "addReport": //添加报告 return regInterfaceImpl.addReport(jsonStr); - case "delReport": + case "delReport": //删除报告 return regInterfaceImpl.delReport(jsonStr); // case "test": // return test(); diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/util/RequestInfoUtil.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/util/RequestInfoUtil.java index 5867eda..6f9ddc8 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/util/RequestInfoUtil.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/util/RequestInfoUtil.java @@ -85,8 +85,14 @@ public class RequestInfoUtil { for (RegResultMed regResultMed : regResultMedList) { regResultMapper.insertRegResultMed(regResultMed); } + if(regReportFile != null){ + String reportNo1 = regReportFile.getReportNo(); + if(reportNo1 != null && !reportNo1.equals("")){ + regResultMapper.insertRegReportFile(regReportFile); + } + + } - regResultMapper.insertRegReportFile(regReportFile); } @Transactional(rollbackFor = Exception.class) diff --git a/pf_transitPF/src/main/resources/mapper/RegResultMapper.xml b/pf_transitPF/src/main/resources/mapper/RegResultMapper.xml index 711cb05..96ed6a1 100644 --- a/pf_transitPF/src/main/resources/mapper/RegResultMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegResultMapper.xml @@ -12,58 +12,58 @@ orderitemnames, collectdate, signindate, testdate, reporttime, reportusercode, reportusername, sampletrait, reportkindcode, reportkindname, reportdescrpt, lisgroupcode, lisgroupname, dsthospcode, dsthospname) - values( #{reportno}, - #{hospcode}, - #{hospname}, - #{patid}, - #{patcardtype}, - #{patcardno}, - #{pattype}, - #{regno}, - #{patname}, - #{patsex}, - #{patage}, - #{ageunit}, - #{patbirthday}, - #{patidentity}, - #{phone}, - #{address}, - #{patfeetype}, - #{departcode}, - #{departname}, - #{areacode}, - #{areaname}, - #{patbed}, - #{diagnosiscode}, - #{diagnosisname}, - #{orderpatid}, - #{orderusercode}, - #{orderusername}, - #{ordertime}, - #{srchospcode}, - #{srchospname}, - #{barcode}, - #{tubecode}, - #{tubename}, - #{sampletypecode}, - #{sampletypename}, - #{iser}, - #{orderitemcodes}, - #{orderitemnames}, - #{collectdate}, - #{signindate}, - #{testdate}, - #{reporttime}, - #{reportusercode}, - #{reportusername}, - #{sampletrait}, - #{reportkindcode}, - #{reportkindname}, - #{reportdescrpt}, - #{lisgroupcode}, - #{lisgroupname}, - #{dsthospcode}, - #{dsthospname} + values( #{ReportNo}, + #{HospCode}, + #{HospName}, + #{PatId}, + #{PatCardType}, + #{PatCardNo}, + #{PatType}, + #{RegNo}, + #{PatName}, + #{PatSex}, + #{PatAge}, + #{AgeUnit}, + #{PatBirthday}, + #{PatIdentity}, + #{Phone}, + #{Address}, + #{PatFeeType}, + #{DepartCode}, + #{DepartName}, + #{AreaCode}, + #{AreaName}, + #{PatBed}, + #{DiagnosisCode}, + #{DiagnosisName}, + #{OrderPatId}, + #{OrderUserCode}, + #{OrderUserName}, + #{OrderTime}, + #{SrcHospCode}, + #{SrcHospName}, + #{Barcode}, + #{TubeCode}, + #{TubeName}, + #{SampleTypeCode}, + #{SampleTypeName}, + #{IsER}, + #{OrderItemCodes}, + #{OrderItemNames}, + #{CollectDate}, + #{SignInDate}, + #{TestDate}, + #{ReportTime}, + #{ReportUserCode}, + #{ReportUserName}, + #{SampleTrait}, + #{ReportKindCode}, + #{ReportKindName}, + #{ReportDescrpt}, + #{LisGroupCode}, + #{LisGroupName}, + #{DstHospCode}, + #{DstHospName} ) @@ -79,44 +79,44 @@ testinstcodesb, testinstname, itemresult, itemresulttext, resultremark, itemunit, itemref, itemrefmin, itemrefmax, itemflag, itemflagstr, checkflag, crtflag, crtref, orderitemcode, orderitemname, printsort) - values (#{reportno}, - #{patid}, - #{hospcode}, - #{hospname}, - #{itemresultno}, - #{testtime}, - #{testusercode}, - #{testusername}, - #{audittime}, - #{auditusercode}, - #{auditusername}, - #{itemcode}, - #{itemname}, - #{itemnamecn}, - #{itemcodesb}, - #{itemnamesb}, - #{lonic}, - #{itemmethodcode}, - #{itemmethodname}, - #{equipmentcode}, - #{testinstcode}, - #{testinstcodesb}, - #{testinstname}, - #{itemresult}, - #{itemresulttext}, - #{resultremark}, - #{itemunit}, - #{itemref}, - #{itemrefmin}, - #{itemrefmax}, - #{itemflag}, - #{itemflagstr}, - #{checkflag}, - #{crtflag}, - #{crtref}, - #{orderitemcode}, - #{orderitemname}, - #{printsort} + values (#{ReportNo}, + #{PatId}, + #{HospCode}, + #{HospName}, + #{ItemResultNo}, + #{TestTime}, + #{TestUserCode}, + #{TestUserName}, + #{AuditTime}, + #{AuditUserCode}, + #{AuditUserName}, + #{ItemCode}, + #{ItemName}, + #{ItemNameCn}, + #{ItemCodeSB}, + #{ItemNameSB}, + #{Lonic}, + #{ItemMethodCode}, + #{ItemMethodName}, + #{EquipmentCode}, + #{TestInstCode}, + #{TestInstCodeSB}, + #{TestInstName}, + #{ItemResult}, + #{ItemResultText}, + #{ResultRemark}, + #{ItemUnit}, + #{ItemRef}, + #{ItemRefMin}, + #{ItemRefMax}, + #{ItemFlag}, + #{ItemFlagStr}, + #{CheckFlag}, + #{CrtFlag}, + #{CrtRef}, + #{OrderItemCode}, + #{OrderItemName}, + #{PrintSort} ) @@ -127,34 +127,34 @@ insert into reg_result_germ(reportno, patid, hospcode, hospname, germresultno, germcode, germname, germnamecn, germcodesb, germnamesb, colonycounting, colonyratio, mediumname, culturetime, cultureneed, discoverymode, equipmentcode, testinstcode, testinstcodesb, testinstname, testresult, itemresulttext, ismultidrugr, multidrugrname, crtflag, isinfectious, isbiohazard, printsort) values ( - #{reportno}, - #{patid}, - #{hospcode}, - #{hospname}, - #{germresultno}, - #{germcode}, - #{germname}, - #{germnamecn}, - #{germcodesb}, - #{germnamesb}, - #{colonycounting}, - #{colonyratio}, - #{mediumname}, - #{culturetime}, - #{cultureneed}, - #{discoverymode}, - #{equipmentcode}, - #{testinstcode}, - #{testinstcodesb}, - #{testinstname}, - #{testresult}, - #{itemresulttext}, - #{ismultidrugr}, - #{multidrugrname}, - #{crtflag}, - #{isinfectious}, - #{isbiohazard}, - #{printsort} + #{ReportNo}, + #{PatId}, + #{HospCode}, + #{HospName}, + #{GermResultNo}, + #{GermCode}, + #{GermName}, + #{GermNameCn}, + #{GermCodeSB}, + #{GermNameSB}, + #{ColonyCounting}, + #{ColonyRatio}, + #{MediumName}, + #{CultureTime}, + #{CultureNeed}, + #{DiscoveryMode}, + #{EquipmentCode}, + #{TestInstCode}, + #{TestInstCodeSB}, + #{TestInstName}, + #{TestResult}, + #{ItemResultText}, + #{IsMultidrugR}, + #{MultidrugRName}, + #{CrtFlag}, + #{IsInfectious}, + #{IsBiohazard}, + #{PrintSort} ) @@ -168,28 +168,28 @@ antinamecn, anticodesb, antinamesb, testmethodcode, testmethodname, testresult, resistantcode, resistantname, itemref, dosage, mic, diameterofinhibitionring, sensremark, printsort) - values (#{reportno}, - #{patid}, - #{hospcode}, - #{hospname}, - #{sensresultno}, - #{germresultno}, - #{anticode}, - #{antiname}, - #{antinamecn}, - #{anticodesb}, - #{antinamesb}, - #{testmethodcode}, - #{testmethodname}, - #{testresult}, - #{resistantcode}, - #{resistantname}, - #{itemref}, - #{dosage}, - #{mic}, - #{diameterofinhibitionring}, - #{sensremark}, - #{printsort} + values (#{ReportNo}, + #{PatId}, + #{HospCode}, + #{HospName}, + #{SensResultNo}, + #{GermResultNo}, + #{AntiCode}, + #{AntiName}, + #{AntiNameCn}, + #{AntiCodeSB}, + #{AntiNameSB}, + #{TestMethodCode}, + #{TestMethodName}, + #{TestResult}, + #{ResistantCode}, + #{ResistantName}, + #{ItemRef}, + #{Dosage}, + #{Mic}, + #{DiameterOfInhibitionRing}, + #{SensRemark}, + #{PrintSort} ) @@ -200,15 +200,15 @@ insert into reg_report_file(reportno, reportfilename, reportformat, report, hospcode, hospname, operatetime, usercode, username) values( - #{reportno}, - #{reportfilename}, - #{reportformat}, - #{report}, - #{hospcode}, - #{hospname}, - #{operatetime}, - #{usercode}, - #{username} + #{ReportNo}, + #{ReportFileName}, + #{ReportFormat}, + #{Report}, + #{HospCode}, + #{HospName}, + #{OperateTime}, + #{UserCode}, + #{UserName} )