修改接口
This commit is contained in:
jiangs
parent
b56588b19f
commit
002f2555a2
@ -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");
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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}
|
||||
|
||||
)
|
||||
</insert>
|
||||
@ -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}
|
||||
)
|
||||
</insert>
|
||||
|
||||
@ -127,34 +127,34 @@
|
||||
<insert id="insertRegResultGerm">
|
||||
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}
|
||||
|
||||
)
|
||||
</insert>
|
||||
@ -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}
|
||||
)
|
||||
</insert>
|
||||
|
||||
@ -200,15 +200,15 @@
|
||||
<insert id="insertRegReportFile">
|
||||
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}
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user