develop/hrl_20241217_fyhzjsjbyz

门诊/住院药房查询/发药统计查询中的发药汇总的进价和售价不一致

WEB-INF/src/com/his/zy/zyyfcxmanage/ZyfyTjcxForm.java

@@ -219,7 +219,7 @@ public class ZyfyTjcxForm extends WatWebForm {
 				data.add(jjje);
 				hzdatas.put(ypdm, data);
 			}else{
-				String yzdj = dbgrid3.getColumnValueAsString(i,"YZDJ");
+				String yzdj = dbgrid3.getColumnValueAsString(i,"FYJE");
 				String fysl = dbgrid3.getColumnValueAsString(i,"JZYZSL");
 				
 				
@@ -227,14 +227,14 @@ public class ZyfyTjcxForm extends WatWebForm {
 				String hjsl = MathUtil.add(fysl, tysl);
 				
 				String jjje = dbgrid3.getColumnValueAsString(i,"FYJJJE");
-				String yzje = MathUtil.multiply(hjsl,yzdj);
+				//String yzje = MathUtil.multiply(fysl,yzdj);
 				
 				List<String> data = hzdatas.get(ypdm);
 				data.set(2, MathUtil.add(data.get(2), fysl));
 				data.set(3, MathUtil.add(data.get(3), tysl));
 				data.set(4, MathUtil.add(data.get(4), hjsl));
 				
-				data.set(8, MathUtil.add(data.get(8), yzje));
+				data.set(8, MathUtil.add(data.get(8), yzdj));
 				data.set(9, MathUtil.add(data.get(9), jjje));
 				
 				dbgrid3.setCalcFieldValue(i,"hjsl", hjsl);

release/20241216_1413.text

@@ -22,6 +22,9 @@ develop/lyx_20241217_crb
 ...........................................................................................................................................
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+develop/hrl_20241217_fyhzjsjbyz
+
+门诊/住院药房查询/发药统计查询中的发药汇总的进价和售价不一致
 ...........................................................................................................................................
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<