修复成组问题和退费问题

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>10.10.8</version>
+    <version>10.10.10</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

src/main/java/thyyxxk/webserver/dao/his/hospitalizationCosts/HospitalizationCostsDao.java

@@ -67,7 +67,7 @@ public interface HospitalizationCostsDao extends BaseMapper<ZyDetailChargeTable>
             "(#{patNo}, #{times}, #{name}, #{bedNo}, #{wardCode},  #{wardCode}, #{item.chargeCodeMx}, #{item.chargeAmount,jdbcType=REAL}, " +
             "       (select pack_retprice from yp_zd_dict where code = #{item.chargeCodeMx} and serial = #{item.serial}), getdate(), #{infantFlag}, #{userCode}, 'a', '1', " +
             "       #{item.drugClass},  getdate(), ${index}, #{item.serial}, #{groupNo}, " +
-            "       #{item.doctorCode}, '-1',#{ledgerSn},#{item.detailSn},0,'HT')" +
+            "       #{item.doctorCode}, '-1',#{ledgerSn},#{item.oriDetailSn},0,'HT')" +
             "</foreach>" +
             "</script>")
     void detailsOfDrugReturnForm(@Param("list") List<ZyDetailChargeTable> list,

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/YiZhuLuRuDao.java

@@ -595,7 +595,9 @@ public interface YiZhuLuRuDao {
             "end_time = #{endTime,jdbcType=TIMESTAMP}," +
             "group_no = #{groupNo}," +
             "modifier = #{modifier} " +
-            "where parent_no = #{actOrderNo,jdbcType=REAL}")
+            "where parent_no = #{actOrderNo,jdbcType=REAL} " +
+            " and inpatient_no = #{inpatientNo} " +
+            " and admiss_times = #{admissTimes}")
     void howOftenTheSubPhysicianOrderIsModified(XinZhenYzActOrder pa);
 
 

src/main/java/thyyxxk/webserver/service/hospitalizationCosts/HospitalizationCostsService.java

@@ -254,12 +254,11 @@ public class HospitalizationCostsService {
         // 执行人
         clone.setOpIdCode(userCode);
         clone.setConfirmId(userCode);
+        // 设置原来的流水号
         clone.setOriDetailSn(item.getDetailSn());
         Date now = new Date();
         clone.setGenTime(now);
         clone.setChargeDate(now);
-        // 设置原来的流水号
-        clone.setOriDetailSn(item.getDetailSn());
         // 设置新的流水号
         clone.setDetailSn(maxDetailSn);
         // 这个是唯一要改变的东西

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -450,14 +450,15 @@ public class YiZhuLuRuServer {
         qw.eq("a.admiss_times", param.getAdmissTimes());
         qw.eq("a.status_flag", "1");
 
-        // 不是子节点，就需要查询是否存在子节点
+        // 不是子节点，就需要查询 子节点
         if (data.getParentNo() == null) {
             qw.and(wrapper -> wrapper.eq("a.act_order_no", param.getActOrderNo())
                     .or()
                     .eq("a.parent_no", param.getActOrderNo())
             );
         } else {
-            qw.eq("a.act_order_no", data.getParentNo());
+            // 如果是子节点就返回自己
+            qw.eq("a.act_order_no", data.getActOrderNo());
         }
 
         qw.orderByAsc("a.act_order_no");