代码修改

fs-admin/pom.xml

@@ -86,6 +86,11 @@
             <version>0.4.6</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -487,6 +487,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public R createOrder(Long prescribeId) {
         FsPrescribe prescribe=prescribeMapper.selectFsPrescribeByPrescribeId(prescribeId);
         FsPrescribeDrug map=new FsPrescribeDrug();

fs-service/src/main/resources/mapper/statis/FsStatisSalerWatchMapper.xml

@@ -138,7 +138,7 @@
                 </otherwise>
             </choose>
         </where>
-        GROUP BY period_id
+        GROUP BY period_id,sop_id
     </select>
     <select id="queryTodayList" resultType="com.fs.statis.domain.FsStatisSalerWatch">
         SELECT
@@ -370,7 +370,7 @@
                 </otherwise>
             </choose>
         </where>
-        GROUP BY period_id
+        GROUP BY period_id,sop_id
     </select>
     <select id="queryEveryDayListExport" resultType="com.fs.statis.domain.FsStatisEveryDayWatch">
         SELECT