tijiao

hjzx-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -312,7 +312,7 @@ public class WorkOrderBaseController extends BaseController {
              var  recordList = patientService.getList(qw);
 
 
-            if (recordList == null) {
+            if (recordList.isEmpty()) {
                 Patient pt = new Patient();
 
                 UUID uuid = UUID.randomUUID();

hjzx-mapper/src/main/resources/mapper/report/ReportMapper.xml

@@ -180,8 +180,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectWorkOrderTypeReport" parameterType="api.entity.view.report.ScreenReport" resultMap="SysWorkOrderTypeReport">
 		SELECT  (SELECT `type_name` FROM  `workorder_type` WHERE `id` =a.workordercate)  type_name
 		,COUNT(1) type_count ,
-		SUM(CASE  WHEN workorderstate>=4 THEN 1 ELSE 0  END ) processed,
-		SUM(CASE  WHEN workorderstate=6 THEN 1 ELSE 0  END ) completed
+		SUM(CASE  WHEN workorderstate>3000 THEN 1 ELSE 0  END ) processed,
+		SUM(CASE  WHEN workorderstate=6000 THEN 1 ELSE 0  END ) completed
 		FROM  `wo_workorderbase`   a
 		WHERE `isdelete`=0
 		<if test="startTime != null and startTime !=''">