退检模块,检验项目 BUG修改

liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java

@@ -189,6 +189,8 @@ public class ReportItemServiceImpl implements ReportItemService {
                 if(xmRefNewRow.getXmid() == null || xmRefNewRow.getXmid().equals("")) xmRefNewRow.setXmid(xmInfoNew.getXmid());
                 XmRefNew newXmRef = new XmRefNew();
                 newXmRef.setXmid(xmRefNewRow.getXmid());
+                newXmRef.setXh(xmRefNewRow.getXh());
+                newXmRef.setYq(xmRefNewRow.getYq());
                 List<XmRefNew> xmRefNews = reportItemMapper.queryXmRefNew(newXmRef);
                 if(xmRefNews.size() > 0){
                     reportItemMapper.updateXmRefNewRow(xmRefNewRow);

liswork/src/main/java/com/czlis/liswork/service/impl/work/CancelCheckServiceImpl.java

@@ -63,6 +63,7 @@ public class CancelCheckServiceImpl implements CancelCheckService {
 
         //写日志
         Integer labReqsteplogMax = labReqsteplogMapper.getLabReqsteplogMax(cancelCheckVO.getSqh());
+        if(labReqsteplogMax == null) labReqsteplogMax = 0;
         LabReqsteplog labReqsteplog = new LabReqsteplog();
         labReqsteplog.setSqh(cancelCheckVO.getSqh());
         labReqsteplog.setXh(labReqsteplogMax + 1);

liswork/src/main/resources/mapper/ReportItemMapper.xml

@@ -374,11 +374,13 @@
 
     <delete id="deleteXmTextResult">
         delete from xm_textresult_new where xmid = #{xmid}
+        <if test="xh != null">and xh = #{xh}</if>
     </delete>
 
     <delete id="deleteXmRefNew">
         delete from xm_ref_new where xmid = #{xmid}
         <if test="xh != null">and xh = #{xh}</if>
+        <if test="yq != null and yq != ''">and yq = #{yq}</if>
     </delete>
 
     <delete id="deleteXmValNew">
@@ -466,9 +468,9 @@
             <if test="zd != null and zd != ''">zd = #{zd},</if>
             <if test="instrid != null and instrid != ''">instrid = #{instrid},</if>
             <if test="yq != null and yq != ''">yq = #{yq},</if>
-            xmid = #{xmid},xmdh = #{xmdh},xh = #{xh}
+            xmid = #{xmid},xmdh = #{xmdh}
         </set>
-        where xmid = #{xmid}
+        where xmid = #{xmid} and xh = #{xh} and yq = #{yq}
     </update>
 
     <update id="updateXmValNewRow">