liyuanyuan 10 kuukautta sitten
vanhempi
commit
c767bccfdf

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

312
              var  recordList = patientService.getList(qw);
312
              var  recordList = patientService.getList(qw);
313
 
313
 
314
 
314
 
315
-            if (recordList == null) {
315
+            if (recordList.isEmpty()) {
316
                 Patient pt = new Patient();
316
                 Patient pt = new Patient();
317
 
317
 
318
                 UUID uuid = UUID.randomUUID();
318
                 UUID uuid = UUID.randomUUID();

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

180
 	<select id="selectWorkOrderTypeReport" parameterType="api.entity.view.report.ScreenReport" resultMap="SysWorkOrderTypeReport">
180
 	<select id="selectWorkOrderTypeReport" parameterType="api.entity.view.report.ScreenReport" resultMap="SysWorkOrderTypeReport">
181
 		SELECT  (SELECT `type_name` FROM  `workorder_type` WHERE `id` =a.workordercate)  type_name
181
 		SELECT  (SELECT `type_name` FROM  `workorder_type` WHERE `id` =a.workordercate)  type_name
182
 		,COUNT(1) type_count ,
182
 		,COUNT(1) type_count ,
183
-		SUM(CASE  WHEN workorderstate>=4 THEN 1 ELSE 0  END ) processed,
184
-		SUM(CASE  WHEN workorderstate=6 THEN 1 ELSE 0  END ) completed
183
+		SUM(CASE  WHEN workorderstate>3000 THEN 1 ELSE 0  END ) processed,
184
+		SUM(CASE  WHEN workorderstate=6000 THEN 1 ELSE 0  END ) completed
185
 		FROM  `wo_workorderbase`   a
185
 		FROM  `wo_workorderbase`   a
186
 		WHERE `isdelete`=0
186
 		WHERE `isdelete`=0
187
 		<if test="startTime != null and startTime !=''">
187
 		<if test="startTime != null and startTime !=''">