修改接口
This commit is contained in:
parent
b56588b19f
commit
002f2555a2
@ -27,8 +27,6 @@ public class RegInterfaceImpl {
|
|||||||
@Autowired
|
@Autowired
|
||||||
RegTransitSampleMapper regTransitSampleMapper;
|
RegTransitSampleMapper regTransitSampleMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
private CommonUtil commonUtil;
|
|
||||||
@Autowired
|
|
||||||
RequestInfoUtil requestInfoUtil;
|
RequestInfoUtil requestInfoUtil;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -126,6 +124,7 @@ public class RegInterfaceImpl {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* 查询条码信息
|
||||||
* {
|
* {
|
||||||
* "method":"queryTransitSample",
|
* "method":"queryTransitSample",
|
||||||
* "req":{
|
* "req":{
|
||||||
@ -134,7 +133,7 @@ public class RegInterfaceImpl {
|
|||||||
* }
|
* }
|
||||||
* * }
|
* * }
|
||||||
* }
|
* }
|
||||||
* 查询条码信息
|
*
|
||||||
* @param jsonStr
|
* @param jsonStr
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@ -311,6 +310,7 @@ public class RegInterfaceImpl {
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* 添加报告
|
||||||
*{
|
*{
|
||||||
* "method":"addReport",
|
* "method":"addReport",
|
||||||
* "req":{
|
* "req":{
|
||||||
@ -321,7 +321,7 @@ public class RegInterfaceImpl {
|
|||||||
* "regReportFile":{}
|
* "regReportFile":{}
|
||||||
* }
|
* }
|
||||||
* }
|
* }
|
||||||
* 添加报告
|
*
|
||||||
* @param jsonStr
|
* @param jsonStr
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@ -333,6 +333,17 @@ public class RegInterfaceImpl {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除报告
|
||||||
|
* {
|
||||||
|
* "method":"delLisReport",
|
||||||
|
* "req":{
|
||||||
|
* "reportNo":""
|
||||||
|
* }
|
||||||
|
* }
|
||||||
|
* @param jsonStr
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
public Result delReport(String jsonStr){
|
public Result delReport(String jsonStr){
|
||||||
JSONObject jsonObject = JSONUtil.parseObj(jsonStr).getJSONObject("req");
|
JSONObject jsonObject = JSONUtil.parseObj(jsonStr).getJSONObject("req");
|
||||||
String reportNo = jsonObject.getStr("reportNo");
|
String reportNo = jsonObject.getStr("reportNo");
|
||||||
|
|||||||
@ -63,9 +63,9 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService {
|
|||||||
return regInterfaceImpl.queryTransitSample(jsonStr);
|
return regInterfaceImpl.queryTransitSample(jsonStr);
|
||||||
case "update": //修改状态
|
case "update": //修改状态
|
||||||
return regInterfaceImpl.updateStatus(jsonStr);
|
return regInterfaceImpl.updateStatus(jsonStr);
|
||||||
case "addReport":
|
case "addReport": //添加报告
|
||||||
return regInterfaceImpl.addReport(jsonStr);
|
return regInterfaceImpl.addReport(jsonStr);
|
||||||
case "delReport":
|
case "delReport": //删除报告
|
||||||
return regInterfaceImpl.delReport(jsonStr);
|
return regInterfaceImpl.delReport(jsonStr);
|
||||||
// case "test":
|
// case "test":
|
||||||
// return test();
|
// return test();
|
||||||
|
|||||||
@ -85,8 +85,14 @@ public class RequestInfoUtil {
|
|||||||
for (RegResultMed regResultMed : regResultMedList) {
|
for (RegResultMed regResultMed : regResultMedList) {
|
||||||
regResultMapper.insertRegResultMed(regResultMed);
|
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)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
|
|||||||
@ -12,58 +12,58 @@
|
|||||||
orderitemnames, collectdate, signindate, testdate, reporttime, reportusercode,
|
orderitemnames, collectdate, signindate, testdate, reporttime, reportusercode,
|
||||||
reportusername, sampletrait, reportkindcode, reportkindname, reportdescrpt,
|
reportusername, sampletrait, reportkindcode, reportkindname, reportdescrpt,
|
||||||
lisgroupcode, lisgroupname, dsthospcode, dsthospname)
|
lisgroupcode, lisgroupname, dsthospcode, dsthospname)
|
||||||
values( #{reportno},
|
values( #{ReportNo},
|
||||||
#{hospcode},
|
#{HospCode},
|
||||||
#{hospname},
|
#{HospName},
|
||||||
#{patid},
|
#{PatId},
|
||||||
#{patcardtype},
|
#{PatCardType},
|
||||||
#{patcardno},
|
#{PatCardNo},
|
||||||
#{pattype},
|
#{PatType},
|
||||||
#{regno},
|
#{RegNo},
|
||||||
#{patname},
|
#{PatName},
|
||||||
#{patsex},
|
#{PatSex},
|
||||||
#{patage},
|
#{PatAge},
|
||||||
#{ageunit},
|
#{AgeUnit},
|
||||||
#{patbirthday},
|
#{PatBirthday},
|
||||||
#{patidentity},
|
#{PatIdentity},
|
||||||
#{phone},
|
#{Phone},
|
||||||
#{address},
|
#{Address},
|
||||||
#{patfeetype},
|
#{PatFeeType},
|
||||||
#{departcode},
|
#{DepartCode},
|
||||||
#{departname},
|
#{DepartName},
|
||||||
#{areacode},
|
#{AreaCode},
|
||||||
#{areaname},
|
#{AreaName},
|
||||||
#{patbed},
|
#{PatBed},
|
||||||
#{diagnosiscode},
|
#{DiagnosisCode},
|
||||||
#{diagnosisname},
|
#{DiagnosisName},
|
||||||
#{orderpatid},
|
#{OrderPatId},
|
||||||
#{orderusercode},
|
#{OrderUserCode},
|
||||||
#{orderusername},
|
#{OrderUserName},
|
||||||
#{ordertime},
|
#{OrderTime},
|
||||||
#{srchospcode},
|
#{SrcHospCode},
|
||||||
#{srchospname},
|
#{SrcHospName},
|
||||||
#{barcode},
|
#{Barcode},
|
||||||
#{tubecode},
|
#{TubeCode},
|
||||||
#{tubename},
|
#{TubeName},
|
||||||
#{sampletypecode},
|
#{SampleTypeCode},
|
||||||
#{sampletypename},
|
#{SampleTypeName},
|
||||||
#{iser},
|
#{IsER},
|
||||||
#{orderitemcodes},
|
#{OrderItemCodes},
|
||||||
#{orderitemnames},
|
#{OrderItemNames},
|
||||||
#{collectdate},
|
#{CollectDate},
|
||||||
#{signindate},
|
#{SignInDate},
|
||||||
#{testdate},
|
#{TestDate},
|
||||||
#{reporttime},
|
#{ReportTime},
|
||||||
#{reportusercode},
|
#{ReportUserCode},
|
||||||
#{reportusername},
|
#{ReportUserName},
|
||||||
#{sampletrait},
|
#{SampleTrait},
|
||||||
#{reportkindcode},
|
#{ReportKindCode},
|
||||||
#{reportkindname},
|
#{ReportKindName},
|
||||||
#{reportdescrpt},
|
#{ReportDescrpt},
|
||||||
#{lisgroupcode},
|
#{LisGroupCode},
|
||||||
#{lisgroupname},
|
#{LisGroupName},
|
||||||
#{dsthospcode},
|
#{DstHospCode},
|
||||||
#{dsthospname}
|
#{DstHospName}
|
||||||
|
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
@ -79,44 +79,44 @@
|
|||||||
testinstcodesb, testinstname, itemresult, itemresulttext, resultremark, itemunit,
|
testinstcodesb, testinstname, itemresult, itemresulttext, resultremark, itemunit,
|
||||||
itemref, itemrefmin, itemrefmax, itemflag, itemflagstr, checkflag, crtflag, crtref,
|
itemref, itemrefmin, itemrefmax, itemflag, itemflagstr, checkflag, crtflag, crtref,
|
||||||
orderitemcode, orderitemname, printsort)
|
orderitemcode, orderitemname, printsort)
|
||||||
values (#{reportno},
|
values (#{ReportNo},
|
||||||
#{patid},
|
#{PatId},
|
||||||
#{hospcode},
|
#{HospCode},
|
||||||
#{hospname},
|
#{HospName},
|
||||||
#{itemresultno},
|
#{ItemResultNo},
|
||||||
#{testtime},
|
#{TestTime},
|
||||||
#{testusercode},
|
#{TestUserCode},
|
||||||
#{testusername},
|
#{TestUserName},
|
||||||
#{audittime},
|
#{AuditTime},
|
||||||
#{auditusercode},
|
#{AuditUserCode},
|
||||||
#{auditusername},
|
#{AuditUserName},
|
||||||
#{itemcode},
|
#{ItemCode},
|
||||||
#{itemname},
|
#{ItemName},
|
||||||
#{itemnamecn},
|
#{ItemNameCn},
|
||||||
#{itemcodesb},
|
#{ItemCodeSB},
|
||||||
#{itemnamesb},
|
#{ItemNameSB},
|
||||||
#{lonic},
|
#{Lonic},
|
||||||
#{itemmethodcode},
|
#{ItemMethodCode},
|
||||||
#{itemmethodname},
|
#{ItemMethodName},
|
||||||
#{equipmentcode},
|
#{EquipmentCode},
|
||||||
#{testinstcode},
|
#{TestInstCode},
|
||||||
#{testinstcodesb},
|
#{TestInstCodeSB},
|
||||||
#{testinstname},
|
#{TestInstName},
|
||||||
#{itemresult},
|
#{ItemResult},
|
||||||
#{itemresulttext},
|
#{ItemResultText},
|
||||||
#{resultremark},
|
#{ResultRemark},
|
||||||
#{itemunit},
|
#{ItemUnit},
|
||||||
#{itemref},
|
#{ItemRef},
|
||||||
#{itemrefmin},
|
#{ItemRefMin},
|
||||||
#{itemrefmax},
|
#{ItemRefMax},
|
||||||
#{itemflag},
|
#{ItemFlag},
|
||||||
#{itemflagstr},
|
#{ItemFlagStr},
|
||||||
#{checkflag},
|
#{CheckFlag},
|
||||||
#{crtflag},
|
#{CrtFlag},
|
||||||
#{crtref},
|
#{CrtRef},
|
||||||
#{orderitemcode},
|
#{OrderItemCode},
|
||||||
#{orderitemname},
|
#{OrderItemName},
|
||||||
#{printsort}
|
#{PrintSort}
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
@ -127,34 +127,34 @@
|
|||||||
<insert id="insertRegResultGerm">
|
<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)
|
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 (
|
values (
|
||||||
#{reportno},
|
#{ReportNo},
|
||||||
#{patid},
|
#{PatId},
|
||||||
#{hospcode},
|
#{HospCode},
|
||||||
#{hospname},
|
#{HospName},
|
||||||
#{germresultno},
|
#{GermResultNo},
|
||||||
#{germcode},
|
#{GermCode},
|
||||||
#{germname},
|
#{GermName},
|
||||||
#{germnamecn},
|
#{GermNameCn},
|
||||||
#{germcodesb},
|
#{GermCodeSB},
|
||||||
#{germnamesb},
|
#{GermNameSB},
|
||||||
#{colonycounting},
|
#{ColonyCounting},
|
||||||
#{colonyratio},
|
#{ColonyRatio},
|
||||||
#{mediumname},
|
#{MediumName},
|
||||||
#{culturetime},
|
#{CultureTime},
|
||||||
#{cultureneed},
|
#{CultureNeed},
|
||||||
#{discoverymode},
|
#{DiscoveryMode},
|
||||||
#{equipmentcode},
|
#{EquipmentCode},
|
||||||
#{testinstcode},
|
#{TestInstCode},
|
||||||
#{testinstcodesb},
|
#{TestInstCodeSB},
|
||||||
#{testinstname},
|
#{TestInstName},
|
||||||
#{testresult},
|
#{TestResult},
|
||||||
#{itemresulttext},
|
#{ItemResultText},
|
||||||
#{ismultidrugr},
|
#{IsMultidrugR},
|
||||||
#{multidrugrname},
|
#{MultidrugRName},
|
||||||
#{crtflag},
|
#{CrtFlag},
|
||||||
#{isinfectious},
|
#{IsInfectious},
|
||||||
#{isbiohazard},
|
#{IsBiohazard},
|
||||||
#{printsort}
|
#{PrintSort}
|
||||||
|
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
@ -168,28 +168,28 @@
|
|||||||
antinamecn, anticodesb, antinamesb, testmethodcode, testmethodname, testresult,
|
antinamecn, anticodesb, antinamesb, testmethodcode, testmethodname, testresult,
|
||||||
resistantcode, resistantname, itemref, dosage, mic, diameterofinhibitionring,
|
resistantcode, resistantname, itemref, dosage, mic, diameterofinhibitionring,
|
||||||
sensremark, printsort)
|
sensremark, printsort)
|
||||||
values (#{reportno},
|
values (#{ReportNo},
|
||||||
#{patid},
|
#{PatId},
|
||||||
#{hospcode},
|
#{HospCode},
|
||||||
#{hospname},
|
#{HospName},
|
||||||
#{sensresultno},
|
#{SensResultNo},
|
||||||
#{germresultno},
|
#{GermResultNo},
|
||||||
#{anticode},
|
#{AntiCode},
|
||||||
#{antiname},
|
#{AntiName},
|
||||||
#{antinamecn},
|
#{AntiNameCn},
|
||||||
#{anticodesb},
|
#{AntiCodeSB},
|
||||||
#{antinamesb},
|
#{AntiNameSB},
|
||||||
#{testmethodcode},
|
#{TestMethodCode},
|
||||||
#{testmethodname},
|
#{TestMethodName},
|
||||||
#{testresult},
|
#{TestResult},
|
||||||
#{resistantcode},
|
#{ResistantCode},
|
||||||
#{resistantname},
|
#{ResistantName},
|
||||||
#{itemref},
|
#{ItemRef},
|
||||||
#{dosage},
|
#{Dosage},
|
||||||
#{mic},
|
#{Mic},
|
||||||
#{diameterofinhibitionring},
|
#{DiameterOfInhibitionRing},
|
||||||
#{sensremark},
|
#{SensRemark},
|
||||||
#{printsort}
|
#{PrintSort}
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
@ -200,15 +200,15 @@
|
|||||||
<insert id="insertRegReportFile">
|
<insert id="insertRegReportFile">
|
||||||
insert into reg_report_file(reportno, reportfilename, reportformat, report, hospcode, hospname, operatetime, usercode, username)
|
insert into reg_report_file(reportno, reportfilename, reportformat, report, hospcode, hospname, operatetime, usercode, username)
|
||||||
values(
|
values(
|
||||||
#{reportno},
|
#{ReportNo},
|
||||||
#{reportfilename},
|
#{ReportFileName},
|
||||||
#{reportformat},
|
#{ReportFormat},
|
||||||
#{report},
|
#{Report},
|
||||||
#{hospcode},
|
#{HospCode},
|
||||||
#{hospname},
|
#{HospName},
|
||||||
#{operatetime},
|
#{OperateTime},
|
||||||
#{usercode},
|
#{UserCode},
|
||||||
#{username}
|
#{UserName}
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user