Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.0_4.9.1.sql =================================================================== diff -u -r19879 -r19880 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.0_4.9.1.sql (.../4.9.0_4.9.1.sql) (revision 19879) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.0_4.9.1.sql (.../4.9.0_4.9.1.sql) (revision 19880) @@ -1 +1,7 @@ -update PackingRecord set tousseDefinitionId=(select min(ti.tousseDefinition_id) from TousseInstance ti where ti.packingRecord_id=PackingRecord.id group by ti.packingRecord_id) where tousseDefinitionId is null; \ No newline at end of file +update PackingRecord set tousseDefinitionId=( +select min(ti.tousseDefinition_id) from TousseInstance ti where ti.packingRecord_id=PackingRecord.id group by ti.packingRecord_id +) where tousseDefinitionId is null and tousseType<>'外来器械包'; +update PackingRecord set tousseDefinitionId=( +select case when min(td.tousseType)='外来器械拆分小包' then min(td.parentID) else min(td.id) end +from TousseInstance ti join TousseDefinition td on td.id=ti.tousseDefinition_id where ti.packingRecord_id=PackingRecord.id group by ti.packingRecord_id +) where tousseDefinitionId is null and tousseType='外来器械包'; \ No newline at end of file