fix: 修复多模块Bug及功能优化

修复药品汇总、医嘱套餐、转科管理、用药汇总、处方列表、用户管理等多个模块的问题

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java

@@ -187,6 +187,9 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService
      */
     @Override
     public R<?> medicineSummary(List<MedicineSummaryParam> medicineSummaryParamList) {
+        if (medicineSummaryParamList == null || medicineSummaryParamList.isEmpty()) {
+            throw new ServiceException("请至少选择一条待汇总的药品");
+        }
         // 领药人
         Long receiverId = medicineSummaryParamList.get(0).getReceiverId();
         // 申请时间

openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java

@@ -102,6 +102,7 @@ public class OrdersGroupPackageAppServiceImpl implements IOrdersGroupPackageAppS
             ordersGroupPackageDetail.setMethodCode(ordersGroupPackageDetailSaveDto.getMethodCode()); // 给药途径
             ordersGroupPackageDetail.setDoseQuantity(ordersGroupPackageDetailSaveDto.getDoseQuantity()); // 小单位单次剂量
             ordersGroupPackageDetail.setGroupId(ordersGroupPackageDetailSaveDto.getGroupId()); // 组号
+            ordersGroupPackageDetail.setGroupOrder(ordersGroupPackageDetailSaveDto.getGroupOrder()); // 组内排序号
             ordersGroupPackageDetail.setTherapyEnum(ordersGroupPackageDetailSaveDto.getTherapyEnum()); // 治疗类型
             ordersGroupPackageDetailService.save(ordersGroupPackageDetail);
         }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java

@@ -88,6 +88,11 @@ public class OrdersGroupPackageDetailQueryDto {
      */
     private Long groupId;
 
+    /**
+     * 组内排序号
+     */
+    private Integer groupOrder;
+
     /**
      * 治疗类型：1-长期 2-临时
      */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailSaveDto.java

@@ -63,6 +63,11 @@ public class OrdersGroupPackageDetailSaveDto {
      */
     private Long groupId;
 
+    /**
+     * 组内排序号
+     */
+    private Integer groupOrder;
+
     /**
      * 治疗类型：1-长期 2-临时
      */

openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml

@@ -47,6 +47,7 @@
         togpd.method_code AS method_code,
         togpd.dose_quantity AS dose_quantity,
         togpd.group_id,
+        togpd.group_order AS group_order,
         togpd.dispense_per_duration AS dispense_per_duration,
         togpd.therapy_enum AS therapy_enum,
         CASE

openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackageDetail.java

@@ -67,6 +67,11 @@ public class OrdersGroupPackageDetail extends HisBaseEntity {
      */
     private Long groupId;
 
+    /**
+     * 组内排序号
+     */
+    private Integer groupOrder;
+
     /**
      * 治疗类型：1-长期 2-临时
      */